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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f66b60288cb8c6730fd7a21435eeeab93663ccd2..6ae40a3f5c591e2b7be303aeaccf6396471f83c9 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -17,7 +17,7 @@ jobs:
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: vendor/bundle
         key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
@@ -41,7 +41,7 @@ jobs:
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: vendor/bundle
         key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
@@ -65,14 +65,14 @@ jobs:
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: vendor/bundle
         key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
         restore-keys: |
           bundle-${{ env.os }}-${{ env.ruby }}-
     - name: Cache node modules
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: node_modules
         key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
@@ -100,7 +100,7 @@ jobs:
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: vendor/bundle
         key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3cedc67885030f2063eee2603ecc2aeb7e50745b..1d7c5035041c6c97fced029598a6e50761c8bfe4 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,14 +21,14 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Cache gems
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: vendor/bundle
         key: bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }}
         restore-keys: |
           bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-
     - name: Cache node modules
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: node_modules
         key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }}

diff --git a/config/locales/be.yml b/config/locales/be.yml
index bceb460f89fa6f0f50c9b831edebe1b9e1f2cec7..d53a04daeb1d95482cfe276e0c6dd4bb39bc4554 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -337,8 +337,8 @@ be:
         way: лінія
         relation: дачыненне
     start_rjs:
-      feature_warning: Неабходна загрузіць %{num_features} аб'ектаў, што можа запаволіць
-        ваш браўзэр. Вы ўпэўнены, што жадаеце праглядзець гэтыя дадзеныя?
+      feature_warning: Неабходна загрузіць %{num_features} аб’ектаў, што можа запаволіць
+        ваш браўзер. Вы ўпэўнены, што жадаеце праглядзець гэтыя даныя?
       load_data: Сцягнуць дадзеныя
       loading: Загрузка...
     tag_details:
@@ -1713,7 +1713,7 @@ be:
       user_page_link: старонка карыстальніка
       anon_edits_link_text: Даведацца ў чым справа.
       id_not_configured: iD не быў настроены
-      no_iframe_support: Ваш браўзэр не падтрымлівае HTML iframe, якія неабходныя
+      no_iframe_support: Ваш браўзер не падтрымлівае рамкі HTML, якія з’яўляюцца неабходнымі
         для гэтай функцыі.
     export:
       title: Экспарт

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 2a74f8c2a983b657b461a5812d07da19dea8a534..97f76c953851abca999c1140bdcc92b890bdfcc1 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2856,6 +2856,7 @@ de:
       no_authorization_code: Kein Autorisierungscode
       unknown_signature_algorithm: Unbekannter Signaturalgorithmus
       invalid_scope: Ungültiger Bereich
+      unknown_error: Authentifizierung fehlgeschlagen
     auth_association:
       heading: Deine ID ist noch nicht mit einem OpenStreetMap-Konto verknüpft.
       option_1: |-

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 71fe50ec2ba2d1bcccf8dc3302e211dcb259ae94..5c90cb4b322f19594f3e89f7ce721b48f831ef13 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2043,10 +2043,10 @@ 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 procedentes
-          de <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA
-          Australia Limite </a> con licencia de Commonwealth of Australia bajo <a
-          href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.'
+        contributors_au_html: '<strong>Australia</strong>: Contiene o se ha desarrollado
+          usando límites administrativos de &copy; <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">Geoscape
+          Australia</a> con licencia de la Commonwealth de Australia bajo <a href="https://creativecommons.org/licenses/by/4.0/">licencia
+          Creative Commons Atribución 4.0 Internacional (CC BY 4.0)</a>.'
         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

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0f296e27894b746bc301c8af9837894138941975..ac2646e37375c6eb8c54d2a17af694f27ea19c75 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2870,6 +2870,7 @@ fr:
       no_authorization_code: Aucun code d’autorisation
       unknown_signature_algorithm: Algorithme de signature inconnu
       invalid_scope: Étendue non valide
+      unknown_error: Échec d’authentification
     auth_association:
       heading: Votre ID n’est pas encore associé à un compte OpenStreetMap.
       option_1: Si vous êtes nouveau sur OpenStreetMap, veuillez créer un nouveau

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index e46933f51a025faf46e787fcd0d54ed8a5c2b4de..badb30df9282de2038298a9f5ef3a19c35deafda 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -19,12 +19,17 @@ fy:
       diary_entry:
         create: Publisearje
         update: Bywurkje
+      issue_comment:
+        create: Reäksje taheakje
       message:
         create: Ferstjoere
       client_application:
         update: Bywurkje
       doorkeeper_application:
         update: Bywurkje
