Merge remote-tracking branch 'upstream/pull/3394'

diff --git a/Gemfile b/Gemfile
index 108f449712673a83aed372383bb12426d4117722..1662fc3c03b895b4b21380477c078bd65e59bce5 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "6.1.4.1"
+gem "rails", "6.1.4.3"
 
 # Require json for multi_json
 gem "json"

diff --git a/Gemfile.lock b/Gemfile.lock
index 46f472d7f7c5f7cd7912c4b5d7e67c37e4cdd307..8dc3edf70868cc6a959de4d158ef56ff754d52b1 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,66 +3,66 @@ GEM
   specs:
     aasm (5.2.0)
       concurrent-ruby (~> 1.0)
-    actioncable (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actioncable (6.1.4.3)
+      actionpack (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailbox (6.1.4.3)
+      actionpack (= 6.1.4.3)
+      activejob (= 6.1.4.3)
+      activerecord (= 6.1.4.3)
+      activestorage (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailer (6.1.4.3)
+      actionpack (= 6.1.4.3)
+      actionview (= 6.1.4.3)
+      activejob (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionpack (6.1.4.3)
+      actionview (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
-    actiontext (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actiontext (6.1.4.3)
+      actionpack (= 6.1.4.3)
+      activerecord (= 6.1.4.3)
+      activestorage (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (6.1.4.3)
+      activesupport (= 6.1.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
-    activejob (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activejob (6.1.4.3)
+      activesupport (= 6.1.4.3)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activemodel (6.1.4.3)
+      activesupport (= 6.1.4.3)
+    activerecord (6.1.4.3)
+      activemodel (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
     activerecord-import (1.2.0)
       activerecord (>= 3.2)
-    activestorage (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activestorage (6.1.4.3)
+      actionpack (= 6.1.4.3)
+      activejob (= 6.1.4.3)
+      activerecord (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
       marcel (~> 1.0.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -80,7 +80,7 @@ GEM
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.539.0)
+    aws-partitions (1.541.0)
     aws-sdk-core (3.124.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -147,7 +147,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    dalli (3.1.0)
+    dalli (3.1.3)
     debug_inspector (1.1.0)
     deep_merge (1.2.1)
     delayed_job (4.1.9)
@@ -281,7 +281,7 @@ GEM
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store
-    loofah (2.12.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -293,7 +293,7 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    minitest (5.15.0)
     msgpack (1.4.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -348,7 +348,7 @@ GEM
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.1)
     parallel (1.21.0)
-    parser (3.0.3.1)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
     pg (1.2.3)
     popper_js (1.16.0)
@@ -370,20 +370,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
-    rails (6.1.4.1)
-      actioncable (= 6.1.4.1)
-      actionmailbox (= 6.1.4.1)
-      actionmailer (= 6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actiontext (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    rails (6.1.4.3)
+      actioncable (= 6.1.4.3)
+      actionmailbox (= 6.1.4.3)
+      actionmailer (= 6.1.4.3)
+      actionpack (= 6.1.4.3)
+      actiontext (= 6.1.4.3)
+      actionview (= 6.1.4.3)
+      activejob (= 6.1.4.3)
+      activemodel (= 6.1.4.3)
+      activerecord (= 6.1.4.3)
+      activestorage (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.1)
+      railties (= 6.1.4.3)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -397,9 +397,9 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (6.1.4.3)
+      actionpack (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
@@ -423,7 +423,7 @@ GEM
       rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.14.0)
+    rubocop-ast (1.15.0)
       parser (>= 3.0.1.1)
     rubocop-minitest (0.17.0)
       rubocop (>= 0.90, < 2.0)
@@ -468,7 +468,7 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.4.1)
+    sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
@@ -563,7 +563,7 @@ DEPENDENCIES
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
-  rails (= 6.1.4.1)
+  rails (= 6.1.4.3)
   rails-controller-testing
   rails-i18n (~> 6.0.0)
   rinku (>= 2.0.6)

diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index 04a1058f8d304f102b395465f0628a4e57d12590..ca3c1da481b471196461b3295db90a126f0cf866 100644 (file)
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -111,6 +111,7 @@ ba:
         language: Тел
       doorkeeper/application:
         name: Исем
+        redirect_uri: Яңынан йүнәлтеү
         confidential: Конфиденциаль ҡушымта?
         scopes: Рөхсәт
       friend:
@@ -155,6 +156,10 @@ ba:
         pass_crypt: Серһүҙ
         pass_crypt_confirmation: Паролде раҫлағыҙ
     help:
+      doorkeeper/application:
+        confidential: Ҡушымта клиент серен сер итеп тоторға мөмкин булған урындарҙа
+          ҡулланыласаҡ (үҙ мобиль ҡушымталар һәм бер битле ҡушымталар конфиденциаль
+          түгел)
       trace:
         tagstring: өтөр аша
       user_block:

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8ff1cadb193249dc8f5257c893f665e01e323e1d..d80bdb266b55e153b804c0085cb9bfd23aa6d3e5 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -928,6 +928,7 @@ de:
           trailhead: Ausgangspunkt eines Wanderweges
           trunk: Schnellstraße
           trunk_link: Schnellstraßenauffahrt
+          turning_circle: Wendestelle
           turning_loop: Wendeschleife
           unclassified: Straße
           "yes": Straße

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4789f866e6a6d4c64579d7b76a463ad6875c2249..1400de2d06153846b9c3bf1584c9615f58d9ba4e 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -940,6 +940,7 @@ fr:
           trailhead: Point de départ
           trunk: Voie express
           trunk_link: Voie express
+          turning_circle: Cercle tournant
           turning_loop: Virage en boucle
           unclassified: Route mineure
           "yes": Route

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index f908fcbab340bb41cb1642ac1f88af3ef2db782c..6cea2b56c953a614e1911d900483ffee8bdc58f1 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1100,6 +1100,7 @@ fy:
     intro_header: Wolkom by OpenStreetMap!
     intro_text: OpenStreetMap is in wrâldkaart makke troch minsken krekt as jo, en
       frij te brûken ûnder in iepen lisinsje.
+    intro_2_create_account: Meitsje in akkount as meidogger
     hosting_partners_html: It webstee is ûnderdak by %{ucl}, %{fastly}, %{bytemark}
       en oare %{partners}.
     partners_ucl: UCL
@@ -1421,28 +1422,49 @@ fy:
       lost password link: Jo wachtwurd kwyt?
       login_button: Oanmelde
       register now: No ynskriuwe
+      with username: 'Hawwe jo al in OpenStreetMap-akkount? Meld jo oan mei jo meidochnamme
+        en wachtwurd:'
       with external: 'Brûk oars in treddepartij en meld jo oan:'
       new to osm: Nij op OpenStreetMap?
+      to make changes: Jo moatte in akkount hawwe om OpenStreetMap-data feroarje te
+        kinnen.
+      create account minute: Meitsje in akkount. It duorret mar in minútsje.
       no account: Hawwe jo gjin akkount?
+      account not active: Spitich, jo akkount is noch net aktyf.<br />Brûk de keppeling
+        yn 'e akkountbefêstigingsmail en aktivearje jo akkount, of <a href="%{reconfirm}">freegje
+        in nije befêstigingsmail</a>.
+      account is suspended: Spitich, jo akkount is útsletten fanwegen fertochte aktiviteiten.<br
+        />Nim kontakt op mei <a href="%{webmaster}">Stipe</a> at jo dat beprate wolle.
+      auth failure: Spitich, koe jo net oanmelde mei dy gegevens.
+      openid_logo_alt: Meld jo oan mei in openID
       auth_providers:
         openid:
           title: Oanmelde mei OpenID
+          alt: Meld jo oan mei in OpenID-URL
         google:
           title: Oanmelde mei Google
+          alt: Meld jo oan mei in Google-openID
         facebook:
           title: Oanmelde mei Facebook
+          alt: Meld jo oan mei in Facebook-akkount
         windowslive:
           title: Oanmelde mei Windows Live
+          alt: Meld jo oan mei in Windows Live-akkount
         github:
           title: Oanmelde mei GitHub
+          alt: Meld jo oan mei in GitHub-akkount
         wikipedia:
           title: Oanmelde mei de Wikipedy
+          alt: Meld jo oan mei in Wikipedy-akkount
         wordpress:
           title: Oanmelde mei Wordpress
+          alt: Meld jo oan mei in Wordpress-openID
         aol:
           title: Oanmelde mei AOL
+          alt: Meld jo oan mei in AOL-openID
     destroy:
       title: Ofmelde
+      heading: Ofmelde by OpenStreetMap
       logout_button: Ofmelde
   shared:
     markdown_help:
@@ -1656,8 +1678,8 @@ fy:
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     create:
       upload_trace: GPS-trajekt oplade
-      trace_uploaded: Jo GPX-bestân is opladen en wachtet op databank&shy;ynfiering.
-        Dat bart trochstrings binnen in heal oere, en der wurdt jo in e-mail tastjoerd
+      trace_uploaded: Jo GPX-bestân is opladen en wachtet op databankynfiering. Dat
+        bart trochstrings binnen in heal oere, en der wurdt jo in e-mail tastjoerd
         at it dien is.
     edit:
       cancel: Annulearje

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 511c4eb348643df48548e0c290ecfed00d53a6dc..eb0dd62caca75e0e74a773d469dc40455cff91cc 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -575,6 +575,9 @@ he:
         title: רשומות ביומן של OpenStreetMap
         description: רשומות יומן אחרונות ממשתמשי OpenStreetMap
     comments:
+      title: הערות יומן שנוספו על ידי %{user}
+      heading: הערות ביומן של %{user}
+      subheading_html: הערות יומן שנוספו על ידי %{user}
       no_comments: אין הערות יומן
       post: רשומה
       when: מתי
@@ -899,6 +902,7 @@ he:
           trailhead: שלט תחילת מסלול
           trunk: דרך עיקרית
           trunk_link: חיבור לדרך עיקרית
+          turning_circle: אזור להסתובבות
           turning_loop: מעגל תנועה
           unclassified: דרך לא מסווגת
           "yes": דרך
@@ -2736,6 +2740,7 @@ he:
       no_authorization_code: אין קוד כניסה
       unknown_signature_algorithm: אלגוריתם חתימה בלתי־ידוע
       invalid_scope: טווח בלתי־תקין
+      unknown_error: האימות נכשל
     auth_association:
       heading: המזהה שלך עדיין אינו משויך לחשבון לחשבון OpenStreetMap.
       option_1: אם התחלת רק עכשיו עם OpenStreetMap, נא ליצור חשבון חדש באמצעות הטופס

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index c7e28832796b1e2b6864ece9a2bd4a48390246b7..4464889876f08d031bce96c5806b88ff05f7a2ab 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -2981,7 +2981,7 @@ hsb:
       timeout: Čas překročowany při kontaktowanju %{server}
     context:
       directions_from: Čara wottud
-      directions_to: Čara wottud
+      directions_to: Čara tam
       show_address: Adresu pokazać
       query_features: Funkcije naprašować
       centre_map: Kartu tu srjedźić

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 77374218cf784cb72cd2f7fbe68d8d5a157c147b..36b4205cbf18b623eef53c12367faf6c2a327b8c 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -855,6 +855,7 @@ mk:
           trailhead: Почеток на патеката
           trunk: Магистрала
           trunk_link: Магистрала
+          turning_circle: Круг на свртување
           turning_loop: Повратен јазол
           unclassified: Некласификуван пат
           "yes": Пат

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 9359b68f865d5b59602a2c52faaacb391784d868..6a40da417d648bc1489c3e47156f3eb606a9b3b0 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -5,6 +5,7 @@
 # Author: Ajeje Brazorf
 # Author: Lancine.kounfantoh.fofana
 # Author: Youssoufkadialy
+# Author: ߛߊ߲߬ߛߊ߲߬ߘߐ߬ ߊߡߙߊ߫
 ---
 nqo:
   html:
@@ -105,6 +106,7 @@ nqo:
       doorkeeper/application:
         name: ߕߐ߮
         redirect_uri: URLs ߟߊߞߎ߲߬ߛߌ߲߬ߠߌ߲
+        confidential: ' ߜߎ߲߬ߘߎ߬ߘߐ߫ ߟߊߥߊߟߌߟߌ߫؟'
         scopes: ߘߌ߬ߢߍ߬ߟߊ߬ߢߌ߬ߣߌ߲߬
       friend:
         user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
@@ -140,8 +142,11 @@ nqo:
         new_email: ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ߫ ߞߎߘߊ
         active: ߞߎ߲߬ߞߊߟߌ߲
         display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
-        description: ߕߐ߯ߛߓߍߟߌ
+        description: ߦߊߞߙߍ ߛߎ߯ߦߌߘߊ
+        home_lat: ߘߟߊߕߍ߮
+        home_lon: ߕߍߟߍ߲
         languages: ߞߊ߲߫ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ ߟߎ߬
+        preferred_editor: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߊ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ
         pass_crypt: ߕߊ߬ߡߌ߲߬ߞߊ߲
         pass_crypt_confirmation: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊߛߙߋߦߊ߫
     help:
@@ -694,6 +699,7 @@ nqo:
           erotic: ߋߙߏߕߌߞ ߝߎ߲ߞߎ߲
           farm: ߛߣߍ߬ߞߍ߬ߝߋ߲߬ ߝߎ߲ߞߎ߲
           fashion: ߘߐ߬ߓߍ߲߬ߠߌ߲߬ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
+          fishing: ߖߍ߯ ߡߌߘߊ߫ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
           food: ߛߎ߬ߡߊ߲߬ ߝߎ߲ߞߎ߲
           gas: ߥߊߦߌ߲߫ ߝߎ߲ߞߎ߲
           hairdresser: ߞߎ߲߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
@@ -1180,6 +1186,7 @@ nqo:
         english_link: ߊ߲߬ߜ߭ߌߟߋ ߓߊߖߎߡߊ
       native:
         title: ߞߊ߬ ߓߍ߲߬ ߞߐߜߍ ߣߌ߲߬ ߡߊ߬
+        native_link: ߒߞߏ_ߕߐ߮_ߦߋ߫_ߦߊ߲߬ ߟߦߍ߬ߡߊ߲߬ߠߌ߲
         mapping_link: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
       legal_babble:
         title_html: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ
@@ -1542,7 +1549,7 @@ nqo:
       my settings: ߒ ߠߊ߫ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߬
       my comments: ߒ ߠߊ߫ ߡߙߌߣߊ߲ ߠߎ߬
       my_preferences: ߒ ߠߊ߫ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ ߟߎ߬
-      blocks on me: ß\92 ß ß\8aß« ß\93ß\8a߬ß\9fß\8a߲߬ߣß\8dß² ß ß\8e߬
+      blocks on me: ß\93ß\8a߬ß\9fß\8aß²ß¬ß ß\8cß² ß¡ß\8dß² ߦß\8bß« ß\92 ß\9eß\8aß²߬
       blocks by me: ߡߍ߲ ߠߎ߬ ߓߊ߬ߟߊ߲߬ߣߍ߲߫ ߦߋ߫ ߒߠߋ ߓߟߏ߫
       send message: ߗߋߛߓߍ߫ ߗߋߣߍ߲
       diary: ߕߋ߬ߟߋ߲
@@ -1552,6 +1559,8 @@ nqo:
       remove as friend: ߕߋߙߌߦߊ ߝߘߊ߫
       add as friend: ߕߋߙߌ ߝߙߊ߬
       mapper since: 'ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߌ߫ ߞߊ߬ߦߌ߯:'
+      email address: 'ߢߎߡߍߙߋ߲߫ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
+      created from: 'ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߞߊ߬ ߝߘߊ߫:'
       description: ߞߊ߲߬ߛߓߍߟߌ
       user location: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߘߌ߲߬ߞߌߙߊ
       role:

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index e4efb8239f236db7e9019e10edc30528dbe9edf7..42f419a723d53b5adda8ac27634c9a4857d690a7 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -940,6 +940,7 @@ pl:
           trailhead: Początek szlaku
           trunk: Droga główna/ekspresowa
           trunk_link: Droga główna/ekspresowa – dojazd
+          turning_circle: Miejsce do zawracania
           turning_loop: Pętla do zawracania
           unclassified: Droga czwartorzędna
           "yes": Droga

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 4aae9d907d5f83277f6b5c73cd9cb7fc6780b517..177275a22d0fb1ac5a93c0551daa4661a6ff3545 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -566,6 +566,7 @@ scn:
           "yes": Ponti
         building:
           house: Casa
+          roof: Tettu
           "yes": Edificiu
         craft:
           brewery: Birrificiu

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index e67c34fabe9855ce36e0bdb0e46f4888b172e2d0..f7b05cca3564554847ad3b2ad0afe473a2339331 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1069,6 +1069,7 @@ sl:
           grocery: Živilska trgovona
           hairdresser: Frizerski salon
           hardware: Železnina
+          hearing_aids: Slušni aparati
           hifi: Trgovina z avdio opremo
           jewelry: Draguljarna
           kiosk: Kiosk prodajalna
@@ -1078,6 +1079,7 @@ sl:
           mall: Trgovski center
           massage: Masaža
           mobile_phone: Trgovina mobilnih telefonov
+          money_lender: Posojilnica
           motorcycle: Trgovina z motorji
           music: Trgovina z glasbo
           musical_instrument: Glasbena trgovina

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index e1883b1a38856c9cc307a8e2cd83e541445a4221..b5d14a3fd0d69d4c22654af6c21eabf0f1898e38 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -32,6 +32,7 @@
 # Author: Olvin
 # Author: Piramidion
 # Author: Prima klasy4na
+# Author: Renvoy
 # Author: Riwnodennyk
 # Author: Ruila
 # Author: Sev
@@ -924,6 +925,7 @@ uk:
           trailhead: Трейлхед
           trunk: Шосе
           trunk_link: З’їзд з/на шосе
+          turning_circle: Радіус повороту
           turning_loop: Місце для розвороту
           unclassified: Дорога без класифікації
           "yes": Дорога

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 2e481b17ec4f84b2f906b6094e812ddded365fc3..a5e8fc53b667f692d95b94067cef65836abd28d4 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -22,6 +22,8 @@
 # Author: 神樂坂秀吉
 ---
 vi:
+  html:
+    dir: ltr
   time:
     formats:
       friendly: '%e tháng %m năm %Y lúc %H:%M'
@@ -530,6 +532,9 @@ vi:
         title: Các mục nhật ký OpenStreetMap
         description: Những mục nhật ký gần đây từ người dùng OpenStreetMap
     comments:
+      title: Bình luận Nhật ký do %{user} Đăng
+      heading: Bình luận Nhật ký của %{user}
+      subheading_html: Bình luận Nhật ký do %{user} Đăng
       no_comments: Không có bình luận nhật ký
       post: Mục nhật ký
       when: Lúc đăng
@@ -567,13 +572,14 @@ vi:
           Nominatim</a>
         geonames_reverse_html: Kết quả <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
+      prefix_format: '%{name}'
       prefix:
         aerialway:
           cable_car: Xe Cáp treo Lớn
           chair_lift: Ghế Cáp treo
           drag_lift: Thang kéo trên Mặt đất
           gondola: Xe Cáp treo Nhỏ
-          magic_carpet: Magic Carpet Lift
+          magic_carpet: Thang kéo Thảm bay
           platter: Đĩa Treo
           pylon: Cột tháp
           station: Trạm Cáp treo
@@ -590,7 +596,7 @@ vi:
           navigationaid: Hỗ trợ điều hướng hàng không
           parking_position: Chỗ Đậu Máy bay
           runway: Đường băng
-          taxilane: Taxilane
+          taxilane: Làn Đường lăn
           taxiway: Đường lăn
           terminal: Nhà ga Sân bay
           windsock: Ống gió
@@ -649,7 +655,7 @@ vi:
           kindergarten: Tiểu học
           language_school: Trương học ngôn ngữ
           library: Thư viện
-          loading_dock: Bến Tải
+          loading_dock: Cửa Bốc dỡ Hàng
           love_hotel: Khách sạn tình yêu
           marketplace: Chợ phiên
           mobile_money_agent: Đại lý tiền di động
@@ -675,7 +681,7 @@ vi:
           ranger_station: Trạm Kiểm lâm
           recycling: Trung tâm hoặc Thùng Tái sinh
           restaurant: Nhà hàng
-          sanitary_dump_station: Trạm đổ vệ sinh
+          sanitary_dump_station: Trạm đổ Vệ sinh
           school: Trường học
           shelter: Nơi Trú ẩn
           shower: Vòi tắm
@@ -688,7 +694,7 @@ vi:
           theatre: Nhà hát
           toilets: Vệ sinh
           townhall: Thị sảnh
-          training: CÆ¡ sá»\9f Ä\91ào tạo
+          training: CÆ¡ sá»\9f Ä\90ào tạo
           university: Trường Đại học
           vending_machine: Máy Bán hàng
           veterinary: Phẫu thuật Thú y
@@ -721,7 +727,7 @@ vi:
           cabin: Túp lều
           chapel: Nhà nguyện
           church: Nhà thờ
-          civic: Tòa nhà dân sự
+          civic: Tòa nhà Dân sự
           college: Tòa nhà Cao đẳng
           commercial: Tòa nhà Thương mại
           construction: Tòa nhà Đang Xây
@@ -767,6 +773,7 @@ vi:
           sawmill: Xưởng cưa
           shoemaker: Thợ Đóng giày
           tailor: Tiệm May
+          winery: Nhà máy Rượu vang
           "yes": Doanh nghiệp Thủ công
         emergency:
           ambulance_station: Trạm Xe cứu thương
@@ -903,6 +910,7 @@ vi:
           marina: Bến tàu
           miniature_golf: Golf Nhỏ
           nature_reserve: Khu Bảo tồn Thiên niên
+          outdoor_seating: Bàn ghế Ngoài trời
           park: Công viên
           picnic_table: Bàn ăn Ngoài trời
           pitch: Sân cỏ
@@ -964,6 +972,7 @@ vi:
           airfield: Sân bay Không quân
           barracks: Trại Lính
           bunker: Boong ke
+          checkpoint: Trạm Kiểm soát
           "yes": Quân sự
         mountain_pass:
           "yes": Đèo
@@ -986,6 +995,7 @@ vi:
           heath: Bãi Hoang
           hill: Đồi
           island: Đảo
+          isthmus: Eo
           land: Đất
           marsh: Đầm lầy
           moor: Truông
@@ -1004,6 +1014,8 @@ vi:
           stone: Đá
           strait: Eo biển
           tree: Cây
+          tree_row: Hàng Cây
+          tundra: Đài nguyên
           valley: Thung lũng
           volcano: Núi lửa
           water: Nước
@@ -1147,6 +1159,7 @@ vi:
           mobile_phone: Tiệm Điện thoại Di động
           money_lender: Tiệm Mượn tiền
           motorcycle: Cửa hàng Xe mô tô
+          motorcycle_repair: Tiệm Sửa Xe máy
           music: Tiệm Nhạc
           musical_instrument: Tiệm Nhạc cụ
           newsagent: Tiệm Báo
@@ -1835,11 +1848,10 @@ vi:
           gợi ý chỉ các độc giả đến openstreetmap.org (có lẽ bằng cách mở rộng “OpenStreetMap”
           trở thành địa chỉ đầy đủ này), đến opendatacommons.org, và nếu hợp lý, đến
           creativecommons.org.
-        credit_3_1_html: "Các hình ảnh bản đồ lớp “Chuẩn” tại www.openstreetmap.org
+        credit_3_1_html: Các hình ảnh bản đồ lớp “Chuẩn” tại www.openstreetmap.org
           là một Tác phẩm được Sản xuất bởi Quỹ OpenStreetMap dùng dữ liệu OpenStreetMap
-          theo Giấy phép Cơ sở dữ liệu Mở. Nếu bạn đang sử dụng các hình ảnh này,
-          xin vui lòng ghi công như sau: \n“Bản đồ gốc và dữ liệu từ OpenStreetMap
-          và Quỹ OpenStreetMap”."
+          theo Giấy phép Cơ sở dữ liệu Mở. Khi sử dụng kiểu bản đồ này, kiểu yêu cầu
+          cùng lời ghi công của dữ liệu bản đồ.
         credit_4_html: |-
           Đối với một bản đồ điện tử tương tác, lời ghi công nên xuất hiện ở góc bản đồ.
           Ví dụ:
@@ -2343,6 +2355,8 @@ vi:
       read_gpx: Đọc tuyến đường GPS riêng tư
       write_gpx: Tải lên tuyến đường GPS
       write_notes: Thay đổi ghi chú
+      read_email: Đọc địa chỉ thư điện tử của người dùng
+      skip_authorization: Tự động chấp nhận đơn xin
   oauth_clients:
     new:
       title: Đăng ký chương trình mới
@@ -2625,6 +2639,7 @@ vi:
       no_authorization_code: Không có mã cho phép
       unknown_signature_algorithm: Thuật toán chữ ký không rõ
       invalid_scope: Phạm vi không hợp lệ
+      unknown_error: Thất bại khi xác thực
     auth_association:
       heading: ID của bạn chưa được liên kết với một tài khoản OpenStreetMap.
       option_1: Nếu bạn mới đến OpenStreetMap, xin vui lòng tạo tài khoản mới dùng

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index eba09881d06cc712da36e6f42a40862560367bd3..142b67310814eeabb51cb6d1f03bbca1ba07b85b 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -905,6 +905,7 @@ zh-CN:
           trailhead: 步道起点
           trunk: 主干道路
           trunk_link: 干道
+          turning_circle: 回车环
           turning_loop: 环形回车道
           unclassified: 无等级道路
           "yes": 道路

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 7c05625aa313b971d02cd735fd7ac303e9b79c27..9eaf82297a492c014d2878cef42b0f30aad2e9c9 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -872,6 +872,7 @@ zh-TW:
           trailhead: 小徑入口處
           trunk: 快速道路
           trunk_link: 快速道路聯絡道
+          turning_circle: 回轉圈
           turning_loop: 環形迴車道
           unclassified: 無編制道路
           "yes": 道路