Localisation updates from https://translatewiki.net.

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 3bfd1190ec0db5105601129bf6a4ba0f2441b623..ad0cf980215f452170f83459a6f06f847d67b057 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -194,6 +194,9 @@ ar:
     remote:
       name: تحكم عن بعد
       description: تحكم عن بعد (JOSM أو Merkaartor)
+  auth:
+    providers:
+      wikipedia: ويكيبيديا
   api:
     notes:
       comment:
@@ -2588,9 +2591,6 @@ ar:
         out: بَعِّدْ
       locate:
         title: أظهر موقعي
-        metersUnit: متر
-        feetUnit: أقدام
-        popup: أنت ضمن {distance} {unit} من هذه النقطة
       base:
         standard: قياسي
         cycle_map: خريطة الدراجات

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index c12b4ce60db724eaf6dfea50c63f745edf335de0..36e983fa609050d4b9aeeed1210ff619630c9380 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -2580,9 +2580,6 @@ ast:
         out: Amenorgar
       locate:
         title: Ver el mio allugamientu
-        metersUnit: metros
-        feetUnit: pies
-        popup: Tas a {distance} {unit} d'esti puntu
       base:
         standard: Estándar
         cycle_map: Mapa ciclista

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 74b7662fe740690cd064b3975608256a9548dd09..215509c7f4a960a0c3c4aef2425795dbcbdaa419 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -2618,9 +2618,6 @@ be:
         out: Паменшыць
       locate:
         title: Паказаць маё месцазнаходжанне
-        metersUnit: метры
-        feetUnit: футы
-        popup: Вы знаходзіцеся ў межах {distance} {unit} ад гэтага пункта
       base:
         standard: Звычайная карта
         cycle_map: Веласіпедная карта

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index f8a3b80c91c01dffe9cbb1ccffb023b18641e57f..76d1ef2df3eef937ad5765bcba9b75ea776735d6 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1681,7 +1681,6 @@ bg:
         out: Отдалечаване
       locate:
         title: Моето местоположение
-        popup: Намирате се на {distance} {unit} от точката
       base:
         standard: Стандартна карта
         cycle_map: Колоездачна карта

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index d967b73dacaf751f9993595bb94f27eeecfa7ee2..2238f09109336a06e4f208e5a747d4a90a6dee63 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1612,9 +1612,6 @@ bn:
       download: ডাউনলোড
       short_url: সংক্ষিপ্ত ইউআরএল
     map:
-      locate:
-        metersUnit: মিটার
-        feetUnit: ফুট
       layers:
         data: মানচিত্র উপাত্ত
     site:

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 32f15ef822cebe2c91ea388f2f12aa543bb5065e..84a7d29b474176a276bcb7d2b8dba496bed273d9 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -2539,7 +2539,6 @@ br:
         out: Dizoumañ
       locate:
         title: Diskouez al lec'h m'emaon
-        popup: Emaoc'h war-hed {distance} {unit} diouzh ar poent-mañ
       base:
         standard: Standard
         cycle_map: Kelc'hiad kartenn

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 4b0bd959178f188869b00ded9117064a1f78f0cb..f894ae9dba176ce6f1c23ccb682b6114d8c56ac6 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -80,6 +80,7 @@ ca:
       diary_comment: Comentari al diari
       diary_entry: Entrada al diari
       friend: Amic
+      issue: Incidència
       language: Llengua
       message: Missatge
       node: Node
@@ -96,6 +97,7 @@ ca:
       relation: Relació
       relation_member: Membre de la relació
       relation_tag: Etiqueta de la relació
+      report: Informe
       session: Sessió
       trace: Traça
       tracepoint: Punt de la traça
@@ -193,6 +195,15 @@ ca:
     remote:
       name: Control remot
       description: Control remot (JOSM o Merkaartor)
+  auth:
+    providers:
+      none: Cap
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Viquipèdia
   api:
     notes:
       comment:
@@ -2621,9 +2632,12 @@ ca:
         out: Allunya
       locate:
         title: Mostra la meva ubicació
-        metersUnit: metres
-        feetUnit: peus
-        popup: Esteu a {distance} {unit} d'aquest punt
+        metersPopup:
+          one: Sou a menys d'un metre del punt
+          other: Sou a menys de %{count} metres del punt
+        feetPopup:
+          one: Sou a menys d'un peu del punt
+          other: Sou a menys de %{count} peus del punt
       base:
         standard: Estàndard
         cycle_map: Mapa ciclista

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 3613e605e7302b42630ea406a4f96dfbb0671408..a0021b096b6c991851404d1c36d2c7c9371968c9 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2539,9 +2539,6 @@ cs:
         out: Oddálit
       locate:
         title: Ukázat moji polohu
-        metersUnit: metry
-        feetUnit: stopy
-        popup: Jste do {distance} {unit} od tohoto bodu
       base:
         standard: Standardní
         cycle_map: Cyklomapa

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 8e357292bf5b7497bee5dba8f9a60833143f9aef..faa5c4f3e866707af0b488115282116c38fee252 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1644,7 +1644,6 @@ cy:
         out: Chwyddo Allan
       locate:
         title: Dangos Fy Lleoliad
-        popup: Rydych o fewn {distance} {unit} o'r pwynt hwn.
       base:
         standard: Safonol
         cycle_map: Map Beicio

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 06bc44a9387dd99bfca7e5e2a2e099f6204dde1f..b254ddbce7c2c39c7b027b7d503c0672e1dda2c3 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -2606,9 +2606,6 @@ da:
         out: Zoom ud
       locate:
         title: Vis min placering
-        metersUnit: meter
-        feetUnit: fod
-        popup: Du er inden for {distance} {unit} af dette punkt
       base:
         standard: Standard
         cycle_map: Cykelkort

diff --git a/config/locales/de.yml b/config/locales/de.yml
index bc671165e9467e21933e3447408e0337fa412e24..3e1b7049dec0b5e713a21807e0ae9a07f453531c 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2694,9 +2694,6 @@ de:
         out: Verkleinern
       locate:
         title: Aktuellen Standort anzeigen
-        metersUnit: Meter
-        feetUnit: Fuß
-        popup: Du bist innerhalb von {distance} {unit} um diesen Punkt
       base:
         standard: Standard
         cycle_map: Radfahrerkarte

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index d5331e85cbd9831826150255c56066f368f05787..be475269992ec987492dd003d10179adc240a239 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -45,6 +45,7 @@ diq:
       diary_comment: Vatışê Rocan
       diary_entry: Deqewtışê Rocan
       friend: Embaz
+      issue: Mesel
       language: Zıwan
       message: Mesac
       node: Qedyin
@@ -61,6 +62,7 @@ diq:
       relation: Elaqe
       relation_member: Ezayê Têkıliye
       relation_tag: Etiketê Têkıliye
+      report: Rapor kerê
       session: Ronıştış
       trace: Şop
       tracepoint: Dawtey şopi
@@ -118,15 +120,34 @@ diq:
     remote:
       name: Duri da qontrol
       description: Duri ra Qonrtol (JOSM yana  Merkaartor)
+  auth:
+    providers:
+      none: Çıniyo
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
+      comment:
+        opened_at_html: '%{when} de vıraziyayo'
+        opened_at_by_html: Terefê %{user} ra %{when} de vıraziyayo
+        commented_at_html: '%{when} de rocaneyayo'
+        commented_at_by_html: Terefê %{user} ra %{when} de rocaneyayo
       entry:
         comment: Mışewre
   browse:
     created: Vıraziya
     closed: Kerd kip
-    created_html: Verê <abbr title='%{title}'>%{time} de</abbr> vıraziyo
-    closed_html: Verê <abbr title='%{title}'>%{time} de</abbr> kılid biyo
+    created_html: <abbr title='%{title}'>%{time}</abbr> de vıraziyayo
+    closed_html: <abbr title='%{title}'>%{time}</abbr> de kılid biyo
+    created_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra vıraziyayo
+    deleted_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra esteriyayo
+    edited_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra vurniyayo
+    closed_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra kılid
+      biyo
     version: Versiyon
     in_changeset: Qeydê Vurnayışan
     anonymous: anonim
@@ -214,7 +235,7 @@ diq:
   changesets:
     changeset_paging_nav:
       showing_page: Pele %{page}
-      next: Peyên »
+      next: Bahdoyên »
       previous: « Verên
     changeset:
       anonymous: Anonim
@@ -222,16 +243,16 @@ diq:
       view_changeset_details: Teferuatê vurnayışê seti bıvin
     changesets:
       id: ID
-      saved_at: Demê qeydi
+      saved_at: Cayê qeydi
       user: Karber
       comment: Mışewre
-      area: Erz
+      area: Erd
     index:
-      title: Seta vurnayışan
-      title_user: Vurriyayışê setê %{user}
+      title: Qeydê vurnayışan
+      title_user: Vurriyayışê qeydi %{user}
       title_friend: Qeydê vurnayışê embazan
       title_nearby: Nezdıra vurriyayışê setê karberi
-      load_more: Dehana vêşi
+      load_more: Dehana vêşi barkerê
   diary_entries:
     form:
       subject: 'Mewzu:'
@@ -242,7 +263,7 @@ diq:
       longitude: 'Derganiye:'
       use_map_link: xerita bıgurene
     index:
-      user_title: '%{user} (Rocek)'
+      user_title: '%{user} rocek'
     edit:
       marker_text: Lokasyonê rocekê cıkewtışi
     show:
@@ -265,11 +286,11 @@ diq:
       view: Bıvêne
       edit: Bıvurne
     comments:
-      post: Bırışe
+      post: Rışte
       when: Key
       comment: Mışewre
-      newer_comments: Tewr Vatışê Newey
-      older_comments: Vatışo Tewr Kehan
+      newer_comments: Mışewreyê Newey
+      older_comments: Mışewreyê Kehani
   geocoder:
     search:
       title:
@@ -787,7 +808,7 @@ diq:
     search:
       search: Cı geyre
       from: Rıştoğ
-      where_am_i: Edo kotideya?
+      where_am_i: Kani no?
       submit_text: Şo
     key:
       table:
@@ -1068,7 +1089,7 @@ diq:
       revoke: Terkne!
     helper:
       time_future: '%{time} dı bıqediyo'
-      time_past: Verdê %{time} qedya
+      time_past: '%{time} qedya'
       block_duration:
         hours:
           one: 1 seate

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 32cc06b8b0331d9136150fc9cb6ef00e52c161e3..28460e535e5e8b17292b8a486217a47a182e50bb 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -2051,7 +2051,6 @@ dsb:
         out: Pómjeńšyś
       locate:
         title: Aktualne městno pokazaś
-        popup: Sy w {distance} {unit} wokoło toś togo dypka
       base:
         standard: Standard
         cycle_map: Kórta za kolesowarjow

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 4beab4c8a568919b40deaaf3466490bea462487f..1f6de387cd12a7c786f32c79a38c17ab517aa51a 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2656,9 +2656,6 @@ el:
         out: Σμίκρυνση
       locate:
         title: Προβολή της Τοποθεσίας μου
-        metersUnit: μέτρα
-        feetUnit: πόδια
-        popup: Είστε μεταξύ {distance} {unit} από αυτό το σημείο
       base:
         standard: Κανονικός
         cycle_map: Χάρτης Ποδηλασίας

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 36623479e042c26f39c59168b8a99189ca2d819d..d4dcbf88645c31378d64d745203a500cc8a670a9 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -2437,7 +2437,6 @@ en-GB:
         out: Zoom Out
       locate:
         title: Show My Location
-        popup: You are within {distance} {unit} of this point
       base:
         standard: Standard
         cycle_map: Cycle Map

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 23732f784c9eb97f1b7bb41fbed9f7af372ab3a2..7484f2921898cf90c9058a9fa43a3e2ff3ae8fb2 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -63,6 +63,7 @@ eo:
       diary_comment: Taglibra komento
       diary_entry: Taglibra skribaĵo
       friend: Amiko
+      issue: Problemo
       language: Lingvo
       message: Mesaĝo
       node: Nodo
@@ -79,6 +80,7 @@ eo:
       relation: Rilato
       relation_member: Ano de rilato
       relation_tag: Etikedo de rilato
+      report: Raporti
       session: Seanco
       trace: Spuro
       tracepoint: Spur-punkto
@@ -175,6 +177,15 @@ eo:
     remote:
       name: ekstera redaktilo
       description: ekstera redaktilo (JOSM aŭ Merkaartor)
+  auth:
+    providers:
+      none: Neniu
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Vikipedio
   api:
     notes:
       comment:
@@ -2560,9 +2571,12 @@ eo:
         out: Malgrandigi
       locate:
         title: Montri mian pozicion
-        metersUnit: metroj
-        feetUnit: futoj
-        popup: Vi estas {distance} {unit} de ĉi tiu punkto
+        metersPopup:
+          one: Vi estas unu metro for de tiu punkto
+          other: Vi estas %{count} metroj for de tiu punkto
+        feetPopup:
+          one: Vi estas unu futo for de tiu punkto
+          other: Vi estas %{count} futoj for de tiu punkto
       base:
         standard: Norma mapo
         cycle_map: Biciklada mapo
@@ -2578,6 +2592,11 @@ eo:
       copyright: © <a href='%{copyright_url}'>Kontribuintoj de OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Donaci</a>
       terms: <a href='%{terms_url}' target='_blank'>Kondiĉoj pri Retejo kaj API</a>
+      thunderforest: Kaheloj danke al <a href='%{thunderforest_url}' target='_blank'>Andy
+        ALLAN</a>
+      hotosm: Kahela stilo de <a href='%{hotosm_url}' target='_blank'>Humanitarian
+        OpenStreetMap Team</a> gastigata de <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+        France</a>
     site:
       edit_tooltip: Redakti la mapon
       edit_disabled_tooltip: Pligrandigu por redakti la mapon

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3a8352f18a3bcf8d23c86709fb567565ce375f86..193b618d0f0330f6f0bcac55a97fd3d66a480fb4 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -219,6 +219,15 @@ es:
     remote:
       name: Control remoto
       description: Control remoto (JOSM o Merkaartor)
+  auth:
+    providers:
+      none: Ninguno
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Microsoft
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       comment:
@@ -1118,7 +1127,7 @@ es:
       successful_update: Su denuncia ha sido actualizada con éxito
       provide_details: Por favor, proporcione los detalles requeridos
     show:
-      title: 'Incidencia #%{issue_id} %{status}'
+      title: '%{status} Informe n.º %{issue_id}'
       reports:
         zero: Sin informes
         one: 1 informe
@@ -1129,12 +1138,12 @@ es:
       resolve: Resolver
       ignore: Ignorar
       reopen: Reabrir
-      reports_of_this_issue: Reportes de esta incidencia
+      reports_of_this_issue: Informes de este problema
       read_reports: Leer reportes
       new_reports: Nuevos reportes
       other_issues_against_this_user: Otras incidencias en contra de este usuario
       no_other_issues: No hay otras incidencias en contra de este usuario.
-      comments_on_this_issue: Comentarios sobre esta incidencia
+      comments_on_this_issue: Comentarios sobre este informe
     resolve:
       resolved: El estado de la incidencia se ha establecido en 'Resuelto'
     ignore:
@@ -1143,7 +1152,7 @@ es:
       reopened: El estado de la incidencia se ha establecido en 'Abierto'.
     comments:
       comment_from_html: Comentario de %{user_link} en %{comment_created_at}
-      reassign_param: Reasignar incidencia?
+      reassign_param: ¿Quiere reasignar el informe?
     reports:
       reported_by_html: Reportado como %{category} por %{user} en %{updated_at}
     helper:
@@ -2662,9 +2671,6 @@ es:
         out: Alejar
       locate:
         title: Mostrar mi ubicación
-        metersUnit: metros
-        feetUnit: pies
-        popup: Estás a {distance} {unit} de este punto
       base:
         standard: Estándar
         cycle_map: Mapa ciclista

diff --git a/config/locales/et.yml b/config/locales/et.yml
index d35f342d55ae3c104c65f10e9670cff8433bb68c..d3bc50c8056c33da47e637648bf2f756a7e764fc 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -2239,7 +2239,6 @@ et:
         out: Vähenda
       locate:
         title: Näita minu asukohta
-        popup: Sa asud sellest punktist {distance} {unit} kaugusel
       base:
         standard: Tavakaart
         cycle_map: Rattakaart

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 0d4549406a967a919a6f9f8bedcaa41bf4b37d1e..a7f72e1d9b64ce6f48383024e277db99371aff9f 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -2520,7 +2520,6 @@ eu:
         out: Txikiagotu
       locate:
         title: Erakutsi nire kokapena
-        popup: Puntu honetatik {distance} {unit}-ra zaude
       base:
         standard: Arrunta
         cycle_map: Bizikletentzako mapa

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 4a0573205f0d790b7dcfceb93b315b5ce2eec2af..105305e213660fed980ea4ec2179560a4a60b2d4 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -878,7 +878,7 @@ fa:
           funicular: راه‌آهن کابلی
           halt: ایستگاه قطار
           junction: اتصال راه‌آهن
-          level_crossing: محل تقاطع دو خط راه‌آهن
+          level_crossing: تقاطع با راه‌آهن
           light_rail: ریل سبک
           miniature: راه آهن کوچک
           monorail: مونوریل
@@ -2574,8 +2574,6 @@ fa:
         out: کوچک‌نمایی
       locate:
         title: نمایش مکان من
-        metersUnit: متر
-        popup: در شعاع {distance} {unit} نسبت به این نقطه قرار دارید
       base:
         standard: استاندارد
         cycle_map: نقشه دوچرخه

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 28cb9d0c054c9037e7691f55011bd236452031c5..db8e99dca248bed755dd8326bd6b3d2515674a6d 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -2583,9 +2583,6 @@ fi:
         out: Loitonna
       locate:
         title: Näytä oma sijaintini
-        metersUnit: metriä
-        feetUnit: jalkaa
-        popup: Sijainti tarkkuudella {distance} {unit} tästä pisteestä
       base:
         standard: Perinteinen
         cycle_map: Pyöräilykartta

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 03ac069376d74858e0de7eb7a66fee36cc0f064d..fe714a1627800ae11707ce8d170f172c4deeee34 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -602,7 +602,7 @@ fit:
       your_gpx_file: Ylöslattaamasi GPX-fiili
       with_description: ', jonka kuvvaus oon'
       failure:
-        failed_to_import: 'epäonnistui importeerata. Täsä virhe:'
+        failed_to_import: 'epäonnistui importeerata. Tässä virhe:'
         more_info_1: Lissää tietoja GPX-importeerausongelmista ja miten niitä voi
           välttää
         more_info_2: 'ne löytyvät atressista:'

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0900679e60f64cbe567d284b9538a34be1b8c700..ccafbe3fe3de6b0651bece31811f7006bcb7a178 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -112,6 +112,7 @@ fr:
       diary_comment: Commentaire du journal
       diary_entry: Entrée du journal
       friend: Ami
+      issue: Problème
       language: Langue
       message: Message
       node: Nœud
@@ -128,6 +129,7 @@ fr:
       relation: Relation
       relation_member: Membre de la relation
       relation_tag: Attribut de la relation
+      report: Rapport
       session: Session
       trace: Trace
       tracepoint: Point de la trace
@@ -226,6 +228,15 @@ fr:
     remote:
       name: Éditeur externe
       description: Éditeur externe (JOSM ou Merkaartor)
+  auth:
+    providers:
+      none: Aucun
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipédia
   api:
     notes:
       comment:
@@ -2698,9 +2709,12 @@ fr:
         out: Vue éloignée
       locate:
         title: Afficher mon emplacement
-        metersUnit: mètres
-        feetUnit: pieds
-        popup: Vous êtes à {distance} {unit} de ce point
+        metersPopup:
+          one: Vous êtes à moins d’un mètre de ce point
+          other: Vous êtes à %{count} mètres de ce point
+        feetPopup:
+          one: Vous êtes à moins d’un pied de ce point
+          other: Vous êtes à moins de %{count} pieds de ce point
       base:
         standard: Standard
         cycle_map: Carte cyclable
@@ -2716,6 +2730,11 @@ fr:
       copyright: © <a href='%{copyright_url}'>Contributeurs de OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Faire un don</a>
       terms: <a href='%{terms_url}' target='_blank'>Conditions du site web et de l’API</a>
+      thunderforest: Priorité des carreaux de <a href='%{thunderforest_url}' target='_blank'>Andy
+        Allan</a>
+      hotosm: Style des carreaux de <a href='%{hotosm_url}' target='_blank'>l’équipe
+        humanitaire de OpenStreetMap</a> hébergé par <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+        France</a>
     site:
       edit_tooltip: Modifier la carte
       edit_disabled_tooltip: Zoomez en avant pour modifier la carte

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index f32ab84bec2467dbe7e352b1155b59b622c30109..a21bf559a46debb4f9a29d58f393689c649dbe49 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1429,7 +1429,6 @@ fur:
         out: Diminuìs zoom
       locate:
         title: Mostre la mê posizion
-        popup: Tu sês a {distance} {unit} di chest pont
       base:
         standard: Standard
         cycle_map: Cycle Map

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 17edd249c340d4ac578dfc323ec5c12325a0ff47..53bff0b28df6063d62b6fd32b42310bb79d834e7 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -2123,7 +2123,6 @@ ga:
         out: Zúmáil amach
       locate:
         title: Taispeáin mo shuíomh
-        popup: Tá tú laistigh de {distance} {unit} den phointe seo
       base:
         standard: Caighdeánach
         cycle_map: Léarscáil Rothaíochta

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index bc90fd489e4def2aaab7a5b870897d383a572ab8..9455b298ec539aaedcdd7b8910edee19b4d52efe 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -2322,7 +2322,6 @@ gd:
         out: Sùm a-mach
       locate:
         title: Seall far a bheil mi
-        popup: Tha thu {distance} {unit} air falbh on phuing seo
       base:
         standard: Àbhaisteach
         cycle_map: Mapa baidhseagail

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 7dd6057f6628417a99aa70cb01fb36f86e8c68ab..8cc24fdd56697b9d0091155bb247ccc2c56589ce 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2621,9 +2621,6 @@ gl:
         out: Afastar
       locate:
         title: Amosar a miña localización
-        metersUnit: metros
-        feetUnit: pés
-        popup: Está a {distance} {unit} deste punto
       base:
         standard: Estándar
         cycle_map: Ciclista

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 25f8797af153ee7b9db1c7662b07726256d1d734..e2360e9e3040c43295eb30bcb232fe0ae8a418a5 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2548,9 +2548,6 @@ he:
         out: התרחקות
       locate:
         title: הצגת המיקום שלי
-        metersUnit: מטר
-        feetUnit: רגל
-        popup: המרחק שלך מהנקודה הזאת הוא {distance} {unit}
       base:
         standard: תקני
         cycle_map: מפת אופניים

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 6cea71e0be3d947581e018e74c79668c04a63311..5ac1609c4eca1e2e3aff134335831f122c9251e8 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1990,7 +1990,6 @@ hr:
         out: Udalji
       locate:
         title: Pokaži moju lokaciju
-        popup: Udaljen/a si {distance} {unit} od ove točke
       base:
         standard: Standardni
         cycle_map: Biciklistička karta

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index dd168a0278b60470308519823d72d115a8d195c3..656b572ff4bcfe9cbb19f446bf338c5cd08575cc 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -2467,7 +2467,6 @@ hsb:
         out: Pomjeńšić
       locate:
         title: Aktualne městno pokazać
-        popup: Sy znutřka {distance} {unit} wokoło tutoho dypka
       base:
         standard: Standard
         cycle_map: Kolesowa karta

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 3533f7d75526367191645a9421481ef85ae9243f..c7739624895ef3e2420192eae27fbd41850ab4c5 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -2594,9 +2594,6 @@ hu:
         out: Kicsinyítés
       locate:
         title: Mutasd a helyzetemet
-        metersUnit: méter
-        feetUnit: láb
-        popup: '{distance} {unit} távolságra vagy ettől a ponttól'
       base:
         standard: Alapértelmezett
         cycle_map: Kerékpártérkép

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index a525982d2b7f1d3cf8471872aaba2ae5182199fd..92d684832431f3e68fde07d3d9fea9f937b047bc 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -2580,9 +2580,6 @@ ia:
         out: Zoom retro
       locate:
         title: Monstrar mi position
-        metersUnit: metros
-        feetUnit: pedes
-        popup: Tu es intra {distance} {unit} de iste puncto
       base:
         standard: Standard
         cycle_map: Carta cyclista

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 254caae64bbb3359d72a661223f71c8c1f2eb21d..ea34bc3fe6c58d768c47bb42d1d2a79be511e44b 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -2506,7 +2506,6 @@ id:
         out: Perkecil
       locate:
         title: Tampilkan Lokasiku
-        popup: Anda dalam {distance} {unit} dari sini
       base:
         standard: Standar
         cycle_map: Peta Sepeda

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 2bae3e2cd0ead52e218c7ed9435326b1923c0f83..b2e842e4d64c2e0b40ebf074612ee6b424658217 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -53,6 +53,7 @@ is:
       diary_comment: Bloggathugasemd
       diary_entry: Bloggfærsla
       friend: Vinur
+      issue: Vandamál
       language: Tungumál
       message: Skilaboð
       node: Hnútur
@@ -69,6 +70,7 @@ is:
       relation: Vensl
       relation_member: Stak í venslum
       relation_tag: Merki vensla
+      report: Skýrsla
       session: Seta
       trace: Ferill
       tracepoint: Ferilpunktur
@@ -168,6 +170,15 @@ is:
     remote:
       name: RC-fjarstýring
       description: RC-fjarstýring (JOSM eða Merkaartor)
+  auth:
+    providers:
+      none: Ekkert
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       comment:
@@ -307,9 +318,8 @@ is:
       opened_by: Búið til af %{user} <abbr title='%{exact_time}'>fyrir %{when} síðan</abbr>
       opened_by_anonymous: Búið til af nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}
         síðan</abbr>
-      commented_by: Umsögn frá %{user} <abbr title='%{exact_time}'>fyrir %{when} síðan</abbr>
-      commented_by_anonymous: Umsögn frá nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}
-        síðan</abbr>
+      commented_by: Umsögn frá %{user} <abbr title='%{exact_time}'> %{when}</abbr>
+      commented_by_anonymous: Umsögn frá nafnlausum notanda <abbr title='%{exact_time}'>%{when}</abbr>
       closed_by: Leyst af %{user} <abbr title='%{exact_time}'>fyrir %{when} síðan</abbr>
       closed_by_anonymous: Leyst af nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}
         síðan</abbr>
@@ -1056,9 +1066,8 @@ is:
       status: Staða
       reports: Skýrslur
       last_updated: Síðast uppfært
-      last_updated_time_html: <abbr title='%{title}'> fyrir %{time} síðan</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'> fyrir %{time} síðan</abbr>
-        af %{user}
+      last_updated_time_html: <abbr title='%{title}'> %{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'> %{time}</abbr> af %{user}
       link_to_reports: Skoða skýrslur
       reports_count:
         one: 1 skýrsla
@@ -1097,9 +1106,10 @@ is:
     reopen:
       reopened: Staða vandamáls hefur verið sett á 'Opið'
     comments:
+      comment_from_html: Athugasemd frá %{user_link} gerð %{comment_created_at}
       reassign_param: Endurúthluta vandamáli?
     reports:
-      reported_by_html: Tilkynnt sem %{category} af %{user}
+      reported_by_html: Tilkynnt sem %{category} af %{user} þann %{updated_at}
     helper:
       reportable_title:
         diary_comment: '%{entry_title}, athugasemd #%{comment_id}'
@@ -2073,6 +2083,7 @@ is:
       no_apps_html: Ert þú að nota forrit sem þú myndir vilja skrá til notkunar hjá
         okkur með %{oauth} staðlinum? Þú verður að skrá vefforritið áður en það fer
         að senda OAuth-beiðnir á þessa þjónustu.
+      oauth: OAuth
       registered_apps: 'Þú hefur skráð eftirfarandi forrit:'
       register_new: Skrá nýtt forrit
     form:
@@ -2623,7 +2634,12 @@ is:
         out: Renna frá
       locate:
         title: Birta staðsetningu mína
-        popup: Þú ert innan {distance} {unit} frá þessum punkti
+        metersPopup:
+          one: Þú ert minna en einn metra frá þessum punkti
+          other: Þú ert minna en %{count} metra frá þessum punkti
+        feetPopup:
+          one: Þú ert minna en eitt fet frá þessum punkti
+          other: Þú ert minna en %{count} fet frá þessum punkti
       base:
         standard: Staðlað
         cycle_map: Hjólakort
@@ -2639,6 +2655,11 @@ is:
       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>
+      thunderforest: Kortatíglar frá <a href='%{thunderforest_url}' target='_blank'>Andy
+        Allan</a>
+      hotosm: Stíll kortatígla frá <a href='%{hotosm_url}' target='_blank'>Humanitarian
+        OpenStreetMap teyminu</a> hýst á <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+        France</a>
     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 d1a06d47100c5b48255afeb1d92cdf66131b570d..3ad7890805ea7635ccfa12c22ac2df706398d937 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -204,6 +204,15 @@ it:
     remote:
       name: Controllo remoto
       description: Controllo remoto (JOSM o Merkaartor)
+  auth:
+    providers:
+      none: Nessuno
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       comment:
@@ -2647,9 +2656,6 @@ it:
         out: Zoom indietro
       locate:
         title: Mostra la mia posizione
-        metersUnit: metri
-        feetUnit: piedi
-        popup: Ti trovi a {distance} {unit} da questo punto
       base:
         standard: Standard
         cycle_map: Mappa ciclabile

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 8ddb27dd7c880d06a3a57b5fedb4ad18b81fd7b4..8941804dc7dfa51da955ea5a8a714646ec9c32e8 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -200,6 +200,9 @@ ja:
     remote:
       name: リモート制御
       description: 遠隔制御 (JOSM または Merkaartor)
+  auth:
+    providers:
+      wikipedia: ウィキペディア
   api:
     notes:
       comment:
@@ -2390,9 +2393,6 @@ ja:
         out: 縮小
       locate:
         title: 現在地を表示
-        metersUnit: メートル
-        feetUnit: フィート
-        popup: あなたはこの位置から{distance}{unit}以内にいます
       base:
         standard: 標準
         cycle_map: サイクリングマップ

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 41a6daed42994ac33e0b6dffd1d5dfc83716e186..5a73bbd64d707c3b62bf56b8add20cbf0331dac5 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -45,6 +45,7 @@ kab:
       diary_comment: Awennit n uɣmis
       diary_entry: Anekcam n uɣmis
       friend: Amdakkel
+      issue: Ugur
       language: Tutlayt
       message: Izen
       node: Tikerrist
@@ -61,6 +62,7 @@ kab:
       relation: Assaɣ
       relation_member: Amedraw n ussaɣ
       relation_tag: Tikerrist n ussaɣ
+      report: Aneqqis
       session: Tiɣimit
       trace: Adsil
       tracepoint: Taneqqiḍt n udsil
@@ -340,7 +342,7 @@ kab:
       user_title: Aɣmis n %{user}
       leave_a_comment: Eǧǧ-d awennit
       login_to_leave_a_comment_html: '%{login_link} akken ad teǧǧeḍ awennit'
-      login: Aseqdac
+      login: Qqen
     no_such_entry:
       title: Ulac ula d yiwen n unekcam n uɣmis yettwafen
       heading: 'Ula d yiwen n unekcam s usulay: %{id}'
@@ -361,6 +363,7 @@ kab:
     diary_comment:
       comment_from_html: Awennit n %{link_user} di %{comment_created_at}
       hide_link: Ffer awennit-agi
+      unhide_link: Sken-d awennit-a
       confirm: Sentem
       report: Sillef awennit agi
     location:

diff --git a/config/locales/km.yml b/config/locales/km.yml
index be4567a2e717caf32f9f21f353f04ce3f6571314..ee79106e51d72f1a05e552d27abca1e5017b5b30 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -851,7 +851,6 @@ km:
         out: បង្រួមចេញ
       locate:
         title: បង្ហាញទីតាំងខ្ញុំ
-        popup: អ្នកកំពុងស្ថិតនៅចម្ងាយ {distance} {unit} ពីចំនុចនេះ
       base:
         standard: ស្តង់ដារ
         cycle_map: ផែនទីផ្លូវទោចក្រយាន

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b708376e757ec4383ae4dcbee53e08727e03ee80..fbaa3e9c4a70c99566aa7a21eebde865235e843a 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -77,6 +77,7 @@ ko:
       diary_comment: 일기 의견
       diary_entry: 일기 항목
       friend: 친구
+      issue: 이슈
       language: 언어
       message: 메시지
       node: 교점
@@ -93,6 +94,7 @@ ko:
       relation: 관계
       relation_member: 관계 구성 요소
       relation_tag: 관계 태그
+      report: 보고서
       session: 세션
       trace: 궤적
       tracepoint: 궤적 지점
@@ -165,6 +167,14 @@ ko:
     remote:
       name: 원격 제어
       description: 원격 제어 (JOSM 또는 Merkaartor)
+  auth:
+    providers:
+      none: 없음
+      openid: OpenID
+      google: 구글
+      facebook: 페이스북
+      github: 깃허브
+      wikipedia: 위키백과
   api:
     notes:
       comment:
@@ -2459,8 +2469,6 @@ ko:
         out: 축소
       locate:
         title: 내 위치 보기
-        metersUnit: 미터
-        popup: 이 점의 {distance} {unit} 안에 있습니다
       base:
         standard: 표준
         cycle_map: 사이클 지도

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 1696ced9481f47bc9600e52a9ba761c651149262..c98877edbaba1337b5a6ff483c64e9c0bc0f6089 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -2518,7 +2518,6 @@ ku-Latn:
         out: Dûr bike
       locate:
         title: Cihê min nîşan bide
-        popup: Tu ji vê nuqteyê {distance} {unit} di nav de yî
       base:
         standard: Standard
         cycle_map: Nexşeya bisiklête

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index dd1203d2b3eceb8ec58e90d7084ed70cd5282389..a8be54ee1a1b1357b66fe527cb2b34b41d5ba714 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -36,6 +36,7 @@ lb:
       changeset: Set vun Ännerungen
       country: Land
       friend: Frënd
+      issue: Problem
       language: Sprooch
       message: Message
       node: Knuet
@@ -43,6 +44,7 @@ lb:
       old_relation: Al Relatioun
       old_way: Ale Wee
       relation: Relatioun
+      report: Rapport
       session: Sessioun
       user: Benotzer
       user_preference: Benotzerastellung
@@ -91,6 +93,15 @@ lb:
       name: iD
     potlatch2:
       name: Potlatch 2
+  auth:
+    providers:
+      none: Keng
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       rss:
@@ -1323,7 +1334,12 @@ lb:
     map:
       locate:
         title: Weise wou ech sinn
-        popup: Dir sidd {distance} {unit} vun dësem Punkt ewech
+        metersPopup:
+          one: Dir sidd manner wéi ee Meter vun dësem Punkt ewech
+          other: Dir sidd %{count} Meter vun dësem Punkt ewech
+        feetPopup:
+          one: Dir sidd manner wéi ee Fouss vun dësem Punkt ewech
+          other: Dir sidd %{count} Féiss vun dësem Punkt ewech
       base:
         standard: Standard
         cycle_map: Vëloskaart

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 497a283b3710c6d0c9df36ef4fd30c017059e24b..00f64c6a363308f91bc8777e86e37a060bae4485 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -2513,7 +2513,6 @@ lt:
         out: Nutolinti
       locate:
         title: Rodyti mano vietą
-        popup: Jūs esate {distance} {unit} nuo šio taško
       base:
         standard: Standartinis
         cycle_map: Dviračių žemėlapis

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 2555d5926d63e6ccfefd962e7102521e77a70c88..d692f3e6a9d1d3379168b473c34ebbbaeb7ac7e3 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -2315,9 +2315,6 @@ lv:
         out: Samazināt
       locate:
         title: Rādīt manu atrašanās vietu
-        metersUnit: metri
-        feetUnit: pēdas
-        popup: Tu esi {distance} {unit} no šī punkta
       base:
         standard: Standarta
         cycle_map: Velokarte

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 62045cc2ad8ea4b4ef3d73902e2df77faac1ea78..f257bd6d2ba83f02879b2760fc3ceb9822ed618e 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -51,6 +51,7 @@ mk:
       diary_comment: Коментар од дневникот
       diary_entry: Ставка во дневник
       friend: Пријател
+      issue: Проблем
       language: Јазик
       message: Порака
       node: Јазол
@@ -67,6 +68,7 @@ mk:
       relation: Однос
       relation_member: Член на однос
       relation_tag: Ознака за однос
+      report: Пријави
       session: Седница
       trace: Трага
       tracepoint: Точка на трага
@@ -166,6 +168,15 @@ mk:
     remote:
       name: Далечинско управување
       description: Далечинско управување (JOSM или Merkaartor)
+  auth:
+    providers:
+      none: Нема
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Википедија
   api:
     notes:
       comment:
@@ -2595,9 +2606,12 @@ mk:
         out: Оддалечи
       locate:
         title: Прик. моја местоположба
-        metersUnit: метри
-        feetUnit: стапки
-        popup: Оддалечени сте {distance} {unit} од оваа точка
+        metersPopup:
+          one: Се наоѓате на еден метар од оваа точка
+          other: Се наоѓате на %{count} метри од оваа точка
+        feetPopup:
+          one: Се наоѓате на една стапка од оваа точка
+          other: Се наоѓате на %{count} стапки од оваа точка
       base:
         standard: Стандардна
         cycle_map: Велосипедска
@@ -2613,6 +2627,11 @@ mk:
       copyright: © <a href='%{copyright_url}'>Учесници во OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Дарувајте</a>
       terms: <a href='%{terms_url}' target='_blank'>Услови за мреж. место и приложникот</a>
+      thunderforest: 'Полиња: <a href=''%{thunderforest_url}'' target=''_blank''>Енди
+        Алан</a>'
+      hotosm: 'Стил на полињата: <a href=''%{hotosm_url}'' target=''_blank''>Хуманитарна
+        екипа на OpenStreetMap</a> вдомена од <a href=''%{osmfrance_url}'' target=''_blank''>OpenStreetMap
+        Франција</a>'
     site:
       edit_tooltip: Уредување на картата
       edit_disabled_tooltip: Приближете за да ја уредите картата

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 54b7c8bad23293c25fed9f3711813dcb359ec112..130eb12b1f41ca24a8efbc230f89aa982cba40b1 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1392,7 +1392,6 @@ mr:
     map:
       locate:
         title: माझे ठिकाण दाखवा
-        popup: आपण या बिंदूपासून {distance}{unit}च्या परिघात  आहात
       base:
         cycle_map: सायकल नकाशा
         transport_map: परिवहन नकाशा

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 0c490efc81f246a165b51b9d5e2bffa82f18a0d6..4f88f34ce04363496e4a0f581de5f8f93bc1882a 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -2199,7 +2199,6 @@ ms:
         out: Zum Jauh
       locate:
         title: Paparkan Lokasi Saya
-        popup: Anda berada pada jarak {distance} {unit} dari titik ini
       base:
         standard: Piawai
         cycle_map: Peta Basikal

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 2ac0ed52522ee4732993ed421b98ab39290a239d..5015377a6c3cfa4cb0544896de2eb160fd69c67c 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -2513,7 +2513,6 @@ nb:
         out: Forminsk utvalg
       locate:
         title: Vis posisjonen min
-        popup: Du er innenfor {distance} {unit} av dette punktet
       base:
         standard: Standard
         cycle_map: Sykkelkart

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 3ee128564d8ad6f5cf9f03f3966edb7468871cc8..d5badc2aa1599d7d6affc3112d00ad8531882e44 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -2647,9 +2647,6 @@ nl:
         out: Uitzoomen
       locate:
         title: Uw locatie weergeven
-        metersUnit: meter
-        feetUnit: voet
-        popup: U bent binnen {distance} {unit} van dit punt
       base:
         standard: Standaard
         cycle_map: Fietskaart

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index fa23f3ab5f2d8fd5869185e8e9368dab50fbe1c1..161d93e714a347dbbdd903de3aeb41283061f285 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -2080,7 +2080,6 @@ nn:
         out: Vis mindre
       locate:
         title: Vis plassering
-        popup: Du er innanfor {distance} {unit} frå dette punktet
       base:
         standard: Standard
         cycle_map: Sykkelkart

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index d5d5fe0a3689ffac8d7512b860f13fcc34cee3d0..937aae70cc3b2727836b474e159645f0854174c9 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -2375,7 +2375,6 @@ oc:
         out: Zoom arrièr
       locate:
         title: Mostrar mon emplaçament
-        popup: Sètz a {distance} {unit} d'aqueste punt
       base:
         standard: Estandard
         cycle_map: Mapa ciclista

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f584042a1eadea0acd620bcaee5feb87e9d11fc1..840be976d237c29f012ed1361e8bc9aeecbe1140 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1469,14 +1469,16 @@ pl:
       open_data_html: 'OpenStreetMap to <i>otwarte dane</i>: możesz używać ich, jak
         tylko chcesz pod warunkiem, że dodasz, że pochodzą one z  OpenStreetMap i
         jego autorów. Jeśli zmienisz lub stworzysz coś na podstawie tych danych, możesz
-        je dystrybuować, ale tylko na tej samej licencji. Zobacz <a href=''%{copyright_path}''>Prawa
-        autorskie i licencja</a>, aby zobaczyć szczegóły.'
+        je dystrybuować, ale tylko na tej samej licencji. Szczegółowe informacje na
+        stronie <a href=''%{copyright_path}''>Prawa autorskie i licencja</a>.'
       legal_title: Pytania prawne
       legal_1_html: |-
         Ta strona internetowa i inne powiązane usługi prowadzone są oficjalnie przez <a href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) w imieniu społeczności. Korzystanie ze wszystkich usług OSMF jest regulowane przez <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Warunki użytkowania</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-        Politykę użytkowania</a> i naszą <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Politykę prywatności</a>.<br><a href="https://osmfoundation.org/Contact">Skontaktuj się z OSMF</a>, jeśli masz pytania dotyczące licencji, praw autorskich lub innych prawnych zagadnień i problemów.
+        Politykę użytkowania</a> i naszą <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Politykę prywatności</a>.
+      legal_2_html: |-
+        Jeśli masz pytania dotyczące licencji, praw autorskich lub innych kwestii prawnych, <a href='https://osmfoundation.org/Contact'>skontaktuj się z OSMF</a>.
         <br>
-        OpenStreetMap, logo oraz State of the Map są <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">zarejestrowanymi znakami towarowymi OSMF</a>.
+        OpenStreetMap, logo z lupą oraz State of the Map są <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">zarejestrowanymi znakami towarowymi OSMF</a>.
       partners_title: Partnerzy
     copyright:
       foreign:
@@ -1762,9 +1764,9 @@ pl:
           track: Droga polna lub leśna
           bridleway: Droga dla koni
           cycleway: Droga rowerowa
-          cycleway_national: droga rowerowa znaczenia państwowego
-          cycleway_regional: droga rowerowa znaczenia regionalnego
-          cycleway_local: droga rowerowa znaczenia lokalnego
+          cycleway_national: Droga rowerowa znaczenia państwowego
+          cycleway_regional: Droga rowerowa znaczenia regionalnego
+          cycleway_local: Droga rowerowa znaczenia lokalnego
           footway: Droga dla pieszych
           rail: Tory kolejowe
           subway: Metro
@@ -1818,8 +1820,8 @@ pl:
           destination: Dostęp tylko do punktu docelowego
           construction: Drogi w budowie
           bicycle_shop: Sklep rowerowy
-          bicycle_parking: postój dla rowerów
-          toilets: ustępy
+          bicycle_parking: Parking dla rowerów
+          toilets: Toalety
     richtext_area:
       edit: Edytuj
       preview: Podgląd
@@ -2655,8 +2657,6 @@ pl:
         out: Oddal
       locate:
         title: Wyświetl dla mojego aktualnego położenia
-        metersUnit: Metrów
-        popup: Jesteś w promieniu {distance} {unit} od tego punktu
       base:
         standard: Podstawowa
         cycle_map: Rowerowa

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index d3d5af3e215d306e35af3935c99dd8c0321ae0cd..25158b2fe1e8c037f6f0fcc6b5df1c7d6bb08af5 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -2642,9 +2642,6 @@ pt-BR:
         out: Afastar
       locate:
         title: Exibir Minha Localização
-        metersUnit: metros
-        feetUnit: pés
-        popup: Você está a menos de {distance} {unit} deste ponto
       base:
         standard: Padrão
         cycle_map: Ciclístico

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 7462b9c8476ea0228ad6d1456ac2b889e00adfc4..7c2f014a8954b0120396048c177cbc2970fc3a1c 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -2627,9 +2627,6 @@ pt-PT:
         out: Afastar
       locate:
         title: Mostrar a minha localização
-        metersUnit: metros
-        feetUnit: pés
-        popup: Está a {distance} {unit} deste ponto
       base:
         standard: Mapa Padrão
         cycle_map: Mapa de Ciclismo

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 64012855b679e1eac9e1d25c1a5c5ad7351a3bfb..5036146a720f428fc3ae21e773a7b341db20d49c 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -2625,7 +2625,6 @@ ro:
         out: Micşorează
       locate:
         title: Arată locația mea
-        popup: Sunteți la {distance} {unit} de acest punct
       base:
         standard: Standard
         cycle_map: Hartă de ciclism

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 54c7e32224642f952536fd9bfc9c05fb107ba32d..174148c4b4588d9235af97c0f2118d6c73d195eb 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -2692,9 +2692,6 @@ ru:
         out: Отдалить
       locate:
         title: Показать мое местоположение
-        metersUnit: метры
-        feetUnit: футы
-        popup: Вы находитесь в {distance} {unit} от этой точки
       base:
         standard: Стандартный
         cycle_map: Карта для велосипедистов

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index a4d93db15fd66631c02ae682f8feb0d80afc8e1b..392c8418b9dde46282355fb279f470aa67298464 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -2257,7 +2257,6 @@ scn:
         out: Zumma pi fora
       locate:
         title: Ammustra unni sugnu
-        popup: T'attrovi nta {distance} {unit} di stu puntu
       base:
         standard: Standard
         cycle_map: Cartina pî bicicletti

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 6be507e45359d42640efbdcdd5aabd734479419c..089f3f75ec79ccc09de3d42f8f3206ada06de607 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -2065,7 +2065,6 @@ sk:
         out: Oddialiť
       locate:
         title: Zobraziť moju polohu
-        popup: Nachádzate sa do {distance} {unit} od tohoto bodu
       base:
         standard: Štandardná
         cycle_map: Cyklomapa

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index a5339c53dfe99072cb479c68b52846f9dad6911a..fe9bd61f882866333bed19e78f3fd8b5709866f0 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -2247,7 +2247,6 @@ sl:
         out: Pomanjšaj
       locate:
         title: Pokaži mojo lokacijo
-        popup: Ste v razdalji {distance} {unit} od te točke
       base:
         standard: Privzeta karta
         cycle_map: Kolesarska karta

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index e78222a2f9c39dbdd4a2efc29a18d2d25265389b..563e8e559ef498298413206dcdbb1037d3ff4d68 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -2426,7 +2426,6 @@ sr:
         out: Умањи
       locate:
         title: Прикажи моју позицију
-        popup: Ти си у кругу {distance} {unit} од ове тачке
       base:
         standard: Стандардна
         cycle_map: Бициклистичка мапа

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index de077b02034091ff02c52169310eff14f3524359..4d0f28d3418cc5e05e05b89c2443b6583718b712 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -2627,9 +2627,6 @@ sv:
         out: Zooma ut
       locate:
         title: Visa min position
-        metersUnit: meter
-        feetUnit: fot
-        popup: Du är inom {distance} {unit} från denna punkt
       base:
         standard: Standard
         cycle_map: Cykelkarta

diff --git a/config/locales/te.yml b/config/locales/te.yml
index c6a9e9f04209e9c4c1a04d2515ad06d6392af2c9..4997126b3d9f4c05fe32f531f41225de28b3cd5e 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -877,7 +877,6 @@ te:
     map:
       locate:
         title: నేనున్న ప్రాంతాన్ని చూపించు
-        popup: మీరు ఈ బిందువుకి  {distance} {unit} లోపు ఉన్నారు
       base:
         standard: ప్రామాణికం
         transport_map: రవాణా పటం

diff --git a/config/locales/th.yml b/config/locales/th.yml
index cfe1d95484575e494c7eb7a43dd4adfb390ac811..7b4f5a716fb2071d5102451b3ac0cce73fa34f19 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -2141,7 +2141,6 @@ th:
         out: ซูมออก
       locate:
         title: แสดงตำแหน่งของฉัน
-        popup: คุณอยู่ในระยะ {distance} {unit} จากจุดนี้
       base:
         standard: ปกติ
         cycle_map: แผนที่จักรยาน

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index c3bc1fd79933fa7cbb4760560bbfe8d210d0e832..d3cacdf58eb612f39d72437e637a1ae979fbf725 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -83,6 +83,7 @@ tr:
       diary_comment: Günlük Yorumu
       diary_entry: Günlük Girdisi
       friend: Arkadaş
+      issue: Sorun
       language: Dil
       message: Mesaj
       node: Düğüm
@@ -99,6 +100,7 @@ tr:
       relation: İlişki
       relation_member: İlgili Üye
       relation_tag: İlişki Etiketi
+      report: Raporla
       session: Oturum
       trace: İz
       tracepoint: İzleme Noktası
@@ -195,6 +197,15 @@ tr:
     remote:
       name: Uzaktan Denetim
       description: Uzaktan Denetim (JOSM veya Merkaartor)
+  auth:
+    providers:
+      none: Hiçbiri
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Vikipedi
   api:
     notes:
       comment:
@@ -2649,9 +2660,12 @@ tr:
         out: Uzaklaştır
       locate:
         title: Konumumu göster
-        metersUnit: metreler
-        feetUnit: ayak
-        popup: Bu noktadan {distance} {unit} içeridesin
+        metersPopup:
+          one: Bu noktanın bir metresindesiniz
+          other: Bu noktanın %{count} metresindesiniz
+        feetPopup:
+          one: Bu noktanın bir adım içindesiniz
+          other: Bu noktanın %{count} adım içindesiniz
       base:
         standard: Standart
         cycle_map: Bisiklet Haritası
@@ -2667,6 +2681,11 @@ tr:
       copyright: © <a href='%{copyright_url}'>OpenStreetMap katkıda bulunanları</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Bağış Yapın</a>
       terms: <a href='%{terms_url}' target='_blank'>Web sitesi ve API şartları</a>
+      thunderforest: Fayans <a href='%{thunderforest_url} 'target='_blank'>Andy Allan</a>'ın
+        izniyle
+      hotosm: <a href='%{hotosm_url}' target='_blank'>İnsani OpenStreetMap Ekibi</a>
+        tarafından <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap Fransa</a>
+        tarafından sunulan karo tarzı
     site:
       edit_tooltip: Haritayı düzenle
       edit_disabled_tooltip: Haritayı düzenlemek için yakınlaştırın

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 3ab1f25f3d4694bc29abd0685cf651cb5162f180..2ec0c94db41b2cb2d642e78320c845fa6ecd6fb3 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -81,6 +81,7 @@ uk:
       diary_comment: Коментарі щоденника
       diary_entry: Запис щоденника
       friend: Друг
+      issue: Проблема
       language: Мова
       message: Повідомлення
       node: Точка
@@ -97,6 +98,7 @@ uk:
       relation: Зв’язок
       relation_member: Елемент зв’язку
       relation_tag: Теґ зв’язку
+      report: Звіт
       session: Сеанс
       trace: Трек
       tracepoint: Точка треку
@@ -210,6 +212,15 @@ uk:
     remote:
       name: Дистанційне керування
       description: Дистанційне керування (JOSM або Merkaartor)
+  auth:
+    providers:
+      none: Немає
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Вікіпедія
   api:
     notes:
       comment:
@@ -1482,16 +1493,16 @@ uk:
           змінюєте наші дані чи створюєте на їх основі свої, ви повинні розповсюджувати
           результати під такою ж Ліцензією. Повний <a href="http://opendatacommons.org/licenses/odbl/1.0/">чинний
           текст</a> Ліцензії пояснює ваші права та обов’язки.
-        intro_3_html: "Ð\9cапи в гÑ\80аÑ\84Ñ\96Ñ\87номÑ\83 виглÑ\8fдÑ\96, а Ñ\82акож докÑ\83менÑ\82аÑ\86Ñ\96Ñ\8f Ñ\80озповÑ\81Ñ\8eджÑ\83ються
+        intro_3_html: "Ð\9aаÑ\80Ñ\82огÑ\80аÑ\84Ñ\96Ñ\8f в наÑ\88иÑ\85 Ñ\82айлаÑ\85 мап, а Ñ\82акож докÑ\83менÑ\82аÑ\86Ñ\96Ñ\8f поÑ\88иÑ\80Ñ\8eються
           на умовах <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Ліцензії
           Creative \nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
         credit_title_html: Як вказати посилання на OpenStreetMap
         credit_1_html: Ми вимагаємо, щоб ви зазначали &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
         credit_2_html: Ви повинні також чітко вказувати, що дані доступні на умовах
-          ліцензії Open  Database License, а у разі, коли ви використовуєте графічні
-          мапи з нашого сервера, на них розповсюджуються умови CC-BY-SA. Ви можете
-          зробити це, навівши посилання на <a href="http://www.openstreetmap.org/copyright">цю
+          ліцензії Open  Database License, а у разі, коли ви використовуєте тайли
+          мап із нашого сервера, на них поширюються умови CC-BY-SA. Ви можете зробити
+          це, навівши посилання на <a href="http://www.openstreetmap.org/copyright">цю
           сторінку з роз’ясненням ліцензійних вимог</a>. Або ж, для виконання наших
           вимог під час розповсюдження даних OSM, ви можете безпосередньо вказувати
           назву ліцензії(й) та посилання на її(їх) текст. Якщо ви користуєтесь носіями,
@@ -1513,7 +1524,7 @@ uk:
         more_2_html: Хоча дані OpenStreetMap  є відкритими, ми не в змозі надавати
           безкоштовний API для сторонніх розробників. Ознайомтесь із нашими <a href="https://operations.osmfoundation.org/policies/api/">Правилами
           використання API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">Правилами
-          використання графічних мап</a> та <a href="https://operations.osmfoundation.org/policies/nominatim/">Правилами
+          використання тайлів мап</a> та <a href="https://operations.osmfoundation.org/policies/nominatim/">Правилами
           використання сервісу Nominatim</a>.
         contributors_title_html: Наші учасники
         contributors_intro_html: 'Нашими учасниками є тисячі людей. Ми також включаємо
@@ -2641,9 +2652,16 @@ uk:
         out: Зменшити
       locate:
         title: Показати моє місцезнаходження
-        metersUnit: метри
-        feetUnit: фути
-        popup: Ви знаходитесь в межах {distance} {unit} від цієї точки
+        metersPopup:
+          one: Ви перебуваєте за один метр від цієї точки
+          few: Ви перебуваєте за %{count} метри від цієї точки
+          many: Ви перебуваєте за %{count} метрів від цієї точки
+          other: Ви перебуваєте за %{count} метрів від цієї точки
+        feetPopup:
+          one: Ви перебуваєте за %{count} фут від цієї точки
+          few: Ви перебуваєте за %{count} фути від цієї точки
+          many: Ви перебуваєте за %{count} футів від цієї точки
+          other: Ви перебуваєте за %{count} футів від цієї точки
       base:
         standard: Стандартний
         cycle_map: ВелоМапа
@@ -2660,6 +2678,11 @@ uk:
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Зробити внесок</a>
       terms: <a href='%{terms_url}' target='_blank'>Умови використання Вебсайту та
         API</a>
+      thunderforest: Тайли надав <a href='%{thunderforest_url}' target='_blank'>Andy
+        Allan</a>
+      hotosm: Стиль тайлів — від <a href='%{hotosm_url}' target='_blank'>Гуманітарної
+        команди OpenStreetMap</a>, хостинг — від <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+        Франція</a>
     site:
       edit_tooltip: Редагування мапи
       edit_disabled_tooltip: Збільшить масштаб для редагування мапи

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index cf722b6e2a69030651ce920a8bc5bbbf7bf13a24..8faf3b7b731612d9f069e9cef99b839cfe9675a6 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -2562,9 +2562,6 @@ vi:
         out: Thu nhỏ
       locate:
         title: Bay tới Vị trí của Tôi
-        metersUnit: mét
-        feetUnit: foot
-        popup: Bạn hiện đang ở cách đây {distance} {unit}
       base:
         standard: Chuẩn
         cycle_map: Bản đồ Xe đạp

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 1f821ae27bd1a8683d0d47280cd76846bb514d4b..3573b7cfe32c25848a69f2b319d33949888b5ade 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -45,6 +45,7 @@
 # Author: 水獭很懒
 # Author: 沈澄心
 # Author: 神樂坂秀吉
+# Author: 铁桶
 # Author: 阿pp
 # Author: 아라
 ---
@@ -107,6 +108,7 @@ zh-CN:
       relation: 关系
       relation_member: 关系成员
       relation_tag: 关系标签
+      report: 报告
       session: 会话
       trace: 轨迹
       tracepoint: 轨迹点
@@ -206,6 +208,9 @@ zh-CN:
     remote:
       name: 远程控制
       description: 远程控制 (JOSM 或 Merkaartor)
+  auth:
+    providers:
+      none: 无
   api:
     notes:
       comment:
@@ -2398,9 +2403,6 @@ zh-CN:
         out: 缩小
       locate:
         title: 显示我的位置
-        metersUnit: 米
-        feetUnit: 英尺
-        popup: 您离该点还有 {distance} {unit}
       base:
         standard: 标准
         cycle_map: 自行车地图

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index f36cc97de1f40de865c87556dcc3d17c4b13da41..dc4063ec433d24cea6d002c067a532782aacab36 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -83,6 +83,7 @@ zh-TW:
       diary_comment: 日記評論
       diary_entry: 日記項目
       friend: 好友
+      issue: 問題
       language: 語言
       message: 訊息
       node: 節點
@@ -99,6 +100,7 @@ zh-TW:
       relation: 關聯
       relation_member: 關聯成員
       relation_tag: 關聯標籤
+      report: 報告
       session: 作業階段
       trace: 軌跡
       tracepoint: 軌跡點
@@ -198,6 +200,15 @@ zh-TW:
     remote:
       name: 遠端控制
       description: 遠端控制 (JOSM 或 Merkaartor)
+  auth:
+    providers:
+      none: 無
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: 維基百科
   api:
     notes:
       comment:
@@ -2420,9 +2431,12 @@ zh-TW:
         out: 縮小
       locate:
         title: 顯示我的位置
-        metersUnit: 公尺
-        feetUnit: 英呎
-        popup: 你在該點的 {distance}{unit} 範圍內
+        metersPopup:
+          one: 您距離此地點在 1 公尺內
+          other: 您距離此地點在 %{count} 公尺內
+        feetPopup:
+          one: 您距離此地點在 1 英尺內
+          other: 您距離此地點在 %{count} 英尺內
       base:
         standard: 標準
         cycle_map: 自行車地圖
@@ -2438,6 +2452,10 @@ zh-TW:
       copyright: © <a href='%{copyright_url}'>OpenStreetMap 貢獻者</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>來捐款吧</a>
       terms: <a href='%{terms_url}' target='_blank'>網站與 API 項目</a>
+      thunderforest: 由 <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>
+        提供的影像塊
+      hotosm: 由 <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap 法國</a>主持的<a
+        href='%{hotosm_url}' target='_blank'>人道 OpenStreetMap 團隊</a>提供的影像塊樣式
     site:
       edit_tooltip: 編輯地圖
       edit_disabled_tooltip: 放大以編輯地圖