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

diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb
index 3af6fd3dc6339784fd23118b43495e438ed7b4f5..588aa1e86ae2918318518d6acc438771899f88fe 100644 (file)
--- a/app/assets/javascripts/edit/id.js.erb
+++ b/app/assets/javascripts/edit/id.js.erb
@@ -2,6 +2,7 @@ $(document).ready(function () {
   const id = $("#id-embed");
 
   if (id.data("configured") === false) {
+    // eslint-disable-next-line no-alert
     alert(I18n.t("site.edit.id_not_configured"));
     return;
   }

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 8ef067740d6025bc6ad0f0f988d69cfcb18f3baa..4555553ee7fb6868950d208a1b0233d2928d73f2 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -255,6 +255,7 @@ $(document).ready(function () {
       fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(5000) })
         .then(callback)
         .catch(function () {
+          // eslint-disable-next-line no-alert
           alert(I18n.t("site.index.remote_failed"));
         });
     }

diff --git a/app/assets/javascripts/index/directions-endpoint.js b/app/assets/javascripts/index/directions-endpoint.js
index 30d499ad731707b404dc1ca3448af2e215cfb7d7..3fdae7c5413560139ada1e4150957d84523da2c5 100644 (file)
--- a/app/assets/javascripts/index/directions-endpoint.js
+++ b/app/assets/javascripts/index/directions-endpoint.js
@@ -108,6 +108,7 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
       delete endpoint.geocodeRequest;
       if (json.length === 0) {
         input.addClass("is-invalid");
+        // eslint-disable-next-line no-alert
         alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value }));
         return;
       }

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 4b4f3d6515f3698370e74d2c92cc96b779b642ac..574c9b8b7d512ba745964711bd76f13fbe2f4631 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -40,6 +40,10 @@ class NotesController < ApplicationController
       @note = Note.visible.find(params[:id])
       @note_comments = @note.comments
     end
+
+    @note_includes_anonymous = @note.author.nil? || @note_comments.find { |comment| comment.author.nil? }
+
+    @note_comments = @note_comments.drop(1) unless !@note.author.nil? && @note.author.status == "deleted"
   rescue ActiveRecord::RecordNotFound
     render :template => "browse/not_found", :status => :not_found
   end

diff --git a/app/models/note.rb b/app/models/note.rb
index d37b863e53b5a77224375fc48990860144171cfe..807ee9ec8b99a7e021ac9ba8b46963c2f74cd2a8 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -94,7 +94,7 @@ class Note < ApplicationRecord
   # Return the note's description, derived from the first comment
   def description
     if user_ip.nil? && user_id.nil?
-      comments.first.body
+      all_comments.first.body
     else
       RichText.new("text", super)
     end
@@ -103,7 +103,7 @@ class Note < ApplicationRecord
   # Return the note's author object, derived from the first comment
   def author
     if user_ip.nil? && user_id.nil?
-      comments.first.author
+      all_comments.first.author
     else
       super
     end

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index 4f20cdd441a227329bc4fca28bcf572c3ad5d016..b65926b5f9df335fd7abbcfda573cfef93ad8c8c 100644 (file)
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -22,7 +22,7 @@
     </p>
   </div>
 
-  <% if @note_comments.find { |comment| comment.author.nil? } -%>
+  <% if @note_includes_anonymous -%>
     <p class='alert alert-warning'><%= t ".anonymous_warning" %></p>
   <% end -%>
 
@@ -52,10 +52,10 @@
     <% end %>
   </div>
 
-  <% if @note_comments.length > 1 %>
+  <% if @note_comments.length > 0 %>
     <div class='note-comments'>
       <ul class="list-unstyled">
-        <% @note_comments.drop(1).each do |comment| %>
+        <% @note_comments.each do |comment| %>
           <li id="c<%= comment.id %>">
             <small class='text-body-secondary'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
             <div class="mx-2">

