Localisation updates from https://translatewiki.net.

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index f2d8ddcb790566585d8e498a1360fc8bd6bdf7d8..0e600367e069647331d248c670c55eb4ddcb98c9 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -9,6 +9,7 @@
 # Author: Armin1392
 # Author: BMRG14
 # Author: Baqeri
+# Author: Beginneruser
 # Author: Dalba
 # Author: Danialbehzadi
 # Author: Darafsh
@@ -440,7 +441,7 @@ fa:
     note:
       title: 'یادداشت: %{id}'
       new_note: یادداشت تازه
-      description: تÙ\88صÛ\8cÙ\81
+      description: تÙ\88ضÛ\8cحات
       open_title: 'یادداشت حل‌نشده #%{note_name}'
       closed_title: 'یادداشت حل‌شده #%{note_name}'
       hidden_title: 'یادداشت پنهان #%{note_name}'

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 142b1d083da8c0b5a88955e29143521c0d96d839..5df388f713dc6a06a611f5006eb577e0175c1620 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -20,6 +20,7 @@
 # Author: Maantietäjä
 # Author: Macofe
 # Author: Markosu
+# Author: Markus Mikkonen
 # Author: McSalama
 # Author: Mediawikitranslator
 # Author: Mikahama
@@ -331,7 +332,7 @@ fi:
           tätä linkkiä.
         agreed_with_pd: Olet myös ilmaissut muokkaustesi olevan tekijänoikeudesta
           vapaita (Public Domain).
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: Mitä tämä tarkoittaa?
       save changes button: Tallenna muutokset
       make edits public button: Tee muokkauksistani julkisia

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index fee12c187591097a32a31ae28b2a499b404dbf27..fc7fec5ff87df9c7a66f356ac8f66e5fd8c8ca37 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -256,6 +256,24 @@ ia:
         delete_account: Deler conto
         delete_introduction: 'Tu pote deler tu conto OpenStreetMap con le button sequente.
           Nota ben que:'
+        delete_profile: Tu information de profilo, includente tu avatar, description
+          e domicilio, essera removite.
+        delete_display_name: Tu nomine a monstrar essera removite e potera esser reusate
+          per altere contos.
+        retain_caveats: 'Nonobstante, alcun informationes sur te essera retenite sur
+          OpenStreetMap, mesmo post le deletion de tu conto:'
+        retain_edits: Tu modificationes del base de datos cartographic, si existe,
+          essera retenite.
+        retain_traces: Tu tracias incargate, si existe, essera retenite.
+        retain_diary_entries: Tu entratas e commentos de diario, si existe, essera
+          retenite ma celate al vista.
+        retain_notes: Tu notas e commentos cartographic, si existe, essera retenite
+          ma celate al vista.
+        retain_changeset_discussions: Tu discussiones sur gruppos de modificationes,
+          si existe, essera retenite.
+        retain_email: Tu adresse de e-mail essera retenite.
+        confirm_delete: Es tu secur?
+        cancel: Cancellar
   accounts:
     edit:
       title: Modificar conto
@@ -291,14 +309,17 @@ ia:
           e acceptar le nove Conditiones de Contributor.
         agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como
           liberate al Dominio Public.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: que es isto?
       save changes button: Salveguardar modificationes
       make edits public button: Render tote mi modificationes public
+      delete_account: Deler conto…
     update:
       success_confirm_needed: Informationes del usator actualisate con successo. Tu
         recipera in e-mail un nota pro confirmar tu nove adresse de e-mail.
       success: Informationes del usator actualisate con successo.
+    destroy:
+      success: Conto delite.
   browse:
     created: Create a
     closed: Claudite a
@@ -898,6 +919,7 @@ ia:
           trailhead: Initio de sentiero
           trunk: Via national
           trunk_link: Via national
+          turning_circle: Circulo de giro
           turning_loop: Bucla de giro
           unclassified: Via non classificate
           "yes": Cammino
@@ -1179,6 +1201,7 @@ ia:
           "yes": Loco
         railway:
           abandoned: Ferrovia abandonate
+          buffer_stop: Guardacolpos
           construction: Ferrovia in construction
           disused: Ferrovia in disuso
           funicular: Ferrovia funicular
@@ -2070,7 +2093,7 @@ ia:
             sin explicite permission del titulares del derecto de autor.
         infringement_2_html: Si vos crede que material sub copyright ha essite inserite
           inappropriatemente in le base de datos de OpenStreetMap o in iste sito,
