Localisation updates from https://translatewiki.net.

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 25603aebce40692e99ac74592f5504431c59d2cd..2ded61ae173c8667d41e1c8bc07cb24754abadc1 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -297,7 +297,6 @@ be:
       current email address: Бягучы адрас электроннай пошты
       external auth: Знешняя Аўтэнтыфікацыя
       openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: што гэта?
       contributor terms:
         heading: Умовы ўдзелу

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 28de7f528819d3be2a73aaf7bc6166d775957658..a671b33d2775f00caec2121e3cbb3066772104e2 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -3063,6 +3063,9 @@ cs:
           deleted: Smazaný
         name_or_email: Jméno nebo e-mail
         ip_address: IP adresa
+        edits: Úpravy?
+        has_edits: Má úpravy
+        no_edits: Bez úprav
         search: Hledat
       page:
         found_users:
@@ -3525,6 +3528,14 @@ cs:
     home:
       marker_title: Poloha mého domova
       not_set: Ve vašem účtu není nastavena poloha domova
+    heatmap:
+      tooltip:
+        no_contributions: Dne %{date} žádné úpravy
+        contributions:
+          one: Dne %{date} %{count} úprava
+          few: Dne %{date} %{count} úpravy
+          many: Dne %{date} %{count} úpravy
+          other: Dne %{date} %{count} úprav
   redactions:
     edit:
       heading: Upravit redakci

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 8a162adf28429f4a73eb2d409690aee28c6e3aba..b1888175fe423300124398fe375360ce7e8635c9 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -298,7 +298,6 @@ cy:
       current email address: Cyfeiriad E-bost Cyfredol
       external auth: Dilysu Allanol
       openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: beth yw hwn?
       contributor terms:
         heading: Telerau Cyfranwyr
@@ -308,7 +307,6 @@ cy:
           newydd.
         agreed_with_pd: Rydych hefyd wedi datgan eich bod yn ystyried bod eich golygiadau
           yn y Parth Cyhoeddus.
-        link: https://osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: beth yw hwn?
         not_agreed_with_pd: Nid ydych wedi datgan eich bod yn ystyried bod eich golygiadau
           yn y Parth Cyhoeddus.
@@ -2335,7 +2333,6 @@ cy:
       not_public: Nid ydych wedi gosod eich golygiadau i fod yn gyhoeddus.
       user_page_link: tudalen defnyddiwr
       anon_edits_html: (%{link})
-      anon_edits_link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
       anon_edits_link_text: Gweld pam.
     edit:
       id_not_configured: iD heb ei ffurfweddu
@@ -2429,10 +2426,6 @@ cy:
         bicycle: Beic
         car: Car
         foot: Troed
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:
@@ -3217,7 +3210,6 @@ cy:
         other: '%{count} nodyn dienw'
       counter_warning_guide_link:
         text: gyfrannu eich hun
-        url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
       counter_warning_forum_link:
         text: gall y gymuned eich helpu
       advice: Mae eich nodyn yn gyhoeddus a gellid ei ddefnyddio i ddiweddaru'r map,

diff --git a/config/locales/da.yml b/config/locales/da.yml
index b56e9e1569446332c6d76cca33c16c0b9dc70e3f..1469b9aba89157a681fd84ce57b91a0cbeab6cc6 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -2474,10 +2474,6 @@ da:
         bicycle: Cykel
         car: Bil
         foot: Til fods
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 61ed0c980469847e272c924da96d62094f7172bc..c3b42122ae015b0b23fe50e837a3485b519de406 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -99,14 +99,14 @@ el:
       node: Κόμβος
       node_tag: Ετικέτα κόμβου
       note: Σημείωση
-      old_node: ΠαλαιÏ\8cÏ\82 κÏ\8cμβοÏ\82
-      old_node_tag: Παλαιά εÏ\84ικέÏ\84α κÏ\8cμβοÏ\85
-      old_relation: Παλαιά Ï\83Ï\87έÏ\83η
-      old_relation_member: ΠαλαιÏ\8c μέλοÏ\82 Ï\84ηÏ\82 Ï\83Ï\87έÏ\83ηÏ\82
-      old_relation_tag: Παλαιά εÏ\84ικέÏ\84α Ï\84ηÏ\82 Ï\83Ï\87έÏ\83ηÏ\82
-      old_way: Παλαιά γÏ\81αμμή
-      old_way_node: Î\9aÏ\8cμβοÏ\82 Ï\80αλαιάÏ\82 γÏ\81αμμήÏ\82
-      old_way_tag: Î\95Ï\84ικέÏ\84α Ï\80αλαιάÏ\82 γÏ\81αμμήÏ\82
+      old_node: Παλιός κόμβος
+      old_node_tag: Παλιά ετικέτα κόμβου
+      old_relation: Παλιά σχέση
+      old_relation_member: Παλιό μέλος της σχέσης
+      old_relation_tag: Παλιά ετικέτα της σχέσης
+      old_way: Παλιά γραμμή
+      old_way_node: Κόμβος παλιάς γραμμής
+      old_way_tag: Ετικέτα παλιάς γραμμής
       relation: Σχέση
       relation_member: Μέλος της σχέσης
       relation_tag: Ετικέτα της σχέσης
@@ -293,7 +293,6 @@ el:
       current email address: Τρέχουσα διεύθυνση ηλεκτρονικού ταχυδρομείου
       external auth: Εξωτερική επαλήθευση ταυτότητας
       openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: τι είναι αυτό;
       contributor terms:
         heading: Όροι Συνεισφοράς
@@ -303,7 +302,6 @@ el:
           σας και την αποδοχή των νέων Όρων Συνεισφοράς.
         agreed_with_pd: Δηλώσατε επίσης ότι αποδέχεστε ότι οι τροποποιήσεις σας αποτελούν
           κοινό κτήμα.
-        link: https://osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: τι είναι αυτό;
         not_agreed_with_pd: Δεν έχετε δηλώσει ότι θεωρείτε ότι οι τροποποιήσεις σας
           ανήκουν στον Δημόσιο Τομέα.
@@ -2431,7 +2429,6 @@ el:
         δεν το κάνετε. Μπορείτε να κάνετε τις επεξεργασίες σας δημόσιες από την %{user_page}.
       user_page_link: σελίδα χρήστη
       anon_edits_html: (%{link})
-      anon_edits_link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
       anon_edits_link_text: Μάθετε γιατί συμβαίνει αυτό.
     edit:
       id_not_configured: Ο iD δεν έχει ρυθμιστεί
@@ -2556,10 +2553,6 @@ el:
         bicycle: Ποδήλατο
         car: Αυτοκίνητο
         foot: Πόδια
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:
@@ -3551,6 +3544,7 @@ el:
           tenth: 10η
       time: Διάρκεια
       download: Λήψη διαδρομής ως GeoJSON
+      filename: διαδρομή
     query:
       node: Κόμβος
       way: Γραμμή
@@ -3568,6 +3562,12 @@ el:
     home:
       marker_title: Τοποθεσία του σπιτιού μου
       not_set: Η τοποθεσία του σπιτιού δεν έχει οριστεί για τον λογαριασμό σας
+    heatmap:
+      tooltip:
+        no_contributions: Δεν υπάρχουν συνεισφορές στις %{date}
+        contributions:
+          one: '%{count} συνεισφορά στις %{date}'
+          other: '%{count} συνεισφορές στις %{date}'
   redactions:
     edit:
       heading: Επεξεργασία παράληψης

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 53a92d2bf0d87cf24e4004fdf0679951cf2ad57e..c97bfcd78d909971b50c695d4838f542f7ecb6c3 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -2430,10 +2430,6 @@ eo:
         bicycle: Bicikle
         car: Aŭte
         foot: Piede
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 438832bd373e96dd9c2a89d8e593c5dfe8c4445c..23545433aff3097aaba3b4ee70ac403a2349f407 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -2260,9 +2260,6 @@ et:
         bicycle: Rattaga
         car: Autoga
         foot: Jalgsi
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
     key:
       table:
         entry:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a43c4d37e5897c503baf4513e72099fec9aee25e..f2e2e0be24c1ea40aea1a3719fef53e4d76a53ca 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -48,6 +48,7 @@
 # Author: Ignatgg
 # Author: Iketsi
 # Author: JB
+# Author: JLTRY
 # Author: Jean-Frédéric
 # Author: JenyxGym
 # Author: Jg45
@@ -256,7 +257,7 @@ fr:
         auth_provider: Fournisseur d’authentification
         auth_uid: UID d’authentification
         email: Courriel
-        new_email: Nouvelle adresse de courriel
+        new_email: Nouvelle adresse courriel
         active: Actif
         display_name: Pseudonyme
         description: Description du profil
@@ -1702,11 +1703,11 @@ fr:
         level11: Limite administrative (niveau 11)
       border_types:
         arrondissement: Limite d'arrondissement
-        borough: Limite de borough (sorte d'arrondissement)
+        borough: Limite d'arrondissement
         cercle: Limite de cercle
         city: Limite de ville
-        comarca: Limite de comarque
-        county: Limite de comté
+        comarca: Limite de la Comarque
+        county: Limite de département
         departement: Limite départementale
         department: Limite départementale
         district: Limite de district
@@ -1721,7 +1722,10 @@ fr:
         neighbourhood: Limite de quartier
         parish: Limite de la paroisse
         province: Frontière provinciale
+        região: Limite régionale
+        region: Limite régionale
         state: Frontière de l'État
+        town: Limite communale
         township: Limite de township (canton)
         village: Limite de village
     results:
@@ -1735,7 +1739,9 @@ fr:
       title: Problèmes
       select_status: Sélectionner un état
       select_type: Sélectionner un type
+      select_last_managed_by: Sélectionnez le dernier géré par
       reported_user: Utilisateur signalé
+      not_managed: Non géré
       search: Rechercher
       search_guidance: 'Problèmes de recherche :'
       states:
@@ -1749,6 +1755,7 @@ fr:
       status: État
       reports: Rapports
       last_updated: Dernière mise à jour
+      last_managed: Dernier géré
       reporting_users: Signalement d'utilisateurs
       reports_count:
         one: '%{count} rapport'
@@ -1796,11 +1803,15 @@ fr:
         diary_comment: '%{entry_title}, commentaire nº %{comment_id}'
         note: Note nº %{note_id}
       reportable_heading:
+        diary_comment_html: Commentaire de journal %{title} ajouté le %{datetime_created},
+          mis à jour le %{datetime_updated}
+        diary_entry_html: Entrée du journal %{title} ajouté le %{datetime_created},
+          mis à jour le %{datetime_updated}
         note_html: '%{title} créé le %{datetime_created}, mis à jour le %{datetime_updated}'
         user_html: Utilisateur %{title} créé le %{datetime_created}
     reporters:
       index:
-        title: Numéro de problème %{issue_id} Reporters
+        title: Numéro de problème #%{issue_id} Reporters
       reporters:
         more_reporters: et %{count} de plus
   issue_comments:
@@ -3204,6 +3215,9 @@ fr:
           deleted: Supprimé
         name_or_email: Nom ou courriel
         ip_address: Adresse IP
+        edits: Modifications ?
+        has_edits: A des modifications
+        no_edits: Aucune modification
         search: Rechercher
       page:
         found_users:
@@ -3664,7 +3678,7 @@ fr:
         no_contributions: Pas de contributions le %{date}
         contributions:
           one: '%{count} contribution le %{date}'
-          other: '% {count} contributions le %{date}'
+          other: '%{count} contributions le %{date}'
   redactions:
     edit:
       heading: Modifier le masquage

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 6658460711fc07d66775ccccf4030a6d3ad5b7d6..19725331c451463a74ff7e7d1781672508349986 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -267,7 +267,6 @@ gl:
       current email address: Enderezo de correo electrónico actual
       external auth: Autenticación externa
       openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: que é isto?
       contributor terms:
         heading: Termos do colaborador
@@ -277,7 +276,6 @@ gl:
           do colaborador.
         agreed_with_pd: Tamén declaraches que consideras que as túas edicións pertencen
           ó dominio público.
-        link: https://osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: que é isto?
         not_agreed_with_pd: Non declaraches que consideras que as túas edicións pertencen
           ó dominio público.
@@ -2412,7 +2410,6 @@ gl:
         Podes establecer as túas edicións como públicas dende a túa %{user_page}.
       user_page_link: páxina de usuario
       anon_edits_html: (%{link})
-      anon_edits_link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
       anon_edits_link_text: Descobra velaquí o motivo.
     edit:
       id_not_configured: O iD non está configurado
@@ -2532,10 +2529,6 @@ gl:
         bicycle: Bicicleta
         car: Coche
         foot: A pé
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:
@@ -3325,7 +3318,6 @@ gl:
         other: '%{count} notas anónimas'
       counter_warning_guide_link:
         text: contribuíres ti
-        url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
       counter_warning_forum_link:
         text: a comunidade pode axudarche
       advice: A túa nota será pública e poderá empregarse para actualizar o mapa;

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 8fa2e4ca1aa3a930d7fff3735114f819e69f0dd4..dc782f98310049b445be1df339fe335ace0d9ef0 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -127,6 +127,7 @@ he:
         allow_write_prefs: לשנות את העדפות המשתמש שלהם
         allow_write_diary: יצירת רשומות והערות ביומן
         allow_write_api: לשנות את המפה
+        allow_write_changeset_comments: להעיר על ערכות שינויים
         allow_read_gpx: לקרוא את הקלטות ה־GPS הפרטיות שלהם
         allow_write_gpx: להעלות הקלטות GPS
         allow_write_notes: לשנות הערות
@@ -304,6 +305,7 @@ he:
   accounts:
     show:
       title: עריכת חשבון
+      my_account: החשבון שלי
       current email address: כתובת דוא״ל נוכחית
       external auth: אימות חיצוני
       openid:
@@ -2387,7 +2389,7 @@ he:
       to: ל
       where_am_i: איפה זה?
       where_am_i_title: נא לתאר את מיקומך הנוכחי באמצעות מנוע החיפוש
-      submit_text: ×\9e×¢×\91ר
+      submit_text: ×\9eס×\9c×\95×\9c
       reverse_directions_text: כיוון לדרך חזרה
       modes:
         bicycle: באופניים

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index d757e2816e5cfd5f08817242fbc73fc1fca9d5a4..8c27e8c0e12249702c9bd6b38725931bea644b3f 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1523,16 +1523,16 @@ ia:
           weir: Barrage
           "yes": Curso de aqua
       admin_levels:
-        level2: Frontiera de pais
-        level3: Frontiera de region
-        level4: Frontiera de stato
-        level5: Frontiera de region
-        level6: Frontiera de contato
-        level7: Frontiera de municipio
-        level8: Limite de citate
-        level9: Limite de village
-        level10: Limite de suburbio
-        level11: Frontiera de quartiero
+        level2: Frontiera international
+        level3: Limite administrative (nivello 3)
+        level4: Limite administrative (nivello 4)
+        level5: Limite administrative (nivello 5)
+        level6: Limite administrative (nivello 6)
+        level7: Limite administrative (nivello 7)
+        level8: Limite administrative (nivello 8)
+        level9: Limite administrative (nivello 9)
+        level10: Limite administrative (nivello 10)
+        level11: Limite administrative (nivello 11)
     results:
       no_results: Nulle resultato trovate
       more_results: Plus resultatos
@@ -2652,11 +2652,11 @@ ia:
     setup_user_auth:
       blocked_zero_hour: Tu ha un message urgente sur le sito web de OpenStreetMap.
         Tu debe leger le message ante de poter salveguardar tu modificationes.
-      blocked: Tu accesso al API ha essite blocate. Per favor aperi un session al
-        interfacie web pro plus informationes.
-      need_to_see_terms: Vostre accesso al API ha essite temporarimente suspendite.
-        Per favor aperi session in le interfacie web pro vider le Conditiones de contributor.
-        Non es necessari declarar se de accordo, ma es obligatori haber legite los.
+      blocked: Tu accesso al API ha essite blocate. Per favor aperi session in le
+        interfacie web pro saper plus.
+      need_to_see_terms: Tu accesso al API ha essite temporarimente suspendite. Per
+        favor aperi session in le interfacie web pro examinar le Conditiones de contributor.
+        Non es necessari acceptar los, ma es obligatori haber legite los.
     settings_menu:
       account_settings: Parametros del conto
       oauth2_applications: Applicationes OAuth 2

diff --git a/config/locales/is.yml b/config/locales/is.yml
index a41b8f2c80f1e51c6e0df6e2777e5977d150eaf4..12175f14a4701d925172e5a2544b66ecee4d2d06 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -265,7 +265,6 @@ is:
       current email address: Núverandi póstfang
       external auth: Ytri auðkenning
       openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: hvað er openID?
       contributor terms:
         heading: Skilmálar vegna framlags

diff --git a/config/locales/it.yml b/config/locales/it.yml
index b88328f8d93cbde0bb6ee1517dcf0ccdb194c0f0..4f866e68ebc7ab45fc365df4cfa1e613852ae924 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -328,7 +328,7 @@ it:
           fossero di pubblico dominio.
         pd_link_text: dichiara
       save changes button: Salva modifiche
-      delete_account: Elimina Utenza...
+      delete_account: Cancella utenza...
     go_public:
       heading: Modifica pubblica
       currently_not_public: Attualmente le tue modifiche sono anonime e le persone
@@ -347,13 +347,13 @@ it:
         la propria email per la conferma del nuovo indirizzo di posta elettronica.
       success: Informazioni sull'utente aggiornate con successo.
     destroy:
-      success: Account eliminato.
+      success: Utenza cancellata.
     deletions:
       show:
-        title: Elimina il mio account
+        title: Cancella la mia utenza
         warning: Attenzione! Il processo di cancellazione dell'account è definitivo.
           Non potrà essere annullato.
-        delete_account: Elimina account
+        delete_account: Cancella utenza
         delete_introduction: 'Puoi eliminare il tuo account OpenStreetMap usando il
           pulsante qui sotto. Ricordati dei seguenti dettagli:'
         delete_profile: Le informazioni del tuo profilo, inclusi il tuo avatar, la
@@ -2517,10 +2517,6 @@ it:
         bicycle: Bicicletta
         car: Auto
         foot: A piedi
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 4609ddf93d9d4d66c6227725df7b1274b83c2f4d..e6aff6ee8a970d27036bb05a2b2038a1d7e744db 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2203,10 +2203,6 @@ ja:
         bicycle: 自転車
         car: 自動車
         foot: 徒歩
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index d7839c98a6e782bd02562b2325bb86f40e2f9b7b..7b2f81fa601227a5bc5fcbb4d01a8ce7240c2000 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -124,7 +124,7 @@ ka:
       title: ანგარიშის რედაქტირება
       current email address: 'ელ-ფოსტის ამჟამინდელი მისამართი:'
       openid:
-        link: http://wiki.openstreetmap.org/wiki/KA:OpenID
+        link: https://wiki.openstreetmap.org/wiki/KA:OpenID
         link text: რა არის ეს?
       contributor terms:
         link text: რა არის ეს?

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index a6c0ecc19c540c4bbdbbce925c0d87a328b5504d..2a26e092d82d9b1e7f4de14b00d123662e59c698 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -280,7 +280,6 @@ ko:
       current email address: 현재 이메일 주소
       external auth: 외부 인증
       openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: 무엇인가요?
       contributor terms:
         heading: 기여자 약관

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 09dc3e2aceba5031d95c01c044f8d5f70d034bb1..630541bde1313f0dd3b2550661171cf737265979 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -231,7 +231,6 @@ ne:
       current email address: हालको इमेल ठेगाना
       external auth: वाह्य अथेन्टिकेसन
       openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: यो के हो ?
       contributor terms:
         heading: योगदानकर्ता सर्तहरू

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index ba73ab94d0d439e36ab844ca6c6275aec0a0bc0d..d5970db7c52caefc9d28001fe95fbb1100b5fe9c 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1937,7 +1937,6 @@ nn:
       not_public_description_html: Du kan ikkje lenger redigere kartet om du ikkje
         gjer det. Du kan gjere redigeringane dine offentlege frå din %{user_page}.
       user_page_link: brukarside
-      anon_edits_link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
       anon_edits_link_text: Finn ut kvifor dette er tilfellet.
     edit:
       id_not_configured: iD er ikkje konfigurert

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 0633ced3f9d2570544680be2042660b25ebba9fb..43f8d975cfd0a088ddeb3999af3e8e4005880a34 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -359,7 +359,6 @@ pl:
         review link text: Skorzystaj z tego odnośnika w dogodnym momencie, aby zapoznać
           się z nowymi Warunkami Uczestnictwa i je zaakceptować.
         agreed_with_pd: Zadeklarowałeś, że swoje edycje publikujesz w domenie publicznej.
-        link: https://osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: co to jest?
         not_agreed_with_pd: Nie zadeklarowałeś, że uznajesz swoje zmiany za należące
           do domeny publicznej.
@@ -1671,6 +1670,33 @@ pl:
         level9: Granica dzielnicy (poziom 9)
         level10: Granica osiedla (poziom 10)
         level11: Granica osiedla (poziom 11)
+      border_types:
+        arrondissement: Granica okręgu
+        borough: Granica gminy
+        cercle: Granica okręgu
+        city: Granica miasta
+        comarca: Granica hrabstwa
+        county: Granica hrabstwa
+        departement: Granica departamentu
+        department: Granica departamentu
+        district: Granica dystryktu
+        distrito: Granica dystryktu
+        freguesia: Granica sołectwa
+        local_authority: Granica władz lokalnych
+        municipality: Granica gminy
+        municipi: Granica gminy
+        município: Granica gminy
+        nation: Granica międzynarodowa
+        national: Granica międzynarodowa
+        neighbourhood: Granica sąsiedztwa
+        parish: Granica parafii
+        province: Granica prowincji
+        região: Granica regionu
+        region: Granica regionu
+        state: Granica stanu
+        town: Granica miasteczka
+        township: Granica miasta
+        village: Granica wioski
     results:
       no_results: Nic nie znaleziono
       more_results: Więcej wyników
@@ -2486,7 +2512,6 @@ pl:
         zmienić je na publiczne na %{user_page}.
       user_page_link: stronie użytkownika
       anon_edits_html: (%{link})
-      anon_edits_link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
       anon_edits_link_text: Tu dowiesz się dlaczego.
     edit:
       id_not_configured: iD nie został skonfigurowany
@@ -2612,10 +2637,6 @@ pl:
         bicycle: Rower
         car: Samochód
         foot: Pieszo
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 05e7c7c4ec553ad1e76a803e83d2fbf350e5e175..01b71b4a8bf0da8c7fcd624059f8238d638533ae 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -292,7 +292,6 @@ pt-PT:
       current email address: E-mail atual
       external auth: Autenticação externa
       openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: o que é isto?
       contributor terms:
         heading: Termos de contribuidor
@@ -302,7 +301,6 @@ pt-PT:
           os novos Termos de Contribuidor.
         agreed_with_pd: Também declaraste que as tuas edições são disponibilizadas
           em Domínio Público.
-        link: https://osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: o que é isto?
         not_agreed_with_pd: Não declaraste que consideras as tuas edições pertencentes
           ao domínio público.
@@ -2403,7 +2401,6 @@ pt-PT:
         Podes definir as tuas edições como públicas na tua %{user_page}.
       user_page_link: página de utilizador
       anon_edits_html: (%{link})
-      anon_edits_link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
       anon_edits_link_text: Descobre a que se deve isto.
     edit:
       id_not_configured: O editor iD não foi configurado
@@ -2522,10 +2519,6 @@ pt-PT:
         bicycle: De bicicleta
         car: De carro
         foot: A pé
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:
@@ -3324,7 +3317,6 @@ pt-PT:
         other: '%{count} notas anónimas'
       counter_warning_guide_link:
         text: contribuir efetivamente
-        url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
       counter_warning_forum_link:
         text: a comunidade pode ajudar-te
       advice: 'Lembra-te: a tua nota é pública e poderá ser usada para atualizar o

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index aec2c82b27f508488a68ff176b660095951655c4..a02b3bf2dbec1116cd0aa8c40530e901ed6edd78 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -2363,7 +2363,6 @@ pt:
       not_public_description_html: Você não pode editar o mapa até que você configure
         suas edições para serem públicas, o que pode fazer na sua %{user_page}.
       user_page_link: página de usuário
-      anon_edits_link: http://wiki.openstreetmap.org/wiki/Pt-br:Disabling_anonymous_edits
       anon_edits_link_text: Descubra se é esse o seu caso.
     edit:
       id_not_configured: iD não foi configurado

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b69c1c4b4cac669f5b6b3301c97b9ae5af113479..1c2abcb0e59d610cd679cd36846c78f69780ba1e 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -2738,7 +2738,7 @@ ru:
     setup_user_auth:
       blocked_zero_hour: У вас есть срочное сообщение на сайте OpenStreetMap. Вам
         нужно прочитать сообщение, прежде чем вы сможете сохранить ваши изменения.
-      blocked: Ваш доступ к API заблокирован. Пожалуйста, войдите через веб-интерфейсе,
+      blocked: Ваш доступ к API заблокирован. Пожалуйста, войдите через веб-интерфейс,
         чтобы узнать подробности.
       need_to_see_terms: Ваш доступ к API временно приостановлен. Пожалуйста войдите
         через веб-интерфейс для просмотра условий участия. Вам не обязательно соглашаться,
@@ -3383,6 +3383,14 @@ ru:
     home:
       marker_title: Мой домашний адрес
       not_set: Установка места нахождения не установлена для вашей учётной записи
+    heatmap:
+      tooltip:
+        no_contributions: Нет правок %{date}
+        contributions:
+          one: '%{count} правка %{date}'
+          few: '%{count} правки %{date}'
+          many: '%{count} правок %{date}'
+          other: '%{count} правок %{date}'
   redactions:
     edit:
       heading: Редактировать исправление

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 0450070c57c580f29123f6638e8405fc4d02291b..1e3657716f43673405965a824fd706e483919396 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -218,7 +218,6 @@ scn:
       current email address: Nnirizzu e-mail attuali
       external auth: Tranzuntari di fora
       openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: zoccu è chissu?
       contributor terms:
         heading: Règuli pî cuntribbuti

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 0d483aaf0c79869fc5bad4cf2415c3c9941f6242..b635a9b618fab6b7c7fcab3f1a0502354db48c77 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -294,7 +294,7 @@ sk:
       current email address: Aktuálna e-mailová adresa
       external auth: Externá autentifikácia
       openid:
-        link: http://wiki.openstreetmap.org/wiki/CS:OpenID
+        link: https://wiki.openstreetmap.org/wiki/CS:OpenID
         link text: čo to znamená?
       contributor terms:
         heading: Podmienky prispievania
@@ -396,6 +396,7 @@ sk:
         consider_pd: Svoje príspevky považujem za voľné dielo (Public Domain)
         consider_pd_why: Prečo by som mal chcieť, aby boli moje príspevky voľným dielom
           (Public Domain)?
+        consider_pd_why_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
         confirm: Potvrdiť
       create:
         successfully_declared: Úspešne ste vyhlásili, že vaše úpravy považujete za
@@ -742,6 +743,19 @@ sk:
       applications:
         create:
           notice: Aplikácia bola zaregistrovaná.
+    openid_connect:
+      errors:
+        messages:
+          auth_time_from_resource_owner_not_configured: Zlyhanie v dôsledku chýbajúcej
+            konfigurácie Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner.
+          reauthenticate_resource_owner_not_configured: Zlyhanie v dôsledku chýbajúcej
+            konfigurácie Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner.
+          resource_owner_from_access_token_not_configured: Zlyhanie v dôsledku chýbajúcej
+            konfigurácie Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token.
+          select_account_for_resource_owner_not_configured: Zlyhanie v dôsledku chýbajúcej
+            konfigurácie Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner.
+          subject_not_configured: Generovanie tokenu ID zlyhalo, pretože chýba konfigurácia
+            Doorkeeper::OpenidConnect.configure.subject.
     scopes:
       address: Zobraziť vašu fyzickú adresu
       email: Zobraziť vašu emailovú adresu
@@ -1578,15 +1592,26 @@ sk:
           "yes": Vodná cesta
       admin_levels:
         level2: Štátna hranica
-        level3: Hranica regiónu
-        level4: Hranica kraja (state)
-        level5: Hranica regiónu
-        level6: Hranica okresu (county)
-        level7: Hranica obce
-        level8: Hranica mesta
-        level9: Hranica obce
-        level10: Hranica časti obce
-        level11: Hranica susedstva
+        level3: Administratívna hranica (úroveň 3)
+        level4: Administratívna hranica (úroveň 4)
+        level5: Administratívna hranica (úroveň 5)
+        level6: Administratívna hranica (úroveň 6)
+        level7: Administratívna hranica (úroveň 7)
+        level8: Administratívna hranica (úroveň 8)
+        level9: Administratívna hranica (úroveň 9)
+        level10: Administratívna hranica (úroveň 10)
+        level11: Administratívna hranica (úroveň 11)
+      border_types:
+        city: Hranica mesta
+        county: Hranica okresu
+        nation: Štátna hranica
+        national: Štátna hranica
+        parish: Hranica farnosti
+        região: Hranica regiónu
+        region: Hranica regiónu
+        state: Hranica kraja (state)
+        town: Hranica mesta
+        village: Hranica obce
     results:
       no_results: Neboli nájdené žiadne výsledky
       more_results: Viac výsledkov
@@ -2267,20 +2292,41 @@ sk:
         contributors_at_cc_by: CC BY
         contributors_at_land_vorarlberg: Vorarlbersko
         contributors_at_cc_by_at_with_amendments: CC BY AT s dodatkami
+        contributors_au_credit_html: |-
+          %{australia}: Zahŕňa alebo využíva Administrative Boundaries © %{geoscape_australia_link}
+          licencované Austrálskym spoločenstvom pod licenciou %{cc_licence_link}.
         contributors_au_australia: Austrália
         contributors_au_geoscape_australia: Geoscape Australia
         contributors_au_cc_licence: Medzinárodná licencia Creative Commons Attribution
           4.0 (CC BY 4.0)
+        contributors_ca_credit_html: |-
+          %{canada}: Obsahuje údaje z
+          GeoBase®, GeoGratis (© Department of Natural
+          Resources Canada), CanVec (© Department of Natural
+          Resources Canada) a StatCan (Geography Division,
+          Statistics Canada).
         contributors_ca_canada: Kanada
         contributors_cz_credit_html: '%{czechia}: Obsahuje údaje zo Štátneho zememeračského
           úradu a katastra licencované pod %{cc_licence_link}'
         contributors_cz_czechia: Česko
         contributors_cz_cc_licence: Medzinárodná licencia Creative Commons Attribution
           4.0 (CC BY 4.0)
+        contributors_fi_credit_html: |-
+          %{finland}: Obsahuje údaje z topografickej databázy
+          National Land Survey of Finland
+          a ďalších súborov údajov pod %{nlsfi_license_link}.
         contributors_fi_finland: Fínsko
         contributors_fi_nlsfi_license: licenciou NLSFI
+        contributors_fr_credit_html: |-
+          %{france}: Obsahuje údaje pochádzajúce z
+          Direction Générale des Impôts.
         contributors_fr_france: Francúzsko
+        contributors_hr_credit_html: |-
+          %{croatia}: Obsahuje údaje zo %{dgu_link} a %{open_data_portal}
+           (verejné informácie Chorvátska).
         contributors_hr_croatia: Chorvátsko
+        contributors_hr_dgu: Štátnej geodetickej správy Chorvátska
+        contributors_hr_open_data_portal: Národného portálu otvorených údajov
         contributors_nl_credit_html: '%{netherlands}: Obsahuje údaje © AND, 2007
           (%{and_link})'
         contributors_nl_netherlands: Holandsko
@@ -2296,10 +2342,26 @@ sk:
         contributors_rs_serbia: Srbsko
         contributors_rs_rgz: Srbského geodetického úradu
         contributors_rs_open_data_portal: Národného portálu otvorených údajov
+        contributors_si_credit_html: |-
+          %{slovenia}: Obsahuje údaje z %{gu_link} a %{mkgp_link}
+           (verejné informácie Slovinska).
         contributors_si_slovenia: Slovinsko
+        contributors_si_gu: Úradu pre zememeranie a mapovanie
+        contributors_si_mkgp: Ministerstva poľnohospodárstva, lesníctva a výživy
+        contributors_es_credit_html: |-
+          %{spain}: Obsahuje údaje pochádzajúce zo
+          Španielskeho národného geografického inštitútu (%{ign_link}) a
+          Národného kartografického systému (%{scne_link})
+          licencované na opätovné použitie pod licenciou %{cc_by_link}.
         contributors_es_spain: Španielsko
         contributors_es_cc_by: CC BY 4.0
+        contributors_za_credit_html: '%{south_africa}: Obsahuje údaje pochádzajúce
+          z %{ngi_link}, štátne autorské práva vyhradené.'
         contributors_za_south_africa: Južná Afrika
+        contributors_za_ngi: 'Chief Directorate: National Geo-Spatial Information'
+        contributors_gb_credit_html: |-
+          %{united_kingdom}: Obsahuje údaje Ordnance
+          Survey © Crown Copyright a právo na databázu 2010-2023.
         contributors_gb_united_kingdom: Spojené kráľovstvo
         contributors_2_html: Ďalšie podrobnosti o týchto a iných zdrojoch, ktoré boli
           použité na pomoc pri zlepšovaní OpenStreetMap, nájdete na %{contributors_page_link}
@@ -2450,10 +2512,6 @@ sk:
         bicycle: Bicykel
         car: Automobil
         foot: Pešo
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 2ffeabc3e5a47aff3f36385f77c8a0f0b29eb446..1728d2c5ceae26db78a71bc3df47ec4968c5ffed 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -2087,8 +2087,8 @@ sr:
     setup_user_auth:
       blocked_zero_hour: Имате хитну поруку на веб-сајту OpenStreetMap. Морате прочитати
         поруку пре него што можете да чувате своје измене.
-      blocked: Ваш приступ АПИ-ју је блокиран. Пријавите се да сазнате више.
-      need_to_see_terms: Ваш приступ АПИ-ју је привремено укинут. Пријавите се да
+      blocked: Ваш приступ API-ју је блокиран. Пријавите се да сазнате више.
+      need_to_see_terms: Ваш приступ API-ју је привремено укинут. Пријавите се да
         бисте погледали услове уређивања. Не морате да их прихватите, већ само да
         их видите.
     settings_menu:

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 21d188b72f2955a31e0f0394e6671a11e0598d29..40e967b26665361d72a864153e931e06063553df 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -311,7 +311,6 @@ tr:
           için lütfen bu bağlantıyı kolaylık sağlamak için izleyin.
         agreed_with_pd: Ayrıca, düzenlemelerinizin Kamu Malı olduğunu düşündüğünüzü
           de beyan ettiniz.
-        link: https://osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: bu nedir?
         not_agreed_with_pd: Yaptığınız düzenlemelerin Kamu Malı olduğunu beyan etmediniz.
         pd_link_text: beyan et
@@ -2510,10 +2509,6 @@ tr:
         bicycle: Bisikletle
         car: Arabayla
         foot: Yürüyerek
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index c863d3a9bb3ea4db5647f8cd8e27bf376e6d52ca..778829a9523315497984f5c53ed7553a80912bf8 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -2539,10 +2539,6 @@ uk:
         bicycle: Велосипед
         car: Машина
         foot: Пішки
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 57947c5599d6baaa99c8112eefe36d4c5a31d0e5..a63e6e47b913da201c940db0bf98737b4403417e 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -2317,10 +2317,6 @@ vi:
         bicycle: Xe đạp
         car: Xe hơi
         foot: Đi bộ
-      providers:
-        fossgis_osrm: OSRM
-        graphhopper: GraphHopper
-        fossgis_valhalla: Valhalla
     key:
       table:
         entry:

diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 5a4d474bf22618b5556c947fbb2273551161644b..c1778c88611666b7a89d996504b80db8b949ffe5 100644 (file)
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -235,7 +235,7 @@ xmf:
       current email address: ელ-ფოსტაშ ასეიანი მიოწურაფუ
       external auth: გალენი აუთენტიფიკაცია
       openid:
-        link: http://wiki.openstreetmap.org/wiki/KA:OpenID
+        link: https://wiki.openstreetmap.org/wiki/KA:OpenID
         link text: მუ რე თენა?
       contributor terms:
         link text: მუ რე თენა?

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 822e6f30e9a06c7d5fbd8bb955cf83a152d40ace..5b105c725ac3807cf9987a7f4fc47e4eaff5817b 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -2187,7 +2187,6 @@ zh-CN:
       not_public: 您尚未公开您的编辑。
       not_public_description_html: 您将无法再编辑此地图，直到您做到如上所述。您可以通过您的%{user_page}公开您的编辑。
       user_page_link: 用户页面
-      anon_edits_link: https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
       anon_edits_link_text: 了解为什么这很重要。
     edit:
       id_not_configured: iD 尚未配置
@@ -2990,7 +2989,6 @@ zh-CN:
         other: '%{count} 个匿名注释'
       counter_warning_guide_link:
         text: 自己贡献
-        url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
       counter_warning_forum_link:
         text: 社区可以帮助你
       advice: 您的注释会公开，并可能用于更新地图，所以不要输入个人信息，或是来自版权保护地图的信息或目录列表。

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index ed20d26bfa28bfe1ed905f6ac963c3aecd3ceed2..5d7cbb3a11ce815a23c7f33374293e3c06a19cef 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -290,6 +290,8 @@ zh-TW:
         review link text: 請跟隨此連結，方便你檢視並接受新的貢獻者條款。
         agreed_with_pd: 你亦同意將你的編輯放到公共領域
         link text: 這是什麼？
+        not_agreed_with_pd: 你仍未宣稱你的編輯是公共領域。
+        pd_link_text: 宣稱
       save changes button: 儲存變更
       delete_account: 刪除帳號…
     go_public:
@@ -353,8 +355,15 @@ zh-TW:
         terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     pd_declarations:
       show:
+        title: 認定我的貢獻屬於公共領域
+        consider_pd: 我認定我的貢獻屬於公共領域
+        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
         confirm: 確認
+      create:
+        successfully_declared: 你成功宣稱你的貢獻屬於公共領域了。
+        already_declared: 你已經宣稱你的貢獻屬於公共領域了。
+        did_not_confirm: 你仍未宣稱你的貢獻屬於公共領域。
   browse:
     deleted_ago_by_html: 由%{user}%{time_ago}刪除
     edited_ago_by_html: 由%{user}%{time_ago}編輯
@@ -492,6 +501,13 @@ zh-TW:
       timeout:
         sorry: 很抱歉，你請求的變更集評論過長無法讀取
   changesets:
+    changeset:
+      comments:
+        one: 1 項評論
+        other: '%{count} 項評論'
+      changes:
+        one: '%{count} 變更'
+        other: '%{count} 變更'
     index:
       title: 變更集
       title_user: '%{user} 的變更集'
@@ -1507,16 +1523,43 @@ zh-TW:
           weir: 堰
           "yes": 水道
       admin_levels:
-        level2: 國界
-        level3: 區界
-        level4: 州界
-        level5: 區界
-        level6: 縣界
-        level7: 自治邦界
-        level8: 市界
-        level9: 村里界
-        level10: 市區邊界
-        level11: 鄰近區界
+        level2: 國際邊界
+        level3: 行政邊界（等級3)
+        level4: 行政邊界（等級4)
+        level5: 行政邊界（等級5)
+        level6: 行政邊界 (等級6)
+        level7: 行政邊界（等級7)
+        level8: 行政邊界（等級8)
+        level9: 行政邊界（等級9)
+        level10: 行政邊界（等級10)
+        level11: 行政邊界（等級11)
+      border_types:
+        arrondissement: 行政區邊界
+        borough: 自治市鎮邊界
+        cercle: 邊界線
+        city: 市界
+        comarca: 科馬卡邊界
+        county: 縣界
+        departement: 部門邊界
+        department: 部門邊界
+        district: 區界
+        distrito: 區界
+        freguesia: 語域邊界
+        local_authority: 地方當局邊界
+        municipality: 市政邊界
+        municipi: 市政邊界
+        município: 市政邊界
+        nation: 國際邊界
+        national: 國際邊界
+        neighbourhood: 鄰里邊界
+        parish: 教區邊界
+        province: 省界
+        região: 地區邊界
+        region: 地區邊界
+        state: 州界
+        town: 城鎮邊界
+        township: 鄉鎮邊界
+        village: 村里邊界
     results:
       no_results: 找不到結果
       more_results: 更多結果
@@ -1588,7 +1631,11 @@ zh-TW:
       reportable_title:
         diary_comment: '%{entry_title}，留言 #%{comment_id}'
         note: '註記 #%{note_id}'
+      reportable_heading:
+        user_html: 使用者 %{title} 建立於 %{datetime_created}
     reporters:
+      index:
+        title: 'Issue #%{issue_id} 提交者'
       reporters:
         more_reporters: 以及 %{count} 個
   issue_comments:
@@ -2161,7 +2208,6 @@ zh-TW:
       not_public_description_html: 在你這麼做之前將無法再編輯地圖，可以在你的 %{user_page} 將自己的編輯設定為公開。
       user_page_link: 使用者頁面
       anon_edits_html: (%{link})
-      anon_edits_link: https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
       anon_edits_link_text: 瞭解為什麼這很重要。
     edit:
       id_not_configured: iD 尚未設定
@@ -2743,7 +2789,18 @@ zh-TW:
       show:
         title: 使用者
         heading: 使用者
+        select_status: 選擇狀態
+        states:
+          pending: 待處理
+          active: 活躍
+          confirmed: 已確認
+          suspended: 已暫停
+          deleted: 已刪除
+        name_or_email: 姓名或電子郵件
         ip_address: IP 位址
+        edits: 編輯？
+        has_edits: 有編輯
+        no_edits: 沒有編輯
         search: 搜尋
       page:
         found_users:
@@ -2935,6 +2992,7 @@ zh-TW:
       closed_title: 已解決的註記：#%{note_name}
       hidden_title: 已隱藏的註記：#%{note_name}
       description_when_author_is_deleted: 已刪除
+      description_when_there_is_no_opening_comment: 未知的
       event_opened_by_html: 由%{user}%{time_ago}建立
       event_opened_by_anonymous_html: 由匿名使用者%{time_ago}建立
       event_commented_by_html: 來自%{user}%{time_ago}的評論
@@ -2971,7 +3029,6 @@ zh-TW:
         other: '%{count} 則匿名註記'
       counter_warning_guide_link:
         text: 自己做出貢獻
-        url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
       counter_warning_forum_link:
         text: 社群可以協助您
       advice: 你的註記已公開並可用於更新地圖，因此請不要輸入個人訊息，或是來自於具版權保護地圖的訊息以及目錄清單。
@@ -3154,6 +3211,11 @@ zh-TW:
       centre_map: 置此於地圖中央
     home:
       marker_title: 我家位置
+      not_set: 你的帳號還未設定家位置
+    heatmap:
+      tooltip:
+        no_contributions: '%{date} 沒有貢獻'
+        contributions: '{{PLURAL|one=%{count} 貢獻於%{date}|% {count} 貢獻於 %{date}}'
   redactions:
     edit:
       heading: 編輯修訂