+      redaction:
+        create: Redigearring oanmeitsje
+        update: Redigearring bewarje
       trace:
         create: Oplade
         update: Feroarings bewarje
@@ -64,7 +69,7 @@ fy:
       way_tag: Linelebel
     attributes:
       diary_comment:
-        body: Tekst
+        body: Ynhâld
       diary_entry:
         user: Meidogger
         title: Underwerp
@@ -99,6 +104,8 @@ fy:
       report:
         category: Selektearje in reden foar jo melding
       user:
+        auth_provider: Autentifikaasje-oanbieder
+        auth_uid: Autentifikaasje-UID
         email: E-mail
         email_confirmation: Befêstiging e-mail
         new_email: Nij e-mailadres
@@ -112,6 +119,8 @@ fy:
         pass_crypt: Wachtwurd
         pass_crypt_confirmation: Wachtwurd befêstigje
     help:
+      trace:
+        tagstring: skaat mei komma's
       user:
         email_confirmation: Jo adres wurdt net publikelik toand; sjoch ús <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
           title="Privacybelied fan OSMF mei in stik oer e-mailadressen">Privacybelied</a>
@@ -281,7 +290,7 @@ fy:
         note: notysje
     timeout:
       title: Tiid ferrûn
-      sorry: Spitich, it opfreegjen fan 'e data foar %{type}-ID %{id} duorre te lang.
+      sorry: Spitich, it opheljen fan 'e data foar %{type}-ID %{id} duorre te lang.
       type:
         node: punt
         way: line
@@ -290,12 +299,12 @@ fy:
         note: notysje
     redacted:
       redaction: Redigearring %{id}
-      message_html: '%{type}-ferzje %{version} kin nei redaksje net werjûn wurde.
-        Sjoch %{redaction_link} foar ynformaasje.'
+      message_html: Ferzje %{version} fan %{type} kin nei redaksje net werjûn wurde.
+        Sjoch %{redaction_link} foar ynformaasje.
       type:
-        node: Punt
-        way: Line
-        relation: Relaasje
+        node: punt
+        way: line
+        relation: relaasje
     start_rjs:
       feature_warning: '%{num_features} skaaimerken wurde laden, wat jo webblêder
         traach meitsje kin of dat er net mear reägearret. Wolle jo wier dy data werjaan?'
@@ -303,6 +312,14 @@ fy:
       loading: Laden ...
     tag_details:
       tags: Lebels
+      wiki_link:
+        key: De wiki-beskriuwingsside foar it lebel %{key}
+        tag: De wiki-beskriuwingsside foar it lebel %{key}=%{value}
+      wikidata_link: It item %{page} op Wikidata
+      wikipedia_link: It artikel %{page} op 'e Wikipedy
+      wikimedia_commons_link: It bestân %{page} op Wikimedia Commons
+      telephone_link: '%{phone_number} skilje'
+      colour_preview: Proefbyld kleur %{colour_value}
     note:
       title: 'Notysje: %{id}'
       new_note: Nije notysje
@@ -352,6 +369,21 @@ fy:
       no_more_area: Gjin wizigingssets mear yn dizze krite.
       no_more_user: Gjin wizigingssets mear fan dizze meidogger.
       load_more: Mear lade
+    timeout:
+      sorry: Spitich, it opheljen fan 'e list wizigingssets dy't jo fregen duorre
+        te lang.
+  changeset_comments:
+    comment:
+      comment: 'Nije reäksje op wizigingsset #%{changeset_id} fan %{author}'
+      commented_at_by_html: Bywurke %{when} troch %{user}
+    comments:
+      comment: 'Nije reäksje op wizigingsset #%{changeset_id} fan %{author}'
+    index:
+      title_all: Oerlis oer OpenStreetMap-wizigingsset
+      title_particular: 'Oerlis oer OpenStreetMap-wizigingsset #%{changeset_id}'
+    timeout:
+      sorry: Spitich, it opheljen fan 'e list wizigingssetreäksjes dy't jo fregen
+        duorre te lang.
   dashboards:
     contact:
       km away: '%{count}km fuort'
@@ -389,6 +421,7 @@ fy:
       new_title: In nij stik yn myn meidoggerdeiboek skriuwe
       my_diary: Myn deiboek
       no_entries: Gjin deiboekstikken
+      recent_entries: Deiboekstikken fan koartby
       older_entries: Aldere stikken
       newer_entries: Nijere stikken
     edit:
@@ -402,6 +435,7 @@ fy:
       login: Meld jo oan
     no_such_entry:
       title: Deiboekstik ûnbekend
+      heading: 'Gjin stik mei ID: %{id}'
     diary_entry:
       posted_by_html: Pleatst troch %{link_user} op %{created} yn it %{language_link}.
       updated_at_html: Lêst bywurke op %{updated}.
@@ -440,7 +474,7 @@ fy:
     make_friend:
       heading: '%{user} as freon tafoegje?'
       button: As freon tafoegje
-      success: '%{name} is no jo freon!'
+      success: '%{name} is no jo freon(dinne)!'
       failed: Spitich, %{name} as freon tafoegjen mislearre.
       already_a_friend: Jo binne al freonen mei %{name}.
     remove_friend:
@@ -467,12 +501,19 @@ fy:
           station: Kabelbaanstasjon
         aeroway:
           aerodrome: Fleanfjild
+          airstrip: Lâningsstripe
           apron: Platfoarm
           gate: Gate
+          hangar: Hangaar
           helipad: Helyhaven
+          holding_position: Wachtposysje
+          navigationaid: Grûnljochten loftfeart
+          parking_position: Parkearposysje
           runway: Start-/lâningsbaan
+          taxilane: Taksystripe
           taxiway: Taksybaan
-          terminal: Terminal
+          terminal: Passazjiershal
+          windsock: Wynsek
         amenity:
           animal_boarding: Bistepinsjon
           animal_shelter: Biste-asyl
@@ -662,10 +703,16 @@ fy:
           railway: Histoaryske spoarwei
           roman_road: Romeinske wei
           ruins: Ruïne
+          rune_stone: Runestien
           stone: Stien
           tomb: Tombe
           tower: Toer
+          wayside_chapel: Weikapel
+          wayside_cross: Weikrús
+          wayside_shrine: Weiskryn
           wreck: Wrak
+        junction:
+          "yes": Krusing
         landuse:
           allotments: Folkstunen
           basin: Wetterbekken
@@ -792,6 +839,7 @@ fy:
           estate_agent: Makelder
           lawyer: Jurist
           ngo: Kantoar NGO
+          telecommunication: Tillekommunikaasjekantoar
           travel_agent: Reisburo
           "yes": Kantoar
         place:
@@ -819,7 +867,7 @@ fy:
           square: Plein
           state: Steat
           subdivision: Dielgebiet
-          suburb: Foarstêd
+          suburb: Stedsdiel
           town: Stêd
           village: Doarp
           "yes": Plak
@@ -932,6 +980,7 @@ fy:
         level7: Gemeentegrins
         level8: Stedsgrins
         level9: Doarpsgrins
+        level10: Stedsdielgrins
         level11: Buertgrins
       types:
         cities: Grutte stêden
@@ -949,8 +998,10 @@ fy:
     home: Nei jo fêste lokaasje
     logout: Ofmelde
     log_in: Oanmelde
+    log_in_tooltip: Oanmelde mei in besteand akkount
     sign_up: Ynskriuwe
     start_mapping: Set útein
+    sign_up_tooltip: In akkount foar bewurkjen oanmeitsje
     edit: Bewurkje
     history: Skiednis
     export: Eksportearje
@@ -1157,6 +1208,7 @@ fy:
     no_such_message:
       title: Berjocht ûnbekend
       heading: Berjocht ûnbekend
+      body: Spitich, der is gjin berjocht mei dy ID.
     outbox:
       title: Utfek
       my_inbox: Myn ynfek
@@ -1189,9 +1241,22 @@ fy:
       destroyed: Berjocht wiske
   passwords:
     lost_password:
+      title: Wachtwurd kwyt
+      heading: Wachtwurd fergetten?
       email address: 'E-mailadres:'
+      new password button: Nij wachtwurd
+      help_text: Folje it e-mailadres yn dat jo by it ynskriuwen brûkt hawwe. Wy stjoere
+        der dan in keppeling hinne dy't jo brûke kinne en stel jo wachtwurd op 'e
+        nij yn.
+      notice email on way: Spitich dat jo 'm kwyt binne :-( mar in e-mail is ûnderweis,
+        dat jo kinne gau in nijenien ynstelle.
+      notice email cannot find: Koe dat e-mailadres net fine, spitich.
     reset_password:
+      title: Nij wachtwurd
+      heading: Wachtwurd op 'e nij ynstelle foar %{user}
+      reset: Nij wachtwurd
       flash changed: Jo wachtwurd is feroare.
+      flash token bad: Haw dat bewiisteken net fûn, de URL efkes neisjen?
   preferences:
     show:
       title: Myn foarkarren
@@ -1396,7 +1461,7 @@ fy:
           - -taksybaan
           apron:
           - Lofthavenplatfoarm
-          - -terminal
+          - -passazjiershal
           admin: Bestjoerlike grins
           forest: Bosk
           wood: Wâld
@@ -1458,9 +1523,17 @@ fy:
       identifiable: Identifisearber (werjûn yn 'e trajektelist en as identifisearbere,
         oardere punten mei tiidstimpels)
     new:
+      upload_trace: GPS-trajekt oplade
+      visibility_help: wat betsjut dat?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Help
+      help_url: https://wiki.openstreetmap.org/wiki/Upload
+    create:
+      upload_trace: GPS-trajekt oplade
     edit:
       cancel: Annulearje
+      visibility_help: wat betsjut dat?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
       updated: Trajekt bywurke
     trace_optionals:
@@ -1590,7 +1663,7 @@ fy:
       edits: Bewurkings
       traces: Trajekten
       notes: Kaartnotysjes
-      remove as friend: Freon ôffiere
+      remove as friend: Freon ôf
       add as friend: Freon tafoegje
       mapper since: 'Kaartmakker sûnt:'
       ct status: 'Bydragersbetingsten:'
@@ -1627,6 +1700,7 @@ fy:
         heading: Bydragersbetingsten
         agreed: Jo binne akkoart gien mei de nije Bydragersbetingsten.
         not yet agreed: Jo binne noch net akkoart gien mei de nije Bydragersbetingsten.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: wat is dit?
       save changes button: Feroarings bewarje
     index:
@@ -1864,4 +1938,9 @@ fy:
     show:
       description: 'Beskriuwing:'
       user: 'Auteur:'
+  validations:
+    leading_whitespace: begjint mei wytromte
+    trailing_whitespace: einiget mei wytromte
+    invalid_characters: befettet ûnjildige tekens
+    url_characters: befettet spesjale URL-tekens (%{characters})
 ...

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 3dc2881870eed88b826de539a503f6ea948a3065..9b9b219a8794fc0831894c2edafcee667dfb6c9f 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -2479,6 +2479,7 @@ ko:
       no_authorization_code: 인증 코드가 없습니다.
       unknown_signature_algorithm: 알려지지 않은 인증 알고리즘
       invalid_scope: 잘못된 범위
+      unknown_error: 인증 실패
     auth_association:
       heading: 당신의 ID는 아직 OpenStreetMap 계정에 등록되지 않았습니다.
       option_1: 만약 당신이 OpenStreetMap에 처음이시면, 아래 양식을 사용해 새 계정을 만들어 주세요.

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 4a1b29a7891cbc4c1325627cb0edd54bcc00e72d..20edb15a33b5c53f2a26c6b16ed2c312c397af1d 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -2747,6 +2747,7 @@ mk:
       no_authorization_code: Нема код за овластување
       unknown_signature_algorithm: Непознат алгоритам на потпис
       invalid_scope: Неважечки делокруг
+      unknown_error: Заверката не успеа
     auth_association:
       heading: Вашата назнака сè уште не е здружена со сметка на OpenStreetMap.
       option_1: Доколку сте нови на OpenStreetMap, направете сметка користејќи го

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index f813dc7493c3fefc95324ef1303be98b4bcb56ec..2764e7546e2aadbda96257e3c36c30c2940ca46e 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -1505,4 +1505,6 @@ nqo:
       public editing:
         enabled link text: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
         disabled link text: ߡߎ߲߬ߠߊ߫ ߒߠߋ ߕߍ߫ ߛߋ߫ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߍ߫ ߟߊ߫؟
+    auth_failure:
+      unknown_error: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߓߘߊ߫ ߗߌߙߏ߲߫
 ...

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 06cee6c9b93ed5631d0f1fe3fa54e577573d18d5..1410164109a275235ec6de2ad07183ec292f0810 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -3062,7 +3062,7 @@ pl:
       queryfeature_disabled_tooltip: Przybliż mapę, aby obejrzeć dane obiektów
     changesets:
       show:
-        comment: Komentować
+        comment: Komentarz
         subscribe: Obserwuj
         unsubscribe: Nie obserwuj
         hide_comment: ukryj
@@ -3083,7 +3083,7 @@ pl:
         resolve: Oznacz jako rozwiązaną
         reactivate: Ponownie aktywuj
         comment_and_resolve: Skomentuj i rozwiąż