-          per favor consulta nostre <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura
+          per favor consulta nostre <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">procedura
           de remotion</a> o submitte un plancto immediate usante nostre <a href="https://dmca.openstreetmap.org/">formulario
           in linea</a>.
         trademarks_title_html: <span id="trademarks"></span>Marcas commercial
@@ -2644,7 +2667,7 @@ ia:
       consider_pd: In addition a lo que precede, io considera mi contributiones como
         essente in le dominio public
       consider_pd_why: que es isto?
-      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       guidance_html: 'Informationes pro adjutar a comprender iste terminos: a <a href="%{summary}">summario
         facile a comprender</a> e alcun <a href="%{translations}">traductiones non
         official</a>'

diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 9bc4a6b1b9cbf3b0df8d642192c056a811cec311..2123f69081b57a917126d615c9884974f6e33189 100644 (file)
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -177,11 +177,11 @@ kn:
   browse:
     created: ಸೃಷ್ಟಿಸಲ್ಪಟ್ಟ
     closed: ಮುಚ್ಚಲಾಗಿದೆ
-    closed_html: <abbr %{time} ಹಿಂದೆ %{title} ಅನ್ನು </abbr> ಮುಗಿಸಿದ್ದಾರೆ
+    closed_html: ಮುಚ್ಚಲಾಗಿದೆ <abbr title='%{title}'>%{time}</abbr>
     created_by_html: ಸೃಷ್ಟಿಸಲಾಗಿದೆ <abbr title='%{title}'>%{time}</abbr> by %{user}
     deleted_by_html: ಅಳಿಸಲಾಗಿದೆ <abbr title='%{title}'>%{time}</abbr> ಇವರಿಂದ %{user}
     edited_by_html: ತಿದ್ದಲಾಗಿದೆ <abbr title='%{title}'>%{time}</abbr> ಇವರಿಂದ %{user}
-    closed_by_html: '%{user}ರವರು <abbr %{time} ಹಿಂದೆ %{title} ಅನ್ನು </abbr> ಮುಗಿಸಿದ್ದಾರೆ'
+    closed_by_html: '%{user} ರವರಿಂದ <abbr title=''%{title}''>%{time}</abbr> ಮುಚ್ಚಲಾಗಿದೆ'
     version: ಆವೃತ್ತಿ
     in_changeset: ಬದಲಾವಣೆಗಳು
     anonymous: ಅನಾಮಧೇಯ
@@ -281,18 +281,18 @@ kn:
       area: ಪ್ರದೇಶ
     index:
       title: ಬದಲಾವಣೆಗಳು
-      title_user: '  %{user}ಅವರಿಂದಾದ ಬದಲಾವಣೆಗಳು'
-      title_friend: ನಿಮà³\8dಮ ಗೆಳೆಯರಿಂದಾದ ಬದಲಾವಣೆಗಳು
+      title_user: '%{user}ಅವರಿಂದಾದ ಬದಲಾವಣೆಗಳು'
+      title_friend: ನನà³\8dನ ಗೆಳೆಯರಿಂದಾದ ಬದಲಾವಣೆಗಳು
       title_nearby: ಹತ್ತಿರದ ಬಳಕೆದಾರರಿಂದಾದ ಬದಲಾವಣೆಗಳು
       empty: ಯಾವುದೇ ಬದಲಾವಣೆಗಳು ಸಿಗುತ್ತಿಲ್ಲ.
