Merge branch 'master' into cancancan

2018-10-31 11:16:47 +01:00 · 2018-10-31 11:16:47 +01:00 · f11221f05b
commit f11221f05b
parent 0888f43d7b ad85a03e21
62 changed files with 885 additions and 456 deletions
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@ -41,6 +41,9 @@ Rails.application.configure do
  # Print deprecation notices to the stderr.
  config.active_support.deprecation = :stderr

+  # Export translations automatically
+  config.middleware.use I18n::JS::Middleware
+
  # Raises error for missing translations
  config.action_view.raise_on_missing_translations = true
 end
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@ -793,6 +793,9 @@ aln:
            agjenci ose burim kryesor ka qenë i përfshirë në
            OpenStreetMap, ai mund të jetë e arsyeshme për kredi nga ana e tyre direkt
            riprodhimin e kreditit e tyre apo duke i lidhur me të në këtë faqe.
+        contributors_au_html: |-
+          <strong> Australi </ strong>: Përmban të dhëna të bazuara periferi
+             në Zyra Australiane e Statistikave të dhënave.
        contributors_ca_html: |-
          <strong> Kanada </ strong>: Përmban të dhëna nga
             GeoBase ®, GeoGratis (© Departamenti i Natyrore
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@ -1362,6 +1362,9 @@ ast:
          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> y
          Land Tirol (baxo <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT con enmiendes</a>).
+        contributors_au_html: |-
+          <strong>Australia</strong>: Contien datos de barrios basaos en datos de Australian Bureau of
+          Statistics.
        contributors_ca_html: |-
          <strong>Canadá</strong>: Contien datos de GeoBase&reg;, GeoGratis (&copy; Department of Natural
          Resources Canada), CanVec (&copy; Department of Natural
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@ -1,4 +1,4 @@
-# Messages for Belarusian (Taraškievica orthography) (беларуская (тарашкевіца)‎)
+# Messages for be-tarask (be-tarask)
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: EugeneZelenko
@ -868,6 +868,9 @@ be-Tarask:
          <strong>Аўстрыя</strong>: утрымлівае зьвесткі <a href="https://data.wien.gv.at/">гораду Вены</a> (на ўмовах
          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), а таксама земляў <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Форарльбэрг</a> і
          Тыроль (на ўмовах <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT з дапаўненьнямі</a>).
+        contributors_au_html: |-
+          <strong>Аўстралія</strong>: Утрымлівае зьвесткі пра прыгарады ад
+          Аўстралійскага бюро статыстыкі.
        contributors_ca_html: |-
          <strong>Канада</strong>: Утрымлівае зьвесткі
          GeoBase&reg;, GeoGratis (&copy; Дэпартамэнта прыродных рэсурсаў
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@ -1332,6 +1332,9 @@ br:
          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> ha
          Land Tirol (dindan <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT gant enkemmadoù</a>).
+        contributors_au_html: |-
+          <strong>Australia</strong>: Ennañ ar roadennoù diwar-benn an bannlevioù
+             diazezet war roadennoù Australian Bureau of Statistics.
        contributors_ca_html: |-
          <strong>Kanada</strong> : Ennañ roadennoù eus
             GeoBase&reg;, GeoGratis (&copy; Department of Natural
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -1285,6 +1285,9 @@ ca:
          <strong>Àustria</strong>: conté dades de
              <a href="http://data.wien.gv.at/">Stadt Wien</a> sota
              <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.
+        contributors_au_html: |-
+          <strong>Austràlia</strong>: conté dades suburbi basats
+              en les dades d'Austràlia Oficina d'estadístiques.
        contributors_ca_html: |-
          <strong>Canadà</strong>: conté dades de
              GeoBase ®, GeoGratis (© Departament de Natural
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@ -1398,6 +1398,8 @@ cs:
          BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">země
          Vorarlbersko</a> a země Tyrolsko (pod <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
          BY AT s dodatky</a>).'
+        contributors_au_html: '<strong>Austrálie</strong>: Obsahuje data předměstí
+          založená na datech Australského statistického úřadu.'
        contributors_ca_html: '<strong>Kanada</strong>: Obsahuje data z GeoBase&reg;,
          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
          Department of Natural Resources Canada) a StatCan (Geography Division, Statistics
@ -2067,6 +2069,7 @@ cs:
        i budoucí příspěvky.
      consider_pd: Navíc k výše uvedené dohodě považuji své příspěvky za volné dílo.
      consider_pd_why: co to znamená?
+      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
      guidance: 'Informace, které pomohou tyto podmínky pochopit: <a href="%{summary}">lidsky
        čitelné shrnutí</a> a nějaké <a href="%{translations}">neoficiální překlady</a>'
      agree: Souhlasím
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@ -1341,6 +1341,9 @@ da:
          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Delstaten Vorarlberg</a> og
          Delstaten Tyrol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT med tilføjelser</a>).
+        contributors_au_html: |-
+          <strong>Australien</strong>: Indeholder forstadsdata baseret
+          på data fra Australian Bureau of Statistics.
        contributors_ca_html: |-
          <strong>Canada</strong>: Indeholder data fra
          GeoBase&reg;, GeoGratis (&copy; Department of Natural
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -1460,6 +1460,8 @@ de:
          BY AT</a>), des <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Landes
          Vorarlberg</a> und des Landes Tirol (<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">lizenziert
          gemäß CC BY AT samt Erweiterungen zur Lizenz</a>).'
+        contributors_au_html: '<strong>Australien</strong>: Enthält Daten zu Siedlungen,
+          die auf Daten des <i>Australian Bureau of Statistics</i> basieren.'
        contributors_ca_html: '<strong>Kanada</strong>: Enthält Daten von GeoBase&reg;,
          GeoGratis (&copy; <i>Department of Natural Resources Canada</i>), CanVec
          (&copy; <i>Department of Natural Resources Canada</i>) und StatCan (<i>Geography
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@ -752,7 +752,7 @@ diq:
      output: Vıcyaen
      export_button: Teberdayış
    sidebar:
-      search_results: Neticeyê geyrayışi
+      search_results: Peyniya cıgeyrayışi
      close: Racnê
    search:
      search: Cı geyre
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@ -1087,6 +1087,9 @@ dsb:
          BY</a>), <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
          Vorarlberg</a> a  Land Tirol (pod <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
          AT ze změnami</a>).'
+        contributors_au_html: '<strong>Awstralska</strong>: Wopśimujo pśedměsćańske
+          daty na zakłaźe datow awstralskego  amta za statistiku (Australian Bureau
+          of Statistics).'
        contributors_ca_html: '<strong>Kanada</strong>: Wopśimujo daty z GeoBase&reg;,
          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
          Department of Natural Resources Canada), a StatCan (Geography Division,
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -1347,6 +1347,11 @@ en:
          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
          Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
+        contributors_au_html: |
+          <strong>Australia</strong>: Contains data sourced from
+          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
+          licensed by the Commonwealth of Australia under
+          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
        contributors_ca_html: |
          <strong>Canada</strong>: Contains data from
          GeoBase&reg;, GeoGratis (&copy; Department of Natural
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@ -1369,6 +1369,10 @@ eo:
          <strong>Aŭstrujo</strong>: enhavas datumojn el <a href="https://data.wien.gv.at/">Stadt Wien</a> (laŭ <a href="https://creativecommons.org/licenses/by/3.0/at/deed.eo">CC BY</a>),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> kaj
          Land Tirol (laŭ <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT kun postaj ŝanĝoj</a>).
+        contributors_au_html: '<strong>Aŭstralio</strong>: enhavas datumojn el <a
+          href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia
+          Limited</a> kunhavigataj de Komunejo de Aŭstralio laŭ la permesilo <a href="https://creativecommons.org/licenses/by/4.0/deed.eo">CC
+          BY 4.0</a>.'
        contributors_ca_html: |-
          <strong>Kanado</strong>: enhavas datumojn el
          GeoBase&reg;, GeoGratis (&copy; Department of Natural
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -45,6 +45,7 @@
 # Author: Rubenwap
 # Author: Ruila
 # Author: Sim6
+# Author: Tiberius1701
 # Author: Toliño
 # Author: Translationista
 # Author: VegaDark
@ -1431,6 +1432,8 @@ es:
          <strong>Austria</strong>: Contiene datos de
             <a href="https://data.wien.gv.at/">Stadt Wien</a> (bajo
             <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> y Land Tirol (bajo licencia <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT con modificaciones</a>).
+        contributors_au_html: '<strong>Australia</strong>: Contiene datos suburbanos
+          cuya base es la información provista por Australian Bureau of Statistics.'
        contributors_ca_html: '<strong>Canadá</strong>: contiene datos de GeoBase&reg;,
          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
          Department of Natural Resources Canada) y StatCan (Geography Division, Statistics
@ -2082,9 +2085,9 @@ es:
      title: Registrarse
      no_auto_account_create: Desafortunadamente no estamos actualmente habilitados
        para crear una cuenta para ti automáticamente.
-      contact_webmaster: Contacta al <a href="%{webmaster}">webmaster</a> para gestionar
-        la creación de una cuenta. Intentaremos gestionar la solicitud lo más pronto
-        posible.
+      contact_webmaster: Contacta con el <a href="%{webmaster}">webmaster</a> para
+        gestionar la creación de una cuenta. Intentaremos gestionar la solicitud lo
+        más pronto posible.
      about:
        header: Libre y editable
        html: <p>A diferencia de otros mapas, OpenStreetMap está creado completamente
@ -2714,7 +2717,7 @@ es:
      relation: Relación
      nothing_found: No se encontraron características
      error: 'Error al contactar con %{server}: %{error}'
-      timeout: Tiempo de espera agotado al contactar a %{server}
+      timeout: Tiempo de espera agotado al contactar con %{server}
    context:
      directions_from: Indicaciones desde aquí
      directions_to: Indicaciones hasta aquí
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Alirezaaa
+# Author: Amirsara
 # Author: Arash.pt
 # Author: Armin1392
 # Author: BMRG14
@ -278,7 +279,7 @@ fa:
      sorry: پوزش، بازیابی فهرست تغییرات درخواستی شما خیلی زمان برد.
    rss:
      title_all: بحث در مورد جعبه تغییر OpenStreetMap
-      title_particular: 'بحث در مورد جعبه تغییر شماره #% {changeset_id} OpenStreetMap'
+      title_particular: 'بحث در مورد تغییرات انجام شده در #%{changeset_id} OpenStreetMap'
      comment: 'نظر جدید در مورد جعبه تغییر %{changeset_id}{changeset_id} #% توسط
        %{author}'
      commented_at_html: بروز شده %{when} قبل
@ -427,7 +428,7 @@ fa:
          ferry_terminal: پایانه کشتی
          fire_station: آتش‌نشانی
          food_court: پذيرايي
-          fountain: چشمه
+          fountain: فواره
          fuel: پمپ بنزین
          gambling: قمار
          grave_yard: محوطهٔ گورستان
@ -725,7 +726,7 @@ fa:
          "yes": دفتر
        place:
          allotments: سهم
-          city: شهر بزرگ
+          city: شهر
          city_block: بلوک شهری
          country: کشور
          county: شهرستان
@ -1068,8 +1069,8 @@ fa:
      confirm: 'قبل از اینکه ما کار دیگری انجام دهیم، نیاز داریم که تأیید شود این
        درخواست از شما آمده، پس اگر این چنین است لطفاً برای تأیید حسابتان روی پیوند
        زیر کلیک کنید:'
-      welcome: بعد از اینکه حسابتان را تأیید کردید، ما به شما برخی از اطلاعات اضافی
-        را ارائه میدهیم تا بتوانید شروع کنید.
+      welcome: بعد از اینکه حسابتان را تأیید کردید، اطلاعات بیشتری به شما ارائه می‌دهیم
+        تا بتوانید شروع کنید.
    email_confirm:
      subject: '[OpenStreetMap] ایمیلتان را تأیید کنید'
    email_confirm_plain:
@ -1337,8 +1338,8 @@ fa:
          برای اطلاعات بیشتر درباره این‌ها و سایر منابعی که برای پیشرفت اوپن‌استریت‌مپ استفاده شده‌اند، لطفاً <a
          href="https://wiki.openstreetmap.org/wiki/Contributors">صفحهٔ مشارکت‌کنندگان</a> را در ویکی نگاه کنید.
        contributors_footer_2_html: ورود داده‌ها در OpenStreetMap به این معنی نیست
-          که ارائه‌دهندهٔ اصلی داده‌ها توسط OpenStreetMap تأییدشده، هر گونه ضمانتی
-          فراهم می‌کند، یا هر گونه مسئولیت را می‌پذیرد.
+          که فراهم‌کنندهٔ اصلی داده‌ها OpenStreetMap را تأیید می‌کند، ضمانتی می‌دهد،
+          یا مسئولیتی را می‌پذیرد.
        infringement_title_html: نقض کپی‌رایت
        infringement_1_html: به مشارکت‌کنندگان OSM یادآوری می کنیم که هرگز داده‌ای
          را از منابع دارای حق نشر اضافه نکنند (مثلاً نقشه‌های گوگل یا نقشه‌های چاپ‌شده)،
@ -1982,7 +1983,7 @@ fa:
        را بررسی کنید، یا شاید پیوندی که کلیک کردید اشتباه است.
      deleted: حذف شده
    show:
-      my diary: روزنوشت من
+      my diary: روزنوشت‌های من
      new diary entry: روزنوشت تازه
      my edits: ویرایش های من
      my traces: ردهای من
@ -2417,9 +2418,11 @@ fa:
        unhide_comment: نمایش
    notes:
      new:
-        intro: چیزی مشکل دارد؟ به نقشه‌کش‌های دیگر اصلاع دهید تا آن را اصلاح کنند.
-          علامت موشواره را بر روی محلی که مشکل دارد قرار دهید و مشکل را شرح دهید (لطفاً
-          اطلاعات شخصی در بخش ننویسید یا اطلاعاتی از حق تکثیر نقشه یا فهرست دایرکتوری‌ها)
+        intro: مشکلی بر روی نقشه پیدا کرده‌اید یا چیزی از قلم افتاده؟ به نقشه‌کش‌های
+          دیگر اطلاع دهید تا آن را اصلاح کنند. نشانه را بر روی محلی که مشکل دارد قرار
+          دهید و با نوشتن یادداشت، مشکل را به‌طور کامل شرح دهید.
+        advice: همهٔ افراد این یادداشت شما را می‌بینند. بنابراین اطلاعات خصوصی یا
+          اطلاعات برداشت‌شده از منابع دارای حق تکثیر را اینجا ننویسید.
        add: افزودن یادداشت
      show:
        anonymous_warning: این یادداشت شامل نظرات کاربران ناشناس است که باید به‌طور
@ -2427,7 +2430,7 @@ fa:
        hide: نهفتن
        resolve: حل شد
        reactivate: فعال سازی مجدد
-        comment_and_resolve: نظر و راه حل
+        comment_and_resolve: نظر + حل شد
        comment: نظر
    edit_help: نقشه را جابجا کنید و روی مکانی که می‌خواهید ویرایش کنید بزرگنمایی کنید،
      سپس اینجا کلیک کنید.
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@ -1402,6 +1402,9 @@ fi:
          <a href="https://data.wien.gv.at/">Stadt Wienistä</a> (<a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY -lisenssillä</a>),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlbergista</a> ja
          Land Tirolista (<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT -lisenssillä tietyin muutoksin</a>).
+        contributors_au_html: |-
+          <strong>Australia</strong>: Sisältää kaupunginosatietoja
+             Australian Bureau of Statisticsilta.
        contributors_ca_html: |-
          <strong>Kanada</strong>: Sisältää karttatietoja
             GeoBasesta ®, GeoGratisista (© Department of Natural
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@ -1450,6 +1450,10 @@ fr:
          la <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">région
          du Vorarlberg</a> et la région du Tyrol (sous licence <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
          BY AT avec amendements</a>).'
+        contributors_au_html: "<strong>Australie</strong> : contient des données source
+          de \n<a href=\"https://www.psma.com.au/psma-data-copyright-and-disclaimer\">PSMA
+          Australia Limited</a>\ndont la licence appartient au Commonwealth d'Australie
+          sous \n<a href=\"https://creativecommons.org/licenses/by/4.0/\">CC BY 4.0</a>."
        contributors_ca_html: '<strong>Canada</strong> : contient des données de <em>GeoBase</em>®,
          <em>GeoGratis</em> (© Département des Ressources naturelles du Canada),
          <em>CanVec</em> (© Département des Ressources naturelles du Canada) et <em>StatCan</em>
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@ -23,8 +23,8 @@ gl:
  activerecord:
    models:
      acl: Listaxe do control de acceso
-      changeset: Conxunto de cambios
-      changeset_tag: Etiqueta do conxunto de cambios
+      changeset: Conxunto de mudanzas
+      changeset_tag: Etiqueta do conxunto de mudanzas
      country: País
      diary_comment: Comentario do diario
      diary_entry: Entrada do diario
@ -115,7 +115,7 @@ gl:
    edited_by_html: Editado <abbr title='%{title}'>hai %{time}</abbr> por %{user}
    closed_by_html: Pechado <abbr title='%{title}'>hai %{time}</abbr> por %{user}
    version: Versión
-    in_changeset: Conxunto de cambios
+    in_changeset: Conxunto de mudanzas
    anonymous: anónimo
    no_comment: (sen comentarios)
    part_of: Parte de
@ -124,7 +124,7 @@ gl:
    view_details: Ve-los detalles
    location: 'Localización:'
    changeset:
-      title: 'Conxunto de cambios: %{id}'
+      title: 'Conxunto de mudanzas: %{id}'
      belongs_to: Autor
      node: Nós (%{count})
      node_paginated: Nós (%{x}-%{y} de %{count})
@ -136,15 +136,15 @@ gl:
      hidden_commented_by: Comentario agochado de %{user} <abbr title='%{exact_time}'>
        hai %{when}</abbr>
      commented_by: Comentario de %{user} <abbr title='%{exact_time}'> hai %{when}</abbr>
-      changesetxml: Conxunto de cambios do XML
+      changesetxml: Conxunto de mudanzas do XML
      osmchangexml: osmChange XML
      feed:
-        title: Conxunto de cambios %{id}
-        title_comment: Conxunto de cambios %{id} - %{comment}
+        title: Conxunto de mudanzas %{id}
+        title_comment: Conxunto de mudanzas %{id} - %{comment}
      join_discussion: Inicia-la sesión pra unirse á parola
      discussion: Parola
-      still_open: O conxunto de cambios segue aberto - Abrirase a parola cando o conxunto
-        de cambios estea pechado.
+      still_open: O conxunto de mudanzas segue aberto - Abrirase a parola cando o
+        conxunto de mudanzas estea pechado.
    node:
      title: 'Nó: %{name}'
      history_title: 'Historial do nó: %{name}'
@ -175,7 +175,7 @@ gl:
        node: nó
        way: camiño
        relation: relación
-        changeset: conxunto de cambios
+        changeset: conxunto de mudanzas
        note: nota
    timeout:
      sorry: Tardouse demasiado en obter os datos para o %{type} co id %{id}.
@ -183,7 +183,7 @@ gl:
        node: nó
        way: camiño
        relation: relación
-        changeset: conxunto de cambios
+        changeset: conxunto de mudanzas
        note: nota
    redacted:
      redaction: Redacción %{id}
@ -195,7 +195,7 @@ gl:
        relation: relación
    start_rjs:
      feature_warning: A carga de %{num_features} características pode facer que o
-        seu navegador vaia lento ou que non responda. Está seguro de querer amosar
+        seu navegador vaia lento ou que non responda. Está na certeza de querer amosar
        eses datos?
      load_data: Cargar os datos
      loading: Cargando...
@ -229,8 +229,8 @@ gl:
      report: Informar desta nota
    query:
      title: Consulta-las características
-      introduction: Prema no mapa para atopar características preto de aquí.
-      nearby: Características preto de aquí
+      introduction: Prema no mapa para atopar características preto daquí.
+      nearby: Características preto daquí
      enclosing: Características envolventes
  changeset:
    changeset_paging_nav:
@ -240,7 +240,7 @@ gl:
    changeset:
      anonymous: Anónimo
      no_edits: (sen edicións)
-      view_changeset_details: Ve-los detalles do conxunto de cambios
+      view_changeset_details: Ve-los detalles do conxunto de mudanzas
    changesets:
      id: ID
      saved_at: Gardado o
@ -248,24 +248,24 @@ gl:
      comment: Comentario
      area: Zona
    index:
-      title: Conxuntos de cambios
-      title_user: Conxuntos de cambios por %{user}
-      title_friend: Conxuntos de cambios das amizades
-      title_nearby: Conxuntos de cambios dos usuarios de lugares preto de ti
-      empty: Non se atoparon conxuntos de cambios.
-      empty_area: Non hai conxuntos de cambios nesta zona.
-      empty_user: Non hai conxuntos de cambios deste usuario.
-      no_more: Non se atoparon máis conxuntos de cambios.
-      no_more_area: Non hai máis conxuntos de cambios nesta zona.
-      no_more_user: Non hai máis conxuntos de cambios deste usuario.
+      title: Conxuntos de mudanzas
+      title_user: Conxuntos de mudanzas por %{user}
+      title_friend: Conxuntos de mudanzas das amizades
+      title_nearby: Conxuntos de mudanzas dos usuarios de lugares preto de ti
+      empty: Non se atoparon conxuntos de mudanzas.
+      empty_area: Non hai conxuntos de mudanzas nesta zona.
+      empty_user: Non hai conxuntos de mudanzas deste usuario.
+      no_more: Non se atoparon máis conxuntos de mudanzas.
+      no_more_area: Non hai máis conxuntos de mudanzas nesta zona.
+      no_more_user: Non hai máis conxuntos de mudanzas deste usuario.
      load_more: Cargar máis
    timeout:
-      sorry: Desculpe que levase moito tempo obter a listaxe do conxunto de cambios
+      sorry: Desculpe que levase moito tempo obte-la listaxe do conxunto de mudanzas
        que solicitou.
    rss:
      title_all: Parola da edición no OpenStreetMap
      title_particular: 'Parola da edición #%{changeset_id} no OpenStreetMap'
-      comment: 'Novo comentario sobre os cambios #%{changeset_id} de %{author}'
+      comment: 'Novo comentario sobre as mudanzas #%{changeset_id} de %{author}'
      commented_at_html: Actualizado hai %{when}
      commented_at_by_html: Actualizado hai %{when} por %{user}
      full: Parola completa
@ -794,7 +794,7 @@ gl:
          stop: Parada de ferrocarril
          subway: Metro
          subway_entrance: Boca de metro
-          switch: Puntos de cambio de vía
+          switch: Puntos de mudanza de vía
          tram: Vía de tranvías
          tram_stop: Parada de tranvías
        shop:
@ -1022,7 +1022,7 @@ gl:
      select: Seleccione unha razón pola que queira informarnos
      disclaimer:
        intro: 'Antes de enviarlle o informe aos moderadores, asegúrese de que:'
-        not_just_mistake: Vostede está seguro/a de que o problema non é un simple
+        not_just_mistake: Vostede está na certeza de que o problema non é un sinxelo
          erro
        unable_to_fix: Non é quen de arranxar o problema só ou coa axuda dos membros
          da comunidade
@ -1151,13 +1151,13 @@ gl:
      subject: '[OpenStreetMap] Confirme o seu enderezo de correo electrónico'
    email_confirm_plain:
      greeting: 'Ola:'
-      hopefully_you: Alguén (probablemente vostede) quere cambiar o seu enderezo de
+      hopefully_you: Alguén (probábelmente vostede) quere muda-lo seu enderezo do
        correo electrónico en %{server_url} a %{new_address}.
      click_the_link: Se este é vostede, prema na seguinte ligazón para confirma-la
        modificación.
    email_confirm_html:
      greeting: 'Ola:'
-      hopefully_you: Alguén (probablemente vostede) quere cambiar o seu enderezo de
+      hopefully_you: Alguén (probábelmente vostede) quere muda-lo seu enderezo do
        correo electrónico en %{server_url} a %{new_address}.
      click_the_link: Se este é vostede, prema na seguinte ligazón para confirma-la
        modificación.
@ -1206,17 +1206,17 @@ gl:
      greeting: Ola,
      commented:
        subject_own: O %{commenter} de [OpenStreetMap] fixo un comentario nun dos
-          seus conxuntos de cambios
-        subject_other: '[OpenStreetMap] %{commenter} comentou nun conxunto de cambios
+          seus conxuntos de mudanzas
+        subject_other: '[OpenStreetMap] %{commenter} comentou nun conxunto de mudanzas
          no que estás atinxido'
        your_changeset: '%{commenter} deixou un comentario nun dos seus conxuntos
-          de cambios xerado o %{time}'
-        commented_changeset: '%{commenter} deixou un comentario nun conxunto de cambios
-          do mapa que está seguindo, xerado por %{changeset_author} o %{time}'
+          de mudanzas xerado o %{time}'
+        commented_changeset: '%{commenter} deixou un comentario nun conxunto de mudanzas
+          do mapa que está a seguer, xerado por %{changeset_author} o %{time}'
        partial_changeset_with_comment: co comentario '%{changeset_comment}'
        partial_changeset_without_comment: sen comentarios
-      details: Pódense atopar máis detalles acerca do conxunto de cambios en %{url}.
-      unsubscribe: Para darse de baixa das actualizacións deste conxunto de cambios,
+      details: Pódense atopar máis detalles acerca do conxunto de mudanzas en %{url}.
+      unsubscribe: Para darse de baixa das actualizacións deste conxunto de mudanzas,
        olle %{url} e prema en "darse de baixa".
  messages:
    inbox:
@ -1406,6 +1406,9 @@ gl:
          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> e
          Land Tirol (baixo a licenza <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT con emendas</a>).
+        contributors_au_html: |-
+          <strong>Australia:</strong> Contén datos de barrios baseados
+          nos datos do Australian Bureau of Statistics.
        contributors_ca_html: |-
          <strong>Canadá:</strong> Contén datos de
          GeoBase&reg;, GeoGratis (&copy; Department of Natural
@ -1486,12 +1489,12 @@ gl:
        Flash de OpenStreetMap. Pode <a href="https://get.adobe.com/flashplayer/">descargar
        Flash do sitio Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Tamén
        están dispoñíbeis outras opcións</a> para editar OpenStreetMap.
-      potlatch_unsaved_changes: Ten cambios sen gardar. (Para gardalos no Potlatch
-        ten que desmarcar o camiño actual ou o punto se está a editar no modo en vivo
+      potlatch_unsaved_changes: Ten mudanzas sen gardar. (Para gardalas no Potlatch
+        ten que desmarca-la vía actual ou o punto se está a editar no modo ao vivo
        ou premer sobre o botón "Gardar".)
      potlatch2_not_configured: O Potlatch 2 non está configurado; consulte https://wiki.openstreetmap.org/wiki/The_Rails_Port
        para obter máis información
-      potlatch2_unsaved_changes: Ten cambios sen gardar. (Para gardar no Potlatch
+      potlatch2_unsaved_changes: Ten mudanzas sen gardar. (Para gardar no Potlatch
        2, prema en "Gardar".)
      id_not_configured: O iD non está configurado
      no_iframe_support: O seu navegador non soporta os iframes HTML, necesarios para
@ -1798,7 +1801,7 @@ gl:
      description: 'Descrición:'
      tags: 'Etiquetas:'
      tags_help: separadas por comas
-      save_button: Garda-los cambios
+      save_button: Garda-las mudanzas
      visibility: 'Visibilidade:'
      visibility_help: que significa isto?
      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
@ -1937,7 +1940,7 @@ gl:
      support_notice: Soportamos HMAC-SHA1 (recomendado) e sinaturas RSA-SHA1.
      edit: Edita-los detalles
      delete: Borrar o cliente
-      confirm: Está seguro?
+      confirm: Está na certeza?
      requests: 'Solicitar os seguintes permisos ao usuario:'
      allow_read_prefs: ler as súas preferencias de usuario.
      allow_write_prefs: modificar as súas preferencias de usuario.
@ -2183,9 +2186,9 @@ gl:
      unhide_user: Descobrir este usuario
      delete_user: Borrar este usuario
      confirm: Confirmar
-      friends_changesets: conxuntos de cambios das amizades
+      friends_changesets: conxuntos de mudanzas das amizades
      friends_diaries: entradas de diario das amizades
-      nearby_changesets: conxuntos de cambios dos usuarios de lugares preto de ti
+      nearby_changesets: conxuntos de mudanzas dos usuarios de lugares preto de ti
      nearby_diaries: entradas de diario dos usuarios de lugares preto de ti
      report: Denunciar este usuario
    popup:
@ -2251,7 +2254,7 @@ gl:
      longitude: 'Lonxitude:'
      update home location on click: Quere actualiza-lo lugar do enderezo ó premer
        sobre o mapa?
-      save changes button: Garda-los cambios
+      save changes button: Garda-las mudanzas
      make edits public button: Facer públicas todas as miñas edicións
      return to profile: Voltar ó perfil
      flash update success confirm needed: Información de usuario actualizada correctamente.
@ -2277,17 +2280,17 @@ gl:
        proceso sen problemas.
      failure: Non se atopou o usuario "%{name}".
    confirm_email:
-      heading: Confirma-lo cambio do enderezo de correo electrónico
+      heading: Confirma-la mudanza do enderezo de correo electrónico
      press confirm button: Prema sobre o botón de confirmación que aparece deseguido
        para confirmar o seu novo enderezo de correo electrónico.
      button: Confirmar
-      success: Confirmámoslle o cambio enderezo de enderezo electrónico!
+      success: Confirmámoslle a mudanza do enderezo de correo electrónico!
      failure: Xa se confirmou un enderezo de correo electrónico con este pase.
      unknown_token: Ese código de confirmación caducou ou non existe.
    set_home:
      flash success: Gardouse o domicilio
    go_public:
-      flash success: Todas as súas edicións son públicas e agora está autorizado a
+      flash success: Tódalas súas edicións son públicas e agora está autorizado a
        editar.
    make_friend:
      heading: Quere engadir a %{user} coma amizade?
@ -2315,8 +2318,8 @@ gl:
      hide: Agochar os usuarios seleccionados
      empty: Non se atoparon usuarios que coincidisen
    suspended:
-      title: Conta cancelada
-      heading: Conta cancelada
+      title: Conta suspendida
+      heading: Conta suspendida
      webmaster: webmaster
      body: |-
        <p>
@ -2352,14 +2355,16 @@ gl:
    grant:
      title: Confirma-la concesión do rol
      heading: Confirma-la concesión do rol
-      are_you_sure: Seguro que quere concederlle o rol "%{role}" ao usuario "%{name}"?
+      are_you_sure: Está na certeza de que quere concederlle o rol "%{role}" ó usuario
+        "%{name}"?
      confirm: Confirmar
      fail: Non se lle puido conceder o rol "%{role}" ao usuario "%{name}". Comprobe
        que tanto o usuario coma o rol son correctos.
    revoke:
      title: Confirma-la revogación do rol
      heading: Confirma-la revogación do rol
-      are_you_sure: Seguro que quere revogarlle o rol "%{role}" ao usuario "%{name}"?
+      are_you_sure: Está na certeza de que quere revogarlle o rol "%{role}" ó usuario
+        "%{name}"?
      confirm: Confirmar
      fail: Non se lle puido revogar o rol "%{role}" ao usuario "%{name}". Comprobe
        que tanto o usuario coma o rol son correctos.
@ -2420,7 +2425,7 @@ gl:
      heading: Revogando o bloqueo en %{block_on} por %{block_by}
      time_future: Este bloqueo rematará en %{time}.
      past: Este bloqueo rematou hai %{time}. Entón, xa non se pode retirar.
-      confirm: Está seguro de querer retirar este bloqueo?
+      confirm: Está na certeza de querer retirar este bloqueo?
      revoke: Revogar!
      flash: Revogouse o bloqueo.
    period:
@ -2451,7 +2456,7 @@ gl:
      show: Amosar
      edit: Editar
      revoke: Revogar!
-      confirm: Está seguro?
+      confirm: Está na certeza?
      reason: 'Motivo para o bloqueo:'
      back: Ollar tódolos bloqueos
      revoker: 'Autor da revogación:'
@ -2507,7 +2512,7 @@ gl:
    close: Pechar
    share:
      title: Compartir
-      cancel: Cancelar
+      cancel: Desbotar
      image: Imaxe
      link: Ligazón ou HTML
      long_link: Ligazón
@ -2565,7 +2570,7 @@ gl:
      show:
        comment: Comentario
        subscribe: Subscribirse
-        unsubscribe: Cancela-la subscrición
+        unsubscribe: Desbota-la subscrición
        hide_comment: agochar
        unhide_comment: amosar
    notes:
@ -2716,11 +2721,11 @@ gl:
      user: 'Creador:'
      edit: Editar esta redacción
      destroy: Eliminar esta redacción
-      confirm: Está seguro?
+      confirm: Está na certeza?
    create:
      flash: Redacción creada.
    update:
-      flash: Gardáronse os cambios.
+      flash: Gardáronse as mudanzas.
    destroy:
      not_empty: A redacción non está baleira. Elimine todas as versións previas pertencentes
        a esta redacción antes de destruíla.
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@ -1278,6 +1278,9 @@ he:
          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>,
          מ<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">מדינת פורארלברג</a>
          וממדינת טירול (לפי <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT עם תיקונים</a>).
+        contributors_au_html: |-
+          <strong>אוסטרליה</strong>: מכיל מנתוני פרוורים המבוססים על
+          נתוני הלשכה האוסטרלית לסטטיסטיקה (Australian Bureau of Statistics).
        contributors_ca_html: |-
          <strong>קנדה</strong>: מכיל נתונים
          מ־GeoBase&reg;&rlm;, GeoGratis&rlm; (&copy;&rlm; Department of Natural
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@ -1099,6 +1099,8 @@ hr:
        contributors_intro_html: 'Sudionici projekta su tisuće individualaca. Projekt
          također uključuje podatke pod slobodnim licencama od nacionalnih kartografskih
          agencija i drugih izvora, među kojima su:'
+        contributors_au_html: '<strong>Australija</strong>: Sadrži podatke o predgrađima
+          na osnovu podataka Australian Bureau of Statistics.'
        contributors_ca_html: |-
          <strong>Kanada</strong>: Sadrži podatke iz
             GeoBase&reg;, GeoGratis (&copy; Department of Natural
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@ -1183,6 +1183,9 @@ hsb:
          BY</a>), <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
          Vorarlberg</a> a Land Tirol (pod <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
          AT ze změnami</a>).'
+        contributors_au_html: '<strong>Awstralska</strong>: Wobsahuje předměšćanske
+          daty na zakładźe datow Awstralskeho  zarjada za statistiku (Australian Bureau
+          of Statistics).'
        contributors_ca_html: '<strong>Kanada</strong>: Wobsahuje daty z GeoBase&reg;,
          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
          Department of Natural Resources Canada), a StatCan (Geography Division,
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@ -1282,6 +1282,9 @@ hu:
          <strong>Ausztria</strong>: adatokat tartalmaz a következő forrásból:
             <a href="https://data.wien.gv.at/">Bécs városa</a>
             <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> licenc alatt.
+        contributors_au_html: |-
+          <strong>Ausztrália</strong>: tartalmaz külvárosi adatokat az
+             Ausztrál Statisztikai Hivatal adatain alapulva.
        contributors_ca_html: |-
          <strong>Kanada</strong>: adatokat tartalmaz a következő forrásokból:
             GeoBase&reg;, GeoGratis (&copy; Department of Natural
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@ -1204,6 +1204,9 @@ ia:
          <strong>Austria</strong>: Contine datos ab le
             <a href="https://data.wien.gv.at/">Citate de Vienna</a> licentiate sub
             <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.
+        contributors_au_html: |-
+          <strong>Australia</strong>: Contine datos de suburbios a base
+             de datos del Australian Bureau of Statistics.
        contributors_ca_html: |-
          <strong>Canada</strong>: Contine datos ab
             GeoBase&reg;, GeoGratis (&copy; Department of Natural
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@ -1416,6 +1416,9 @@ it:
          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> e
          Land Tirol (sotto <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT con emendamenti</a>).
+        contributors_au_html: |-
+          <strong>Australia</strong>: contiene i dati della periferia basati
+          sui dati dell'Australian Bureau of Statistics.
        contributors_ca_html: |-
          <strong>Canada</strong>: contiene i dati della
          GeoBase&reg;, GeoGratis (&copy; Department of Natural
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@ -1724,6 +1724,8 @@ ko:
      save_button: 바뀜 저장
      visibility: '공개 여부:'
      visibility_help: 이게 무슨 뜻입니까?
+    update:
+      updated: 추적 업데이트됨
    trace_optionals:
      tags: 태그
    show:
@ -2002,9 +2004,11 @@ ko:
      read and accept: 아래의 계약을 읽고 기존 및 앞으로의 기여가 계약 약관에 동의했는지 확인하려면 동의 버튼을 누르세요.
      consider_pd: 위의 계약뿐만 아니라 내 기여가 퍼블릭 도메인에 있는지 고려하세요
      consider_pd_why: 이게 뭐죠?
+      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
      guidance: '약관을 이해하는 데 유용한 정보: <a href="%{summary}">사람이 읽을 수 있는 요약</a>과 일부 <a
        href="%{translations}">비공식 번역</a>'
      agree: 동의
+      declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
      decline: 거부
      you need to accept or decline: 계속하려면 새 기여자 약관을 읽고 나서 동의나 거부하세요.
      legale_select: '거주 국가:'
@ -2125,6 +2129,7 @@ ko:
      image: '그림:'
      gravatar:
        gravatar: Gravatar 사용
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
        link text: 이게 뭐죠?
        disabled: 그라바타가 비활성화되었습니다.
        enabled: 그라바타의 표시가 활성화되었습니다
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@ -9,7 +9,7 @@
 lb:
  time:
    formats:
-      friendly: '%e %B %Y ëm %H:%M'
+      friendly: '%e %B %Y um %H:%M'
  activerecord:
    models:
      changeset: Set vun Ännerungen
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@ -222,6 +222,7 @@ lv:
      reopened_by_anonymous: Atkal aktivizēja anonīms <abbr title='%{exact_time}'>%{when}
        atpakaļ</abbr>
      hidden_by: Paslēpa %{user} <abbr title='%{exact_time}'>%{when} atpakaļ</abbr>
+      report: Ziņot par šo piezīmi
    query:
      title: Vaicājuma funkcijas
      introduction: Noklikšķiniet uz kartes, lai atrastu tuvumā esošos objektus.
@ -623,6 +624,7 @@ lv:
          bridge: Tilts
          bunker_silo: Bunkurs
          chimney: Skurstenis
+          flagpole: Karoga masts
          lighthouse: Bāka
          pipeline: Cauruļvads
          tower: Tornis
@ -801,6 +803,7 @@ lv:
          pet: Zooveikals
          pharmacy: Aptieka
          photo: Fotoveikals
+          seafood: Jūras veltes
          second_hand: Lietoto preču veikals
          shoes: Apavu veikals
          sports: Sporta veikals
@ -879,6 +882,7 @@ lv:
    index:
      search: Meklēt
      status: Statuss
+      reports: Ziņojumi
      states:
        ignored: Ignorēts
        open: Atvērt
@ -1213,6 +1217,9 @@ lv:
          <strong>Austrija</strong>: Ietver datus no
              <a href="http://data.wien.gv.at/">Stadt Wien</a> (zem
              <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>).
+        contributors_au_html: |-
+          <strong>Austrālija</strong>: Ietver pilsētu datus no
+              Australian Bureau of Statistics data.
        contributors_ca_html: |-
          <strong>Kanāda</strong>: Ietver datus no
              GeoBase&reg;, GeoGratis (&copy; Department of Natural
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@ -1385,6 +1385,9 @@ mk:
          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.mk">CC BY</a>),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Покраина Предарлска</a> и
          Покраина Тирол (под <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT со исправки</a>).
+        contributors_au_html: |-
+          <strong>Австралија</strong>: Содржи податоци за населби од
+          Австралиското биро за статистика.
        contributors_ca_html: |-
          <strong>Canada</strong>: Содржи податоци од
          GeoBase&reg;, GeoGratis (&copy; Министерство за природни ресурси на Канада), CanVec (&copy; Министерство за природни ресурси на Канада), and StatCan (Географско одделение,
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@ -1154,6 +1154,8 @@ ms:
          BY</a>) dan <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
          Vorarlberg</a>, dan Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
          AT dengan pindaan</a>).'
+        contributors_au_html: '<strong>Australia</strong>: Mengandungi data subbandar
+          berasaskan data Australian Bureau of Statistics.'
        contributors_ca_html: '<strong>Kanada</strong>: Mengandungi data daripada
          GeoBase&reg;, GeoGratis (&copy; Department of Natural Resources Canada),
          CanVec (&copy; Department of Natural Resources Canada), and StatCan (Geography
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@ -1382,6 +1382,9 @@ nb:
             <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>,
          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> og
          Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT med tilføyelser</a>).
+        contributors_au_html: |-
+          <strong>Australia</strong>: Inneholder forstaddata basert
+             på Australian Bureau of Statistics data.
        contributors_ca_html: |-
          <strong>Canada</strong>: Inneholder data fra
             GeoBase®, GeoGratis (© Department of Natural
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@ -24,6 +24,7 @@
 # Author: MrLeopold
 # Author: Optilete
 # Author: Pje335
+# Author: Robin van der Linde
 # Author: Robin van der Vliet
 # Author: Robin0van0der0vliet
 # Author: Romaine
@ -252,6 +253,7 @@ nl:
      reopened_by_anonymous: <abbr title='%{exact_time}'>%{when} geleden</abbr> opnieuw
        geactiveerd door anoniem
      hidden_by: <abbr title='%{exact_time}'>%{when} ago</abbr> verborgen door %{user}
+      report: Notitie rapporteren
    query:
      title: Nabije objecten opvragen
      introduction: Klik op de kaart om nabije eigenschappen te ontdekken.
@ -348,6 +350,7 @@ nl:
      comment_from: Reactie van %{link_user} op %{comment_created_at}
      hide_link: Reactie verbergen
      confirm: Bevestigen
+      report: Rapporteer deze opmerking
    location:
      location: 'Locatie:'
      view: Bekijken
@ -691,6 +694,7 @@ nl:
          wastewater_plant: Afvalwaterzuivering
          watermill: Watermolen
          water_tower: Watertoren
+          water_well: Put
          water_works: Waterwerken
          windmill: Windmolen
          works: Fabriek
@ -882,6 +886,7 @@ nl:
          tobacco: Tabakswinkel
          toys: Speelgoedwinkel
          travel_agency: Reisbureau
+          tyres: Bandenwinkel
          video: Videotheek
          wine: Wijnwinkel
          "yes": Winkel
@ -948,6 +953,40 @@ nl:
    results:
      no_results: Geen resultaten gevonden
      more_results: Meer resultaten
+  issues:
+    index:
+      title: Problemen
+      select_status: Selecteer Status
+      select_type: Selecteer Type
+      select_last_updated_by: Selecteer Laats Bijgewerkt Door
+      reported_user: Gerapporteerde Gebruiker
+      not_updated: Niet Bijgewerkt
+      search: Zoeken
+      search_guidance: 'Zoek Problemen:'
+      user_not_found: Gebruiker bestaat niet
+      status: Status
+      reports: Rapportages
+      last_updated: Laatst Bijgewerkt
+      reported_item: Gerapporteerd Item
+      states:
+        ignored: Genegeerd
+        open: Open
+        resolved: Opgelost
+    show:
+      ignore: Negeren
+      reopen: Heropenen
+  reports:
+    new:
+      categories:
+        diary_entry:
+          other_label: Anders
+        diary_comment:
+          other_label: Anders
+        user:
+          other_label: Anders
+        note:
+          spam_label: Deze notitie is spam
+          other_label: Anders
  layouts:
    logo:
      alt_text: Logo OpenStreetMap
@ -973,6 +1012,8 @@ nl:
    intro_text: OpenStreetMap is een kaart van de wereld, gemaakt door mensen zoals
      u en vrij te gebruiken onder een open licentie.
    intro_2_create_account: Maak een gebruiker aan
+    hosting_partners_html: Hosting wordt ondersteund door %{ucl}, %{bytemark}, en
+      andere %{partners}.
    partners_ucl: het UCL VR Centre
    partners_bytemark: Bytemark Hosting
    partners_partners: partners
@ -1297,6 +1338,9 @@ nl:
          <a href="https://data.wien.gv.at/">Stad Wenen</a> (onder
          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> en
          Land Tirol (onder <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY-AT met aanvullingen</a>).
+        contributors_au_html: |-
+          <strong>Australië</strong>: Bevat wijkgegevens
+          gebaseerd op gegevens van het Australian Bureau of Statistics.
        contributors_ca_html: |-
          <strong>Canada</strong>: Bevat gegevens van
          GeoBase&reg;, GeoGratis (&copy; Department of Natural
@ -2058,6 +2102,7 @@ nl:
      friends_diaries: dagboekberichten van vrienden
      nearby_changesets: wijzigingensets van gebruikers in de buurt
      nearby_diaries: dagboekberichten van gebruikers in de buurt
+      report: Rapporteer deze Gebruiker
    popup:
      your location: Uw locatie
      nearby mapper: Dichtbijzijnde mapper
@ -2497,6 +2542,14 @@ nl:
        roundabout_with_exit: Neem op de rotonde afslag %{exit} naar %{name}
        unnamed: naamloos
        courtesy: Routebeschrijving met dank aan %{link}
+        exit_counts:
+          first: 1e
+          second: 2e
+          third: 3e
+          fourth: 4e
+          fifth: 5e
+          sixth: 6e
+          seventh: 7e
      time: Tijd
    query:
      node: Node
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@ -1120,6 +1120,9 @@ nn:
             <a href="http://creativecommons.org/licenses/by/3.0/at/deed.dei">CC BY</a>,
             <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> og
             Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT med tilleg</a>).
+        contributors_au_html: |-
+          <strong>Australia</strong>: Inneheld forstadsdata basert
+             på Australian Bureau of Statistics data.
        contributors_ca_html: |-
          <strong>Canada</strong>: Inneheld data frå
             GeoBase®, GeoGratis (© Department of Natural
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@ -1348,6 +1348,8 @@ pl:
          <strong>Austria</strong>: Zawiera dane <a href="https://data.wien.gv.at/">miasta Wiednia</a> (na licencji <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> oraz
          Land Tyrol (na licencji <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT z późniejszymi zmianami</a>).
+        contributors_au_html: '<strong>Australia</strong>: Zawiera dane o miejscowościach
+          oparte na danych ''''Australian Bureau of Statistics''''.'
        contributors_ca_html: '<strong>Kanada</strong>: Zawiera dane z GeoBase&reg;,
          GeoGratis (&copy; ''Department of Natural Resources Canada''), CanVec (&copy;
          ''Department of Natural Resources Canada'') i StatCan (''Geography Division,
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -1436,6 +1436,9 @@ pt-BR:
          BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
          Vorarlberg</a> e Land Tirol (sob a licença <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
          AT com emendas</a>).'
+        contributors_au_html: |-
+          <strong>Austrália</strong>: Contém dados do subúrbio baseado
+             nos dados do Australian Bureau of Statistics.
        contributors_ca_html: "<strong>Canadá</strong>: Contém dados do\n   GeoBase&reg;,
          GeoGratis (&copy; Departamento de Recursos\n   Naturais do Canadá), CanVec
          (&copy; Departamento de Recursos\n   Naturais do Canadá), and StatCan (Divisão
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@ -1415,6 +1415,8 @@ pt-PT:
          BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
          Vorarlberg</a> e Land Tirol (sob a licença <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
          AT com emendas</a>).'
+        contributors_au_html: '<strong>Austrália</strong>: Contém dados de periferias
+          provenientes de dados do Australian Bureau of Statistics.'
        contributors_ca_html: '<strong>Canadá</strong>: Contém dados de GeoBase&reg;,
          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
          Department of Natural Resources Canada), e StatCan (Geography Division,
@ -2089,6 +2091,7 @@ pt-PT:
      terms accepted: Obrigado por aceitar os novos termos de colaborador!
      terms declined: Lamentamos não ter aceitado os novos Termos de Colaborador.
        Para obter mais informações consulte <a href="%{url}">esta página wiki</a>.
+      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
    terms:
      title: Termos de colaborador
      heading: Termos de colaborador
@ -2098,9 +2101,11 @@ pt-PT:
      consider_pd: para além do acordo exposto acima, considero que as minhas contribuições
        se encontram em Domínio Público.
      consider_pd_why: O que é isto?
+      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
      guidance: 'Informação para ajudar a compreender os termos: um <a href="%{summary}">resumo
        inteligível</a> e algumas <a href="%{translations}">traduções informais</a>'
      agree: Aceitar
+      declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
      decline: Rejeitar
      you need to accept or decline: Por favor leia e depois aceite ou recuse os novos
        Termos de Colaborador para continuar.
@ -2223,6 +2228,7 @@ pt-PT:
          os Termos de Colaborador.
        agreed_with_pd: Também declarou que as suas edições são disponibilizadas em
          Domínio Público.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
        link text: o que é isto?
      profile description: 'Descrição do perfil:'
      preferred languages: 'Línguas preferidas:'
@ -2230,6 +2236,7 @@ pt-PT:
      image: 'Imagem:'
      gravatar:
        gravatar: Usar imagem do site Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
        link text: o que é isto?
        disabled: O Gravatar foi desativado.
        enabled: A visualização do seu avatar de Gravatar foi ativada.
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@ -1455,6 +1455,8 @@ ru:
        contributors_at_html: |-
          <strong>Австрия.</strong> Данные <a href="https://data.wien.gv.at/">города Вена</a> (на условиях <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), а также земель <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Форарльберга</a> и
             Тироля (на условиях <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT с дополнениями</a>).
+        contributors_au_html: <strong>Австралия.</strong> Данные пригородов от Австралийского
+          бюро статистики.
        contributors_ca_html: <strong>Канада.</strong> Данные от GeoBase ®, GeoGratis
          (© Департамент природных ресурсов Канады), CanVec (© Департамент природных
          ресурсов Канады) и StatCan (Отдел Географии, Статистическое ведомство Канады).
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@ -1082,6 +1082,8 @@ sk:
          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">krajiny Vorarlberg</a> a
          krajiny Tirol (pod licenciou <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT s úpravami</a>).
+        contributors_au_html: '<strong>Austrália</strong>: Obsahuje dáta predmestí
+          založené na dátach Austrálskeho štatistického úradu.'
        contributors_ca_html: '<strong>Kanada</strong>: Obsahuje dáta z GeoBase ®,
          GeoGratis (© Department of Natural Resources Canada), CanVec (© Department
          of Natural Resources Canada) a StatCan (Geography Division, Statistics Canada).'
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@ -1067,6 +1067,8 @@ sq:
          por kur përfshihen në OSM, hartat nga një agjencion nacional i hartave \n
          \ apo faktor tjerë madhor burimor, është e arsyeshme të citohen drejtpërsëdrejti
          \n   duke paraqitur emrin apo duke lidhur faqen e tyre me link."
+        contributors_au_html: '<strong>Australia</strong>: Përmban të dhëna periferike
+          të bazuara në të dhënat e Zyrës Australiane të Statistikave.'
        contributors_ca_html: |-
          <strong>Canada</strong>: Përmban të dhëna nga
          GeoBase&reg;, GeoGratis (&copy; Department of Natural
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@ -907,6 +907,9 @@ sr-Latn:
             <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
             <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Forarlberg</a> i
          Land Tirol (pod licencom <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT sa izmenama i dopunama</a>).
+        contributors_au_html: |-
+          <strong>Australija</strong>: sadrži podatke o opštinama
+              na osnovu podataka Australijskog biroa za statistiku.
        contributors_ca_html: |-
          <strong>Kanada</strong>: sadrži podatke iz
              Beobaze&reg;, Geogratisa (&copy; Odeljenje za prirodne
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@ -1272,7 +1272,7 @@ sr:
        attribution_example:
          alt: Пример како да наведете Опенстритмап на некој страници
          title: Пример за навођење
-        more_title_html: Сазнај више
+        more_title_html: Више о
        more_1_html: |-
          Више о употреби података и како да нас наводите можете наћи на <a
          href="http://osmfoundation.org/Licence">страници лиценце OSMF</a> и у <a
@ -1294,6 +1294,9 @@ sr:
             <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
             <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Ланд Форарлберг</a> и
          Ланд Тирол (под лиценцом <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT са изменама и допунама</a>).
+        contributors_au_html: |-
+          <strong>Аустралија</strong>: садржи податке о општинама
+              на основу података Аустралијског бироа за статистику.
        contributors_ca_html: |-
          <strong>Канада</strong>: садржи податке из
              Беобазе&reg;, Геогратиса (&copy; Одељење за природне
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@ -1426,6 +1426,9 @@ sv:
          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> och
          Land Tirol (under licensen <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT med tillägg</a>).
+        contributors_au_html: |-
+          <strong>Australia</strong>: Innehåller förortsdata baserad
+             på data från Australian Bureau of Statistics.
        contributors_ca_html: |-
          <strong>Kanada</strong>: Innehåller data från
             GeoBase&reg;, GeoGratis (&copy; Department of Natural
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@ -192,7 +192,7 @@ th:
        tag: หน้าคำอธิบายวิกิาสำหรับป้ายระบุ %{key}=%{value}
      wikidata_link: รายการ %{page} ที่วิกิสนเทศ
      wikipedia_link: บทความ %{page} ที่วิกิพีเดีย
-      telephone_link: โทรศัพท์ไปเลขหมาย %{phone_number}
+      telephone_link: โทรศัพท์ไปที่หมายเลข %{phone_number}
    note:
      title: 'หมายเหตุ: %{id}'
      new_note: หมายเหตุใหม่
@ -448,7 +448,7 @@ th:
          social_facility: สโมสรพบปะ
          studio: สถานที่บันทึกภาพและเสียง
          swimming_pool: สระว่ายน้ำ
-          taxi: รถแท็กซี่
+          taxi: จุดจอดแท็กซี่
          telephone: โทรศัพท์สาธารณะ
          theatre: โรงละคร
          toilets: ห้องน้ำสาธารณะ
@ -809,7 +809,7 @@ th:
          deli: ร้านขายอาหารพิเศษ
          department_store: ห้างสรรพสินค้า
          discount: ร้านสินค้าลดราคา
-          doityourself: ทำด้วยตัวท่านเอง
+          doityourself: ร้านอุปกรณ์ช่างประจำบ้าน
          dry_cleaning: ร้านซักแห้ง
          electronics: ร้านเครื่องไฟฟ้า
          estate_agent: บริษัทอสังหาริมทรัพย์
@ -946,6 +946,13 @@ th:
      created_at: เมื่อ %{datetime}
  reports:
    new:
+      title_html: แจ้งปัญหาเกี่ยวกับ %{link}
+      select: 'เลือกประเภทของปัญหาที่ประสงค์จะแจ้ง:'
+      disclaimer:
+        intro: 'ก่อนที่จะแจ้งปัญหาไปยังผู้ดูแล ขอให้ดูจนแน่ใจก่อนว่า:'
+        not_just_mistake: ปัญหานี้ไม่ได้เกิดจากเพียงความพลั้งเผลอ
+        unable_to_fix: คุณและผู้ใช้คนอื่นไม่สามารถเข้าไปแก้ปัญหานี้ด้วยตัวเอง
+        resolve_with_user: คุณได้พยายามพูดคุยแก้ไขปัญหากับผู้ใช้คนดังกล่าวแล้ว
      categories:
        diary_entry:
          threat_label: บันทึกนี้มีใจความข่มขู่คุกคาม
@ -962,6 +969,7 @@ th:
          abusive_label: หมายเหตุนี้ใช้ถ้อยคำหยาบคายหรือส่งเสริมความรุนแรง
          other_label: อื่นๆ
    create:
+      successful_report: ทำการแจ้งปัญหาเสร็จสิ้นเรียบร้อย
      provide_details: กรุณาระบุรายละเอียด
  layouts:
    logo:
@ -1297,7 +1305,10 @@ th:
        infringement_2_html: |-
          หากท่านเชื่อว่าข้อมูลละเมิดลิขสิทธิ์ปรากฏในเว็บไซต์นี้หรือในฐานข้อมูล OpenStreetMap โปรดดู <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">ขั้นตอนการลบข้อมูลละเมิดลิขสิทธิ์</a> หรือแจ้งได้ที่
          <a href="http://dmca.openstreetmap.org/">หน้ารับแจ้งการละเมิดข้อมูลลิขสิทธิ์</a>
-        trademarks_title_html: <span id="trademarks"></span>เครืองหมายการค้า
+        trademarks_title_html: <span id="trademarks"></span>เครื่องหมายการค้า
+        trademarks_1_html: OpenStreetMap, State of the Map, และตราสัญลักษณ์แว่นขยาย
+          เป็นเครื่องหมายการค้าจดทะเบียนของมูลนิธิ OpenStreetMap, หากคุณมีข้อสงสัยเกี่ยวกับการใช้ชื่อและตราสัญลักษณ์ของเรา
+          สามารถตรวจสอบรายละเอียดได้ที่หน้า<a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">นโยบายเครื่องหมายการค้า</a>
    index:
      js_1: ท่านกำลังใช้เบราว์เซอร์ที่ไม่รองรับจาวาสคริปต์ หรือท่านปิดใช้งานจาวาสคริปต์
      js_2: OpenStreetMap ใช้จาวาสคริปต์ในการแสดงแผนที่
@ -1711,6 +1722,9 @@ th:
      no account: ยังไม่ได้เป็นสมาชิก?
      account not active: ขออภัย บัญชีของท่านยังไม่เปิดใช้งาน<br/>โปรดใช้ลิงก์ที่ให้ไว้ในอีเมลตอบรับเพื่อเปิดใช้งานบัญชี
        หรือ<a href="%{reconfirm}">ขออีเมลตอบรับใหม่</a> หากสูญหาย
+      account is suspended: ขออภัย บัญชีของคุณถูกระงับการใช้งานเนื่องจากกิจกรรมที่น่าสงสัย<br/>หากต้องการพูดคุยในรายละเอียด
+        กรุณาติดต่อ<a href="%{webmaster}">ผู้ดูแลระบบ</a>
+      auth failure: ขออภัย ไม่สามารถเข้าระบบด้วยชื่อผู้ใช้และรหัสผ่านดังกล่าวได้
      openid_logo_alt: เข้าใช้งานด้วย OpenID
      auth_providers:
        openid:
@ -1730,11 +1744,13 @@ th:
          alt: เข้าใช้งานด้วยบัญชี GitHub
        wikipedia:
          title: เข้าใช้งานด้วยวิกิพีเดีย
+          alt: เข้าสู่ระบบด้วยบัญชีวิกิพีเดีย
        yahoo:
          title: เข้าใช้งานด้วย Yahoo
          alt: เข้าใช้งานด้วย Yahoo OpenID
        wordpress:
          title: เข้าใช้งานด้วย Wordpress
+          alt: เข้าสู่ระบบด้วย Wordpress OpenID
        aol:
          title: เข้าใช้งานด้วย AOL
          alt: เข้าใช้งานด้วย AOL OpenID
@ -1836,6 +1852,7 @@ th:
      no nearby users: ไม่ได้มีผู้ใดแสดงตัวว่าทำแผนที่อยู่ใกล้เคียง
      role:
        administrator: คนนี้เป็นผู้ดูแลระบบ
+        moderator: ผู้ใช้นี้เป็นผู้ดูแล
      comments: ความเห็นที่เขียน
      create_block: กีดกันผู้ใช้นี้
      activate_user: เปิดใช้งานผู้ใช้นี้
@ -2120,6 +2137,8 @@ th:
      new:
        add: เพิ่มหมายเหตุ
      show:
+        anonymous_warning: หมายเหตุนี้มีข้อความจากผู้ที่ไม่ประสงค์จะออกนาม ซึ่งควรทำการตรวจสอบตามข้อมูลที่แจ้งมานี้ด้วยตัวคุณเองอีกครั้ง
+          ก่อนจะดำเนินการใดๆ ต่อ
        hide: ซ่อน
        resolve: ปิดเรื่อง
        reactivate: รื้อฟื้นหมายเหตุ
@ -2139,27 +2158,35 @@ th:
      directions: เส้นทาง
      distance: ระยะทาง
      errors:
+        no_route: ไม่พบเส้นทางระหว่างสองจุดที่คุณต้องการ
        no_place: ขออภัย - ไม่พบสถานที่ "%{place}"
      instructions:
        continue_without_exit: เคลื่อนต่อไปทางถนน %{name}
+        slight_right_without_exit: เบนขวาไปที่ %{name}
        offramp_right_with_name: ใช้ทางลาดด้านขวาไปที่ถนน %{name}
        onramp_right_without_exit: เลี่ยวขวาที่ทางลาดไปที่ถนน %{name}
-        endofroad_right_without_exit: เมื่อถึงสุดถนนเลี้ยวขวาไปที่ถนน %{name}
+        endofroad_right_without_exit: เมื่อถึงสุดถนนแล้ว ให้เลี้ยวขวาเข้า %{name}
        merge_right_without_exit: เลี้ยวขวาเข้าสู่ถนน %{name} ซึ่งเป็นทางเอก
        fork_right_without_exit: ที่ทางแยกเลี้ยวขวาไปที่ถนน %{name}
+        turn_right_without_exit: เลี้ยวขวาเข้า %{name}
        sharp_right_without_exit: หักขวาเข้า %{name}
        uturn_without_exit: วกกลับไปตามถนน %{name}
        sharp_left_without_exit: หักซ้ายเข้า %{name}
        turn_left_without_exit: เลี้ยวซ้ายไปที่ %{name}
        offramp_left_with_name: ใช้ทางลาดด้านซ้ายไปที่ %{name}
        onramp_left_without_exit: เลี้ยวซ้ายบนทางลาดไปที่ถนน %{name}
+        onramp_left_without_directions: เลี้ยวซ้ายขึ้นทางลาด
+        onramp_left: เลี้ยวซ้ายขึ้นทางลาด
        endofroad_left_without_exit: เมื่อถึงสุดถนนเลี้ยวซ้ายไปที่ถนน %{name}
        merge_left_without_exit: เลี้ยวซ้ายเข้าสู่ถนน %{name} ซึ่งเป็นทางเอก
        fork_left_without_exit: ที่ทางแยกเลี้ยวซ้ายไปที่ถนน %{name}
        slight_left_without_exit: ขยับซ้ายเล็กน้อยไปที่ %{name}
        follow_without_exit: ไปตาม %{name}
+        leave_roundabout_without_exit: ออกจากวงเวียน - %{name}
        start_without_exit: เริ่มที่ %{name}
        destination_without_exit: ตรงไปยังจุดหมาย
+        against_oneway_without_exit: ให้วิ่งสวนเลนไปบน %{name}
+        end_oneway_without_exit: สิ้นสุดช่วงเดินรถทางเดียวบน %{name}
        roundabout_with_exit: ณ วงเวียน ใช้ทางออก %{exit} ไปที่ถนน %{name}
        exit_roundabout: ออกจากวงเวียนไปทาง %{name}
        unnamed: ถนนไม่มีชื่อ
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@ -1090,6 +1090,9 @@ tl:
          BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land
          Vorarlberg</a> at ng\nLand Tirol (na nasa ilalim ng <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC
          BY AT na mayroong mga susog</a>)."
+        contributors_au_html: |-
+          <strong>Australiya</strong>: Naglalaman ng datong sub-urbano na nakabatay
+          sa dato ng Tanggapan ng Estadistika ng Australiya.
        contributors_ca_html: "<strong>Canada</strong>: Naglalaman ng dato mula sa\nGeoBase&reg;,
          GeoGratis (&copy; Kagawaran ng Likas na Yaman ng \nCanada), CanVec (&copy;
          Kagawaran ng Likas na Yaman ng Canada), at StatCan \n(Dibisyon ng Heograpiya,
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@ -1106,6 +1106,8 @@ tr:
    intro_text: OpenStreetMap senin gibi insanlar tarafından oluşturulan, kullanımı
      serbest ve açık lisans altında olan bir dünya haritasıdır.
    intro_2_create_account: hesap oluşturunuz
+    hosting_partners_html: Barındırma hizmeti, %{ucl}, %{bytemark} ve diğer %{partners}
+      tarafından desteklenmektedir.
    partners_ucl: UCL
    partners_bytemark: Bytemark Hosting
    partners_partners: ortaklar
@ -1427,6 +1429,10 @@ tr:
          <strong>Avusturya</strong>: <a href="https://data.wien.gv.at/">Stadt Wien</a> (<a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> lisansı altında),
          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> ve
          Land Tirol'dan (<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">değişiklikleriyle CC BY AT lisansı altında</a>) veriler içermektedir.
+        contributors_au_html: '<strong>Avustralya</strong>: <a href="https://creativecommons.org/licenses/by/4.0/">CC
+          BY 4.0</a> kapsamında Commonwealth of Australia tarafından lisanslanan <a
+          href="https://creativecommons.org/licenses/by/4.0/">PSMA Australia Limited</a>''ten
+          alınan verileri içerir.'
        contributors_ca_html: "<strong>Kanada</strong>: GeoBase&reg;, GeoGratis \n(&copy;
          Department of Natural\nResources Canada), CanVec (&copy; Department of Natural\nResources
          Canada) ve StatCan'den (Geography Division,\nStatistics Canada) veriler
@ -2109,6 +2115,7 @@ tr:
      terms accepted: Yeni katılımcı şartları kabul ettiğin için teşekkür ederiz!
      terms declined: Yeni Katılımcı Koşulları kabul etmediğiniz için üzgünüz. Daha
        fazla bilgi için lütfen <a href="%{url}">buradaki wiki sayfasına</a> bakınız.
+      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
    terms:
      title: Katılımcı Şartları
      heading: Katılımcı Şartları
@ -2118,9 +2125,13 @@ tr:
      consider_pd: Yukarıdaki anlaşmaya ek olarak, katkılarınızın kamu malı olarak
        kabul edilmesini de seçebilirsiniz
      consider_pd_why: bu nedir?
+      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
      guidance: 'Buradaki bilgileri anlamanıza yardımcı olabilecek bilgiler:  <a href="%{summary}">okunabilir
        bir özet</a> ve ayrıca <a href="%{translations}">genel çeviriler</a>'
      agree: Kabul Et
+      declined: |2-
+
+        https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
      decline: Reddet
      you need to accept or decline: Lütfen katılımcı şartlarını okuyunuz ve şartları
        kabul ya da ret ediniz.
@ -2241,6 +2252,7 @@ tr:
        review link text: Yeni Katkıda Bulunma Şartlarını incelemek ve kabul etmek
          için lütfen bu bağlantıyı kolaylık sağlamak için izleyin.
        agreed_with_pd: Ayrıca düzenlediklerin Kamu Malı olsun diye kabul ettin.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
        link text: Bu nedir?
      profile description: 'Tanıtım:'
      preferred languages: 'Tercih edilen diller (mesela tr,en,de):'
@ -2248,6 +2260,9 @@ tr:
      image: 'Resim:'
      gravatar:
        gravatar: Gravatar kullanın
+        link: |2-
+
+          https://wiki.openstreetmap.org/wiki/Gravatar
        link text: bu nedir?
        disabled: Gravatar devre dışı bırakıldı.
        enabled: Gravatarınızın görüntüsü etkinleştirildi.
@ -2622,7 +2637,12 @@ tr:
          %{directions} yönüne doğru'
        offramp_right_with_name: Sağdaki rampayı kullanarak %{name} girin
        offramp_right_with_directions: '%{directions} yönünde sağdaki rampadan'
+        offramp_right_with_name_directions: Sağdaki %{directions} taraftaki rampayı,
+          %{name} yoluna doğru alın.
        onramp_right_without_exit: Rampadan sağa dönerek %{name} girin
+        onramp_right_with_directions: '%{directions} doğru rampadan sağ dönün'
+        onramp_right_with_name_directions: '%{name} üzerindeki rampaya doğru %{directions}
+          yönünde sağa dönün'
        onramp_right_without_directions: Rampaya doğru sağa dönün
        onramp_right: Rampaya doğru sağa dönün
        endofroad_right_without_exit: Yolun sonunda sağa %{name} yönünde dönün
@ -2642,8 +2662,12 @@ tr:
          %{directions} yönüne doğru'
        offramp_left_with_name: Soldaki rampayı kullanarak %{name} girin
        offramp_left_with_directions: '%{directions} yönünde soldaki rampadan'
+        offramp_left_with_name_directions: '%{name} üzerindeki rampaya doğru %{directions}
+          yönünde sola ilerleyin'
        onramp_left_without_exit: Rampadan sola dönerek %{name} girin
        onramp_left_with_directions: '%{directions} doğru rampadan sola dönün'
+        onramp_left_with_name_directions: '%{name} üzerindeki rampaya doğru %{directions}
+          yönünde sola dönün'
        onramp_left_without_directions: Rampaya doğru sola dönün
        onramp_left: Rampaya doğru sola dönün
        endofroad_left_without_exit: Yolun sonunda sola %{name} yönünde dönün
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@ -1222,6 +1222,8 @@ uk:
          <strong>Австрія</strong>: дані від
             <a href="http://data.wien.gv.at/">Stadt Wien</a> (на умовах ліцензії
             <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> та Земля Тіроль (на умовах <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT з виправленнями</a>).
+        contributors_au_html: '<strong>Австралія</strong>: дані передмість від Австралійського
+          Бюро Статистики.'
        contributors_ca_html: '<strong>Канада</strong>: дані від GeoBase&reg;, GeoGratis
          (&copy; Департамент природних ресурсів Канади), CanVec (&copy; Департамент
          природних ресурсів Канади), та StatCan (Відділ Географії, Статистичне відомство
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@ -1335,6 +1335,8 @@ vi:
          BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Bang
          Vorarlberg</a>, và Bang Tyrol (theo <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">bản
          sửa đổi CC BY Áo</a>).'
+        contributors_au_html: '<strong>Úc</strong>: Bao gồm dữ liệu về ngoại ô dựa
+          trên dữ liệu của Cục Thống kê Úc.'
        contributors_ca_html: '<strong>Canada</strong>: Bao gồm dữ liệu từ GeoBase®,
          GeoGratis (© Bộ Tài nguyên Canada), CanVec (© Bộ Tài nguyên Canada), và
          StatCan (Sở Địa lý, Statistics Canada).'
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@ -1327,6 +1327,9 @@ zh-TW:
          BY</a>授權) 、<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
          Vorarlberg</a>及 Land Tirol (修訂的<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
          AT</a>授權) 的資料。
+        contributors_au_html: |-
+          <strong>澳大利亞</strong>：包含來自
+          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA 澳大利亞有限公司</a>的資料來源，並依據<a href="https://creativecommons.org/licenses/by/4.0/deed.zh_TW">姓名標示 4.0 國際</a>澳大利亞聯邦條款授權。
        contributors_ca_html: |-
          <strong>加拿大</strong>：包含來自 GeoBase&reg;，GeoGratis (&copy; Department of Natural
          Resources Canada) ，CanVec (&copy; Department of Natural