Localisation updates from https://translatewiki.net.

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 85c14a0c7290c42c6503242f401f89dca6f353b7..d3955907d44ba1b329e310ee7a062ea212e4f8b8 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1072,9 +1072,9 @@ ast:
         de retirada de datos</a> o pidilo direutamente nel nuesu <a href="http://dmca.openstreetmap.org/">formulariu
         en llinia</a>.
       trademarks_title_html: <span id="trademarks"></span>Marques rexistraes
         de retirada de datos</a> o pidilo direutamente nel nuesu <a href="http://dmca.openstreetmap.org/">formulariu
         en llinia</a>.
       trademarks_title_html: <span id="trademarks"></span>Marques rexistraes

-      trademarks_1_html: OpenStreetMap ya'l logotipu de la lente son marques rexistraes
-        de la Fundación OpenStreetMap. Si tienes entrugues tocante al to usu de les
-        marques, mándales al <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">grupu
+      trademarks_1_html: OpenStreetMap ,el logotipu de la lente y Estáu del Mapa son
+        marques rexistraes de la Fundación OpenStreetMap. Si tienes entrugues tocante
+        al usu de les marques, mándales al <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">grupu

         de trabayu sobro llicencies</a>.
   welcome_page:
     title: ¡Bienveníu!
         de trabayu sobro llicencies</a>.
   welcome_page:
     title: ¡Bienveníu!

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 63e1c41d8e6ec2dc30de8d590cf1f951b2abd451..57ffe9facb26c774fabfb24be07123ed6e16a898 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -12,6 +12,7 @@
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25

+# Author: Sampablokuper

 # Author: Shirayuki
 ---
 en-GB:
 # Author: Shirayuki
 ---
 en-GB:


@@ -1101,9 +1102,10 @@ en-GB:
         procedure</a> or file directly at our <a href="http://dmca.openstreetmap.org/">on-line
         filing page</a>.
       trademarks_title_html: <span id="trademarks"></span>Trademarks
         procedure</a> or file directly at our <a href="http://dmca.openstreetmap.org/">on-line
         filing page</a>.
       trademarks_title_html: <span id="trademarks"></span>Trademarks

-      trademarks_1_html: OpenStreetMap and the magnifying glass logo are registered
-        trademarks of the OpenStreetMap Foundation. If you have questions about your
-        use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
+      trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of the
+        Map are registered trademarks of the OpenStreetMap Foundation. If you have
+        questions about your use of the marks, please send your questions to the <a
+        href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence

         Working Group</a>.
   welcome_page:
     title: Welcome!
         Working Group</a>.
   welcome_page:
     title: Welcome!

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 2894526432b64c7b9f4868485cbbf29cde466a2c..2a33a71ccf1a6378d90d282440343103a0976225 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -961,9 +961,9 @@ et:
         protseduuri</a> poole või otse meie
         <a href="http://dmca.openstreetmap.org/">onlain lehele</a>.
       trademarks_title_html: <span id="trademarks"></span>Kaubamärgid
         protseduuri</a> poole või otse meie
         <a href="http://dmca.openstreetmap.org/">onlain lehele</a>.
       trademarks_title_html: <span id="trademarks"></span>Kaubamärgid

-      trademarks_1_html: OpenStreetMap ja suurendusklaasi logo on OpenStreetMap Sihtasutuse
-        registreeritud kaubamärgid. Kui teil on nende märkide kasutamise kohta küsimusi,
-        siis saatke küsimused <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Litsentsi
+      trademarks_1_html: OpenStreetMap, suurendusklaasi logo ja State of the Map on
+        OpenStreetMap Sihtasutuse registreeritud kaubamärgid. Kui teil on nende märkide
+        kasutamise kohta küsimusi, siis saatke küsimused <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Litsentsi

         töörühmale</a>.
   welcome_page:
     title: Tere tulemast!
         töörühmale</a>.
   welcome_page:
     title: Tere tulemast!