-      empty_area: à²\88 ಪà³\8dರದà³\87ಶದಲà³\8dಲಿ ಯಾವà³\81ದà³\86 ಬದಲಾವಣೆಗಳಿಲ್ಲ.
-      empty_user: à²\88 ಬಳà²\95à³\86ದಾರರಿà²\82ದ ಯಾವà³\81ದà³\86 ಬದಲಾವಣೆಗಳಿಲ್ಲ.
-      no_more: à²\87ನà³\8dನಾವ ಬದಲಾವಣೆಗಳು ಸಿಗುತ್ತಿಲ್ಲ.
-      no_more_area: à²\88 ಪà³\8dರದà³\87ಶದಲà³\8dಲಿ à²\87ನà³\8dನಾವà³\81ದà³\86 ಬದಲಾವಣೆಗಳಿಲ್ಲ.
-      no_more_user: à²\88 ಬಳà²\95à³\86ದಾರರಿà²\82ದ à²\87ನà³\8dನಾವುದೇ ಬದಲಾವಣೆಗಳಿಲ್ಲ.
+      empty_area: à²\88 ಪà³\8dರದà³\87ಶದಲà³\8dಲಿ ಯಾವà³\81ದà³\87 ಬದಲಾವಣೆಗಳಿಲ್ಲ.
+      empty_user: à²\88 ಬಳà²\95à³\86ದಾರರಿà²\82ದ ಯಾವà³\81ದà³\87 ಬದಲಾವಣೆಗಳಿಲ್ಲ.
+      no_more: à²\87ನà³\8dಯಾವ ಬದಲಾವಣೆಗಳು ಸಿಗುತ್ತಿಲ್ಲ.
+      no_more_area: à²\88 ಪà³\8dರದà³\87ಶದಲà³\8dಲಿ à²\87ನà³\8dಯಾವà³\81ದà³\87 ಬದಲಾವಣೆಗಳಿಲ್ಲ.
+      no_more_user: à²\88 ಬಳà²\95à³\86ದಾರರಿà²\82ದ à²\87ನà³\8dಯಾವುದೇ ಬದಲಾವಣೆಗಳಿಲ್ಲ.
       load_more: ಇನ್ನೂ ತೋರಿಸಿ
     timeout:
-      sorry: ಕ್ಷಮಿಸಿ, ನೀವು ಕೇಳಿದ ಬದಲಾವಣಾ ಪಟ್ಟಿ  ಪಡೆಯಲು ದೀರ್ಘ ಸಮಯ ಬೇಕಾಯಿತು.
+      sorry: ಕ್ಷಮಿಸಿ, ನೀವು ಕೇಳಿದ ಬದಲಾವಣಾ ಪಟ್ಟಿ ಪಡೆಯಲು ದೀರ್ಘ ಸಮಯ ಬೇಕಾಯಿತು.
   changeset_comments:
     comment:
       comment: '%{author} ಅವರಿಂದ ಬದಲಾವಣಾ ಸಂಖ್ಯೆ %{changeset_id} ರ ಹೊಸ ಅನಿಸಿಕೆ'

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index ec62ded062bab4d8a39bb51b578d6a00991210af..892b6ce918083cb2ed8b6b0b76e9486714359e40 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -309,8 +309,8 @@ nl:
         delete_account: Verwijder Account
         delete_introduction: 'U kunt uw OpenStreetMap account verwijderen via onderstaande
           knop. Let op de volgende details:'
-        delete_profile: Informatie over uw profiel, inclusief uw avatar, beschrijving
-          en thuis locatie worden verwijderd.
+        delete_profile: Uw profielinformatie, waaronder uw avatar, beschrijving en
+          thuislocatie, wordt verwijderd.
         delete_display_name: Uw weergegeven naam wordt verwijderd en kan opnieuw gebruikt
           worden voor andere accounts.
         retain_caveats: 'Sommige informatie over u blijft behouden op OpenStreetMap,

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index cdba0f8fa83c5c34c9a71173b1d83e344f926559..cbfd0abaae7d43eb6edca348a780b8a5c79a4854 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2178,7 +2178,7 @@ pl:
           praw autorskich.
         infringement_2_html: Jeśli uważasz, że materiał chroniony prawem autorskim
           został niewłaściwie dodany do bazy OpenStreetMap, zajrzyj pod adres naszej
-          <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedury
+          <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">procedury
           usuwania danych</a> lub <a href="https://dmca.openstreetmap.org/">wypełnij
           formularz on-line</a>.
         trademarks_title_html: <span id="trademarks"></span>Znaki towarowe

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 28cc269719974f61c257e2aa3e7856ded034d5ee..987b9bff95cda28e46c7631042f67a4d84e92162 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -200,6 +200,11 @@ sk:
         few: pred menej ako %{count} sekundami
         many: pred menej ako %{count} sekundami
         other: pred menej ako %{count} sekundami
+      less_than_x_minutes:
+        one: pred menej ako minútou
+        few: pred menej ako %{count} minútami
+        many: pred menej ako %{count} minútami
+        other: pred menej ako %{count} minútami
       over_x_years:
         one: pred viac ako rokom
         few: pred viac ako %{count} rokmi
@@ -1767,6 +1772,7 @@ sk:
       welcome:
         url: /welcome
         title: Vitajte na OSM
+        description: Začnite týmto rýchlym sprievodcom popisujúcim základy OpenStreetMap.
       beginners_guide:
         url: http://wiki.openstreetmap.org/wiki/Sk:Beginners%27_guide
       help:
@@ -1896,11 +1902,17 @@ sk:
           názov reštaurácie alebo najvyššia povolená rýchlosť na ceste.
       rules:
         title: Pravidlá!
+        paragraph_1_html: OpenStreetMap má iba zopár formálnych pravidiel, ale od
+          všetkých účastníkov sa očakáva, že budú spolupracovať a komunikovať s komunitou.
+          Ak premýšľate nad akoukoľvek inou činnosťou než manuálna editácia, prečítajte
+          si, prosím, a dodržiavajte pokyny na stránkach <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Importy</a>
+          a <a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automatizované
+          editácie</a>.
       questions:
         title: Akékoľvek otázky?
         paragraph_1_html: |-
           OpenStreetMap ponúka niekoľko zdrojov, kde je možné získať informácie o projekte, spýtať sa rôzne otázky a spoločne diskutovať a dokumentovať témy týkajúce sa mapovania.
-          <a href='%{help_url}'>Tu získajte pomoc</a>. Ste organizácia, ktorá má plány s OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Pozrite sa na sprievodcu privítaním.</a>.
+          <a href='%{help_url}'>Tu získajte pomoc</a>. Ste organizácia, ktorá má plány s OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Pozrite sa na sprievodcu privítaním</a>.
       start_mapping: Začať mapovať
       add_a_note:
         title: Nie je čas upravovať? Pridajte poznámku!
@@ -1942,7 +1954,7 @@ sk:
       pending: NEVYRIEŠENÁ
       filename: 'Názov súboru:'
       download: stiahnuť
-      uploaded: 'Nahraté o:'
+      uploaded: 'Nahraté:'
       points: 'Bodov:'
       start_coordinates: 'Začiatočná súradnica:'
       map: mapa

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 4239ec2ce397018a113c2694555da2d8cfd89bdd..796d2c9913f62d16c7f8d6748387942762835f68 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -311,7 +311,7 @@ te:
           చూసి, అంగీకరించండి.
         agreed_with_pd: మీరు చేసే దిద్దుబాట్లు బహిరంగ డొమెయిన్‌లో ఉంటాయని భావిస్తున్నట్లుగా
           కూడా ప్రకటించారు.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: ఇది ఏమిటి?
       save changes button: మార్పులను భద్రపరచు
       make edits public button: నా దిద్దుబాట్లన్నింటినీ బహిరంగం చేయి
@@ -1933,6 +1933,7 @@ te:
         ఇక్కడ తోడ్పాటునందించేవారు విహంగ చిత్రాలను, GPS డివైసులను, లో టెక్ క్షేత్య్ర
         స్థాయి మ్యాపులనూ వాడి OSM కచ్చితత్వంతో ఉందని, తాజా సమాచారంతో ఉందనీ నిర్థారిస్తారు.
       community_driven_title: సాముదాయిక కృషితో కూడినది
+      open_data_title: ఓపెన్ డేటా
       partners_title: భాగస్వాములు
     copyright:
       foreign:
@@ -1975,10 +1976,15 @@ te:
           Usage Policy</a> లను చూడండి."
         contributors_title_html: మా కాంట్రిబ్యూటర్లు
         infringement_title_html: కాపీహక్కుల ఉల్లంఘన
+        infringement_2_html: "OpenStreetMap డేటాబేసులో గానీ, ఈ సైటులో గానీ కాపీహక్కులున్న
+          సమాచారాన్ని అనుచితంగా వాడారని మీరు భావిస్తే, మా <a href=\"https://wiki.osmfoundation.org/wiki/Takedown_procedure\">తొలగించే
+          పద్ధతిని</a> చూడండి. లేదా నేరుగా మా \n<a href=\"https://dmca.openstreetmap.org/\">ఆన్‌లైను
+          ఫిర్యాదు పేజీలో</a> రాయండి."
         trademarks_title_html: <span id="trademarks"></span>ట్రేడుమార్కులు
     index:
       permalink: స్థిరలంకె
       shortlink: చిన్నలింకు
+      createnote: ఓ నోట్‍ను చేర్చండి
     edit:
       user_page_link: వాడుకరి పేజీ
       anon_edits_html: (%{link})