-        comment: Komentować
+        comment: Dodaj komentarz
     edit_help: Proszę przesunąć mapę i przybliżyć modyfikowane położenie, a następnie
       kliknąć tutaj.
     directions:

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index e02c65f9a608a12e27627892d44b91c0c698dbc8..c236bd80ac50d15b97b1a9f7aba96bdfd58a52f8 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -757,6 +757,7 @@ ru:
           loading_dock: Загрузочный док
           love_hotel: Отель любви
           marketplace: Рынок
+          mobile_money_agent: Агент мобильных денег
           monastery: Монастырь
           money_transfer: Перевод денег
           motorcycle_parking: Парковка для мотоциклов
@@ -883,6 +884,8 @@ ru:
           electrician: Электрик
           electronics_repair: Ремонт электроники
           gardener: Садовник
+          glaziery: Стекольщик
+          handicraft: Ремесло
           painter: Художник
           photographer: Фотограф
           plumber: Сантехник

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 65647a8146301bf02dc508400ab1d49d76de92d5..5e516eb11e46cf37bf23adc9b2be49ae607b96b1 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -23,6 +23,8 @@ sat:
       client_application:
         create: ᱧᱩᱛᱩᱢ ᱚᱞ
         update: ᱦᱟᱹᱞᱤᱭᱟᱹᱜ
+      doorkeeper_application:
+        update: ᱟᱹᱨᱩ ᱯᱷᱮᱨᱟᱣ
       trace:
         create: ᱞᱟᱫᱮ
         update: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱱᱪᱟᱣ ᱢᱮ

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 870d933c9a4b88a724526bef146f5a574294e656..7cc250ead2d3f5816070bf79ae0ca0745f788db3 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1974,11 +1974,10 @@ sv:
           och länka direkt till licenserna. I media där länkar ej är möjliga
           (t.ex. tryckt material), förslår vi att du hänvisar dina läsare till openstreetmap.org
           (förslagsvis genom att expandera 'OpenStreetMap' till hela denna adress), till opendatacommons.org, och om relevant till creativecommons.org.
-        credit_3_1_html: 'Kartrutorna i “standardstilen” på www.openstreetmap.org
+        credit_3_1_html: Kartrutorna i “standardstilen” på www.openstreetmap.org
           är ett producerat verk av OpenStreetMap Foundation med hjälp av OpenStreetMap-data
-          under licensen Open Database. Använder du dessa rutor, vänligen använd följande
-          erkännande: “Baskarta och data från OpenStreetMap och OpenStreetMap
-          Foundation”.'
+          under licensen Open Database. När du använder denna kartstil krävs samma
+          erkännande som för kartdata.
         credit_4_html: |-
           För en navigerbar elektronisk karta, ska källhänvisningen synas i ena hörnet av kartan.
           Till exempel:
@@ -2561,6 +2560,8 @@ sv:
       confirm_delete: Radera den här applikationen?
       client_id: Klient-ID
       client_secret: Klienthemlighet
+      client_secret_warning: Se till att spara denna hemlighet - den kommer inte vara
+        tillgänglig igen
       permissions: Behörigheter
       redirect_uris: Omdirigerings-URI:er
     not_found:
@@ -2780,6 +2781,7 @@ sv:
       no_authorization_code: Ingen behörighetskod
       unknown_signature_algorithm: Okänd signaturalgoritm
       invalid_scope: Ogiltiga omfattning
+      unknown_error: Autentisering misslyckades
     auth_association:
       heading: Ditt ID är inte associerat med ett OpenStreetMap-konto ännu.
       option_1: |-

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 6300a059d40d4e7dda68855fbfb662a6a4700bc2..ab3647e0685bbd1354071d2b159bfe117d2f089b 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -2822,6 +2822,7 @@ uk:
       no_authorization_code: Немає коду авторизації
       unknown_signature_algorithm: Невідомий алгоритм підпису
       invalid_scope: Недійсна область
+      unknown_error: Помилка автентифікації
     auth_association:
       heading: Ваш ID ще не пов'язаний з обліковим записом OpenStreetMap.
       option_1: Якщо ви вперше в OpenStreetMap – створіть новий обліковий запис, використовуючи

diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 322044caa14cadd745edd276c08337d991f145db..d54f87a7f4c90f1425d2c83a292b55202e7f4a94 100644 (file)
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -992,6 +992,9 @@ xmf:
         waterway:
           artificial: ხელუანური წყაროლინი
           canal: არხი
+  users:
+    auth_failure:
+      unknown_error: ავთენტიფიკაციაქ ვეგშართჷ
   user_blocks:
     show:
       created: 'გიჭყჷ:'