@@ -1195,6 +1195,14 @@ et:
       details: Märkuse lisateavet leiad %{url}.
     changeset_comment_notification:
       greeting: Tere,
       details: Märkuse lisateavet leiad %{url}.
     changeset_comment_notification:
       greeting: Tere,

+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} on kommenteerinud ühte sinu muutuskogumit'
+        subject_other: '[OpenStreetMap] %{commenter} on kommenteerinud muutuskogumit,
+          millest sa oled huvitunud'
+        your_changeset: '%{commenter} on jätnud kommentaari ühele sinu muutuskogumile,
+          mis on loodud %{time}'
+        commented_changeset: '%{commenter} on jätnud kommentaari kaardi muutuskogumile,
+          mida sa jälgid, mille on loonud %{changeset_author} kuupäeval %{time}'

   message:
     inbox:
       title: Saabunud kirjad
   message:
     inbox:
       title: Saabunud kirjad

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 3c9f24bb37b51bec5f359fee1ab3b90562916f9c..0865edcb78faa4dbce49aff0e6adc1da7bd23492 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1100,9 +1100,9 @@ gl:
         para retirar datos</a> ou deixe unha notificación no noso
         <a href="http://dmca.openstreetmap.org/">formulario en liña</a>.
       trademarks_title_html: <span id="trademarks"></span>Marcas rexistadas
         para retirar datos</a> ou deixe unha notificación no noso
         <a href="http://dmca.openstreetmap.org/">formulario en liña</a>.
       trademarks_title_html: <span id="trademarks"></span>Marcas rexistadas

-      trademarks_1_html: OpenStreetMap e o logotipo coa lupa son marcas rexistadas
-        da OpenStreetMap Foundation. Se ten algunha pregunta sobre a utilización das
-        marcas, por favor envée as súas cuestión ó <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Grupo
+      trademarks_1_html: OpenStreetMap, o logotipo coa lupa e ''State of the Map''
+        son marcas rexistadas da Fundación OpenStreetMap. Se ten algunha pregunta
+        sobre a utilización das marcas, por favor envée as súas cuestión ó <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Grupo

         de Traballo de Licenzas</a>.
   welcome_page:
     title: Reciba a nosa benvida!
         de Traballo de Licenzas</a>.
   welcome_page:
     title: Reciba a nosa benvida!

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 9faffb313ac06d69e4f81ed3f2ef7a53120e8d4f..0026f8b9257254ad03f7796bf6c6becf798214e6 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -11,6 +11,7 @@
 # Author: Devid Farinelli
 # Author: Dieterdreist
 # Author: Efred
 # Author: Devid Farinelli
 # Author: Dieterdreist
 # Author: Efred

+# Author: Einreiher

 # Author: Federico Mugnaini
 # Author: Frammm
 # Author: Fringio
 # Author: Federico Mugnaini
 # Author: Frammm
 # Author: Fringio


@@ -1114,10 +1115,10 @@ it:
          <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura di rimozione per violazione del copyright</a> o segnalacelo direttamente alla nostra
         <a href="http://dmca.openstreetmap.org/">pagina di segnalazione on-line</a>.
       trademarks_title_html: <span id="trademarks"></span>Marchi registrati
          <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura di rimozione per violazione del copyright</a> o segnalacelo direttamente alla nostra
         <a href="http://dmca.openstreetmap.org/">pagina di segnalazione on-line</a>.
       trademarks_title_html: <span id="trademarks"></span>Marchi registrati

-      trademarks_1_html: OpenStreetMap, il logo con la lente d'ingrandimento e State
-        of the Map sono marchi registrati della Fondazione OpenStreetMap. Se avete
-        domande sull'uso dei marchi, inviatele al <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">gruppo
-        di lavoro per le licenze</a>.
+      trademarks_1_html: '"OpenStreetMap", il logo con la lente d''ingrandimento e
+        "State of the Map" sono marchi registrati della <i>Fondazione OpenStreetMap</i>.
+        Se avete domande sull''uso dei marchi, inviatele al <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">gruppo
+        di lavoro per le licenze</a>.'

   welcome_page:
     title: Benvenuto!
     introduction_html: Benvenuti in OpenStreetMap, la mappa del mondo libera e modificabile.
   welcome_page:
     title: Benvenuto!
     introduction_html: Benvenuti in OpenStreetMap, la mappa del mondo libera e modificabile.

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 5e8817896a4d6c097325aa540b37f27b2b208e15..4fbd2789968d987214548b61828bd1a71f93a427 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1792,7 +1792,7 @@ ko:
       use external auth: 다른 제3자 로그인 방식 사용하기
       auth no password: 제3자 인증은 비밀번호가 필요하지 않지만, 일부 추가 도구나 서버는 여전히 필요할 수 있습니다.
       continue: 가입하기
       use external auth: 다른 제3자 로그인 방식 사용하기
       auth no password: 제3자 인증은 비밀번호가 필요하지 않지만, 일부 추가 도구나 서버는 여전히 필요할 수 있습니다.
       continue: 가입하기

-      terms accepted: ì\83\88 기ì\97¬ì\9e\90 ì\95½ê´\80ì\97\90 ë\8f\99ì\9d\98í\95\98셔서 감사합니다!
+      terms accepted: ì\83\88 기ì\97¬ì\9e\90 ì\95½ê´\80ì\97\90 ë\8f\99ì\9d\98í\95´ 주셔서 감사합니다!

       terms declined: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 <a href="%{url}">이
         위키 문서</a>를 참조하세요.
     terms:
       terms declined: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 <a href="%{url}">이
         위키 문서</a>를 참조하세요.
     terms:

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index e833964539c8e5445b64c6ba159cb7875e4ecff5..e71c0db7e60818932cb25c0bbdb117a13043dc57 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1091,9 +1091,9 @@ mk:
         \nза отстранување</a> или поднесете жалба на \n<a href=\"http://dmca.openstreetmap.org/\">оваа
         наменска страница</a>."
       trademarks_title_html: <span id="trademarks"></span>Заштитни знаци
         \nза отстранување</a> или поднесете жалба на \n<a href=\"http://dmca.openstreetmap.org/\">оваа
         наменска страница</a>."
       trademarks_title_html: <span id="trademarks"></span>Заштитни знаци

-      trademarks_1_html: OpenStreetMap и логото со лупа се заштитни знаци на фондацијата
-        OpenStreetMap. Ако имате прашања во врска со употребата на знаците, пишете
-        ѝ на <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Работната
+      trademarks_1_html: OpenStreetMap, логото со лупа и  „State of the Map“ („Состојба
+        на картата“) се заштитни знаци на задолжбината OpenStreetMap. Ако имате прашања
+        во врска со употребата на знаците, пишете ѝ на <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Работната

         група за лиценци</a>.
   welcome_page:
     title: Добре дојдовте!
         група за лиценци</a>.
   welcome_page:
     title: Добре дојдовте!

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index c7cbb7ac933c4c6dd387a6f18f70a396ad037ab1..5cce5aeed5830ab7f0c97acd9a508f5564e27d15 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -999,9 +999,8 @@ oc:
         title: Exemple d'atribucion
       more_title_html: Per trobar mai d’informacions
       more_1_html: |-
         title: Exemple d'atribucion
       more_title_html: Per trobar mai d’informacions
       more_1_html: |-

-        Se volètz obténer mai d’informacions sus cossí reütilizar nòstras donadas e nos creditar, legissètz la <a
-          href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">FAQ
-          legala</a>.
+        Per obténer mai d’informacions sus cossí reütilizar nòstras donadas e nos creditar, legissètz la <a
+        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">FAQ legala</a>.

       contributors_title_html: Nòstres contributors
       contributors_fr_html: |-
         <strong>França</strong> : conten de donadas de la
       contributors_title_html: Nòstres contributors
       contributors_fr_html: |-
         <strong>França</strong> : conten de donadas de la


@@ -1697,16 +1696,16 @@ oc:
         revoke:
           administrator: Revocar l'accès administrator
           moderator: Revocar l'accès moderador
         revoke:
           administrator: Revocar l'accès administrator
           moderator: Revocar l'accès moderador

-      block_history: blòts recebuts
-      moderator_history: blòts provesits
+      block_history: Blocatges actius
+      moderator_history: Blocatges donats

       comments: Comentaris
       comments: Comentaris

-      create_block: blocar aqueste utilizaire
-      activate_user: activar aqueste utilizaire
-      deactivate_user: desactivar aqueste utilizaire
+      create_block: Blocar aqueste utilizaire
+      activate_user: Activar aqueste utilizaire
+      deactivate_user: Desactivar aqueste utilizaire

       confirm_user: Confirmar aqueste utilizaire
       confirm_user: Confirmar aqueste utilizaire

-      hide_user: amagar aqueste utilizaire
-      unhide_user: reafichar aqueste utilizaire
-      delete_user: suprimir aqueste utilizaire
+      hide_user: Amagar aqueste utilizaire
+      unhide_user: Reafichar aqueste utilizaire
+      delete_user: Suprimir aqueste utilizaire

       confirm: Confirmar
       friends_changesets: Percórrer totes los gropes de modificacions dels amics
       friends_diaries: Entradas de jornal dels amics
       confirm: Confirmar
       friends_changesets: Percórrer totes los gropes de modificacions dels amics
       friends_diaries: Entradas de jornal dels amics

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index f464a317e3ed81eae5829b396afd0e888fb9a117..29b8df2c7c8cdae38554a06a3184d166677f16c9 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1127,9 +1127,10 @@ ru:
          изымания</a> или непосредственно на нашу
         <a href="http://dmca.openstreetmap.org/">вебстраницу регистрации</a>.
       trademarks_title_html: <span id="trademarks"></span>Товарные знаки
          изымания</a> или непосредственно на нашу
         <a href="http://dmca.openstreetmap.org/">вебстраницу регистрации</a>.
       trademarks_title_html: <span id="trademarks"></span>Товарные знаки

-      trademarks_1_html: OpenStreetMap и логотип с увеличительным стеклом являются
-        зарегистрированными товарными знаками Фонда OpenStreetMap. Если у вас есть
-        вопросы об использовании знаков, пожалуйста, отправьте ваши вопросы <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">рабочей
+      trademarks_1_html: OpenStreetMap, логотип с увеличительным стеклом и State of
+        the Map являются зарегистрированными товарными знаками Фонда OpenStreetMap.
+        Если у вас есть вопросы об использовании знаков, пожалуйста, отправьте ваши
+        вопросы <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">рабочей

         группе по лицензированию</a>.
   welcome_page:
     title: Добро пожаловать!
         группе по лицензированию</a>.
   welcome_page:
     title: Добро пожаловать!

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 7a2533b348b74396ec89499ec18708816187305d..9937563afde85388e80d31ea3c584b75a7b519bc 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1061,7 +1061,8 @@ zh-TW:
       infringement_2_html: 如果你認為有版權的材料被不恰當地加入到 OpenStreetMap 資料庫或此網站，請請參考我們的<a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我們的<a
         href="http://dmca.openstreetmap.org/">網上申報頁面</a>提出。
       trademarks_title_html: <span id="trademarks"></span>商標
       infringement_2_html: 如果你認為有版權的材料被不恰當地加入到 OpenStreetMap 資料庫或此網站，請請參考我們的<a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我們的<a
         href="http://dmca.openstreetmap.org/">網上申報頁面</a>提出。
       trademarks_title_html: <span id="trademarks"></span>商標

-      trademarks_1_html: 開放街圖和放大鏡logo是開放街圖基金會的註冊商標。如果你對於使用這些商標有疑問的話，請將你的問題寄到<a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">授權條款工作小組
+      trademarks_1_html: 開放街圖、放大鏡logo和開放街圖研討會是開放街圖基金會的註冊商標。如果你對於使用這些商標有疑問的話，請將你的問題寄到<a
+        href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">授權條款工作小組

         (Licence Working Group)</a>。
   welcome_page:
     title: 歡迎！
         (Licence Working Group)</a>。
   welcome_page:
     title: 歡迎！