@@ -2347,6 +2353,7 @@ te:
       heading: నియమాలు
       read_tou: నేను వాడుక నియమాలను చదివాను, వాటికి అంగీకరిస్తున్నాను
       consider_pd_why: ఇది ఏమిటి?
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       continue: కొనసాగించు
       decline: తిరస్కరించు
       legale_select: 'నివసించే దేశం:'

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 2ac3a6dc669503009574237309f04f44be510c4b..394f451586b768d8254b7d467b8bfdf703485be1 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -316,7 +316,18 @@ zh-CN:
     deletions:
       show:
         title: 删除我的账户
+        warning: 警告！这是账户删除流程的最后一步，并且不可被恢复。
         delete_account: 删除账户
+        delete_introduction: 您可以用下面的按钮删除您的OpenStreetMap账户。请注意下面的细节：
+        delete_profile: 您的个人简介，包括您的头像、介绍和家的位置，都将被移除。
+        delete_display_name: 您显示的用户名将被移除，并且可以被其他账户复用。
+        retain_caveats: 然而，部分信息仍将被保留在OpenStreetMap里，即使您的账户被删除：
+        retain_edits: 您对地图数据库的编辑，如果有，将被保留。
+        retain_traces: 您上传的轨迹，如果有，将被保留。
+        retain_diary_entries: 您的日记与日记下的评论，如果有，将被保留，但不可见。
+        retain_notes: 您的地图注记与注记中的评论，如果有，将被保留，但不可见。
+        retain_changeset_discussions: 您在变更集下的讨论，如果有，将被保留。
+        retain_email: 您的电子邮件地址将被保留。
         confirm_delete: 您确定吗？
         cancel: 取消
   accounts:
@@ -349,7 +360,7 @@ zh-CN:
         link text: 这是什么？
       save changes button: 保存更改
       make edits public button: 公开我所有的编辑
-      delete_account: 删除账户……
+      delete_account: 删除账户
     update:
       success_confirm_needed: 成功更新用户信息。 查看您的邮箱以确认您的新邮箱地址。
       success: 成功更新用户信息。
@@ -1689,7 +1700,7 @@ zh-CN:
       introduction_2: 点击电子邮件中的链接确认您的账户，然后您就可以开始绘制地图了。
       press confirm button: 按下面的确认按钮激活您的账户。
       button: 确认
-      success: 已确认您的账å\8f·ï¼\8cæ\84\9fè°¢æ\82¨ç\9a\84注å\86\8cï¼\81
+      success: 已确认您的账æ\88·ï¼\8cæ\84\9fè°¢æ\82¨ç\9a\84注å\86\8cï¼\81
       already active: 该账户已经确认。
       unknown token: 确认码已经过期或不存在。
       reconfirm_html: 如果您需要我们重新发送确认邮件，<a href="%{reconfirm}">请点击这里</a>。
@@ -1703,7 +1714,7 @@ zh-CN:
       failure: 具有此令牌的电子邮件地址已经确认过了。
       unknown_token: 那个确认代码已过期或不存在。
     resend_success_flash:
-      confirmation_sent: 我们已经向%{email}发出一条新的确认通知，一旦您确认您的账户，就能获得映射。
+      confirmation_sent: 我们已经向%{email}发出一条新的确认通知，一旦您确认您的账户，就能开始绘图。
       whitelist: 如果您用于发送确认请求的邮箱具有反垃圾邮件系统，请确保将%{sender}加入白名单，因为我们无法恢复任何确认请求。
   messages:
     inbox:
@@ -1853,7 +1864,7 @@ zh-CN:
           alt: 使用Facebook账户登录
         windowslive:
           title: 使用Windows Live登录
-          alt: 使用一个Windows Live账户登录
+          alt: 使用Windows Live账户登录
         github:
           title: 使用GitHub登录
           alt: 通过GitHub账户登录
@@ -2548,6 +2559,8 @@ zh-CN:
       activate_user: 启用此用户
       deactivate_user: 停用此用户
       confirm_user: 确认此用户
+      unconfirm_user: 取消确认该用户
+      unsuspend_user: 取消暂停该用户
       hide_user: 隐藏此用户
       unhide_user: 取消隐藏此用户
       delete_user: 删除此用户
@@ -2764,7 +2777,7 @@ zh-CN:
         standard: 标准
         cyclosm: 自行车地图
         cycle_map: 骑行运动地图
-        transport_map: 交é\80\9aè·¯ç½\91地图
+        transport_map: 交é\80\9aè¿\90è¾\93地图
         hot: 人道救援地图
         opnvkarte: 公共交通地图
       layers: