Localisation updates from https://translatewiki.net.

diff --git a/config/locales/de.yml b/config/locales/de.yml
index ced91d895d0740f23791bdcb1e7d98d58040b85d..bf321a0e8996b93f95971d3cdf7384bbd828475a 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -5,6 +5,7 @@
 # Author: Al
 # Author: Als-Holder
 # Author: Apmon
 # Author: Al
 # Author: Als-Holder
 # Author: Apmon

+# Author: Atomkraftzwerg

 # Author: Avatar
 # Author: Bpw85
 # Author: Campmaster
 # Author: Avatar
 # Author: Bpw85
 # Author: Campmaster


@@ -68,6 +69,9 @@ de:
         create: Speichern
       diary_entry:
         create: Veröffentlichen
         create: Speichern
       diary_entry:
         create: Veröffentlichen

+        update: Aktualisieren
+      issue_comment:
+        create: Kommentar hinzufügen

       message:
         create: Senden
       client_application:
       message:
         create: Senden
       client_application:


@@ -155,6 +159,21 @@ de:
         description: Beschreibung
         languages: Sprachen
         pass_crypt: Passwort
         description: Beschreibung
         languages: Sprachen
         pass_crypt: Passwort

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: vor ca. einer Stunde
+        other: vor ca. %{count} Stunden
+      about_x_months:
+        one: vor ca. einem Monat
+        other: vor ca. %{count} Monaten
+      about_x_years:
+        one: vor ca. einem Jahr
+        other: vor ca. %{count} Jahren
+      almost_x_years:
+        one: vor fast einem Jahr
+        other: vor fast %{count} Jahren
+      half_a_minute: vor einer halben Minute

   printable_name:
     with_name_html: '%{name} (%{id})'
   editor:
   printable_name:
     with_name_html: '%{name} (%{id})'
   editor:


@@ -1431,8 +1450,7 @@ de:
       legal_html: |-
         Diese Website und viele damit in Zusammenhang stehenden Dienste werden
         von der <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
       legal_html: |-
         Diese Website und viele damit in Zusammenhang stehenden Dienste werden
         von der <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)

-        für die OSM-Gemeinschaft betrieben. Die Verwendung aller OSMF-betriebenen Dienste
-        ist wird durch unsere
+        für die OSM-Gemeinschaft betrieben. Die Verwendung aller OSMF-betriebenen Dienste wird durch unsere

         „<a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Acceptable Use Policies</a>“
         und unserer <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Datenschutzrichtlinie</a> geregelt.
         <br>
         „<a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Acceptable Use Policies</a>“
         und unserer <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Datenschutzrichtlinie</a> geregelt.
         <br>

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 85081f63a49d957f1b8cc8153a5694aab843ce37..520ed9b2618646176e5d913469535d22ce4b99f8 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -122,6 +122,45 @@ eo:
         description: Priskribo
         languages: Lingvoj
         pass_crypt: Pasvorto
         description: Priskribo
         languages: Lingvoj
         pass_crypt: Pasvorto

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: proksimume antaŭ 1 horo
+        other: proksimume antaŭ %{count} horoj
+      about_x_months:
+        one: proksimume antaŭ 1 monato
+        other: proksimume antaŭ %{count} monatoj
+      about_x_years:
+        one: proksimume antaŭ 1 jaro
+        other: proksimume antaŭ %{count} jaroj
+      almost_x_years:
+        one: malpli ol antaŭ 1 jaro
+        other: malpli ol antaŭ %{count} jaroj
+      half_a_minute: antaŭ duonminuto
+      less_than_x_seconds:
+        one: malpli ol antaŭ 1 sekundo
+        other: malpli ol antaŭ %{count} sekundoj
+      less_than_x_minutes:
+        one: malpli ol antaŭ 1 minuto
+        other: malpli ol antaŭ %{count} minutoj
+      over_x_years:
+        one: pli ol antaŭ 1 jaro
+        other: pli ol antaŭ %{count} jaroj
+      x_seconds:
+        one: antaŭ 1 sekundo
+        other: antaŭ %{count} sekundoj
+      x_minutes:
+        one: antaŭ 1 minuto
+        other: antaŭ %{count} minutoj
+      x_days:
+        one: antaŭ 1 tago
+        other: antaŭ %{count} tagoj
+      x_months:
+        one: antaŭ 1 monato
+        other: antaŭ %{count} monatoj
+      x_years:
+        one: antaŭ 1 jaro
+        other: antaŭ %{count} jaroj

   editor:
     default: Implicita (nune %{name})
     potlatch:
   editor:
     default: Implicita (nune %{name})
     potlatch:

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 9cdbf3196abb3d52a6a10af312a67d734517efd7..461fe918893e5ab7861dc69efa0b90d72bcb3dd1 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1546,8 +1546,8 @@ fa:
           description: دریافت این محدوده از یکی از آینه‌های پایگاه‌دادهٔ OpenStreetMap
         geofabrik:
           title: دانلودهای Geofabrik
           description: دریافت این محدوده از یکی از آینه‌های پایگاه‌دادهٔ OpenStreetMap
         geofabrik:
           title: دانلودهای Geofabrik

-          description: داده‌های قاره‌ها، کشورها، و شهرهای برگزیده که به‌طور منظم به‌روز
-            می‌شود
+          description: گزیدهٔ اطلاعات قاره‌ها، کشورها، و شهرهای منتخب که به‌طور منظم
+            روزآمد می‌شود

         metro:
           title: خلاصه های مترو
           description: خلاصه هایی برای شهرهای بزرگ جهان و مناطق اطرافشان
         metro:
           title: خلاصه های مترو
           description: خلاصه هایی برای شهرهای بزرگ جهان و مناطق اطرافشان

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 18ee37c0401567553604aa13a62040deead0e8be..69bdab4d47133c3add4261f76cb4a9ce53c189b5 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -168,6 +168,14 @@ fr:
         description: Description
         languages: Langues
         pass_crypt: Mot de passe
         description: Description
         languages: Langues
         pass_crypt: Mot de passe

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: il y a environ une heure
+        other: il y a environ %{count} heures
+      about_x_months:
+        one: il y a environ un mois
+        other: il y a environ %{count} mois

   printable_name:
     with_name_html: '%{name} (%{id})'
   editor:
   printable_name:
     with_name_html: '%{name} (%{id})'
   editor:

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 8f909caa3f73c41157c4e18f2dd262573d0df281..85579bae0ac037b20f106ab0d107f13c3770fbd5 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -2007,7 +2007,7 @@ hu:
         hivatkozást, amivel visszaállíthatod a jelszavad.
       notice email on way: Sajnálom, hogy elvesztetted :-( de már úton van egy e-mail,
         így nemsokára alaphelyzetbe állíthatod.
         hivatkozást, amivel visszaállíthatod a jelszavad.
       notice email on way: Sajnálom, hogy elvesztetted :-( de már úton van egy e-mail,
         így nemsokára alaphelyzetbe állíthatod.

-      notice email cannot find: Az e-mail cím nem található, sajnálom.
+      notice email cannot find: Sajnáljuk, az e-mail-cím nem található.

     reset_password:
       title: Jelszó alaphelyzetbe állítása
       heading: '%{user} jelszavának alaphelyzetbe állítása'
     reset_password:
       title: Jelszó alaphelyzetbe állítása
       heading: '%{user} jelszavának alaphelyzetbe állítása'


@@ -2149,8 +2149,8 @@ hu:
     account:
       title: Felhasználói fiók szerkesztése
       my settings: Beállításaim
     account:
       title: Felhasználói fiók szerkesztése
       my settings: Beállításaim

-      current email address: 'Jelenlegi e-mail cím:'
-      new email address: 'Új e-mail cím:'
+      current email address: 'Jelenlegi e-mail-cím:'
+      new email address: 'Új e-mail-cím:'

       email never displayed publicly: (soha nem jelenik meg nyilvánosan)
       external auth: 'Külső Hitelesítés:'
       openid:
       email never displayed publicly: (soha nem jelenik meg nyilvánosan)
       external auth: 'Külső Hitelesítés:'
       openid:

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 933ee6b16e7487e09e0e71df00d4eb397cd0ed13..a2dfa9791fbb7ee59d33d51fe681effec0d162b8 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -24,6 +24,8 @@ is:
       diary_entry:
         create: Birta
         update: Uppfæra
       diary_entry:
         create: Birta
         update: Uppfæra

+      issue_comment:
+        create: Bæta við athugasemd

       message:
         create: Senda
       client_application:
       message:
         create: Senda
       client_application:


@@ -110,6 +112,45 @@ is:
         description: Lýsing
         languages: Tungumál
         pass_crypt: Lykilorð
         description: Lýsing
         languages: Tungumál
         pass_crypt: Lykilorð

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: fyrir um klukkustund síðan
+        other: fyrir um %{count} klukkustundum síðan
+      about_x_months:
+        one: fyrir um mánuði síðan
+        other: fyrir um %{count} mánuðum síðan
+      about_x_years:
+        one: fyrir um ári síðan
+        other: fyrir um %{count} árum síðan
+      almost_x_years:
+        one: fyrir næstum ári síðan
+        other: fyrir næstum %{count} árum síðan
+      half_a_minute: fyrir hálfri mínútu síðan
+      less_than_x_seconds:
+        one: fyrir minna en sekúndu síðan
+        other: fyrir minna en %{count} sekúndum síðan
+      less_than_x_minutes:
+        one: fyrir minna en mínútu síðan
+        other: fyrir minna en %{count} mínútum síðan
+      over_x_years:
+        one: fyrir meira en ári síðan
+        other: fyrir meira en %{count} árum síðan
+      x_seconds:
+        one: fyrir 1 sekúndu síðan
+        other: fyrir %{count} sekúndum síðan
+      x_minutes:
+        one: fyrir 1 mínútu síðan
+        other: fyrir %{count} mínútum síðan
+      x_days:
+        one: fyrir 1 degi síðan
+        other: fyrir %{count} dögum síðan
+      x_months:
+        one: fyrir mánuði síðan
+        other: fyrir %{count} mánuðum síðan
+      x_years:
+        one: fyrir ári síðan
+        other: fyrir %{count} árum síðan

   printable_name:
     with_version: '%{id}, útgáfa %{version}'
     with_name_html: '%{name} (%{id})'
   printable_name:
     with_version: '%{id}, útgáfa %{version}'
     with_name_html: '%{name} (%{id})'


@@ -2172,6 +2213,7 @@ is:
       title: Skilmálar
       heading: Skilmálar
       heading_ct: Skilmálar vegna framlags
       title: Skilmálar
       heading: Skilmálar
       heading_ct: Skilmálar vegna framlags

+      read_ct: Ég hef lesið og samþykki ofangreinda skilmála fyrir framlög þátttakenda

       read_tou: Ég hef lesið og samþykki notkunarskilmálana
       consider_pd: Til viðbótar við ofangreint samkomulag, lít ég svo á að framlög
         mín verði í almenningseigu (Public Domain)
       read_tou: Ég hef lesið og samþykki notkunarskilmálana
       consider_pd: Til viðbótar við ofangreint samkomulag, lít ég svo á að framlög
         mín verði í almenningseigu (Public Domain)


@@ -2601,6 +2643,7 @@ is:
         title: Lög
       copyright: © <a href='%{copyright_url}'>Þátttakendur í OpenStreetMap verkefninu</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Styrkja verkefnið</a>
         title: Lög
       copyright: © <a href='%{copyright_url}'>Þátttakendur í OpenStreetMap verkefninu</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Styrkja verkefnið</a>

+      terms: <a href='%{terms_url}' target='_blank'>Skilmálar vefsvæðis og API-kerfisviðmóts</a>

     site:
       edit_tooltip: Breyta kortinu
       edit_disabled_tooltip: Renndu að til að breyta kortinu
     site:
       edit_tooltip: Breyta kortinu
       edit_disabled_tooltip: Renndu að til að breyta kortinu

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 8aaa95489ce1b9295ca7ac00e9886d64684939c2..30bf68533b7ba5691a174d894b00d09ef1d56726 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -147,6 +147,45 @@ it:
         description: Descrizione
         languages: Lingue
         pass_crypt: Password
         description: Descrizione
         languages: Lingue
         pass_crypt: Password

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: circa 1 ora fa
+        other: circa %{count} ore fa
+      about_x_months:
+        one: circa 1 mese fa
+        other: circa %{count} mesi fa
+      about_x_years:
+        one: circa 1 anno fa
+        other: circa %{count} anni fa
+      almost_x_years:
+        one: almeno 1 anno fa
+        other: almeno %{count} anni fa
+      half_a_minute: mezzo minuto fa
+      less_than_x_seconds:
+        one: meno di 1 secondo fa
+        other: meno di %{count} secondi fa
+      less_than_x_minutes:
+        one: meno di un minuto fa
+        other: meno di %{count} minuti fa
+      over_x_years:
+        one: oltre 1 anno fa
+        other: oltre %{count} anni fa
+      x_seconds:
+        one: 1 secondo fa
+        other: '%{count} secondi fa'
+      x_minutes:
+        one: 1 minuto fa
+        other: '%{count} minuti fa'
+      x_days:
+        one: 1 giorno fa
+        other: '%{count} giorni fa'
+      x_months:
+        one: 1 mese fa
+        other: '%{count} mesi fa'
+      x_years:
+        one: 1 anno fa
+        other: '%{count} anni fa'

   editor:
     default: Predefinito (al momento %{name})
     potlatch:
   editor:
     default: Predefinito (al momento %{name})
     potlatch:

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 0f466bbc0586bbb18039d1e4096cb3b3abcae6a3..bd6a5bd339f019c01bdb76b4bdfc9a0a75be133b 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -37,6 +37,7 @@
 # Author: Wrightbus
 # Author: Yusuke1109
 # Author: ネイ
 # Author: Wrightbus
 # Author: Yusuke1109
 # Author: ネイ

+# Author: 神樂坂秀吉

 # Author: 青子守歌
 # Author: 아라
 ---
 # Author: 青子守歌
 # Author: 아라
 ---


@@ -140,6 +141,45 @@ ja:
         description: 説明
         languages: 言語
         pass_crypt: パスワード
         description: 説明
         languages: 言語
         pass_crypt: パスワード

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: 約1時間前
+        other: 約%{count}時間前
+      about_x_months:
+        one: 約1ヶ月前
+        other: 約%{count}ヶ月前
+      about_x_years:
+        one: 約1年
+        other: 約%{count}年前
+      almost_x_years:
+        one: ほぼ1年前
+        other: ほぼ%{count}年前
+      half_a_minute: 30秒前
+      less_than_x_seconds:
+        one: 1秒前以内に
+        other: '%{count}秒前以内に'
+      less_than_x_minutes:
+        one: 1分前以内に
+        other: '%{count}分前以内に'
+      over_x_years:
+        one: 1年前以上
+        other: '%{count}年前以上'
+      x_seconds:
+        one: 1秒
+        other: '%{count}秒前'
+      x_minutes:
+        one: 1分前
+        other: '%{count}分前'
+      x_days:
+        one: 1日前
+        other: '%{count}日前'
+      x_months:
+        one: 1ヶ月前
+        other: '%{count}ヶ月前'
+      x_years:
+        one: 1年前
+        other: '%{count}年前'

   editor:
     default: 既定 (現在は %{name})
     potlatch:
   editor:
     default: 既定 (現在は %{name})
     potlatch:

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 662f33a7d082fbf56104364efd1790c04f234b18..92ed61ee7f236df383add5a0220ef07692ed9a77 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -27,6 +27,7 @@
 # Author: Wrightbus
 # Author: Ykhwong
 # Author: Ysjbserver
 # Author: Wrightbus
 # Author: Ykhwong
 # Author: Ysjbserver

+# Author: 神樂坂秀吉

 # Author: 고솜
 # Author: 밥풀떼기
 # Author: 아라
 # Author: 고솜
 # Author: 밥풀떼기
 # Author: 아라


@@ -130,6 +131,12 @@ ko:
         description: 설명
         languages: 언어
         pass_crypt: 비밀번호
         description: 설명
         languages: 언어
         pass_crypt: 비밀번호

+  datetime:
+    distance_in_words_ago:
+      half_a_minute: 30초 전
+      x_years:
+        one: 1년 전
+        other: '%{count}년 전'

   editor:
     default: 기본값 (현재 %{name})
     potlatch:
   editor:
     default: 기본값 (현재 %{name})
     potlatch:

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 12e2a25d9c22e679358ff5cc2148bd47dfce452e..81df00b0e7bb46431acf3f0236a63ad681bf9a68 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -77,6 +77,9 @@ lb:
         description: Beschreiwung
         languages: Sproochen
         pass_crypt: Passwuert
         description: Beschreiwung
         languages: Sproochen
         pass_crypt: Passwuert

+  datetime:
+    distance_in_words_ago:
+      half_a_minute: virun enger hallwer Minutt

   editor:
     default: Standard (elo %{name})
     potlatch:
   editor:
     default: Standard (elo %{name})
     potlatch:

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 531f28d27711b662bd8bd350228d7b89e35b36d3..c1d661956956f813f75f28d3e77342d3164a10a9 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -29,8 +29,8 @@ mk:
         create: Регистрирање
         update: Уреди
       redaction:
         create: Регистрирање
         update: Уреди
       redaction:

-        create: Создај редакција
-        update: Зачувај редакција
+        create: Создај исправка
+        update: Зачувај исправка

       trace:
         create: Подигни
         update: Зачувај промени
       trace:
         create: Подигни
         update: Зачувај промени


@@ -109,6 +109,45 @@ mk:
         description: Опис
         languages: Јазици
         pass_crypt: Лозинка
         description: Опис
         languages: Јазици
         pass_crypt: Лозинка

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: пред околу 1 час
+        other: пред околу %{count} часа
+      about_x_months:
+        one: пред околу 1 месец
+        other: пред околу %{count} месеци
+      about_x_years:
+        one: пред околу 1 година
+        other: пред околу %{count} години
+      almost_x_years:
+        one: речиси пред 1 година
+        other: речиси пред %{count} години
+      half_a_minute: пред половина минута
+      less_than_x_seconds:
+        one: пред помалку од 1 секунда
+        other: пред помалку од %{count} секунди
+      less_than_x_minutes:
+        one: пред помалку од 1 минута
+        other: пред помалку од %{count} минути
+      over_x_years:
+        one: пред повеќе од 1 година
+        other: пред повеќе од %{count} години
+      x_seconds:
+        one: пред повеќе од 1 секунда
+        other: пред повеќе од %{count} секунди
+      x_minutes:
+        one: пред 1 минута
+        other: пред %{count} минути
+      x_days:
+        one: пред 1 ден
+        other: пред %{count} дена
+      x_months:
+        one: пред 1 месец
+        other: пред %{count} месеци
+      x_years:
+        one: пред 1 година
+        other: пред %{count} години

   printable_name:
     with_version: '%{id}, вер. %{version}'
     with_name_html: '%{name} (%{id})'
   printable_name:
     with_version: '%{id}, вер. %{version}'
     with_name_html: '%{name} (%{id})'


@@ -1294,7 +1333,7 @@ mk:
     no_such_message:
       title: Нема таква порака
       heading: Нема таква порака
     no_such_message:
       title: Нема таква порака
       heading: Нема таква порака

-      body: Ð\97а жал, нема поÑ\80ака Ñ\81о Ñ\82оÑ\98 id.
+      body: Ð\97а жал, нема поÑ\80ака Ñ\81о Ñ\82аа назнака.

     outbox:
       title: За праќање
       my_inbox: Моите %{inbox_link}
     outbox:
       title: За праќање
       my_inbox: Моите %{inbox_link}


@@ -1444,8 +1483,10 @@ mk:
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Покраина Предарлска</a> и
           Покраина Тирол (под <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT со исправки</a>).
         contributors_au_html: |-
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Покраина Предарлска</a> и
           Покраина Тирол (под <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT со исправки</a>).
         contributors_au_html: |-

-          <strong>Австралија</strong>: Содржи податоци за населби од
-          Австралиското биро за статистика.
+          <strong>Австралија</strong>: Содржи податоци преземени од
+          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">Општествените картографски заводи на Австралија (PSMA)</a>
+          ставени на располагање од австралиската држава под лиценцата
+          <a href="https://creativecommons.org/licenses/by/4.0/deed.mk">CC BY 4.0</a>.

         contributors_ca_html: |-
           <strong>Canada</strong>: Содржи податоци од
           GeoBase&reg;, GeoGratis (&copy; Министерство за природни ресурси на Канада), CanVec (&copy; Министерство за природни ресурси на Канада), and StatCan (Географско одделение,
         contributors_ca_html: |-
           <strong>Canada</strong>: Содржи податоци од
           GeoBase&reg;, GeoGratis (&copy; Министерство за природни ресурси на Канада), CanVec (&copy; Министерство за природни ресурси на Канада), and StatCan (Географско одделение,


@@ -1538,7 +1579,7 @@ mk:
         без кои оваа можност не може да работи.
     export:
       title: Извези
         без кои оваа можност не може да работи.
     export:
       title: Извези

-      area_to_export: Простор за извоз
+      area_to_export: Подрачје за извоз

       manually_select: Рачно изберете друга површина
       format_to_export: Формат за извоз
       osm_xml_data: OpenStreetMap XML податоци
       manually_select: Рачно изберете друга површина
       format_to_export: Формат за извоз
       osm_xml_data: OpenStreetMap XML податоци


@@ -1579,7 +1620,7 @@ mk:
       add_marker: Додај бележник на картата
       latitude: Г.Ш.
       longitude: Г.Д.
       add_marker: Додај бележник на картата
       latitude: Г.Ш.
       longitude: Г.Д.

-      output: Ð\98злезни подаÑ\82оÑ\86и
+      output: Ð\98звод

       paste_html: Ископирајте го HTML кодот за да го вметнете во страницата.
       export_button: Извези
     fixthemap:
       paste_html: Ископирајте го HTML кодот за да го вметнете во страницата.
       export_button: Извези
     fixthemap:


@@ -2714,33 +2755,33 @@ mk:
   redactions:
     edit:
       description: Опис
   redactions:
     edit:
       description: Опис

-      heading: Уреди редакција
-      title: Уреди редакција
+      heading: Уреди исправки
+      title: Уреди исправки

     index:
     index:

-      empty: Нема редакции.
-      heading: Список на редакции
-      title: Список на редакции
+      empty: Нема исправки за приказ.
+      heading: Список на исправки
+      title: Список на исправки

     new:
       description: Опис
     new:
       description: Опис

-      heading: Внесете информации за новата редакција
-      title: Создавање на нова редакција
+      heading: Внесете информации за нова исправка
+      title: Создавање на нова исправка

     show:
       description: 'Опис:'
     show:
       description: 'Опис:'

-      heading: Прикажана е редакцијата „%{title}“
-      title: Приказ на редакција
+      heading: Прикажана е исправката „%{title}“
+      title: Приказ на исправка

       user: 'Создавач:'
       user: 'Создавач:'

-      edit: Уреди ја редакцијава
-      destroy: Отстрани ја редакцијава
+      edit: Уреди ја исправкава
+      destroy: Отстрани ја исправкава

       confirm: Дали сте сигурни?
     create:
       confirm: Дали сте сигурни?
     create:

-      flash: РедакÑ\86иÑ\98ата е создадена.
+      flash: Ð\98Ñ\81пÑ\80авката е создадена.

     update:
       flash: Промените се зачувани.
     destroy:
     update:
       flash: Промените се зачувани.
     destroy:

-      not_empty: РедакÑ\86иÑ\98аÑ\82а не е пÑ\80азна. Ð\9eдÑ\80едакÑ\82иÑ\80аÑ\98Ñ\82е ги Ñ\81иÑ\82е веÑ\80зии Ñ\88Ñ\82о Ñ\9d пÑ\80инадлежаÑ\82
-        на оваа редакција пред да ја поништите.
-      flash: РедакÑ\86иÑ\98ата е поништена.
-      error: Се појави грешка при поништувањето на редакцијата.
+      not_empty: Ð\98Ñ\81пÑ\80авкаÑ\82а не е пÑ\80азна. Ð\9fониÑ\88Ñ\82еÑ\82е ги измениÑ\82е на Ñ\81иÑ\82е веÑ\80зии Ñ\88Ñ\82о
+        ѝ принадлежат на оваа исправка пред да ја поништите.
+      flash: Ð\98Ñ\81пÑ\80авката е поништена.
+      error: Се појави грешка при поништувањето на исправката.

   validations:
     leading_whitespace: има почетна белина
     trailing_whitespace: има завршна белина
   validations:
     leading_whitespace: има почетна белина
     trailing_whitespace: има завршна белина

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 8d1cc99234fdeb3e69001c740c9f4ea25eefcd52..2ff095bd2371c8070be68078358e3a306c573d10 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -65,6 +65,39 @@ my:
         description: ဖော်ပြချက်
         languages: ဘာသာစကားများ
         pass_crypt: စကားဝှက်
         description: ဖော်ပြချက်
         languages: ဘာသာစကားများ
         pass_crypt: စကားဝှက်

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: ၁ နာရီခန့်အကြာက
+        other: about %{count} နာရီခန့်အကြာက
+      about_x_months:
+        one: ၁ လခန့်အကြာက
+        other: '%{count} လခန့်အကြာက'
+      about_x_years:
+        one: ၁ နှစ်ခန့်အကြာက
+        other: '%{count} နှစ်ခန့်အကြာက'
+      almost_x_years:
+        one: ၁ နှစ်နီးပါးအကြာက
+        other: '%{count} နှစ်နီးပါးအကြာက'
+      half_a_minute: တစ်မိနစ်ခွဲအကြာက
+      over_x_years:
+        one: ၁ နှစ်ကျော်အကြာက
+        other: '%{count} နှစ်ကျော်အကြာက'
+      x_seconds:
+        one: ၁ စက္ကန့်အကြာက
+        other: '%{count} စက္ကန့်အကြာက'
+      x_minutes:
+        one: ၁ မိနစ်အကြာက
+        other: '%{count} မိနစ်အကြာက'
+      x_days:
+        one: ၁ ရက်အကြာက
+        other: '%{count} ရက်အကြာက'
+      x_months:
+        one: ၁ လအကြာက
+        other: '%{count} လအကြာက'
+      x_years:
+        one: ၁ နှစ်အကြာက
+        other: '%{count} နှစ်အကြာက'

   editor:
     remote:
       name: အဝေး ထိန်းချုပ်
   editor:
     remote:
       name: အဝေး ထိန်းချုပ်


@@ -197,6 +230,7 @@ my:
           bank: ဘဏ်
           bar: ဘား
           bench: ခုံတန်းလျား
           bank: ဘဏ်
           bar: ဘား
           bench: ခုံတန်းလျား

+          bus_station: ဘတ်စ်ကားစခန်း

           cafe: လက်ဖက်ရည်ဆိုင်
           car_rental: ကားငှားရုံ
           car_wash: ကားရေဆေး
           cafe: လက်ဖက်ရည်ဆိုင်
           car_rental: ကားငှားရုံ
           car_wash: ကားရေဆေး


@@ -207,6 +241,7 @@ my:
           clock: နာရီ
           college: ကောလိပ်
           courthouse: တရားရုံး
           clock: နာရီ
           college: ကောလိပ်
           courthouse: တရားရုံး

+          crematorium: မီးသင်္ဂြိုဟ်စက်ရုံ

           dentist: သွားဆရာဝန်
           doctors: ဆရာဝန်များ
           drinking_water: သောက်ရေ
           dentist: သွားဆရာဝန်
           doctors: ဆရာဝန်များ
           drinking_water: သောက်ရေ


@@ -230,6 +265,8 @@ my:
           parking: ယာဉ်ရပ်နားရာနေရာ
           pharmacy: ဆေးဆိုင်
           police: ရဲ
           parking: ယာဉ်ရပ်နားရာနေရာ
           pharmacy: ဆေးဆိုင်
           police: ရဲ

+          post_box: စာတိုက်သေတ္တာ
+          post_office: စာတိုက်

           preschool: မူကြိုကျောင်း
           prison: အကျဉ်းထောင်
           public_building: အများပိုင် အဆောက်အအုံ
           preschool: မူကြိုကျောင်း
           prison: အကျဉ်းထောင်
           public_building: အများပိုင် အဆောက်အအုံ


@@ -251,10 +288,12 @@ my:
           aqueduct: ရေသွယ်တံတား
           boardwalk: ပင်လယ်ကမ်းစပ် ပျဉ်ခင်းလမ်း
           suspension: ကြိုးတံတား
           aqueduct: ရေသွယ်တံတား
           boardwalk: ပင်လယ်ကမ်းစပ် ပျဉ်ခင်းလမ်း
           suspension: ကြိုးတံတား

+          viaduct: တောင်ကြားလမ်း

           "yes": တံတား
         building:
           "yes": အဆောက်ဦး
         craft:
           "yes": တံတား
         building:
           "yes": အဆောက်ဦး
         craft:

+          brewery: ဘီယာချက်စက်ရုံ

           electrician: လျှပ်စစ်ပညာရှင်
           photographer: ဓါတ်ပုံဆရာ
         emergency:
           electrician: လျှပ်စစ်ပညာရှင်
           photographer: ဓါတ်ပုံဆရာ
         emergency:


@@ -262,9 +301,11 @@ my:
           phone: အရေးပေါ်ဖုန်း
           "yes": အရေးပေါ်
         highway:
           phone: အရေးပေါ်ဖုန်း
           "yes": အရေးပေါ်
         highway:

+          bridleway: မြင်းစီးလမ်း

           bus_stop: ဘတ်စ်ကား မှတ်တိုင်
           corridor: ဆောင်ကူးစင်္ကြလမ်း
           elevator: ဓါတ်လှေကား
           bus_stop: ဘတ်စ်ကား မှတ်တိုင်
           corridor: ဆောင်ကူးစင်္ကြလမ်း
           elevator: ဓါတ်လှေကား

+          milestone: မှတ်တိုင်

           platform: ပလက်ဖောင်း
           primary: ပင်မလမ်း
           primary_link: ပင်မလမ်း
           platform: ပလက်ဖောင်း
           primary: ပင်မလမ်း
           primary_link: ပင်မလမ်း


@@ -281,18 +322,22 @@ my:
           church: ချက်ခ်ျကျောင်း
           city_gate: မြို့ဂိတ်
           fort: ခံတပ်
           church: ချက်ခ်ျကျောင်း
           city_gate: မြို့ဂိတ်
           fort: ခံတပ်

+          heritage: အမွေအနှစ်နေရာ

           house: အိမ်
           manor: အိမ်ကြီးရခိုင်
           house: အိမ်
           manor: အိမ်ကြီးရခိုင်

+          stone: ကျောက်တုံး

           tomb: သင်္ချိုင်း
           tower: မျှော်စင်
           wreck: ယာဉ်ပျက်
         landuse:
           tomb: သင်္ချိုင်း
           tower: မျှော်စင်
           wreck: ယာဉ်ပျက်
         landuse:

+          basin: မြစ်ဝှမ်း

           cemetery: သုဿန်
           construction: ဆောက်လုပ်ရေး
           forest: သစ်တော
           grass: မြက်
           military: စစ်တပ်ဧရိယာ
           railway: ရထားလမ်း
           cemetery: သုဿန်
           construction: ဆောက်လုပ်ရေး
           forest: သစ်တော
           grass: မြက်
           military: စစ်တပ်ဧရိယာ
           railway: ရထားလမ်း

+          reservoir: ရေလှောင်တံမံ

           road: လမ်းဧရိယာ
           vineyard: စပျစ်ခြံ
         leisure:
           road: လမ်းဧရိယာ
           vineyard: စပျစ်ခြံ
         leisure:


@@ -381,6 +426,8 @@ my:
           copyshop: မိတ္တူဆိုင်
           cosmetics: အလှကုန်ပစ္စည်းဆိုင်
           fashion: ဖက်ရှင်ဆိုင်
           copyshop: မိတ္တူဆိုင်
           cosmetics: အလှကုန်ပစ္စည်းဆိုင်
           fashion: ဖက်ရှင်ဆိုင်

+          interior_decoration: အတွင်းပိုင်း အလှဆင်လုပ်ငန်း
+          laundry: ဒိုဘီဆိုင်

           lottery: ထီ
           market: စျေးတန်း
           massage: မာဆပ်
           lottery: ထီ
           market: စျေးတန်း
           massage: မာဆပ်


@@ -587,6 +634,7 @@ my:
       forums:
         title: ဖိုရမ်များ
       welcomemat:
       forums:
         title: ဖိုရမ်များ
       welcomemat:

+        url: https://welcome.openstreetmap.org/

         title: အဖွဲ့အစည်းများအတွက်
       wiki:
         url: https://wiki.openstreetmap.org/
         title: အဖွဲ့အစည်းများအတွက်
       wiki:
         url: https://wiki.openstreetmap.org/


@@ -604,6 +652,7 @@ my:
       table:
         entry:
           primary: ပင်မလမ်း
       table:
         entry:
           primary: ပင်မလမ်း

+          bridleway: မြင်းစီးလမ်း

           cycleway: စက်ဘီးသွားလမ်း
           rail: ရထားလမ်း
           runway:
           cycleway: စက်ဘီးသွားလမ်း
           rail: ရထားလမ်း
           runway:


@@ -612,6 +661,7 @@ my:
           park: ပန်းခြံ
           lake:
           - ရေကန်
           park: ပန်းခြံ
           lake:
           - ရေကန်

+          cemetery: သုဿန်

           school:
           - ကျောင်း
           - တက္ကသိုလ်
           school:
           - ကျောင်း
           - တက္ကသိုလ်


@@ -808,6 +858,8 @@ my:
       image: ရုပ်ပုံ
       long_link: လင့်
       download: ဒေါင်းလုဒ်
       image: ရုပ်ပုံ
       long_link: လင့်
       download: ဒေါင်းလုဒ်

+    map:
+      copyright: © <a href='%{copyright_url}'>OpenStreetMap ပံ့ပိုးသူများ</a>

     changesets:
       show:
         hide_comment: ဝှက်
     changesets:
       show:
         hide_comment: ဝှက်

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index ce3b9a44fd793e891881b7d2969304d1c5e47430..f24db01a3f0f923d56f0b0a9984a293a1a846551 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -147,6 +147,45 @@ pt-BR:
         description: Descrição
         languages: Idiomas
         pass_crypt: Senha
         description: Descrição
         languages: Idiomas
         pass_crypt: Senha

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: cerca de 1 hora atrás
+        other: cerca de %{count} horas atrás
+      about_x_months:
+        one: cerca de 1 mês atrás
+        other: cerca de %{count} meses antes
+      about_x_years:
+        one: cerca de 1 ano atrás
+        other: cerca de %{count} anos atrás
+      almost_x_years:
+        one: quase 1 ano atrás
+        other: quase %{count} anos atrás
+      half_a_minute: meio minuto atrás
+      less_than_x_seconds:
+        one: menos de 1 segundo atrás
+        other: menos de %{count} segundos atrás
+      less_than_x_minutes:
+        one: menos de um minuto atras
+        other: menos de %{count} minutos atrás
+      over_x_years:
+        one: mais de 1 ano atrás
+        other: mais de %{count} anos atrás
+      x_seconds:
+        one: 1 segundo atrás
+        other: '%{count} segundos atrás'
+      x_minutes:
+        one: 1 minuto atrás
+        other: '%{count} minutos atrás'
+      x_days:
+        one: 1 dia atrás
+        other: '%{count} dias atrás'
+      x_months:
+        one: 1 mês atrás
+        other: '%{count} meses antes'
+      x_years:
+        one: 1 ano atrás
+        other: '%{count} anos atrás'

   printable_name:
     with_version: '%{id}, v%{version}'
     with_name_html: '%{name} (%{id})'
   printable_name:
     with_version: '%{id}, v%{version}'
     with_name_html: '%{name} (%{id})'

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index da16e8b5d68fe072e189d1bda47015aba0a02369..090ae8c688cc1a686dcc002b4abc66db658325a3 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -75,6 +75,7 @@
 # Author: Александр Сигачёв
 # Author: Владимир К
 # Author: Дмитрий
 # Author: Александр Сигачёв
 # Author: Владимир К
 # Author: Дмитрий

+# Author: Дмитрий Нестеров

 # Author: Сrower
 ---
 ru:
 # Author: Сrower
 ---
 ru:


@@ -176,6 +177,50 @@ ru:
         description: Описание
         languages: Языки
         pass_crypt: Пароль
         description: Описание
         languages: Языки
         pass_crypt: Пароль

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: около 1 часа назад
+        other: около %{count} часов назад
+      about_x_months:
+        one: около 1 месяца назад
+        other: около %{count} месяцев назад
+      about_x_years:
+        one: около 1 года назад
+        other: около %{count} лет назад
+      almost_x_years:
+        one: почти 1 год назад
+        other: почти %{count} лет назад
+      half_a_minute: полминуты назад
+      less_than_x_seconds:
+        one: менее 1 секунды назад
+        other: менее %{count} секунд назад
+      less_than_x_minutes:
+        one: менее 1 минуты назад
+        other: менее %{count} минут назад
+      over_x_years:
+        one: более 1 года назад
+        other: более %{count} лет назад
+      x_seconds:
+        one: 1 секунда назад
+        few: '%{count} секунды назад'
+        other: '%{count} секунд назад'
+      x_minutes:
+        one: 1 минута назад
+        few: '%{count} минуты назад'
+        other: '%{count} минут назад'
+      x_days:
+        one: 1 день назад
+        few: '%{count} дня назад'
+        other: '%{count} дней назад'
+      x_months:
+        one: 1 месяц назад
+        few: '%{count} месяца назад'
+        other: '%{count} месяцев назад'
+      x_years:
+        one: 1 год назад
+        few: '%{count} года назад'
+        other: '%{count} лет назад'

   editor:
     default: По умолчанию (назначен %{name})
     potlatch:
   editor:
     default: По умолчанию (назначен %{name})
     potlatch:

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 5fb1497f9324b3d00594c6cfbc5ef9ecfb207b2d..5f5b9ecdb774e8c30a324b5a46762c3d31334baf 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -10,6 +10,7 @@
 # Author: Ruila
 # Author: TMo3289
 # Author: Xwindows
 # Author: Ruila
 # Author: TMo3289
 # Author: Xwindows

+# Author: กิ๊ฟ เลิกล่ะ สายแข็ง

 ---
 th:
   time:
 ---
 th:
   time:


@@ -106,6 +107,14 @@ th:
         description: คำอธิบาย
         languages: ภาษา
         pass_crypt: รหัสผ่าน
         description: คำอธิบาย
         languages: ภาษา
         pass_crypt: รหัสผ่าน

+  datetime:
+    distance_in_words_ago:
+      about_x_years:
+        one: about 1 year ago
+        other: about %{count} years ago
+      x_days:
+        one: 1 day ago
+        other: '%{count} days ago'

   editor:
     default: ค่าปกติ (ขณะนี้ %{name})
     potlatch:
   editor:
     default: ค่าปกติ (ขณะนี้ %{name})
     potlatch:

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 1c53f1c7e60a2caf84b2b4ad34d0f4175329a61e..50332c9a57f1333378214e5ef2c4ff485c30f05d 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -138,6 +138,43 @@ tr:
         description: Tanım
         languages: Diller
         pass_crypt: Parola
         description: Tanım
         languages: Diller
         pass_crypt: Parola

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: yaklaşık 1 saat önce
+        other: yaklaşık %{count} saat önce
+      about_x_months:
+        one: yaklaşık 1 ay önce
+        other: yaklaşık %{count} ay önce
+      about_x_years:
+        one: yaklaşık 1 yıl önce
+        other: yaklaşık %{count} yıl önce
+      almost_x_years:
+        one: neredeyse 1 yıl önce
+        other: neredeyse %{count} yıl önce
+      half_a_minute: yarım dakika önce
+      less_than_x_seconds:
+        one: 1 saniyeden az önce
+        other: '%{count} saniyeden az önce'
+      less_than_x_minutes:
+        one: bir dakikadan daha az bir süre önce
+        other: '%{count} dakikadan daha az bir süre önce'
+      over_x_years:
+        one: 1 yıldan fazla
+        other: '%{count} yıldan fazla'
+      x_seconds: '{{PLURAL|one=1 saniye önce|%{count} saniye önce}'
+      x_minutes:
+        one: 1 dakika önce
+        other: '%{count} dakika önce'
+      x_days:
+        one: 1 gün önce
+        other: '%{count} gün önce'
+      x_months:
+        one: 1 ay önce
+        other: '%{count} ay önce'
+      x_years:
+        one: 1 yıl önce
+        other: '%{count} yıl önce'

   editor:
     default: Varsayılan (kullanılan %{name})
     potlatch:
   editor:
     default: Varsayılan (kullanılan %{name})
     potlatch:


@@ -1426,7 +1463,7 @@ tr:
         text: Tercüme edilmiş bu sayfa ile %{english_original_link} arasında meydana
           gelebilecek herhangi bir uyuşmazlıkta sayfanın özgün dili olan İngilizce
           bölümü önceliklidir.
         text: Tercüme edilmiş bu sayfa ile %{english_original_link} arasında meydana
           gelebilecek herhangi bir uyuşmazlıkta sayfanın özgün dili olan İngilizce
           bölümü önceliklidir.

-        english_link: İngilizce orijinal
+        english_link: İngilizce orijinali

       native:
         title: Sayfa hakkında
         text: Telif hakkı sayfasının İngilizce sürümünü görüntülüyorsunuz. Bu sayfanın
       native:
         title: Sayfa hakkında
         text: Telif hakkı sayfasının İngilizce sürümünü görüntülüyorsunuz. Bu sayfanın


@@ -1445,30 +1482,27 @@ tr:
           OpenStreetMap'e ve katkıda bulunanlarına değindiğiniz
           sürece verilerimizi kopyalamak, dağıtmak, iletmek
           ve uyarlamakta serbestsiniz.
           OpenStreetMap'e ve katkıda bulunanlarına değindiğiniz
           sürece verilerimizi kopyalamak, dağıtmak, iletmek
           ve uyarlamakta serbestsiniz.

-          Verilerimizi değiştirir veya geliştirirseniz,
+          Verilerimizi değiştirir veya geliştirirseniz

           sonucu sadece aynı lisans altında dağıtabilirsiniz.
           Tüm <a href="https://opendatacommons.org/licenses/odbl/1.0/">yasal kod</a>, haklarınızı ve sorumluluklarınızı açıklamaktadır.
         intro_3_html: |-
           Haritalarımızdaki haritacılık ve belgelerimiz, <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> lisansı (CC BY-SA) ile yetkilendirilmiştir.
           sonucu sadece aynı lisans altında dağıtabilirsiniz.
           Tüm <a href="https://opendatacommons.org/licenses/odbl/1.0/">yasal kod</a>, haklarınızı ve sorumluluklarınızı açıklamaktadır.
         intro_3_html: |-
           Haritalarımızdaki haritacılık ve belgelerimiz, <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> lisansı (CC BY-SA) ile yetkilendirilmiştir.

-        credit_title_html: OpenStreetMap nasıl atıf edinir
+        credit_title_html: OpenStreetMap'e nasıl atıfta bulunulur

         credit_1_html: |-
         credit_1_html: |-

-          Atıf şu şekilde yazmak gerekir: &ldquo;&copy; OpenStreetMap
+          Atıf için şu şekilde yazmak gerekir: &ldquo;&copy; OpenStreetMap

           katılımcıları&rdquo;.
         credit_2_html: |-
           katılımcıları&rdquo;.
         credit_2_html: |-

-          Ayrıca, verilerin Open Database License ve
-          haritalarımızdaki karoları kullanıyorsanız haritacılığımız
-          CC BY-SA ile lisanslandırıldığını açıkça belirtmelisiniz.
-          Bunu, <a href="https://www.openstreetmap.org/copyright">bu telif hakkı sayfasına</a> bağlantı vererek gerçekleştirebilirsiniz.
-          Alternatif ve bir gereksinim olarak, OSM'yi  bir veri formunda dağıtıyorsanız direkt olarak lisansları adlandırabilir
+          Ayrıca, verilerin Açık Veritabanı Lisansı (Open Database License) altında ve haritalarımızdaki karoları kullanıyorsanız haritacılığımızın CC BY-SA ile lisanslandırıldığını açıkça belirtmelisiniz. Bunu, <a href="https://www.openstreetmap.org/copyright">bu telif hakkı sayfasına</a> bağlantı vererek gerçekleştirebilirsiniz.
+          Alternatif ve bir gereksinim olarak OSM'yi  bir veri formunda dağıtıyorsanız direkt olarak lisansları adlandırabilir

           veya doğrudan lisanslara bağlayabilirsiniz. Bağlantıların
           mümkün olmadığı ortamlarda (örneğin basılı işler)
           okuyucularınızı openstreetmap.org'a, opendatacommons.org'a
           ve varsa creativecommons.org'a yönlendirmenizi
           öneriyoruz.
         credit_3_html: |-
           veya doğrudan lisanslara bağlayabilirsiniz. Bağlantıların
           mümkün olmadığı ortamlarda (örneğin basılı işler)
           okuyucularınızı openstreetmap.org'a, opendatacommons.org'a
           ve varsa creativecommons.org'a yönlendirmenizi
           öneriyoruz.
         credit_3_html: |-

-          Bir gezinebilir elektronik haritanın sağ alt köşesinde kredisi görünmesi lazım.
-          Örnegin:
+          Bir gezinebilir elektronik haritanın sağ alt köşesinde atfın görünmesi lazım.
+          Örnegin;

         attribution_example:
           alt: Web sayfasıında OpenStreetMap atıf etmek için bir örnek
           title: Atıf örneği
         attribution_example:
           alt: Web sayfasıında OpenStreetMap atıf etmek için bir örnek
           title: Atıf örneği

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 13e04d12b1c7c797a66ce1ebf29f44bc822408c8..8c234f197bf4a0a341e9a4005e0b60c33f18c9cb 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -13,6 +13,7 @@
 # Author: Phjtieudoc
 # Author: Ruila
 # Author: Trần Nguyễn Minh Huy
 # Author: Phjtieudoc
 # Author: Ruila
 # Author: Trần Nguyễn Minh Huy

+# Author: 神樂坂秀吉

 ---
 vi:
   time:
 ---
 vi:
   time:


@@ -111,6 +112,12 @@ vi:
         description: Miêu tả
         languages: Ngôn ngữ
         pass_crypt: Mật khẩu
         description: Miêu tả
         languages: Ngôn ngữ
         pass_crypt: Mật khẩu

+  datetime:
+    distance_in_words_ago:
+      half_a_minute: 30 giây trước
+      x_years:
+        one: 1 năm trước
+        other: '%{count} năm trước'

   editor:
     default: Mặc định (hiện là %{name})
     potlatch:
   editor:
     default: Mặc định (hiện là %{name})
     potlatch:

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 73c30c5bb027a5e8a302d541f8ed28bc22dab3da..6c7e52172904041d0cd4911c96508f0259a0635a 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -28,6 +28,7 @@
 # Author: Qiyue2001
 # Author: RyRubyy
 # Author: Shizhao
 # Author: Qiyue2001
 # Author: RyRubyy
 # Author: Shizhao

+# Author: SinonJZH

 # Author: StephDC
 # Author: TianyinLee
 # Author: WQL
 # Author: StephDC
 # Author: TianyinLee
 # Author: WQL


@@ -144,6 +145,45 @@ zh-CN:
         description: 描述
         languages: 语言
         pass_crypt: 密码
         description: 描述
         languages: 语言
         pass_crypt: 密码

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: 约1小时前
+        other: 约%{count}小时前
+      about_x_months:
+        one: 约1个月前
+        other: 约%{count}个月前
+      about_x_years:
+        one: 约1年
+        other: 约%{count}年前
+      almost_x_years:
+        one: 近1年前
+        other: 近%{count}年前
+      half_a_minute: 30秒前
+      less_than_x_seconds:
+        one: 小于1秒前
+        other: 小于 %{count} 秒前
+      less_than_x_minutes:
+        one: 小于1分钟前
+        other: 小于 %{count} 分钟前
+      over_x_years:
+        one: 超过1年前
+        other: 超过%{count}年前
+      x_seconds:
+        one: 1秒
+        other: '%{count}秒前'
+      x_minutes:
+        one: 1分钟前
+        other: '%{count}分钟前'
+      x_days:
+        one: 1日前
+        other: '%{count}日前'
+      x_months:
+        one: 1个月前
+        other: '%{count}个月前'
+      x_years:
+        one: 1年前
+        other: '%{count}年前'

   printable_name:
     with_version: '%{id}，版本 %{version}'
     with_name_html: '%{name}%{id}'
   printable_name:
     with_version: '%{id}，版本 %{version}'
     with_name_html: '%{name}%{id}'


@@ -389,6 +429,7 @@ zh-CN:
         other: '%{count} 个评论'
       edit_link: 编辑该文章
       hide_link: 隐藏该文章
         other: '%{count} 个评论'
       edit_link: 编辑该文章
       hide_link: 隐藏该文章

+      unhide_link: 取消隐藏此项目

       confirm: 确认
       report: 举报此记录
     diary_comment:
       confirm: 确认
       report: 举报此记录
     diary_comment:


@@ -1410,6 +1451,9 @@ zh-CN:
           <strong>斯洛文尼亚</strong>：包含来自
           <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a>和
           <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>（斯洛文尼亚公开信息）的数据。
           <strong>斯洛文尼亚</strong>：包含来自
           <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a>和
           <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>（斯洛文尼亚公开信息）的数据。

+        contributors_es_html: <strong>西班牙</strong>：包含来自西班牙国家地理研究所（<a href="http://www.ign.es/">IGN</a>）和国家制图系统（<a
+          href="http://www.scne.es/">SCNE</a>）的数据，这些数据以<a href="https://creativecommons.org/licenses/by/4.0/">知识共享
+          署名 4.0协议</a>授权。

         contributors_za_html: <strong>南非</strong>：包含来自<a href="http://www.ngi.gov.za/">行政局：国家地球空间信息</a>，国家版权所有。
         contributors_gb_html: <strong>英国</strong>：包含来自 Ordnance 的调查数据，&copy; Crown
           版权所有及数据库权利，2010-19。
         contributors_za_html: <strong>南非</strong>：包含来自<a href="http://www.ngi.gov.za/">行政局：国家地球空间信息</a>，国家版权所有。
         contributors_gb_html: <strong>英国</strong>：包含来自 Ordnance 的调查数据，&copy; Crown
           版权所有及数据库权利，2010-19。


@@ -1968,6 +2012,10 @@ zh-CN:
       title: 条款
       heading: 条款
       heading_ct: 贡献者条款
       title: 条款
       heading: 条款
       heading_ct: 贡献者条款

+      read and accept with tou: 请阅读贡献者协议和使用条款，勾选下列2个复选框，并点击“确定”按钮。
+      contributor_terms_explain: 该协议影响到有关您过去、现在及将来的贡献的条款。
+      read_ct: 我已了解并同意贡献者条款
+      tou_explain_html: 这些%{tou_link}适用于网站方面的使用，与其它由OSMF提供的基础内容。请点击链接，阅读并同意该条款。

       read_tou: 我已阅读并同意使用条款
       consider_pd: 除了上述协议，我同意将我的贡献授权为公共领域
       consider_pd_why: 这是什么？
       read_tou: 我已阅读并同意使用条款
       consider_pd: 除了上述协议，我同意将我的贡献授权为公共领域
       consider_pd_why: 这是什么？


@@ -2253,6 +2301,18 @@ zh-CN:
         hours:
           one: 1 小时
           other: '%{count} 小时'
         hours:
           one: 1 小时
           other: '%{count} 小时'

+        days:
+          one: 1日
+          other: '%{count}日'
+        weeks:
+          one: 1周
+          other: '%{count}周'
+        months:
+          one: 1个月
+          other: '%{count}个月'
+        years:
+          one: 1年
+          other: '%{count}年'

     blocks_on:
       title: 对 %{name} 的封禁
       heading: 对 %{name} 的封禁列表
     blocks_on:
       title: 对 %{name} 的封禁
       heading: 对 %{name} 的封禁列表


@@ -2386,6 +2446,7 @@ zh-CN:
       engines:
         fossgis_osrm_bike: 自行车（OSRM）
         fossgis_osrm_car: 汽车（OSRM）
       engines:
         fossgis_osrm_bike: 自行车（OSRM）
         fossgis_osrm_car: 汽车（OSRM）

+        fossgis_osrm_foot: 步行（OSRM）

         graphhopper_bicycle: 自行车（GraphHopper）
         graphhopper_car: 汽车（GraphHopper）
         graphhopper_foot: 步行（GraphHopper）
         graphhopper_bicycle: 自行车（GraphHopper）
         graphhopper_car: 汽车（GraphHopper）
         graphhopper_foot: 步行（GraphHopper）

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 0f7bc19f3a9248ea1d843943afaf5fef888f3bcc..471a3a2203c8d3c15a49b1ed93360628a30ca897 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -31,9 +31,12 @@
 # Author: SupaplexTW
 # Author: Wehwei
 # Author: Wrightbus
 # Author: SupaplexTW
 # Author: Wehwei
 # Author: Wrightbus

+# Author: 神樂坂秀吉

 # Author: 아라
 ---
 zh-TW:
 # Author: 아라
 ---
 zh-TW:

+  html:
+    dir: 由左至右

   time:
     formats:
       friendly: '%Y 年 %B %e 日 %H 時 %M 分'
   time:
     formats:
       friendly: '%Y 年 %B %e 日 %H 時 %M 分'


@@ -133,8 +136,48 @@ zh-TW:
         description: 說明
         languages: 語言
         pass_crypt: 密碼
         description: 說明
         languages: 語言
         pass_crypt: 密碼

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: 約1小時前
+        other: 約%{count}小時前
+      about_x_months:
+        one: 約1個月前
+        other: 約%{count}個月前
+      about_x_years:
+        one: 約1年
+        other: 約%{count}年前
+      almost_x_years:
+        one: 近1年
+        other: 近%{count}年前
+      half_a_minute: 30秒前
+      less_than_x_seconds:
+        one: 小於 1 秒前
+        other: 小於 %{count} 秒前
+      less_than_x_minutes:
+        one: 小於 1 分前
+        other: 小於 %{count} 分前
+      over_x_years:
+        one: 超過1年前
+        other: 超過%{count}年前
+      x_seconds:
+        one: 1秒前
+        other: '%{count}秒前'
+      x_minutes:
+        one: 1分鐘前
+        other: '%{count}分鐘前'
+      x_days:
+        one: 1日前
+        other: '%{count}日前'
+      x_months:
+        one: 1個月前
+        other: '%{count}個月前'
+      x_years:
+        one: 1年前
+        other: '%{count}年前'

   printable_name:
     with_version: '%{id}，版本%{version}'
   printable_name:
     with_version: '%{id}，版本%{version}'

+    with_name_html: '%{name}%{id}'

   editor:
     default: 預設 (目前為 %{name})
     potlatch:
   editor:
     default: 預設 (目前為 %{name})
     potlatch:


@@ -224,6 +267,7 @@ zh-TW:
       history_title: 關聯歷史：%{name}
       members: 成員
     relation_member:
       history_title: 關聯歷史：%{name}
       members: 成員
     relation_member:

+      entry: '%{type} %{name}'

       entry_role: '%{type} %{name} 作為 %{role}'
       type:
         node: 節點
       entry_role: '%{type} %{name} 作為 %{role}'
       type:
         node: 節點


@@ -418,6 +462,7 @@ zh-TW:
           Nominatim</a> 的結果
         geonames_reverse: 來自<a href="http://www.geonames.org/">GeoNames</a>的結果
     search_osm_nominatim:
           Nominatim</a> 的結果
         geonames_reverse: 來自<a href="http://www.geonames.org/">GeoNames</a>的結果
     search_osm_nominatim:

+      prefix_format: '%{name}'

       prefix:
         aerialway:
           cable_car: 大型纜車
       prefix:
         aerialway:
           cable_car: 大型纜車


@@ -1107,6 +1152,9 @@ zh-TW:
       successful_report: 已成功登記您的回報
       provide_details: 請提供所需的詳情
   layouts:
       successful_report: 已成功登記您的回報
       provide_details: 請提供所需的詳情
   layouts:

+    project_name:
+      title: OpenStreetMap
+      h1: OpenStreetMap

     logo:
       alt_text: OpenStreetMap 標誌
     home: 移至家的位置
     logo:
       alt_text: OpenStreetMap 標誌
     home: 移至家的位置


@@ -1159,6 +1207,7 @@ zh-TW:
       header: '%{from_user} 評論主旨為 %{subject} 的 OpenStreetMap 日記項目：'
       footer: 您也可以在 %{readurl} 閱讀評論，並且在 %{commenturl} 留下評論，或在 %{replyurl} 回覆
     message_notification:
       header: '%{from_user} 評論主旨為 %{subject} 的 OpenStreetMap 日記項目：'
       footer: 您也可以在 %{readurl} 閱讀評論，並且在 %{commenturl} 留下評論，或在 %{replyurl} 回覆
     message_notification:

+      subject_header: '[OpenStreetMap] %{subject}'

       hi: '%{to_user} 您好，'
       header: '%{from_user} 透過 OpenStreetMap 寄給您主旨為 %{subject} 的訊息：'
       footer_html: 您也可以在 %{readurl} 閱讀訊息，並且在 %{replyurl} 回覆
       hi: '%{to_user} 您好，'
       header: '%{from_user} 透過 OpenStreetMap 寄給您主旨為 %{subject} 的訊息：'
       footer_html: 您也可以在 %{readurl} 閱讀訊息，並且在 %{replyurl} 回覆


@@ -1179,6 +1228,7 @@ zh-TW:
         failed_to_import: 看來匯入失敗。錯誤訊息為：
         more_info_1: 更多關於 GPX 匯入失敗與如何避免它們的
         more_info_2: 資訊可在這裡找到：
         failed_to_import: 看來匯入失敗。錯誤訊息為：
         more_info_1: 更多關於 GPX 匯入失敗與如何避免它們的
         more_info_2: 資訊可在這裡找到：

+        import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures

       success:
         subject: '[OpenStreetMap] GPX 匯入成功'
         loaded_successfully: |-
       success:
         subject: '[OpenStreetMap] GPX 匯入成功'
         loaded_successfully: |-


@@ -1447,6 +1497,7 @@ zh-TW:
       not_public: 您尚未將您的編輯設為公開。
       not_public_description: 在您這麼做之前將無法再編輯地圖。您可以在您的 %{user_page} 將自己的編輯設定為公開。
       user_page_link: 使用者頁面
       not_public: 您尚未將您的編輯設為公開。
       not_public_description: 在您這麼做之前將無法再編輯地圖。您可以在您的 %{user_page} 將自己的編輯設定為公開。
       user_page_link: 使用者頁面

+      anon_edits: (%{link})

       anon_edits_link_text: 瞭解為什麼這很重要。
       flash_player_required: 您需要 Flash player 才能使用 Potlatch，OpenStreetMap Flash 編輯器。您可以<a
         href="https://get.adobe.com/flashplayer/">在 Adobe.com 下載 Flash Player</a>。<a
       anon_edits_link_text: 瞭解為什麼這很重要。
       flash_player_required: 您需要 Flash player 才能使用 Potlatch，OpenStreetMap Flash 編輯器。您可以<a
         href="https://get.adobe.com/flashplayer/">在 Adobe.com 下載 Flash Player</a>。<a


@@ -2270,17 +2321,17 @@ zh-TW:
           one: 1 小時
           other: '%{count} 小時'
         days:
           one: 1 小時
           other: '%{count} 小時'
         days:

-          one: 1 日
-          other: '%{count} 日'
+          one: 1日
+          other: '%{count}日'

         weeks:
         weeks:

-          one: 1 週
-          other: '%{count} 週'
+          one: 1週
+          other: '%{count}週'

         months:
         months:

-          one: 1 個月
-          other: '%{count} 個月'
+          one: 1個月
+          other: '%{count}個月'

         years:
         years:

-          one: 1 年
-          other: '%{count} 年'
+          one: 1年
+          other: '%{count}年'

     blocks_on:
       title: 對 %{name} 的封鎖
       heading: 對 %{name} 封鎖的清單
     blocks_on:
       title: 對 %{name} 的封鎖
       heading: 對 %{name} 封鎖的清單