diff --git a/config/eslint.js b/config/eslint.js
index 8307b15d6cc1a63dc49721560a0e3739587b2320..90040f7bfae41cdaf6e7deb55f79d4bc29d86e4f 100644 (file)
--- a/config/eslint.js
+++ b/config/eslint.js
@@ -86,7 +86,7 @@ module.exports = [
       "curly": ["error", "multi-line", "consistent"],
       "dot-notation": "error",
       "eqeqeq": ["error", "smart"],
-      "no-alert": "warn",
+      "no-alert": "error",
       "no-array-constructor": "error",
       "no-caller": "error",
       "no-console": "warn",

diff --git a/config/locales/af.yml b/config/locales/af.yml
index c8ace82236eca6361e30d24d09296a993e41c119..83823a4d126759d1591b09877d5d165ffd1d9c36 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1280,7 +1280,6 @@ af:
       reopened: Probleemstatus is op 'Oop' gestel
     comments:
       comment_from_html: Kommentaar van %{user_link} op %{comment_created_at}
-      reassign_param: Ken die probleem weer toe?
     reports:
       reported_by_html: As %{category} gerapporteer deur %{user} op %{updated_at}
     helper:

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 2055e06ceb6f2fa68e1655e6b1bed7439f365d46..e88bc8a93fa55219a51adba7eb8e76599324735d 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1509,7 +1509,6 @@ ar:
       reopened: تم تعيين حالة المشكلة إلى 'مفتوحة'
     comments:
       comment_from_html: التعليق من %{user_link} في %{comment_created_at}
-      reassign_param: إعادة تعيين المشكلة؟
     reports:
       reported_by_html: تم الإبلاغ عنه ك%{category} بواسطة %{user} في %{updated_at}
     helper:

diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 6296e9400974f1eaf0126316a14766187ece40b5..c05e6121d038acacf47722a2fd40316c54b83ee9 100644 (file)
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -573,10 +573,7 @@ arz:
       see_their_profile: يمكنك أن تشاهد ملفه الشخصى على %{userurl} وإضافته كصديق أيضًا
         إن كنت ترغب فى ذلك.
     gpx_failure:
-      failed_to_import: 'فشلت في الاستيراد كملف تعقب GPS. من فضلك تحقق من إن الملف
-        الخاص بك هو ملف GPX صالح أو أرشيف يحتوي على ملف (ملفات) GPX في الصيغة المُدعمة
-        (.tar.gz، .tar.bz2, .tar، .zip، .gpx.gz ، .gpx .bz2). ممكن يكون هناك مشكلة
-        في التنسيق أو النص مع ملفك؟ هيك خطأ التأمين:'
+      failed_to_import: شكله ملفك فشل في الاستيراد كمتابعة GPS.
       subject: '[خريطه الشارع المفتوحة] فشل استيراد جى بى إكس'
     gpx_success:
       subject: '[خريطه الشارع المفتوحة] نجاح استيراد جى بى إكس'

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 1dff4a175d2ddc96c78deb8aba4b731b30966e9e..a881c7504696a00aa49e588af36bc3fd48f9e5ff 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1119,7 +1119,6 @@ ast:
       reopened: L'estáu del problema pasó a «Abiertu»
     comments:
       comment_from_html: Comentariu de %{user_link} el %{comment_created_at}
-      reassign_param: ¿Volver a asinar el problema?
     reports:
       reported_by_html: Reportáu como %{category} por %{user} el %{updated_at}
     helper:

diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index 6b887205e39e1979b3b5a736aa42a895f7d63a1f..1d6204438de4afa9af33419895d856d6c3e4808b 100644 (file)
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -1481,7 +1481,6 @@ ba:
       reopened: Мәсьәлә статусы 'Асыҡ' тип ҡуйылған
     comments:
       comment_from_html: Фекер %{user_link} тарафынан %{comment_created_at} өҫтәлде
-      reassign_param: Мәсьәләне яңынан тәғәйенләргәме?
     reports:
       reported_by_html: '%{category} тип хәбәр ителгән, автор: %{user}, %{updated_at}
         көнө'

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 9dfa0aa9547720f32c15fbf23028dbc090791b3f..e44a820f6fa6dc50cf7b7f2dfcab2cebbc7bef7c 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -91,7 +91,7 @@ be-Tarask:
         support_url: URL-адрас падтрымкі
         allow_read_prefs: чытаць іх налады ўдзельніка
         allow_write_prefs: зьмяняць іх налады ўдзельніка
-        allow_write_diary: Ñ\81Ñ\82ваÑ\80аÑ\86Ñ\8c запÑ\96Ñ\81Ñ\8b Ñ\9e дзÑ\91нÑ\8cнÑ\96кÑ\83, камÑ\8dнÑ\82аÑ\80Ñ\8b Ñ\96 знаÑ\91мÑ\96Ñ\86Ñ\86а
+        allow_write_diary: Ñ\81Ñ\82ваÑ\80аÑ\86Ñ\8c запÑ\96Ñ\81Ñ\8b Ñ\96 камÑ\8dнÑ\82аÑ\80Ñ\8b Ñ\9e дзÑ\91нÑ\8cнÑ\96кÑ\83
         allow_write_api: зьмяняць мапу
         allow_read_gpx: чытаць іх прыватныя GPS-трэкі
         allow_write_gpx: загружаць GPS-трэкі
@@ -251,6 +251,7 @@ be-Tarask:
       title: Рэдагаваньне рахунку
       my settings: Мае налады
       current email address: Цяперашні адрас электроннай пошты
+      external auth: Вонкавая аўтэнтыфікацыя
       openid:
         link text: што гэта?
       contributor terms:
@@ -263,8 +264,13 @@ be-Tarask:
           набытак.
         link text: што гэта?
       save changes button: Захаваць зьмены
+      delete_account: Выдаліць уліковы запіс…
     go_public:
       heading: Публічнае рэдагаваньне
+      currently_not_public: Цяпер вашыя рэдагаваньні ананімныя, і людзі ня могуць
+        даслаць вам паведамленьні ці бачыць вашае знаходжаньне. Каб паказаць, што
+        вы рэдагавалі і дазволіць людзям зьвязвацца з вамі пра сайт, націсьніце кнопку
+        ніжэй.
       make_edits_public_button: Зрабіць усе мае рэдагаваньні публічнымі
     update:
       success_confirm_needed: Інфармацыя карыстальніка была абноўленая пасьпяхова.
@@ -887,10 +893,7 @@ be-Tarask:
     follow_notification:
       see_their_profile: Вы можаце прагледзець яго профіль на %{userurl}.
     gpx_failure:
-      failed_to_import: 'немагчыма імпартаваць як файл GPS-сьледу. Праверце, ці сапраўды
-        гэты файл ёсьць GPX альбо архівам з файлам(і) GPX падтрымліванага фармату
-        (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Магчыма, праблема з фарматам
-        ці сынтаксам вашага файлу? Памылка імпарту такая:'
+      failed_to_import: Падобна, што ваш файл не атрымалася імпартаваць як GPS-сьлед.
       subject: '[OpenStreetMap] памылка імпарту GPX'
     gpx_success:
       subject: '[OpenStreetMap] імпарт GPX адбыўся пасьпяхова'

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 3ec005ee67c6816bb57304fb13e99d99d8d7efc3..fb3d47023b560bfd72fa705123b043303cef4ce7 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1572,7 +1572,6 @@ be:
       reopened: Статус праблемы быў зменены на «Адкрыта»
     comments:
       comment_from_html: Каментарый ад %{user_link} у %{comment_created_at}
-      reassign_param: Пераназначыць праблему?
     reports:
       reported_by_html: Паведамлена як %{category} удзельнікам %{user} у %{updated_at}
     helper:

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 74d28315c7f732a1165a6b3b273ec854e06da4d5..ec87c510de708d5e03b9bf62263ebc7f4a51d85e 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1601,6 +1601,8 @@ bn:
       preview: প্রাকদর্শন
       help: সাহায্য
     pagination:
+      changeset_comments:
+        newer: নতুনতর মন্তব্য
       diary_comments:
         older: পুরাতন মন্তব্য
         newer: নতুনতর মন্তব্য
@@ -1973,6 +1975,7 @@ bn:
         title: '%{user}-এর কৃত দিনলিপি ভুক্তি'
       page:
         post: পোস্ট
+        comment: মন্তব্য
     suspended:
       title: অ্যাকাউন্ট স্থগিত করা হয়েছে
       heading: অ্যাকাউন্ট স্থগিত করা হয়েছে

diff --git a/config/locales/br.yml b/config/locales/br.yml
index c02eaa77f8d7ad01b4914619fe7d3735ba4520cc..755057128942bf1a20ad99da491bd994cc32761d 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -100,7 +100,7 @@ br:
         support_url: URL skoazell
         allow_read_prefs: lenn o fenndibaboù implijer.
         allow_write_prefs: kemmañ o fenndibaboù implijer.
-        allow_write_diary: krouiñ enmonedoù en deizlevr, addisplegoù ha kavout mignoned.
+        allow_write_diary: skrivit en ho teizlevr ha skrivit evezhiadennoù
         allow_write_api: kemmañ ar gartenn
         allow_read_gpx: lenn o roudoù GPS prevez
         allow_write_gpx: kas roudoù GPS
@@ -545,6 +545,8 @@ br:
       ways_paginated: Hentoù (%{x}-%{y} diwar %{count})
       relations: Darempredoù (%{count})
       relations_paginated: Darempredoù (%{x}-%{y} diwar %{count})
+    not_found_message:
+      sorry: 'Hon digarezit, n''eo ket bet kavet an hollad cheñchamantoù #%{id}.'
     timeout:
       sorry: Ho tigarez, re hir eo adtapout ar roll cheñchamantoù hoc'h eus goulennet.
   changeset_subscriptions:
@@ -568,13 +570,17 @@ br:
     popup:
       your location: Ho lec'hiadur
       nearby mapper: Kartennour en ardremez
+      following: O heuliañ
     show:
       title: Ma zaolenn-vourzh
       no_home_location_html: '%{edit_profile_link} ha termenit ho chomlec''h evit
         gwelout an implijerien en ardremez.'
       edit_your_profile: Aozañ ho profil
+      followings: Ma mignoned
+      no followings: N'emaoc'h o heuliañ den ebet c'hoazh.
       nearby users: 'Implijerien all tost deoc''h :'
       no nearby users: N'eus implijer ebet all en ardremez c'hoazh.
+      followed_changesets: Holladoù cheñchamantoù
       nearby_changesets: Strolladoù kemmoù an implijer tro-war-dro
       nearby_diaries: Enmonedoù deizlevr an implijerien tro-war-dro
   diary_entries:
@@ -585,6 +591,7 @@ br:
       use_map_link: Implijout ar gartenn
     index:
       title: Deizlevrioù an implijerien
+      title_followed: Deizlevrioù ho mignoned
       title_nearby: Deizlevrioù ar vignoned tost
       user_title: Deizlevr %{user}
       in_language_title: Enmontoù en deizlevr e %{language}
@@ -675,6 +682,20 @@ br:
       title: Fazi an arload
     not_found:
       title: N'eo ket bet kavet ar restr
+  follows:
+    show:
+      follow:
+        heading: Fellout a ra deoc'h heuliañ %{user}?
+        button: Heuliañ an implijer
+      unfollow:
+        heading: Fellout a ra deoc'h paouez da heuliañ %{user}?
+        button: Na heuliañ an implijer
+    create:
+      success: Emaoc'h o heuliañ %{name} bremañ!
+      already_followed: Emaoc'h o heuliañ %{name} dija.
+    destroy:
+      success: N'emaoc'h ket o heuliañ %{name} ken.
+      not_followed: N'emaoc'h ket o heuliañ %{name}.
   geocoder:
     search:
       title:
@@ -1526,7 +1547,6 @@ br:
       reopened: Stad ar gudenn zo bet lakaet e "Digor"
     comments:
       comment_from_html: Evezhiadenn gant %{user_link} war %{comment_created_at}
-      reassign_param: Adfiziout ar gudenn ?
     reports:
       reported_by_html: Disklêriet evel %{category} gant %{user} d'an %{updated_at}
     helper:
@@ -1633,6 +1653,13 @@ br:
       hi: Demat dit %{to_user},
       see_their_profile: 'Gallout a rit gwelet o frofil amañ : %{userurl}.'
       see_their_profile_html: 'Gallout a rit gwelet o frofil amañ : %{userurl}.'
+    gpx_details:
+      filename: Anv ar restr
+      url: URL
+      description: Deskrivadur
+      tags: Tikedennoù
+      total_points: Niver hollek ar poentoù
+      imported_points: Niver a boentoù enporzhiet
     gpx_failure:
       hi: Demat %{to_user},
       failed_to_import: 'n''en deus ket gallet bezañ enporzhiet. Setu amañ ar fazi
@@ -1748,6 +1775,7 @@ br:
       success: Kadarnaet eo ho kont, trugarez evit bezañ en em enskrivet !
       already active: Kadarnaet eo bet ar gont-mañ c'hoazh.
       unknown token: Diamzeret eo ar c'hod gwiriekaat pe n'eus ket anezhañ.
+      resend_button: Adkas ar postel kadarnaat
     confirm_resend:
       failure: N'eo ket bet kavet an implijer %{name}.
     confirm_email:
@@ -1942,6 +1970,9 @@ br:
       preview: Rakwelet
       help: Skoazell
     pagination:
+      changeset_comments:
+        older: Evezhiadennoù koshañ
+        newer: Evezhiadennoù nevesañ
       diary_comments:
         older: Evezhiadennoù koshañ
         newer: Evezhiadennoù nevesañ
@@ -2625,6 +2656,8 @@ br:
       edits: Kemmoù
       traces: roudoù
       notes: Notennoù kartenn
+      unfollow: Na heuliañ
+      follow: Heuliañ
       mapper since: 'Kartennour abaoe :'
       last map edit: 'Kemm diwezhañ ar gartenn:'
       no activity yet: Obererezh ebet c'hoazh
@@ -2706,8 +2739,16 @@ br:
       user:
         summary_html: '%{name} krouet eus %{ip_address} d''an %{date}'
         summary_no_ip_html: '%{name} krouet d''an %{date}'
+    comments:
+      index:
+        heading_html: Evezhiadennoù eus %{user}
+        changesets: Holladoù cheñchamantoù
+        no_comments: Evezhiadenn ebet
     changeset_comments:
+      index:
+        title: Kemennadennoù en holladoù cheñchamantoù skrivet gant %{user}
       page:
+        changeset: Hollad cheñchamantoù
         when: Pegoulz
         comment: Evezhiadenn
     diary_comments:
@@ -2715,6 +2756,8 @@ br:
         title: Kemennadennoù skrivet en deizlevr gant %{user}
       page:
         post: Embann
+        when: Pegoulz
+        comment: Evezhiadenn
     suspended:
       title: Kont arsavet
       heading: Kont arsavet
@@ -2938,6 +2981,8 @@ br:
       showing_page: Pajenn %{page}
       next: War-lerc'h
       previous: Kent
+    not_found_message:
+      sorry: 'Hon digarezit, n''eo ket bet kavet an notenn #%{id}.'
   javascripts:
     close: Serriñ
     share:

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index ffc88f6567e353b11177c8f6558146ddd40dfa4d..3c8efe05fae5c1bdf8e97218f77892351534c33c 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1508,7 +1508,6 @@ ca:
       reopened: L'estat de la incidència ha passat a "Oberta"
     comments:
       comment_from_html: Comentari de %{user_link} a %{comment_created_at}
-      reassign_param: Reassignar incidència?
     reports:
       reported_by_html: Denunciat com a %{category} per %{user} a %{updated_at}
     helper:

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 779fa591f5ce2fa6818d023a8b7ecb0abff45d33..c13d5969af8399b1619448f75ffdd452881d208a 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -1511,7 +1511,6 @@ ce:
       reopened: Проблеман статус гIотайира 'Хьайилина' чу
     comments:
       comment_from_html: Декъашхочуна коммент %{user_link} йина %{comment_created_at}
-      reassign_param: ДIахьажайай проблем?
     reports:
       reported_by_html: Иштта гайта йу %{category} дакъашхочу %{user}кхучохь %{updated_at}
     helper:

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 0a76eab2e92ce273001dc595c30e9144ab7524b5..a0f4188362990b5ee8dac37b426774cdc684ad60 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1669,7 +1669,6 @@ cs:
       reopened: Stav problému změněn na „Otevřeno”
     comments:
       comment_from_html: Komentář od %{user_link} z %{comment_created_at}
-      reassign_param: Znovu pověřit řešením problému?
     reports:
       reported_by_html: Nahlášeno jako %{category} uživatelem %{user} v %{updated_at}
     helper:

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 8ff98d7e6c557d2db888613938b8abfaee91021b..0a91fdefa92a72cc459bf18d959ad0c479ba600b 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1611,7 +1611,6 @@ cy:
       reopened: Mae statws y mater wedi'i osod i 'Agored'
     comments:
       comment_from_html: Sylw gan %{user_link} ar %{comment_created_at}
-      reassign_param: Ailbennu'r Mater?
     reports:
       reported_by_html: Adroddwyd fel %{category} gan %{user} ar %{updated_at}
     helper:

diff --git a/config/locales/da.yml b/config/locales/da.yml
index e007915bedc3dc46ab2b20c153a7befef80c74a3..9de9654f7b111936c0aead90ec68c71af11a465b 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1579,7 +1579,7 @@ da:
       reports: Rapporter
       last_updated: Sidst opdateret
       last_updated_time_ago_user_html: '%{time_ago} af %{user}'
-      reporter_users: Rapporterende brugere
+      reporting_users: Anmeldende brugere
       reports_count:
         one: '%{count} rapport'
         other: '%{count} rapporter'
@@ -1618,7 +1618,8 @@ da:
       reopened: Sagens status er blevet sat til 'Åben'
     comments:
       comment_from_html: Kommentar fra %{user_link} skrevet %{comment_created_at}
-      reassign_param: Tildel sagen igen?
+      reassign_to_moderators: Overgiv problem til moderatorer
+      reassign_to_administrators: Overgiv problem til administratorer
     reports:
       reported_by_html: Rapporteret som %{category} af %{user} den %{updated_at}
     helper:
@@ -3157,6 +3158,7 @@ da:
       open_title: 'Uløst bemærkning #%{note_name}'
       closed_title: 'Løst bemærkning #%{note_name}'
       hidden_title: 'Skjult bemærkning #%{note_name}'
+      description_when_author_is_deleted: slettet
       event_opened_by_html: Oprettet af %{user} %{time_ago}
       event_opened_by_anonymous_html: Oprettet af anonym %{time_ago}
       event_commented_by_html: Kommentar fra %{user} %{time_ago}

diff --git a/config/locales/de.yml b/config/locales/de.yml
index e6344830cc56b009fb1551186f8dc3b75e1e04d1..59a66354839eb0fb7d941cafdc421db3f5a30022 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1683,7 +1683,6 @@ de:
       reports: Meldungen
       last_updated: Zuletzt aktualisiert
       last_updated_time_ago_user_html: '%{time_ago} von %{user}'
-      reporter_users: Reporter-Benutzer
       reports_count:
         one: Eine Meldung
         other: '%{count} Meldungen'
@@ -1722,7 +1721,6 @@ de:
       reopened: Der Problemstatus wurde auf „Offen“ geändert
     comments:
       comment_from_html: Kommentar von %{user_link} erstellt am %{comment_created_at}
-      reassign_param: Problem erneut zuweisen?
     reports:
       reported_by_html: Gemeldet als %{category} von %{user} bei %{updated_at}
     helper:

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 1aec9c3a504cd4f168b46932ad190b354dfb52d0..7c48cafcb753606687f253f53fa88a0bb835ce18 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -459,6 +459,7 @@ el:
       feature_warning: Η φόρτωση %{num_features} χαρακτηριστικών ενδέχεται να καταστήσει
         τον περιηγητή σας αργό ή να μην αντιδρά. Σίγουρα θέλετε να εμφανίσετε αυτά
         τα δεδομένα;
+      feature_error: 'Δεν ήταν δυνατή η φόρτωση των χαρακτηριστικών: %{message}'
       load_data: Φόρτωση δεδομένων
       loading: Φόρτωση...
     tag_details:
@@ -1611,6 +1612,7 @@ el:
       reports_count:
         one: '%{count} Αναφορά'
         other: '%{count} Αναφορές'
+      more_reporters: και %{count} ακόμη
       reported_item: Αναφερόμενο στοιχείο
       states:
         ignored: Παραβλέφθηκε
@@ -1646,7 +1648,6 @@ el:
       reopened: Η κατάσταση του ζητήματος έχει οριστεί σε 'Ανοιχτό'
     comments:
       comment_from_html: Σχόλιο από %{user_link} γραμμένο στις %{comment_created_at}
-      reassign_param: Επανανάθεση ζητήματος;
     reports:
       reported_by_html: Αναφέρθηκε ως %{category} από %{user} στις %{updated_at}
     helper:

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 25794cc9fde873a5d041605d5f2db5efa7bf005a..7b2be6a0cb63180d6a2a1376550d2688d2d7fc40 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -836,7 +836,7 @@ en:
           census: "Census Boundary"
           national_park: "National Park"
           political: "Electoral Boundary"
-          protected_area : "Protected Area"
+          protected_area: "Protected Area"
           "yes": "Boundary"
         bridge:
           aqueduct: "Aqueduct"
@@ -987,7 +987,7 @@ en:
           turning_circle: "Turning Circle"
           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
-          "yes" : "Road"
+          "yes": "Road"
         historic:
           aircraft: "Historic Aircraft"
           archaeological_site: "Archaeological Site"
@@ -1167,7 +1167,7 @@ en:
           trench: "Trench"
           "yes": "Military"
         mountain_pass:
-          "yes" : "Mountain Pass"
+          "yes": "Mountain Pass"
         natural:
           atoll: "Atoll"
           bare_rock: "Bare Rock"

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index bd692caa74f73e691b930af69b03772b5d580110..315ac45f4d77abd975d1f70e8f4e1085362b8874 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -432,6 +432,7 @@ eo:
     start_rjs:
       feature_warning: Ŝarĝanta %{num_features} objektojn, kiuj povas igi vian foliumilon
         malrapida aŭ nerespondebla. Ĉu vi certe volas montri tiujn ĉi datumojn?
+      feature_error: 'Ne povis enlegi objektojn: %{message}'
       load_data: Elŝuti datumojn
       loading: Ŝargado…
     tag_details:
@@ -1573,6 +1574,7 @@ eo:
       reports_count:
         one: '%{count} raporto'
         other: '%{count} raportoj'
+      more_reporters: kaj %{count} pli
       reported_item: Objekto raportita
       states:
         ignored: Ignorita
@@ -1607,7 +1609,6 @@ eo:
       reopened: Problemo estas malfermita
     comments:
       comment_from_html: Komento fare de %{user_link} je %{comment_created_at}
-      reassign_param: Ĉu reasigni problemon?
     reports:
       reported_by_html: Raportita kiel %{category} fare de %{user} je %{updated_at}
     helper:

diff --git a/config/locales/es.yml b/config/locales/es.yml
index e0592a87b3ce610e18a64b2baaaaeb7e61735f93..222a0e4ff694afbe20a31fed0225b7775541d567 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1663,7 +1663,6 @@ es:
       reopened: El estado de la incidencia se ha establecido a 'Abierto'.
     comments:
       comment_from_html: Comentario de %{user_link} en %{comment_created_at}
-      reassign_param: ¿Quiere reasignar la incidencia?
     reports:
       reported_by_html: Denunciado como %{category} por %{user} en %{updated_at}
     helper:

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index c7ce429d51fc0ed5f973a8fbfb4e1dff85f0cc8b..e8bb3355e1cf7a9dcd8946ca796bb63b5e528b97 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1475,7 +1475,6 @@ eu:
       reopened: Arazoaren egoera 'Irekita' dela ezarri da
     comments:
       comment_from_html: '%{user_link} erabiltzailearen iruzkina %{comment_created_at}(e)an'
-      reassign_param: Arazoa biresleitu?
     reports:
       reported_by_html: '%{user} erabiltzaileak %{category} gisa salatua. Data: %{updated_at}'
     helper:

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index fb523f63b738808c9f92f74a54855a47138781b1..5e36a2c4e2d1e550859f5885f8d985358907f75b 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1361,6 +1361,7 @@ fa:
       reports_count:
         one: '%{count} گزارش'
         other: '%{count} گزارش'
+      more_reporters: و %{count} مورد بیشتر
       reported_item: مورد گزارش‌شده
     show:
       reports:
@@ -1387,7 +1388,6 @@ fa:
       reopened: وضعیت مسئله روی «باز» تنظیم شد
     comments:
       comment_from_html: نظر از %{user_link} در %{comment_created_at}
-      reassign_param: مشکل تخصیص مجدد؟
     reports:
       reported_by_html: در %{updated_at}،‏ %{user} به‌عنوان %{category} گزارشش کرد
     helper:
@@ -2185,7 +2185,7 @@ fa:
     scopes:
       read_prefs: خواندن ترجیحات کاربری
       write_prefs: تغییر ترجیحات کاربری
-      write_diary: ایجاد روزنوشت، نظردهی و افزودن دوست
+      write_diary: ایجاد روزنوشت و نظردهی
       write_api: اصلاح نقشه
       read_gpx: خواندن ردهای جی‌پی‌اس خصوصی
       write_gpx: بارگذاری ردهای جی‌پی‌اس

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 56f392b433e192ca12e6dec25a13b3f5065ac98d..4154c37a8a6bf3c164e99695dedac63047ca9c67 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1451,7 +1451,6 @@ fi:
       reopened: Tapaus on merkitty käsittelyssä olevaksi
     comments:
       comment_from_html: Kommentti käyttäjältä %{user_link} %{comment_created_at}
-      reassign_param: Haluatko määrittää tapauksen tilan uudelleen?
     reports:
       reported_by_html: Käyttäjä %{user} ilmiantanut merkinnällä %{category} %{updated_at}
     helper:

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index c189db11b7df9fa1fbf8ba75e0dd53d2d7d41df2..650ecec4a3c215496d1def96b1c7beb7c20a90e4 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -491,8 +491,6 @@ fit:
       ignored: Tapaus oon markeerattu aiheettomaksi
     reopen:
       reopened: Tapaus oon markeerattu käsittelyssä olevaksi
-    comments:
-      reassign_param: Halvaakko määrittää tapauksen tilan uuesti?
     reports:
       reported_by_html: Käyttäjä %{user} ilmiantanut merkinnällä %{category}
     helper:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 30be25d1785f84c28014546e3120e59a84ddcc28..8ba5143569cd7d1a3b6dbdbed4e4b10f5e11c352 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1734,7 +1734,6 @@ fr:
       reopened: L’état du problème a été mis à « Ouvert »
     comments:
       comment_from_html: Commentaire de %{user_link} sur %{comment_created_at}
-      reassign_param: Réaffecter le problème ?
     reports:
       reported_by_html: Signalé comme %{category} par %{user} le %{updated_at}
     helper:

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 17a85d5e86cf6f5f7ab7c31d32c19738ef1a4424..0863dbe55f88f2c3c0c4714f16373ee82b9dd4c9 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1364,7 +1364,6 @@ fy:
       reopened: De probleemstatus is op 'Iepen' set
     comments:
       comment_from_html: Reäksje fan %{user_link} op %{comment_created_at}
-      reassign_param: Probleem weryndiele?
     reports:
       reported_by_html: Meld as %{category} troch %{user} op %{updated_at}
     helper:

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index fe46865fc351f9b0c10556eccce06458b89385aa..3e176070c4b9e80b04c0812ec3d762af1d73abfa 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -989,8 +989,6 @@ ga:
       ignored: Stádas na faidhbe socraithe go 'Neamhaird'
     reopen:
       reopened: Stádas na faidhbe socraithe go 'Oscailte'
-    comments:
-      reassign_param: Athshann an Fhadhb?
   reports:
     new:
       disclaimer:

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index e677b49c10b5eaa3057347f077e2c6d822d7a7c9..aa761d9f66f9db8369dbb51909284add968a3590 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -433,6 +433,7 @@ gl:
     start_rjs:
       feature_warning: Cargando %{num_features} funcións, que poden facer que o teu
         navegador sexa lento ou non responda. Queres mostrar estes datos?
+      feature_error: 'Non se puideron cargar as funcións: %{message}'
       load_data: Cargar os datos
       loading: Cargando...
     tag_details:
@@ -1582,6 +1583,7 @@ gl:
       reports_count:
         one: '%{count} denuncia'
         other: '%{count} denuncias'
+      more_reporters: e %{count} máis
       reported_item: Elemento denunciado
       states:
         ignored: Ignorado
@@ -1616,7 +1618,6 @@ gl:
       reopened: O estado da incidencia mudou a "Aberta"
     comments:
       comment_from_html: Comentario de %{user_link} no %{comment_created_at}
-      reassign_param: Reasignar o erro?
     reports:
       reported_by_html: Denunciado coma %{category} por %{user} o %{updated_at}
     helper:

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 742bd726f7b954cec084b184ef3aa2b226cbf971..4a995d157e9535daa45208975e44774bd26518b9 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1610,7 +1610,6 @@ he:
       reopened: מצב הבעיות שונה ל„פתוחה”
     comments:
       comment_from_html: תגובה מאת %{user_link} על %{comment_created_at}
-      reassign_param: להקצות את הבעיה מחדש?
     reports:
       reported_by_html: דווח בתור %{category} על־ידי %{user} ב־%{updated_at}
     helper:

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 948af6ff266f96e71dd6444a3e4b82afd3998c0b..7cae4d1bcb6f1824e25ee3b0015157ac9b4f02bb 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -1398,7 +1398,6 @@ hsb:
       reopened: Status problema je so změnił na „wočinjene“
     comments:
       comment_from_html: Komentar wužiwarja %{user_link} wot %{comment_created_at}
-      reassign_param: Problem znowa připokazać?
     reports:
       reported_by_html: Zdźěleny jako %{category} wot %{user} %{updated_at}
     helper:

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 372f7faae3a6a438acb72711fd85a45f26c35b14..6909dc59b332a9eb40ba2a9cfe0df459efef8a92 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1571,7 +1571,6 @@ hu:
       reopened: 'A probléma állapota átállítva a következőre: „nyitott”'
     comments:
       comment_from_html: '%{user_link} hozzászólása (%{comment_created_at})'
-      reassign_param: Probléma újrakiadása?
     reports:
       reported_by_html: '%{user} bejelentette %{category} kategóriájúként ekkor: %{updated_at}'
     helper:

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 90dcb1bffb1aca29170370cdc29702076a4b3b5a..52d7fc9510b17d7b75e5b59f6733671090bf566f 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1592,7 +1592,6 @@ ia:
       reopened: Le stato del problema ha essite cambiate a 'Aperte'
     comments:
       comment_from_html: Commento de %{user_link} del %{comment_created_at}
-      reassign_param: Reassignar problema?
     reports:
       reported_by_html: Reportate como %{category} per %{user} le %{updated_at}
     helper:

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 3d9165fc07ba3f8a6824c8fc8c69f0480317294e..bb76da2ea16561ec0af13b0d5bb90e52f0b209ce 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1481,7 +1481,6 @@ id:
       reopened: Status isu telah diset ke 'Terbuka'
     comments:
       comment_from_html: Komentar dari %{user_link} pada %{comment_created_at}
-      reassign_param: Tugaskan Kembali Masalah?
     reports:
       reported_by_html: Dilaporkan sebagai %{category} oleh %{user} pada %{updated_at}
     helper:

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 805a3069ee3e8b11bd94294c2458610ef33aeeff..133538cc581076c74c99ca2826949cc447716462 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1537,7 +1537,6 @@ is:
       reopened: Staða vandamáls hefur verið sett á 'Opið'
     comments:
       comment_from_html: Athugasemd frá %{user_link} gerð %{comment_created_at}
-      reassign_param: Endurúthluta vandamáli?
     reports:
       reported_by_html: Tilkynnt sem %{category} af %{user} þann %{updated_at}
     helper:

diff --git a/config/locales/it.yml b/config/locales/it.yml
index f3561e59ce3c608833e6ca118a5ef78f7f6d5245..c147303be73b814caad24f8f3bfd9b11c3e2649f 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1660,7 +1660,6 @@ it:
       reopened: Lo stato del problema è stato impostato su ‘Aperto’
     comments:
       comment_from_html: Commento di %{user_link} il %{comment_created_at}
-      reassign_param: Riassegnare il problema?
     reports:
       reported_by_html: Segnalato come %{category} da %{user} il %{updated_at}
     helper:

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index b990b01b369e1bdf95acd2be0ad5b3da0c164590..a096c58a55294580d06835a6b323fa7db6b87610 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -118,6 +118,7 @@ ja:
       message: メッセージ
       node: ノード
       node_tag: ノードのタグ
+      note: メモ
       old_node: 古いノード
       old_node_tag: 古いノードのタグ
       old_relation: 古いリレーション
@@ -148,7 +149,7 @@ ja:
         support_url: サポート URL
         allow_read_prefs: 利用者設定を読み込む
         allow_write_prefs: 利用者設定を変更する
-        allow_write_diary: 日記エントリを作成する・コメントする・友達を作る
+        allow_write_diary: 日記エントリを作成する・コメントする
         allow_write_api: 地図を変更する
         allow_read_gpx: 非公開GPSトレースを読み込む
         allow_write_gpx: GPSトレースをアップロードする
@@ -351,6 +352,7 @@ ja:
         readable_summary: 人間が読める要約
         informal_translations: 非公式の翻訳
         continue: 続行
+        cancel: キャンセル
         you need to accept or decline: 続行するには新しい協力者規約を読んで承諾または拒否してください。
         legale_select: 'お住まいの国:'
         legale_names:
@@ -455,6 +457,8 @@ ja:
       view_redacted_data: 編集されたデータを表示
       view_redaction_message: 編集メッセージを表示
   nodes:
+    not_found_message:
+      sorry: 'ノード #%{id} は見つかりませんでした。'
     timeout:
       sorry: 申し訳ありませんが、ノードのデータ（id %{id}）は、時間がかかりすぎたため取得できませんでした。
   old_nodes:
@@ -463,6 +467,8 @@ ja:
     timeout:
       sorry: 申し訳ありませんが、ID %{id} の履歴データは時間がかかりすぎたため取得できませんでした。
   ways:
+    not_found_message:
+      sorry: 'ウェイ #%{id} は見つかりませんでした。'
     timeout:
       sorry: 申し訳ありませんが、ウェイのデータ（id %{id}）は時間がかかりすぎたため取得できませんでした。
   old_ways:
@@ -471,6 +477,8 @@ ja:
     timeout:
       sorry: 申し訳ありませんが、ウェイの履歴データ（id %{id}）は時間がかかりすぎたため取得できませんでした。
   relations:
+    not_found_message:
+      sorry: 'リレーション #%{id} は見つかりませんでした。'
     timeout:
       sorry: 申し訳ありませんが、リレーションのデータ（id %{id}）は時間がかかりすぎたため取得できませんでした。
   old_relations:
@@ -537,6 +545,8 @@ ja:
       ways_paginated: ウェイ (%{x}-%{y} / %{count})
       relations: リレーション (%{count}件)
       relations_paginated: リレーション (%{x}-%{y} / %{count})
+    not_found_message:
+      sorry: '変更セット #%{id} は見つかりませんでした。'
     timeout:
       sorry: 申し訳ありませんが、要求した変更セットの一覧は時間がかかりすぎたため取得できませんでした。
   changeset_subscriptions:
@@ -567,6 +577,8 @@ ja:
       edit_your_profile: プロフィールの編集
       nearby users: 周辺にいるその他の利用者
       no nearby users: あなたの活動地域周辺に他のマッパーはいないようです。
+      followed_changesets: 変更セット
+      followed_diaries: 日記エントリ
       nearby_changesets: 周辺の利用者の変更セット
       nearby_diaries: 周辺の利用者の日記エントリ
   diary_entries:
@@ -1540,7 +1552,6 @@ ja:
       reopened: 問題の状態は「未解決」に設定されました
     comments:
       comment_from_html: '%{comment_created_at} の %{user_link} さんからのコメント'
-      reassign_param: 問題を再度、割り当てますか？
     reports:
       reported_by_html: '%{user}による %{category} として%{updated_at}に報告済み'
     helper:
@@ -1641,8 +1652,7 @@ ja:
       see_their_profile_html: '%{userurl} でプロフィールを閲覧できます。'
     gpx_failure:
       hi: こんにちは、%{to_user} さん。
-      failed_to_import: 'GPS トレース ファイルとしてインポートできませんでした。ファイルが有効な GPXファイル、または、GPX ファイルを含む圧縮ファイル（対応形式は.tar.gz,
-        .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2）であることを確認してください。ファイルの形式または構造に問題がある可能性があります。エラー内容は次の通りです:'
+      failed_to_import: ファイルをGPS トレースとしてインポートできませんでした。
       more_info: GPXインポートの失敗とその回避方法についての詳細は、%{url}に記載されています。
       more_info_html: GPXインポートの失敗とその回避方法についての詳細は、%{url}に記載されています。
       subject: '[OpenStreetMap] GPX インポートに失敗'
@@ -1826,6 +1836,14 @@ ja:
   preferences:
     show:
       title: 個人設定
+      site_color_schemes:
+        auto: 自動
+        light: ライト
+        dark: ダーク
+      map_color_schemes:
+        auto: 自動
+        light: ライト
+        dark: ダーク
       save: 設定の更新
     update:
       failure: 設定を更新できませんでした。
@@ -1897,6 +1915,9 @@ ja:
       preview: プレビュー
       help: ヘルプ
     pagination:
+      changeset_comments:
+        older: 古いコメント
+        newer: 新しいコメント
       diary_comments:
         older: 古いコメント
         newer: 新しいコメント
@@ -2442,7 +2463,7 @@ ja:
       openid: OpenStreetMapを使用してログイン
       read_prefs: 利用者設定の読み込み
       write_prefs: 利用者設定の変更
-      write_diary: 日記エントリを作成する・コメントする・友達を作る
+      write_diary: 日記エントリを作成する・コメントする
       write_api: マップの修正
       read_gpx: 非公開GPSトレースを読む
       write_gpx: GPSトレースをアップロードする
@@ -2859,10 +2880,10 @@ ja:
         fossgis_osrm_foot: 徒歩(OSRM)
         graphhopper_bicycle: 自転車(GraphHopper)
         graphhopper_car: 自動車(GraphHopper)
-        graphhopper_foot: 歩行(GraphHopper)
+        graphhopper_foot: 徒歩(GraphHopper)
         fossgis_valhalla_bicycle: 自転車(Valhalla)
         fossgis_valhalla_car: 自動車(Valhalla)
-        fossgis_valhalla_foot: 歩行(Valhalla)
+        fossgis_valhalla_foot: 徒歩(Valhalla)
       descend: 下り坂
       directions: 方向
       distance: 距離

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 60949e64046cec258add75b1869658d310b51662..5d63bf21575ff7af7505b27bb33a672aa5a0a882 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1484,7 +1484,6 @@ ko:
       reopened: 이슈 상태가 '열림'으로 설정되었습니다
     comments:
       comment_from_html: '%{comment_created_at}에 %{user_link}님의 댓글'
-      reassign_param: 이슈를 다시 할당하시겠습니까?
     reports:
       reported_by_html: '%{updated_at}에 %{user}님이 %{category} 분류로 보고함'
     helper:

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index fb54e55ffec88f6f44434337e0fec81e3629d6c3..0bc1a2191fced0e328e8200917833cadbc91c346 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -1420,7 +1420,6 @@ ku-Latn:
       reopened: Rewşa pirsgirêk wekî "Vekirî" hat eyarkirin
     comments:
       comment_from_html: Şîrove ji %{user_link} li ser %{comment_created_at}
-      reassign_param: Bila pirsgirêk ji nû ve bê tayînkirin?
     reports:
       reported_by_html: Ji aliyê %{user} ve wekî %{category} hat raporkirin li ser
         %{updated_at}

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index b65dc29e52616d9c42303add9196df2f9eeadb5a..ead60fb80b99d1bb5cf4afad6b36eaaa476540f5 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -256,8 +256,8 @@ lb:
         agreed: Dir hutt den neien Bedéngungen fir Matwierkender zougestëmmt.
         not yet agreed: Dir hutt den neien Bedéngungen fir Matwierkender nach net
           zougestëmmt.
-        review link text: Follegt w.e.g. dëssem Link fir déi nei Bedéngungen fir Matwierkender
-          ze gesinn an ze akzeptéieren.
+        review link text: Gitt wgl. dësem Link no fir déi nei Bedéngunge fir Matwierkender
+          ze gesinn an z'akzeptéieren.
         agreed_with_pd: Dir hudd och deklaréiert dass Dir Är Ännerungen der Öffentlechkeet
           zur Verfügung stellt (Public Domain).
         link text: wat ass dëst?
@@ -1456,6 +1456,7 @@ lb:
       reports_count:
         one: '%{count} Bericht'
         other: '%{count} Berichter'
+      more_reporters: a(n) %{count} méi
       reported_item: Gemellten Objet
       states:
         ignored: Ignoréiert
@@ -1486,7 +1487,6 @@ lb:
       reopened: De Problemstatus gouf op „Oppe“ geännert
     comments:
       comment_from_html: Commentaire vun %{user_link} erstallt den %{comment_created_at}
-      reassign_param: Problem op en Neits zouweisen?
     reports:
       reported_by_html: Gemellt als %{category} vun %{user} den %{updated_at}
     helper:
@@ -1749,8 +1749,8 @@ lb:
       back_to_inbox: Zréck an de Postagang
     create:
       message_sent: Message geschéckt
-      limit_exceeded: Dir hutt a leschter Zäit vill Messagen geschéckt. Waart w.e.g.
-        eng Zäit ier Dir probéiert méi ze schécken.
+      limit_exceeded: Dir hutt a leschter Zäit vill Messagë geschéckt. Waart wgl.
+        eng Zäit, ier Dir probéiert nach méi ze schécken.
     no_such_message:
       title: Kee sou ee Message
       heading: Kee sou ee Message
@@ -1901,9 +1901,9 @@ lb:
       logout_button: Ofmellen
     suspended_flash:
       suspended: Äre Kont gouf leider wéinst verdächtegen Aktivitéite suspendéiert.
-      contact_support_html: Kontaktéiert w.e.g. %{support_link} wann Dir dëst diskutéiere
-        wëllt.
-      support: support
+      contact_support_html: Kontaktéiert wgl. de %{support_link}, wann Dir doriwwer
+        diskutéiere wëllt.
+      support: Support
   shared:
     markdown_help:
       headings: Iwwerschrëften
@@ -2356,6 +2356,7 @@ lb:
       traces: Spueren
       notes: Notizen op der Kaart
       no activity yet: Nach keng Aktivitéit
+      uid: 'Benotzer-ID:'
       email address: 'E-Mail-Adress:'
       status: 'Status:'
       role:

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 37ae4edb716d74b46c904bef89e006d8560088ad..29d3f403efa7533a0174adf0d0a9ac2ca9fd111a 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1530,7 +1530,6 @@ lt:
       reopened: Problemos būsena pakeista į „Atvira“
     comments:
       comment_from_html: '%{user_link} komentavo %{comment_created_at}'
-      reassign_param: Iš naujo priskirti problemą?
     reports:
       reported_by_html: Pranešta kaip %{category} naudotojo %{user} %{updated_at}
     helper:

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index ff8e971378b425477be2697eeac531c524a0e926..8451befcea25bc8b328f9b70302cacc5b403f280 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -20,6 +20,7 @@
 # Author: Raitisx
 # Author: Ruila
 # Author: Silraks
+# Author: Soshial
 # Author: Treisijs
 # Author: Ttdnet
 ---
@@ -929,14 +930,15 @@ lv:
           isolated_dwelling: Izolēta Mājvieta
           locality: Vieta
           municipality: Pašvaldība
-          neighbourhood: Pilsētas rajons
+          neighbourhood: Maza apkaime
           plot: Sižets
           postcode: Pasta indekss
+          quarter: Apkaime
           region: Reģions
           sea: Jūra
           state: Štats
           subdivision: Subdivīzija
-          suburb: Piepilsēta
+          suburb: Pilsētas apgabals
           town: Pilsēta
           village: Ciems
           "yes": Vieta
@@ -1117,7 +1119,7 @@ lv:
         level7: Pašvaldības robeža
         level8: Pilsētas robeža
         level9: Ciema robeža
-        level10: Priekšpilsētas robeža
+        level10: Pilsētas apgabala robeža
         level11: Apkaimes robeža
     results:
       no_results: Nav atrasts neviens rezultāts

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 0257cc4eeb43a3c14f30b8a6f13f25eb92c3be05..a74c5333624aa219d892465ad6d0212c179e8287 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1564,7 +1564,6 @@ mk:
       reopened: Состојбата на проблемот е поставена како „Отворено“
     comments:
       comment_from_html: Коментар од %{user_link} на %{comment_created_at}
-      reassign_param: Да го предоделам проблемот?
     reports:
       reported_by_html: Пријавено како %{category} од %{user} на %{updated_at}
     helper:

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index b67bd1db3b16b1b7a30662e8dd68fbb0b3766e90..deea7747b6adfcbe539d75fd4cba452674613e10 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1297,7 +1297,6 @@ nb:
       reopened: Saksstatus har blitt satt til 'Åpen'
     comments:
       comment_from_html: Kommentar fra %{user_link} %{comment_created_at}
-      reassign_param: Omtildele sak?
     reports:
       reported_by_html: Reportert som %{category} av %{user} %{updated_at}
     helper:

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d23780f2ab2a2a83d424727be9b9ce70299f862f..bb05cc61517d939dea54210fceeaa115f4614092 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -511,13 +511,14 @@ nl:
     not_found_message:
       sorry: 'Knooppunt #%{id} kon helaas niet gevonden worden.'
     timeout:
-      sorry: Het ophalen van de gegevens voor het ID %{id} duurde te lang.
+      sorry: Het ophalen van de gegevens voor het knooppunt met ID %{id} duurde te
+        lang.
   old_nodes:
     not_found_message:
       sorry: 'Sorry, knooppunt #%{id} versie %{version} kon niet gevonden worden.'
     timeout:
-      sorry: Het ophalen van de gegevens voor knooppunt met het ID %{id} duurde te
-        lang.
+      sorry: Het ophalen van de geschiedenis voor het knooppunt met ID %{id} duurde
+        te lang.
   ways:
     not_found_message:
       sorry: 'Weg #%{id} kon helaas niet gevonden worden.'
@@ -533,7 +534,7 @@ nl:
     not_found_message:
       sorry: 'Relatie #%{id} kon helaas niet gevonden worden.'
     timeout:
-      sorry: Het ophalen van de relatie met het ID %{id} duurde te lang.
+      sorry: Het ophalen van de gegevens voor de relatie met ID %{id} duurde te lang.
   old_relations:
     not_found_message:
       sorry: 'Sorry, relatie #%{id} versie %{version} kon niet gevonden worden.'
@@ -1655,7 +1656,6 @@ nl:
       reopened: De status van het probleem is ingesteld op 'Open'
     comments:
       comment_from_html: Reactie van %{user_link} op %{comment_created_at}
-      reassign_param: Probleem opnieuw toewijzen?
     reports:
       reported_by_html: Als %{category} gerapporteerd door %{user} op %{updated_at}
     helper:

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index f9ec23dc1fba10f9022992d6331242c13c0b9246..d100f49df51c6c8b6129af6226b87305afdb6deb 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1351,7 +1351,6 @@ nn:
       reopened: Stoda på saka har vorte sett til «Open»
     comments:
       comment_from_html: Kommentar frå %{user_link}, skriven %{comment_created_at}
-      reassign_param: Omdeleger saka?
     reports:
       reported_by_html: Meld som %{category} av %{user}, %{updated_at}
     helper:

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 88812243ad50a79a811515398ab25fe052cd2dc4..9c93b876c14a1a6bbf519aad0c71000cc56ec4d3 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1376,7 +1376,6 @@ oc:
       reopened: L'estat de l'incidéncia s'es establit en 'Dobèrt'.
     comments:
       comment_from_html: Comentari de %{user_link} sus %{comment_created_at}
-      reassign_param: Reasignar l’Incidéncia?
     reports:
       reported_by_html: Raportat coma %{category} per %{user} lo %{updated_at}
     helper:

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 9c6e1102ec9d2705016c4295e65295d4f4b6cdba..97ad657e088b6ecb6cb4bb0e502ae810d14a92d7 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -91,7 +91,7 @@ pa:
         support_url: ਮਦਦ URL
         allow_read_prefs: ਉਹਨਾਂ ਦੀਆਂ ਵਰਤੋਂਕਾਰ ਤਰਜੀਹਾਂ ਨੂੰ ਪੜ੍ਹੋ
         allow_write_prefs: ਉਹਨਾਂ ਦੀਆਂ ਵਰਤੋਂਕਾਰ ਤਰਜੀਹਾਂ ਨੂੰ ਸੋਧੋ
-        allow_write_diary: ਰà©\8bà¨\9c਼ਨਾਮà¨\9aਾ ਦਰà¨\9c਼ à¨\95ਰà©\8b, à¨\9fਿੱਪਣà©\80à¨\86à¨\82 à¨\95ਰà©\8b à¨\85ਤà©\87 ਦà©\8bਸਤ ਬਣਾà¨\93
+        allow_write_diary: ਰà©\8bà¨\9c਼ਨਾਮà¨\9aਾ à¨\87ੰਦਰਾà¨\9c à¨\85ਤà©\87 à¨\9fਿੱਪਣà©\80à¨\86à¨\82 ਦਰà¨\9c਼ à¨\95ਰà©\8b
         allow_write_api: ਨਕਸ਼ੇ ਨੂੰ ਬਦਲੋ
         allow_read_gpx: ਉਹਨਾਂ ਦੇ ਨਿੱਜੀ GPS ਖੁਰਾ-ਖੋਜ ਪੜ੍ਹੋ
         allow_write_gpx: GPS ਖੁਰਾ-ਖੋਜ ਜੋੜੋ
@@ -1885,7 +1885,7 @@ pa:
       openid: OpenStreetMap ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਦਾਖਲ ਹੋਵੋ
       read_prefs: ਵਰਤੋਂਕਾਰ ਤਰਜੀਹਾਂ ਪੜ੍ਹੋ
       write_prefs: ਵਰਤੋਂਕਾਰ ਤਰਜੀਹਾਂ ਸੋਧੋ
-      write_diary: ਰà©\8bà¨\9c਼ਨਾਮà¨\9aਾ ਦਰà¨\9c਼ à¨\95ਰà©\8b, à¨\9fਿੱਪਣà©\80à¨\86à¨\82 à¨\95ਰà©\8b à¨\85ਤà©\87 ਦà©\8bਸਤ ਬਣਾà¨\93
+      write_diary: ਰà©\8bà¨\9c਼ਨਾਮà¨\9aਾ à¨\87ੰਦਰਾà¨\9c à¨\85ਤà©\87 à¨\9fਿੱਪਣà©\80à¨\86à¨\82 ਦਰà¨\9c਼ à¨\95ਰà©\8b
       write_api: ਨਕਸ਼ੇ ਨੂੰ ਬਦਲੋ
       read_gpx: ਨਿੱਜੀ GPS ਖੁਰਾ-ਖੋਜ ਪੜ੍ਹੋ
       write_gpx: GPS ਖੁਰਾ-ਖੋਜ ਜੋੜੋ

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3712d0e42263bd53967d3d3475cfaa13c19e86ce..459bbe6160b54cb64e5505afc61e4b8fa66b1a25 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1711,7 +1711,6 @@ pl:
       reopened: Status sprawy został ustawiony na „Otwarta”
     comments:
       comment_from_html: Komentarz od %{user_link} z %{comment_created_at}
-      reassign_param: Przydzielić sprawę?
     reports:
       reported_by_html: Zgłoszone %{updated_at} jako %{category} przez %{user}
     helper:

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 594808b91e08f3e881f87dd922c1d82d8ff9ccab..4cb337ff6d8023ebb11be0c7cabb95f674b8133f 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1604,7 +1604,6 @@ pt-PT:
       reopened: O estado do problema foi alterado para 'Aberto'
     comments:
       comment_from_html: Comentário de %{user_link} em %{comment_created_at}
-      reassign_param: Reatribuir o problema?
     reports:
       reported_by_html: Denunciado como %{category} por %{user} em %{updated_at}
     helper:

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 9e32f458c6e34b418c253fdf5f6ac2830f11b089..c2abc7cddc9e24ae4cb5e6c3614842a1343fa2d3 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1621,7 +1621,6 @@ pt:
       reopened: O status do problema foi definido como "Aberto"
     comments:
       comment_from_html: Comentário de %{user_link} em %{comment_created_at}
-      reassign_param: Reatribuir problema?
     reports:
       reported_by_html: Denunciado como %{category} por %{user} em %{updated_at}
     helper:

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 4cd541f672c193830accbce8377e01167666d7f5..3f466fe180d7155135d98e9e3d744c232c1a9e62 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1528,7 +1528,6 @@ ro:
       reopened: Starea problemei a fost setată la 'Deschis'
     comments:
       comment_from_html: Comentariu de la %{user_link} pe %{comment_created_at}
-      reassign_param: Realocați problema?
     reports:
       reported_by_html: Raportat %{category} de %{user} pe %{updated_at}
     helper:

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 8da1c2400a387e5140b816e39b34638202663dc1..04f1d259fe42cc4ca24f71b6d230ce46cdbbad74 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1712,7 +1712,6 @@ ru:
       reopened: Статус проблемы был установлен в "Открыто"
     comments:
       comment_from_html: Комментарий участника %{user_link}, созданный %{comment_created_at}
-      reassign_param: Переназначить проблему?
     reports:
       reported_by_html: Указано как %{category} пользователем %{user} %{updated_at}
     helper:
@@ -3141,6 +3140,8 @@ ru:
       anonymous_warning_sign_up: зарегистрироваться
       counter_warning_guide_link:
         url: https://wiki.openstreetmap.org/wiki/RU:%D0%A0%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE_%D0%BD%D0%BE%D0%B2%D0%B8%D1%87%D0%BA%D0%B0
+      counter_warning_forum_link:
+        url: https://community.openstreetmap.org/
       advice: Ваша заметка является общедоступной и может использоваться для обновления
         карты, поэтому не вводите личную информацию, информацию из защищённых авторскими
         правами карт или справочников.

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 11de24943beb48040556bfeb572c838cccfc027d..7737433f8ba6394c3d3db24240cdaaf6c41f7fe1 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1469,7 +1469,6 @@ sc:
       reopened: S'istadu de su problema est istadu impostadu comente ‘Abertu'
     comments:
       comment_from_html: Cummentu de %{user_link} de su %{comment_created_at}
-      reassign_param: Torrare a assignare su problema?
     reports:
       reported_by_html: Sinnaladu comente %{category} dae %{user} su %{updated_at}
     helper:

diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index 1c8284a7808593031340c6cac40a781202412dea..08fc951a5c27dc1ed37a0795f35867ef9f5d8199 100644 (file)
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -1327,6 +1327,9 @@ skr-arab:
       my profile: میݙی پروفائل
       my settings: میݙیاں ترتیباں
       my comments: میݙے تبصرے
+    comments:
+      index:
+        no_comments: کوئی تبصرہ کائنی
     changeset_comments:
       page:
         when: کڈݨ

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 9aa4e06547f1ba67944d6ffef8541819af2de340..2da7df0750f7d3c71e0ff7395fd09d090eb573a3 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1537,7 +1537,6 @@ sl:
       reopened: Stanje težave je nastavljeno na »Odprto«
     comments:
       comment_from_html: Komentar uporabnika %{user_link} dne %{comment_created_at}
-      reassign_param: Želite predodeliti težavo?
     reports:
       reported_by_html: Sporočil_a %{user} kot %{category} dne %{updated_at}
     helper:

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 05915f2284869028e42d2da3b0e1bc8af9635c71..4b2a052dc78073f50a3b7271a160d551b97d849e 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -834,8 +834,6 @@ sq:
       ignored: Statusi i lëshimit është vendosur në 'Injoruar'
     reopen:
       reopened: Statusi i lëshimit është vendosur në 'të hapur'
-    comments:
-      reassign_param: Problemi i ri-caktimit
   reports:
     new:
       disclaimer:

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 717716290b97fe23eb9089d889235c5c35f2ce57..ec8eebef9cc9531ae73f370ce3086755c81bd551 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -136,7 +136,7 @@ sv:
         support_url: Supportadress
         allow_read_prefs: läs deras användaralternativ
         allow_write_prefs: ändra deras användaralternativ
-        allow_write_diary: skapa dagboksinlägg, kommentarer och hitta vänner.
+        allow_write_diary: skapa dagboksinlägg och kommentarer
         allow_write_api: ändra kartan
         allow_read_gpx: läs deras privata GPS-spår
         allow_write_gpx: ladda upp GPS-spår
@@ -461,6 +461,7 @@ sv:
       feature_warning: Laddar %{num_features} kartkomponenter, vilket kan göra din
         webbläsare långsam eller få den att sluta svara. Är du säker på att du vill
         visa denna data?
+      feature_error: 'Funktionerna kunde inte laddas in: %{message}'
       load_data: Ladda data
       loading: Läser in …
     tag_details:
@@ -540,6 +541,7 @@ sv:
       title: Ändringsuppsättningar
       title_user: Ändringsuppsättningar av %{user}
       title_user_link_html: Ändringsuppsättningar av %{user_link}
+      title_followed: Ändringsuppsättning efter följande
       title_nearby: Ändringsuppsättningar av närbelägna användare
       empty: Inga ändringsuppsättningar hittades.
       empty_area: Inga ändringsuppsättningar i det här området.
@@ -610,14 +612,19 @@ sv:
     popup:
       your location: Din position
       nearby mapper: Användare i närheten
+      following: Följare
     show:
       title: Min kontrollpanel
       no_home_location_html: '%{edit_profile_link} och sätt din hemposition för att
         se närliggande användare.'
       edit_your_profile: Redigera din profil
+      followings: Följare
+      no followings: Du följare ännu inga andra användare.
       nearby users: Andra användare nära dig
       no nearby users: Det är ännu inga andra användare som uppgett att de kartlägger
         nära dig.
+      followed_changesets: ändringsuppsättningar
+      followed_diaries: dagboksanteckning
       nearby_changesets: närbelägna användares ändringsuppsättningar
       nearby_diaries: närbelägna användares dagboksinlägg
   diary_entries:
@@ -628,6 +635,7 @@ sv:
       use_map_link: Använd karta
     index:
       title: Användardagböcker
+      title_followed: Följares dagböcker
       title_nearby: Närbelägna användares dagböcker
       user_title: '%{user}s dagbok'
       in_language_title: Dagboksinlägg på %{language}
@@ -747,6 +755,23 @@ sv:
       title: Filen hittades inte
       description: Det gick inte att hitta en fil/katalog/API-operation med det namnet
         på OpenStreetMap-servern (HTTP 404)
+  follows:
+    show:
+      follow:
+        heading: Vill du följa %{user}?
+        button: Följ användare
+      unfollow:
+        heading: Vill du sluta följa %{user}?
+        button: Sluta följa användare
+    create:
+      success: Du följer nu %{name}!
+      failed: Tyvärr misslyckades din begäran att följa %{name}.
+      already_followed: Du följer redan %{name}.
+      limit_exceeded: Du har följt många användare den senaste tiden. Vänta ett tag
+        innan du försöker följa någon mer.
+    destroy:
+      success: Du slutade följa %{name}.
+      not_followed: Du följer inte %{name}.
   geocoder:
     search:
       title:
@@ -1572,6 +1597,7 @@ sv:
       reports_count:
         one: '%{count} rapport'
         other: '%{count} rapporter'
+      more_reporters: och %{count} till
       reported_item: Rapporterat objekt
       states:
         ignored: Ignorerad
@@ -1606,7 +1632,6 @@ sv:
       reopened: Ärendestatus har ändrats till "Öppen"
     comments:
       comment_from_html: Kommentar från %{user_link} på %{comment_created_at}
-      reassign_param: Återtilldela ärende?
     reports:
       reported_by_html: Rapporterades som %{category} av %{user} den %{updated_at}
     helper:
@@ -1717,14 +1742,20 @@ sv:
         meddelande till författaren på %{replyurl}
     follow_notification:
       hi: Hej %{to_user},
+      subject: '[OpenStreetMap] %{user} följde dig'
+      followed_you: '%{user} följer dig nu på OpenStreetMap.'
       see_their_profile: Du kan se deras profil på %{userurl}.
       see_their_profile_html: Du kan se deras profil på %{userurl}.
+      follow_them: Du kan också följa dem på %{followurl}.
+      follow_them_html: Du kan också följa dem på %{followurl}.
     gpx_details:
       details: 'Dina fildetaljer:'
       filename: Filnamn
       url: Webbadress
       description: Beskrivning
       tags: Taggar
+      total_points: Totalt antal poäng
+      imported_points: Antalet importerade poäng
     gpx_failure:
       hi: Hej %{to_user},
       failed_to_import: Det verkade som att din fil inte kunde importeras som ett
@@ -1740,6 +1771,7 @@ sv:
       subject: '[OpenStreetMap] Misslyckades importera GPX'
     gpx_success:
       hi: Hej %{to_user},
+      imported_successfully: Det ser ut som att din fel har importerats som ett GPS-spår.
       all_your_traces: Alla dina uppladdade GPX-spår finns på %{url}
       all_your_traces_html: Alla dina framgångsrikt uppladdade GPX-spår finns på %{url}.
       subject: '[OpenStreetMap] Lyckades importera GPX'
@@ -2048,6 +2080,9 @@ sv:
       preview: Förhandsgranska
       help: Hjälp
     pagination:
+      changeset_comments:
+        older: Äldre kommentarer
+        newer: Nyare kommentarer
       diary_comments:
         older: Äldre kommentarer
         newer: Nyare kommentarer
@@ -2741,7 +2776,7 @@ sv:
       openid: Logga in med OpenStreetMap
       read_prefs: Läs användaralternativ
       write_prefs: Ändra användaralternativ
-      write_diary: Skapa dagboksinlägg, kommentarer och hitta vänner.
+      write_diary: Skapa dagboksanteckning och kommentarer
       write_api: Ändra kartan
       read_gpx: Läs privata GPS-spår
       write_gpx: Ladda upp GPS-spår
@@ -2870,6 +2905,8 @@ sv:
       edits: Redigeringar
       traces: Spår
       notes: Kartanteckningar
+      unfollow: Sluta följa
+      follow: Följ
       mapper since: 'Karterar sedan:'
       last map edit: 'Senaste kartredigering:'
       no activity yet: Ännu ingen aktivitet
@@ -2944,8 +2981,17 @@ sv:
       user:
         summary_html: '%{name} skapades från %{ip_address} den %{date}'
         summary_no_ip_html: '%{name} skapad den %{date}'
+    comments:
+      index:
+        heading_html: '%{user}s kommentarer'
+        changesets: Ändringsuppsättningar
+        diary_entries: Dagboksanteckningar
+        no_comments: Inga kommentarer
     changeset_comments:
+      index:
+        title: Kommentarer till ändringsuppsättning tillagda av %{user}
       page:
+        changeset: Ändringsuppsättning
         when: När
         comment: Kommentar
     diary_comments:
@@ -2953,6 +2999,8 @@ sv:
         title: Dagbokskommentarer tillagda av %{user}
       page:
         post: Inlägg
+        when: När
+        comment: Kommentar
     suspended:
       title: Kontot avstängt
       heading: Kontot avstängt
@@ -3162,10 +3210,20 @@ sv:
       intro: Upptäckt ett misstag eller något som saknas? Låt andra karterare veta
         så att vi kan fixa det. Flytta markören till rätt position och skriv in en
         kommentar som förklarar problemet.
-      anonymous_warning_html: Du är inte inloggad. %{log_in} eller %{sign_up} om du
-        vill få uppdateringar för din anteckning.
+      anonymous_warning_html: Du är inte inloggad. %{log_in} eller %{sign_up} för
+        att få uppdateringar för din anteckning och hjälpa kartläggare lösa det.
       anonymous_warning_log_in: logga in
       anonymous_warning_sign_up: registrera dig
+      counter_warning_html: Du har redan postat minst %{x_anonymous_notes}, det är
+        bra för gemenskapen, tack! Nu uppmuntrar vi dig att %{contribute_by_yourself},
+        det är inte så komplicerat, och %{community_can_help}.
+      x_anonymous_notes:
+        one: '%{count} anonym anteckning'
+        other: '%{count} anonyma anteckningar'
+      counter_warning_guide_link:
+        text: bidra själv
+      counter_warning_forum_link:
+        text: gemenskapen kan hjälpa dig
       advice: Din anteckning är offentlig och kan användas för att uppdatera kartan,
         så skriv inte personuppgifter eller information från upphovsrättsligt skyddade
         kartor eller kataloger.

diff --git a/config/locales/te.yml b/config/locales/te.yml
index edcdce0aa1fef4e7289350a9b72f245e854a812a..b30d15c866e7fe1389c0cf075053c19e8bce4b1b 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -1340,7 +1340,6 @@ te:
       reopened: అంశం స్థితిని 'తెరిచి ఉన్న' అని పెట్టాం
     comments:
       comment_from_html: '%{comment_created_at} %{user_link} చేసిన వ్యాఖ్య'
-      reassign_param: అంశాన్ని తిరిగి కేటాయించాలా?
     reports:
       reported_by_html: '%{user} %{updated_at} న %{category} అని ఫిర్యాదు చేసారు'
     helper:

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 9d6d402b612b6547b0d00193e8298ee25f3cc485..81476d6821f2a20100fb422c68e8020368798e33 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1445,7 +1445,6 @@ th:
       reopened: สถานะปัญหาได้ถูกตั้งค่าเป็น 'เปิด'
     comments:
       comment_from_html: ความคิดเห็นจาก %{user_link} เมื่อ %{comment_created_at}
-      reassign_param: กำหนดปัญหาใหม่หรือไม่
     reports:
       reported_by_html: รายงานเป็น %{category} โดย %{user} เมื่อ %{updated_at}
     helper:

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index aaed64210a87677c404604d2d92fbe616e81297d..c647bd18315e24176777f0362db0541072f49f39 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1112,8 +1112,6 @@ tl:
       ignored: Kalagayan ng isyu ay nakatakda bilang 'Hindi pinansin'
     reopen:
       reopened: Kalagayan ng isyu ay nakatakda bilang 'Bukas'
-    comments:
-      reassign_param: Muling italaga ang isyu?
     reports:
       reported_by_html: Naiulat bilang %{category} ni %{user} noong %{updated_at}
     helper:

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 111630be491c97f19fb9a914d9c19ebe3ec90c0e..2ab8e7d3f85fbbdd382006c4b880a0d34e718dfe 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1619,7 +1619,6 @@ tr:
       reopened: Sorun durumu 'Aç' olarak ayarlandı
     comments:
       comment_from_html: '%{comment_created_at} tarihinde %{user_link} üzerinden yorum'
-      reassign_param: Sorunu Yeniden Ata?
     reports:
       reported_by_html: '%{updated_at} tarihinde %{user} tarafından %{category} olarak
         bildirildi'

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index d54a3cf528e77e19b8635b92ace8cfaeab76d413..25fafdf9e6325c8e79cd908c679aaae69f38520a 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -498,6 +498,7 @@ uk:
       feature_warning: Завантаження %{num_features} об’єктів, може призвести до уповільнення
         або неможливості роботи вашого оглядача. Ви справді бажаєте переглянути ці
         дані?
+      feature_error: 'Обʼєкти не вдалося завантажити: %{message}'
       load_data: Завантажити дані
       loading: Завантаження…
     tag_details:
@@ -1647,6 +1648,7 @@ uk:
         few: '%{count} Скарги'
         many: '%{count} Скарг'
         other: ""
+      more_reporters: і ще %{count}
       reported_item: Про що
       states:
         ignored: Проігноровано
@@ -1683,7 +1685,6 @@ uk:
       reopened: Статус проблеми був змінений на 'Відкрито'
     comments:
       comment_from_html: Коментар від %{user_link}, %{comment_created_at}
-      reassign_param: Перепризначити звернення?
     reports:
       reported_by_html: Повідомлено як %{category}, %{user}, %{updated_at}
     helper:
@@ -2142,6 +2143,9 @@ uk:
       preview: Попередній перегляд
       help: Довідка
     pagination:
+      changeset_comments:
+        older: Старіші коментарі
+        newer: Нові коментарі
       diary_comments:
         older: Старіші коментарі
         newer: Нові коментарі
@@ -3051,8 +3055,17 @@ uk:
       user:
         summary_html: '%{name} зареєстровано з %{ip_address}, %{date}'
         summary_no_ip_html: '%{name} зареєстровано %{date}'
+    comments:
+      index:
+        heading_html: Коментарі %{user}
+        changesets: Набори змін
+        diary_entries: Записи щоденника
+        no_comments: Немає коментарів
     changeset_comments:
+      index:
+        title: Коментарі до набору змін додані %{user}
       page:
+        changeset: Набір змін
         when: Коли
         comment: Коментар
     diary_comments:
@@ -3060,6 +3073,8 @@ uk:
         title: Коментарі до щоденника додав %{user}
       page:
         post: Повідомлення
+        when: Коли
+        comment: Коментар
     suspended:
       title: Обліковий запис призупинено
       heading: Обліковий запис призупинено

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 0508588f9c44843b5f2fdf901523bbfff130bd48..3cbd8f3beb09d6c82e6b99d927a67954ab0dcc56 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1446,7 +1446,6 @@ vi:
       reopened: Trạng thái vấn đề được đánh dấu là “Mở”
     comments:
       comment_from_html: Bình luận của %{user_link} vào %{comment_created_at}
-      reassign_param: Chỉ định lại Vấn đề?
     reports:
       reported_by_html: Báo cáo là %{category} bởi %{user} vào %{updated_at}
     helper:

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 03bd6202446d899b603ab2440484b00f451871ab..029cf0da42773a1be703fc6402dc0c51a25a4359 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -171,7 +171,7 @@ zh-CN:
         support_url: 支持 URL
         allow_read_prefs: 读取其用户设置
         allow_write_prefs: 修改其用户偏好
-        allow_write_diary: 创建日记文章、评论并结交朋友。
+        allow_write_diary: 创建日记和评论
         allow_write_api: 修改地图
         allow_read_gpx: 读取他们的私人GPS轨迹
         allow_write_gpx: 上传GPS轨迹
@@ -612,6 +612,7 @@ zh-CN:
       edit_your_profile: 编辑你的档案
       nearby users: 其他附近的用户
       no nearby users: 附近没有在进行制图的用户。
+      followed_changesets: 变更集
       nearby_changesets: 附近用户的变更集
       nearby_diaries: 附近用户的日记文章
   diary_entries:
@@ -1596,7 +1597,6 @@ zh-CN:
       reopened: 问题状态已设置为“开放”
     comments:
       comment_from_html: '%{user_link}于%{comment_created_at}发表的评论'
-      reassign_param: 要重新分配问题吗？
     reports:
       reported_by_html: 由%{user}在%{updated_at}报告为%{category}
     helper:
@@ -2546,7 +2546,7 @@ zh-CN:
       openid: 使用 OpenStreetMap 登录
       read_prefs: 阅读用户首选项
       write_prefs: 修改用户首选项
-      write_diary: 创建日记、评论和交朋友
+      write_diary: 创建日记和评论
       write_api: 修改地图
       read_gpx: 读取私人GPS轨迹
       write_gpx: 上传GPS轨迹
@@ -2734,8 +2734,13 @@ zh-CN:
       user:
         summary_html: '%{name}在%{date}从%{ip_address}创建'
         summary_no_ip_html: '%{name} 创建于 %{date}'
+    comments:
+      index:
+        changesets: 变更集
+        no_comments: 没有评论
     changeset_comments:
       page:
+        changeset: 变更集
         when: 时间
         comment: 评论
     diary_comments:

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index aad7bfc043c7fa8126cba3e172d93372a9f5fbf3..a25f8d0c317d45614a0776a800b71b4ddddbea39 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1549,7 +1549,6 @@ zh-TW:
       reopened: 問題狀態已設定成「開啟」
     comments:
       comment_from_html: 由 %{user_link} 於 %{comment_created_at} 發表的評論
-      reassign_param: 重新指派問題？
     reports:
       reported_by_html: 由 %{user} 於 %{updated_at} 回報為 %{category}
     helper:

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index f10dc9ba1c50b1721f9d660e9b2ada1f651b3d8f..e695dbb4342449a88d197b7a941c8e93b375b8db 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -7919,7 +7919,8 @@
     }
 }
 
-.ideditor img.tile-removing {
+.ideditor .layer-background img.tile-removing,
+.ideditor .map-in-map-background img.tile-removing {
     opacity: 0;
     z-index: 1;
     mix-blend-mode: normal;

diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index bd1f5a5ddbe6811066ed7995b852e3e156dc75d9..add1166ba8130e52e6176961090d13bd1ebf8f1c 100644 (file)
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -21616,7 +21616,7 @@
   // package.json
   var package_default = {
     name: "iD",
-    version: "2.31.0",
+    version: "2.31.1",
     description: "A friendly editor for OpenStreetMap",
     main: "dist/iD.min.js",
     repository: "github:openstreetmap/iD",