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

diff --git a/Gemfile b/Gemfile
index 17f6cc7918088f087c7e4121241785e1db2a0720..7fbe56280076d9cf8f237769a7e1d0d1da916501 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -146,7 +146,7 @@ group :test do
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
-  gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2
+  gem "rubocop-rails"
   gem "rubocop-rake"
   gem "selenium-webdriver", "~> 3.142.7"
   gem "simplecov", :require => false

diff --git a/Gemfile.lock b/Gemfile.lock
index 42a6a3524607581fe78a56c5b60bd42370809568..6d9878656e8cd4d29857e48ca1e914635dc7a347 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,17 +77,17 @@ GEM
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.522.0)
-    aws-sdk-core (3.121.5)
+    aws-partitions (1.525.0)
+    aws-sdk-core (3.122.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.520.1)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.50.0)
-      aws-sdk-core (~> 3, >= 3.121.2)
+    aws-sdk-kms (1.51.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.104.0)
-      aws-sdk-core (~> 3, >= 3.121.2)
+    aws-sdk-s3 (1.105.1)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
@@ -121,8 +121,8 @@ GEM
     bzip2-ffi (1.1.0)
       ffi (~> 1.0)
     cancancan (3.3.0)
-    canonical-rails (0.2.12)
-      rails (>= 4.1, < 6.2)
+    canonical-rails (0.2.13)
+      rails (>= 4.1, <= 7.0)
     capybara (3.36.0)
       addressable
       matrix
@@ -233,11 +233,11 @@ GEM
     globalid (0.5.2)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
-    hashie (4.1.0)
+    hashie (5.0.0)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.0)
       i18n (>= 0.6.6)
@@ -328,7 +328,7 @@ GEM
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
-    omniauth-oauth2 (1.7.1)
+    omniauth-oauth2 (1.7.2)
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
     omniauth-openid (2.0.1)
@@ -417,14 +417,14 @@ GEM
       rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
+    rubocop-ast (1.13.0)
       parser (>= 3.0.1.1)
     rubocop-minitest (0.15.2)
       rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.12.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.11.3)
+    rubocop-rails (2.12.4)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -564,7 +564,7 @@ DEPENDENCIES
   rubocop
   rubocop-minitest
   rubocop-performance
-  rubocop-rails (~> 2.11.3)
+  rubocop-rails
   rubocop-rake
   sanitize
   sassc-rails

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 6803c761eabeaf015a88c854124e400fc0ff6f86..acab663bc991c6e75a779f025c0be8e4a14d4e7d 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -1,4 +1,4 @@
-<% content_for :head, tag(:meta, :name => :robots, :content => :noindex) %>
+<% content_for :head, tag.meta(:name => :robots, :content => :noindex) %>
 <% content_for :heading do %>
   <div <% if @user %> id="userinformation"<% end %>>
     <% if @user %>

diff --git a/app/views/layouts/_meta.html.erb b/app/views/layouts/_meta.html.erb
index dc08424f36a69432bd1c7d6993dcfc4711102896..2052b1d64135f802f873ca3a2595a666e81837c6 100644 (file)
--- a/app/views/layouts/_meta.html.erb
+++ b/app/views/layouts/_meta.html.erb
@@ -7,19 +7,19 @@
 <%= favicon_link_tag "favicon-96x96.png", :rel => "icon", :sizes => "96x96", :type => "image/png" %>
 <%= favicon_link_tag "android-chrome-192x192.png", :rel => "icon", :sizes => "192x192", :type => "image/png" %>
 <%= favicon_link_tag "favicon-16x16.png", :rel => "icon", :sizes => "16x16", :type => "image/png" %>
-<%= tag("link", :rel => "mask-icon", :href => asset_path("tab-icon.svg"), :color => "#7ebc6f") %>
-<%= tag("link", :rel => "manifest", :href => asset_path("manifest.json")) %>
-<%= tag("meta", :name => "msapplication-config", :content => asset_path("browserconfig.xml")) %>
-<%= tag("meta", :name => "msapplication-TileColor", :content => "#00a300") %>
-<%= tag("meta", :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png")) %>
-<%= tag("meta", :name => "theme-color", :content => "#ffffff") %>
+<%= tag.link :rel => "mask-icon", :href => asset_path("tab-icon.svg"), :color => "#7ebc6f" %>
+<%= tag.link :rel => "manifest", :href => asset_path("manifest.json") %>
+<%= tag.meta :name => "msapplication-config", :content => asset_path("browserconfig.xml") %>
+<%= tag.meta :name => "msapplication-TileColor", :content => "#00a300" %>
+<%= tag.meta :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png") %>
+<%= tag.meta :name => "theme-color", :content => "#ffffff" %>
 <%= canonical_tag %>
 <% if Settings.key?(:publisher_url) -%>
-<%= tag("link", :rel => "publisher", :href => Settings.publisher_url) %>
+<%= tag.link :rel => "publisher", :href => Settings.publisher_url %>
 <% end -%>
-<%= tag("link", :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml")) %>
-<%= tag("meta", :name => "description", :content => "OpenStreetMap is the free wiki world map.") %>
+<%= tag.link :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") %>
+<%= tag.meta :name => "description", :content => "OpenStreetMap is the free wiki world map." %>
 <%= opengraph_tags(@title) %>
 <% if flash[:piwik_goal] -%>
-<%= tag("meta", :name => "piwik-goal", :content => flash[:piwik_goal]) %>
+<%= tag.meta :name => "piwik-goal", :content => flash[:piwik_goal] %>
 <% end -%>

diff --git a/app/views/user_mailer/diary_comment_notification.html.erb b/app/views/user_mailer/diary_comment_notification.html.erb
index b4efae83bd7aa15ed1cda0421fe68b85ff87e431..7f9368fe33b038bb25c2e185c7f07d2b8fb917ef 100644 (file)
--- a/app/views/user_mailer/diary_comment_notification.html.erb
+++ b/app/views/user_mailer/diary_comment_notification.html.erb
@@ -11,8 +11,8 @@
 
 <% content_for :footer do %>
   <p><%= t ".footer_html",
-           :readurl => link_to(@readurl, @readurl) + tag(:br),
-           :commenturl => link_to(@commenturl, @commenturl) + tag(:br),
+           :readurl => link_to(@readurl, @readurl) + tag.br,
+           :commenturl => link_to(@commenturl, @commenturl) + tag.br,
            :replyurl => link_to(@replyurl, @replyurl) %>
   </p>
 <% end %>

diff --git a/app/views/user_mailer/message_notification.html.erb b/app/views/user_mailer/message_notification.html.erb
index 4095b5e59426f13c1a991a2ad5215d7805a00530..a39a3fe5d1825b5cef527a10ded387f82e68f76c 100644 (file)
--- a/app/views/user_mailer/message_notification.html.erb
+++ b/app/views/user_mailer/message_notification.html.erb
@@ -14,7 +14,7 @@
 <% content_for :footer do %>
   <p>
     <%= t ".footer_html",
-          :readurl => link_to(@readurl, @readurl) + tag(:br),
+          :readurl => link_to(@readurl, @readurl) + tag.br,
           :replyurl => link_to(@replyurl, @replyurl) %>
   </p>
 <% end %>

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 4e7b0df12f64ce3fa6c7a37e39226fd58c07e5a6..c4e57d0c662a41b06a259648b61548cd5073ec2d 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1484,6 +1484,7 @@ af:
     inbox:
       title: In-vakkie
       my_inbox: My in-vakkie
+      my_outbox: My uit-vakkie
       from: Van
       subject: Onderwerp
       date: Datum
@@ -1508,6 +1509,8 @@ af:
       heading: Geen so 'n boodskap nie
     outbox:
       title: Uit-vakkie
+      my_inbox: My in-vakkie
+      my_outbox: My uit-vakkie
       to: Aan
       subject: Onderwerp
       date: Datum

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 7606ac25974b1c2275ea70b2ed5d0e7e7d10f4f8..aea02d239adcc9250d07849301ab09888907add4 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -9,6 +9,7 @@
 # Author: Heroid
 # Author: Kosovastar
 # Author: Macofe
+# Author: McDutchie
 # Author: Mdupont
 # Author: MicroBoy
 # Author: Nemo bis
@@ -798,7 +799,7 @@ aln:
       heading: Kycu
       email or username: 'Email Adresa ose Username:'
       password: 'Fjalekalimi:'
-      remember: 'Kujtom mu:'
+      remember: Kujtom mu
       lost password link: Keni harru fjalëkalimin tuaj?
       login_button: Kyçu
       account not active: Na vjen keq, akonti juej nuk asht hala aktiv<br /> Ju lutemi

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index cb0ec70980152a64f13fb47cf3845d64d282c625..e114924f648aee80c0d3067df56ceb4f8217e4b8 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -7,6 +7,7 @@
 # Author: Azouz.anis
 # Author: Bassem JARKAS
 # Author: ButterflyOfFire
+# Author: Danieldegroot2
 # Author: Dr. Mohammed
 # Author: Fahad
 # Author: Faris knight
@@ -17,6 +18,7 @@
 # Author: Kassem7899
 # Author: Kuwaity26
 # Author: Majid Al-Dharrab
+# Author: McDutchie
 # Author: Meno25
 # Author: Mido
 # Author: Mohammed Qubati
@@ -61,6 +63,9 @@ ar:
       client_application:
         create: سجِّل
         update: تحديث
+      doorkeeper_application:
+        create: سجِّل
+        update: تحديث
       redaction:
         create: إنشاء تنقيح
         update: حفظ التنقيح
@@ -132,6 +137,9 @@ ar:
         latitude: خط العرض
         longitude: خط الطول
         language: اللغة
+      doorkeeper/application:
+        name: الاسم
+        scopes: الصلاحيات
       friend:
         user: المستخدم
         friend: صديق
@@ -1293,8 +1301,8 @@ ar:
     intro_text: خريطة الشارع المفتوحة هي خريطة العالم، أُنشِئت بواسطة أشخاص مثلك وحرة
       الاستخدام برخصة مفتوحة.
     intro_2_create_account: أنشئ حساب مستخدم
-    hosting_partners_html: يتم دعم الاستضافة بواسطة %{ucl} و%{bytemark} و%{partners}
-      آخرين.
+    hosting_partners_html: يتم دعم الاستضافة بواسطة %{ucl} و%{fastly} و%{bytemark}
+      و%{partners} آخرين.
     partners_ucl: UCL
     partners_bytemark: استضافة Bytemark
     partners_partners: الشركاء
@@ -1325,6 +1333,7 @@ ar:
       footer: يمكنك أيضًا قراءة التعليق على %{readurl} ويمكنك التعليق على %{commenturl}
         أو الرد على %{replyurl}
     message_notification:
+      subject: '[خريطة الشارع المفتوحة] %{message_title}'
       hi: مرحبًا %{to_user}،
       header: '%{from_user} قام بإرسال رسالة لك عبر خريطة الشارع المفتوحة بالعنوان
         %{subject}:'
@@ -1336,10 +1345,12 @@ ar:
       see_their_profile: يمكنك أن تشاهد ملفهم الشخصي على %{userurl}.
       befriend_them: "\uFEFFيمكنك أيضًا إضافتهم كصديق على %{befriendurl}."
     gpx_failure:
+      hi: مرحبًا %{to_user}،
       failed_to_import: 'فشل الاستيراد، الخطأ هو:'
       import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       subject: '[خريطة الشارع المفتوحة] فشل استيراد جي بي إكس'
     gpx_success:
+      hi: مرحبًا %{to_user}،
       loaded_successfully: تم تحميل بنجاح %{trace_points} نقطة من أصل %{possible_points}
         نقطة ممكنة.
       subject: '[خريطة الشارع المفتوحة] نجاح استيراد جي بي إكس'
@@ -1367,21 +1378,22 @@ ar:
       anonymous: مستخدم مجهول
       greeting: مرحبا،
       commented:
-        subject_own: '[OpenStreetMap] قدعلق %{commenter} على إحدى ملاحظاتك'
-        subject_other: '[OpenStreetMap] علق %{commenter} على ملاحظة تههتم بها'
+        subject_own: '[خريطة الشارع المفتوحة] قدعلق %{commenter} على إحدى ملاحظاتك'
+        subject_other: '[خريطة الشارع المفتوحة] علق %{commenter} على ملاحظة تههتم
+          بها'
         your_note: علق %{commenter} على إحدى ملاحظات خريطتك بالقرب من %{place}.
         commented_note: علق %{commenter} على ملاحظة الخريطة التي علقت عليها، كانت
           الملاحظة بالقرب من %{place}.
       closed:
-        subject_own: '[OpenStreetMap] حل %{commenter} إحدى ملاحظاتك'
-        subject_other: '[OpenStreetMap] حل %{commenter} ملاحظة تهتم بها'
+        subject_own: '[خريطة الشارع المفتوحة] حل %{commenter} إحدى ملاحظاتك'
+        subject_other: '[خريطة الشارع المفتوحة] حل %{commenter} ملاحظة تهتم بها'
         your_note: حل %{commenter} إحدى ملاحظات خريطتك بالقرب من %{place}.
         commented_note: حل %{commenter} ملاحظة الخريطة التي علقت عليها، الملاحظة بالقرب
           من %{place}.
       reopened:
-        subject_own: لقد أعاد [OpenStreetMap] %{commenter} تنشيط إحدى ملاحظاتك
-        subject_other: لقد أعاد [OpenStreetMap] %{commenter} تنشيط ملاحظة كنت مهتما
-          بها
+        subject_own: لقد أعاد [خريطة الشارع المفتوحة] %{commenter} تنشيط إحدى ملاحظاتك
+        subject_other: لقد أعاد [خريطة الشارع المفتوحة] %{commenter} تنشيط ملاحظة
+          كنت مهتما بها
         your_note: لقد أعاد %{commenter} تنشيط إحدى ملاحظات الخريطة بالقرب من %{place}.
         commented_note: لقد أعاد %{commenter} تنشيط ملاحظة الخريطة التي علقت عليها،
           الملاحظة بالقرب من %{place}.
@@ -1390,8 +1402,10 @@ ar:
       hi: أهلا %{to_user}،
       greeting: مرحبا،
       commented:
-        subject_own: '[OpenStreetMap] علق %{commenter} على على إحدى مجموعات تغييراتك'
-        subject_other: '[OpenStreetMap] علق %{commenter} على مجموعة تغييرات تهتم بها'
+        subject_own: '[خريطة الشارع المفتوحة] علق %{commenter} على على إحدى مجموعات
+          تغييراتك'
+        subject_other: '[خريطة الشارع المفتوحة] علق %{commenter} على مجموعة تغييرات
+          تهتم بها'
         your_changeset: '%{commenter} علق على إحدى مجموعات تغييراتك في %{time}'
         commented_changeset: ترك %{commenter} تعليقا في %{time} على مجموعة تغييرات
           تراقبها أنشأها %{changeset_author}
@@ -1513,9 +1527,12 @@ ar:
       preferred_languages: اللغات المفضلة
     edit:
       title: تفضيلات التحرير
+      cancel: إلغاء
   profiles:
     edit:
-      image: "\uFEFFالصورة:"
+      title: عدل الملف
+      cancel: إلغاء
+      image: "\uFEFFالصورة"
       gravatar:
         gravatar: استخدام Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar
@@ -1526,7 +1543,7 @@ ar:
       delete image: أزل الصورة الحالية
       replace image: "\uFEFFاستبدل الصورة الحالية"
       image size hint: "\uFEFF(صورة مربعة على الأقل 100 × 100 تعمل بشكل أفضل)"
-      home location: 'موقع المنزل:'
+      home location: موقع المنزل
       no home location: لم تدخل موقع منزلك.
       update home location on click: تحديث موقع المنزل عندما أنقر على الخريطة؟
   sessions:
@@ -1536,7 +1553,7 @@ ar:
       email or username: 'عنوان البريد الإلكتروني أو اسم المستخدم:'
       password: 'كلمة السر:'
       openid_html: '%{logo} الهوية المفتوحة:'
-      remember: 'تذكرني:'
+      remember: تذكرني
       lost password link: أنسيت كلمة المرور؟
       login_button: تسجيل الدخول
       register now: سجل حسابًا الآن
@@ -1589,8 +1606,11 @@ ar:
       unordered: قائمة غير مرتبة
       ordered: قائمة مرتبة
       link: وصلة
+      image: الصورة
       alt: كل النص
+      url: المسار
     richtext_field:
+      edit: تعديل
       preview: معاينة
   site:
     about:
@@ -2046,6 +2066,7 @@ ar:
       traces_waiting: لديك %{count} أثر في انتظار التحميل. يرجى مراعاة الانتظار قبل
         تحميل أكثر من ذلك، بحيث تتجنب إعاقة طابور التحميل لباقي المستخدمين.
     edit:
+      cancel: إلغاء
       title: تعديل الأثر %{name}
       heading: تعديل الأثر %{name}
       visibility_help: ماذا يعني هذا؟
@@ -2201,8 +2222,22 @@ ar:
     destroy:
       flash: دُمِّر تسجيل تطبيق العميل
   oauth2_applications:
+    index:
+      name: الاسم
+      permissions: الصلاحيات
+    application:
+      edit: تعديل
+      delete: حذف
     show:
       edit: عدل
+      delete: حذف
+      permissions: الصلاحيات
+  oauth2_authorizations:
+    new:
+      deny: رفض
+  oauth2_authorized_applications:
+    index:
+      permissions: الصلاحيات
   users:
     new:
       title: أنشئ حسابا
@@ -2275,6 +2310,7 @@ ar:
       my comments: تعليقاتي
       blocks on me: عمليات منعي
       blocks by me: عمليات المنع بواسطتي
+      edit_profile: عدل الملف
       send message: إرسل رسالة
       diary: يومية
       edits: مساهمات
@@ -2317,13 +2353,13 @@ ar:
     account:
       title: عدل الحساب
       my settings: إعداداتي
-      current email address: 'عنوان البريد الإلكرتروني الحالي:'
-      external auth: 'مصادقة خارجية:'
+      current email address: عنوان البريد الإلكرتروني الحالي
+      external auth: مصادقة خارجية
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: ما هذا؟
       public editing:
-        heading: 'تعديل عام:'
+        heading: تعديل عام
         enabled: مفعَّل، غير مجهول ويمكنك تعديل البيانات.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: ما هذا؟
@@ -2338,7 +2374,7 @@ ar:
           السبب</a>).<ul><li>لن يتم الكشف عن عنوان بريدك الإلكتروني من خلال جعله عاما.</li><li>لا
           يمكن عكس هذا الإجراء وأصبح جميع المستخدمين الجدد عامين افتراضيا.</li></ul>
       contributor terms:
-        heading: 'شروط المساهم:'
+        heading: شروط المساهم
         agreed: لقد وافقت على شروط المساهم الجديدة.
         not yet agreed: لم توافق بعد على شروط المساهم الجديدة.
         review link text: يُرجَى اتباع هذا الرابط في الوقت الذي يناسبك لمراجعة وقبول
@@ -2485,8 +2521,8 @@ ar:
     show:
       title: '%{block_on} عُرقل بواسطة %{block_by}'
       heading_html: '%{block_on} عُرقل بواسطة %{block_by}'
-      created: تم الإنشاء
-      status: الحالة
+      created: 'تم الإنشاء:'
+      status: 'الحالة:'
       show: اعرض
       edit: تعديل
       revoke: ابطل!
@@ -2568,6 +2604,7 @@ ar:
           other: أنت على بعد %{count} قدم من هذه النقطة
       base:
         standard: قياسي
+        cyclosm: CyclOSM
         cycle_map: خريطة الدراجات
         transport_map: خريطة النقل و المواصلات
         hot: الخريطة الإنسانية
@@ -2581,6 +2618,8 @@ ar:
       copyright: © <a href='%{copyright_url}'>مساهمو خريطة الشارع المفتوحة</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>تقديم تبرع</a>
       terms: <a href='%{terms_url}' target='_blank'> مصطلحات الموقع و API</a>
+      cyclosm: نمط البلاط بواسطة <a href='%{cyclosm_url}' target='_blank'></a> المستضاف
+        بواسطة <a href='%{osmfrance_url}' target='_blank'></a>
       thunderforest: البلاط من <a href='%{thunderforest_url}' target='_blank'>Andy
         Allan</a>
       hotosm: نمط البلاط بواسطة <a href='%{hotosm_url}' target='_blank'>Humanitarian

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index d9d02bc258013ee5814c611cfc0cc86ffebfe8a6..c063c38e06186bddd2471356a8e32322518ca8ed 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -4,6 +4,7 @@
 # Author: Enolp
 # Author: Fitoschido
 # Author: Macofe
+# Author: McDutchie
 # Author: Tokvo
 # Author: TomH
 # Author: Xuacu
@@ -1459,7 +1460,7 @@ ast:
       email or username: 'Direición de corréu o nome d''usuariu:'
       password: 'Contraseña:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Recordame:'
+      remember: Recordame
       lost password link: ¿Perdisti la contraseña?
       login_button: Entrar
       register now: Rexistrate agora

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 34f9b23a073ac375d8282769fc3aaed1f75ff92e..4b88f3fbf2f46f22a5e624316e71a928c918204d 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -9,6 +9,7 @@
 # Author: Gwenn-Ael
 # Author: Iriep
 # Author: Macofe
+# Author: McDutchie
 # Author: Nemo bis
 # Author: Shirayuki
 # Author: Y-M D
@@ -1676,7 +1677,7 @@ br:
       email or username: 'Chomlec''h postel pe anv implijer :'
       password: 'Ger-tremen :'
       openid_html: '%{logo} OpenID :'
-      remember: 'Derc''hel soñj ac''hanon :'
+      remember: Derc'hel soñj ac'hanon
       lost password link: Ankouaet ho ker-tremen ganeoc'h ?
       login_button: Kevreañ
       register now: En em enskrivañ bremañ

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index d1c9ef7906dbb24f7cd97bcab6d7aacd142cea47..05e523c55a56f3cb45a836c225760b233f1e6294 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -8,6 +8,7 @@
 # Author: Annamerida
 # Author: Bc0ed5a28dfc189b971a689bae2d31b45cb5f3fd
 # Author: Bogreudell
+# Author: Danieldegroot2
 # Author: Eduardo Martinez
 # Author: El libre
 # Author: Fitoschido
@@ -2307,8 +2308,7 @@ ca:
     new:
       upload_trace: Pujar traça GPS
       visibility_help: què significa això?
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibilitat_de_traces_de
-        GPS
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Ca:Visibility_of_GPS_traces
       help: Ajuda
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     create:
@@ -2330,6 +2330,7 @@ ca:
       title: Editant traça %{name}
       heading: Editant traça %{name}
       visibility_help: què vol dir això?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Ca:Visibility_of_GPS_traces
     update:
       updated: Traça actualitzada
     trace_optionals:

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index d32c4a4ab86c2f48138168169a7697b0d4f87d25..dfdaf7f50b1334597445c6c2889a4c441e46dae4 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -1,6 +1,7 @@
 # Messages for Chechen (нохчийн)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: McDutchie
 # Author: Sasan700
 # Author: Умар
 ---
@@ -828,7 +829,7 @@ ce:
       email or username: 'Эл. пошт йа декъашхочун цӀе:'
       password: 'Пароль:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Дагалаца со:'
+      remember: Дагалаца со
       lost password link: Йицъелла пароль?
       login_button: ЧугӀо
       register now: ДӀадазло

diff --git a/config/locales/de.yml b/config/locales/de.yml
index a15227e86e68ce8ae0b47c2c1a0d3d83d88ff568..110f1d4ffc8fefecd86820aa28b4f8cbaa934a44 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -18,6 +18,7 @@
 # Author: ChrisiPK
 # Author: ChristianSW
 # Author: CygnusOlor
+# Author: Danieldegroot2
 # Author: Daswaldhorn
 # Author: Diebuche
 # Author: Dieterdreist
@@ -1612,7 +1613,7 @@ de:
       failed_to_import: 'konnte nicht importiert werden, die Fehlermeldung:'
       more_info_html: Weitere Informationen über Fehler bei GPX-Importen und wie sie
         vermieden werden können finden sich in %{url}
-      import_failures_url: https://wiki.openstreetmap.org/wiki/DE:GPX
+      import_failures_url: https://wiki.openstreetmap.org/wiki/DE:GPX#Warum_wurde_meine_GPX-Datei_nicht_richtig_hochgeladen.3F
       subject: '[OpenStreetMap] GPX-Import Fehler'
     gpx_success:
       hi: Hallo %{to_user},
@@ -1841,7 +1842,7 @@ de:
         möglicherweise vertippt oder du bist einem ungültigem Link gefolgt.
   preferences:
     show:
-      title: Meine Benutzereinstellungen
+      title: Benutzereinstellungen
       preferred_editor: Bevorzugter Editor
       preferred_languages: Bevorzugte Sprachen
       edit_preferences: Benutzereinstellungen bearbeiten

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index ee290903f1c5943436e8ccea72a3573eef5a763e..6a4f522f95979f69f29f010f4590a6504ce2fa23 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Derbeth
 # Author: Macofe
+# Author: McDutchie
 # Author: Michawiki
 # Author: Shirayuki
 ---
@@ -1115,7 +1116,7 @@ dsb:
       email or username: 'E-mailowa adresa abo wužywarske mě:'
       password: 'Gronidło:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Spomnjeś se:'
+      remember: Spomnjeś se
       lost password link: Sy swójo gronidło zabył?
       login_button: Pśizjawiś se
       register now: Něnto registrěrowaś

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 8fc79363ff8ef8978a44beb745bc6dce65dae478..3d2b784e62406a007dd9c1e44b23832b66d44606 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1868,7 +1868,7 @@ es:
       email or username: 'Dirección de correo electrónico o nombre de usuario:'
       password: 'Contraseña:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Recordarme:'
+      remember: Recordarme
       lost password link: ¿Ha perdido su contraseña?
       login_button: Iniciar sesión
       register now: Regístrese ahora

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 65187c697d2282462a4616f206e303f59dc9dc6b..d62ce46e36778d330b226a089522b18d322b0895 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -11,6 +11,7 @@
 # Author: Ibai
 # Author: Iñaki LL
 # Author: Maite
+# Author: McDutchie
 # Author: Mikel Ibaiba
 # Author: MikelEH
 # Author: PerroVerd
@@ -1553,7 +1554,7 @@ eu:
       email or username: 'Eposta helbidea edo Erabiltzaile izena:'
       password: 'Pasahitza:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Gogora nazazu:'
+      remember: Gogora nazazu
       lost password link: Pasahitza ahaztu duzu?
       login_button: Saioa hasi
       register now: Erregistratu orain

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 90e4bfee65db4a247f1472340ef8a77d1c91d017..d9538aa38212663eb22c8445bfbb9f0d7827c3cb 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -140,7 +140,7 @@ fy:
     node:
       title_html: 'Punt: %{name}'
     way:
-      title_html: 'Wei: %{name}'
+      title_html: 'Gebiet: %{name}'
       nodes: Punten
       nodes_count:
         one: 1 punt
@@ -152,7 +152,7 @@ fy:
       entry_role_html: '%{type} %{name} as %{role}'
       type:
         node: Punt
-        way: Wei
+        way: Gebiet
         relation: Relaasje
     containing_relation:
       entry_html: Relaasje %{relation_name}
@@ -160,17 +160,17 @@ fy:
     not_found:
       type:
         node: punt
-        way: wei
+        way: gebiet
         relation: relaasje
     timeout:
       type:
         node: punt
-        way: wei
+        way: gebiet
         relation: relaasje
     redacted:
       type:
         node: punt
-        way: wei
+        way: gebiet
         relation: relaasje
     tag_details:
       tags: Lebels
@@ -179,7 +179,7 @@ fy:
       description: Beskriuwing
     query:
       title: Skaaimerken opfreegje
-      introduction: Klik op 'e kaart foar skaaimerken yn 'e omkriten.
+      introduction: Klik op 'e kaart foar skaaimerken yn 'e krite.
       nearby: Skaaimerken yn 'e omkriten
       enclosing: Omfetsjende skaaimerken
   changesets:
@@ -311,6 +311,8 @@ fy:
           school: Skoalle
           shelter: Skûlplak
           shower: Dûs
+          social_centre: Sosjaal sintrum
+          social_facility: Sosjale foarsjenning
           studio: Studio
           swimming_pool: Swimbad
           taxi: Taksy
@@ -326,9 +328,15 @@ fy:
           weighbridge: Weachbrêge
         boundary:
           administrative: Bestjoerlike grins
+          census: Folkstellingsgrins
           national_park: Nasjonaal park
+          political: Kiesgrins
+          "yes": Grins
         bridge:
           aqueduct: Akwadukt
+          boardwalk: Plankier
+          suspension: Hingbrêge
+          swing: Draaibrêge
           viaduct: Fiadukt
           "yes": Brêge
         building:
@@ -336,32 +344,84 @@ fy:
           apartments: Apparteminten
           chapel: Kapel
           church: Tsjerkegebou
+          hospital: Sikehûs
+          hotel: Hotelgebou
+          house: Hûs
+          houseboat: Wenboat
+          hut: Hutte
+          kindergarten: Beukerskoalle
+          office: Kantoargebou
+          public: Iepenbier gebou
+          residential: Wengebou
+          retail: Winkelpân
+          roof: Dak
+          train_station: Treinstasjon
+          warehouse: Pakhûs
           "yes": Gebou
+        craft:
+          beekeeper: Ymker
+          photographer: Fotograaf
         highway:
           bridleway: Ruterpaad
           bus_stop: Bushalte
+          construction: Wei yn oanlis
+          cycleway: Fytspaad
+          elevator: Lift
+          footway: Fuotpaad
+          ford: Furde
+          give_way: Boerd foarrang jaan
           living_street: Wenhiem
           milestone: Mylpeal
           motorway: Autogongwei
           motorway_junction: Knooppunt autogongwei
           motorway_link: Op-/ôfreed autogongwei
+          passing_place: Utwykplak
           path: Paad
+          pedestrian: Fuotgongersgebiet
           platform: Perron
+          primary: Primêre wei
+          primary_link: Primêre wei
+          proposed: Plende wei
+          raceway: Racesirkwy
           residential: Strjitte
           road: Strjitwei
+          secondary: Sekundêre wei
+          secondary_link: Sekundêre wei
+          service: Parallelwei
+          services: Sjauffeursfoarsjennings
+          speed_camera: Flitser
+          steps: Trep
+          stop: Stopboerd
           street_lamp: Strjitlampe
+          tertiary: Tertsjêre wei
+          tertiary_link: Tertsjêre wei
+          track: Lânpaad
+          traffic_mirror: Ferkearsspegel
+          traffic_signals: Ferkearsljochten
+          unclassified: Net-klassifisearre wei
+          "yes": Wei
         historic:
+          archaeological_site: Archeologysk plak
           battlefield: Slachfjild
           building: Histoarysk gebou
+          bunker: Bunker
+          cannon: Histoarysk kanon
           castle: Kastiel
           church: Tsjerke
+          city_gate: Stedspoarte
           citywalls: Stedsmuorren
           fort: Fort
+          heritage: Erfgoedplak
           house: Hûs
           memorial: Betinkingsmonumint
+          milestone: Histoaryske mylpeal
           mine: Myn
+          mine_shaft: Mynskacht
           monument: Monumint
+          railway: Histoaryske spoarwei
+          roman_road: Romeinske wei
           ruins: Ruïne
+          stone: Stien
           tomb: Tombe
           tower: Toer
           wreck: Wrak
@@ -376,8 +436,10 @@ fy:
           grass: Gers
           landfill: Jiskebult
           meadow: Greide
+          military: Militêr terrein
           mine: Myn
           quarry: Stiengat
+          railway: Spoarwei
           reservoir: Opslachmar
           residential: Wengebiet
           retail: Lytshannel
@@ -385,6 +447,7 @@ fy:
         leisure:
           beach_resort: Badplak
           common: Mientlân
+          dog_park: Hûnepark
           fishing: Fiskgrûn
           garden: Tún
           golf_course: Golfbaan
@@ -399,43 +462,66 @@ fy:
           stadium: Stadion
           swimming_pool: Swimbad
         man_made:
+          communications_tower: Antennetoer
           dyke: Bediking
+          mast: Mêst
+          pier: Pier
+          surveillance: Bewekking
+          tower: Toer
+          water_tower: Wettertoer
         military:
           barracks: Kazerne
           bunker: Bunker
+        mountain_pass:
+          "yes": Berchpas
         natural:
+          atoll: Atol
           bay: Baai
           beach: Strân
           cape: Kaap
+          cave_entrance: Grotyngong
           cliff: Klif
+          coastline: Kustline
           crater: Krater
           dune: Dún
+          fell: Fjell
           fjord: Fjord
           forest: Bosk
           geyser: Geiser
           glacier: Gletsjer
+          grassland: Greidlân
+          heath: Heide
           hill: Heuvel
+          hot_spring: Waarmwetterboarne
           island: Eilân
+          isthmus: Lâningte
           land: Lân
           marsh: Sompe
           moor: Fean
           mud: Modder
           peak: Pyk
           peninsula: Skiereilân
-          point: Punt
+          point: Lânpunt
           reef: Rif
           ridge: Berchkaam
           rock: Rotsen
+          saddle: Berchseal
+          sand: Sân
           scree: Púnhelling
           scrub: Strewel
+          shingle: Keizel
           spring: Boarne
           stone: Stien
+          strait: Ingte
           tree: Beam
+          tree_row: Beammerige
+          tundra: Toendra
           valley: Fallei
           volcano: Fulkaan
           water: Wetter
           wetland: Somplân
           wood: Wâld
+          "yes": Lânskipselemint
         office:
           accountant: Boekhâlder
           architect: Arsjitekt
@@ -446,7 +532,10 @@ fy:
           travel_agent: Reisburo
           "yes": Kantoar
         place:
+          allotments: Folkstunen
+          archipelago: Arsjipel
           city: Grutte stêd
+          city_block: Wenblok
           country: Lân
           county: Distrikt
           farm: Boerepleats
@@ -454,28 +543,58 @@ fy:
           house: Hûs
           houses: Huzen
           island: Eilân
+          islet: Eilantsje
+          isolated_dwelling: Ofhandige wente
           locality: Plak
           municipality: Gemeente
           neighbourhood: Buert
+          plot: Perseel
           postcode: Postkoade
+          quarter: Wyk
           region: Regio
           sea: See
+          square: Plein
           state: Steat
           subdivision: Dielgebiet
           suburb: Foarstêd
           town: Stêd
           village: Doarp
+          "yes": Plak
         railway:
+          abandoned: Spoarwei yn ferfal
+          construction: Spoarwei yn oanlis
+          disused: Spoarwei yn ûnbrûk
+          funicular: Kabelspoarwei
+          halt: Treinhalte
+          junction: Oansluting
+          level_crossing: Oerwei
           light_rail: Sneltrem
+          miniature: Miniatuerspoar
+          monorail: Monorail
+          narrow_gauge: Smelspoarwei
+          platform: Spoarbaanperron
+          preserved: Museumspoarwei
+          proposed: Spoarwei yn plenning
+          spur: Lokaalspoarwei
           station: Spoarweistasjon
+          stop: Spoarhalte
+          subway: Metro
+          subway_entrance: Metroyngong
+          switch: Wiksel
           tram: Trembaan
           tram_stop: Tremhalte
+          yard: Spoaremplasemint
         shop:
           bakery: Bakker
           boutique: Boetyk
           butcher: Slachter
           chemist: Drogist
+          department_store: Warehûs
+          doityourself: Doch-it-sels
           dry_cleaning: Stomerij
+          electronics: Elektroanikasaak
+          erotic: Sekswinkel
+          fashion: Moadesaak
           florist: Blommist
           furniture: Meubelsaak
           greengrocer: Grientesaak
@@ -484,8 +603,10 @@ fy:
           jewelry: Juwelier
           laundry: Waskerij
           optician: Optisien
+          perfumery: Parfumery
           pet: Bistewinkel
           photo: Fotosaak
+          seafood: Seebanket
           second_hand: Omrinwinkel
           supermarket: Supermerk
           tailor: Kleanmakker
@@ -495,11 +616,17 @@ fy:
           "yes": Winkel
         tourism:
           alpine_hut: Berchhutte
+          apartment: Fakânsje-appartemint
+          artwork: Keunstwurk
           attraction: Attraksje
           bed_and_breakfast: Bêd en brochje
           cabin: Blokhutte
+          camp_pitch: Kampearplak
           camp_site: Kampearterrein
+          caravan_site: Kampearweinterrein
           chalet: Sjalet
+          gallery: Keunstmuseum
+          guest_house: Pinsjon
           hostel: Hostel
           hotel: Hotel
           information: Ynformaasje
@@ -507,14 +634,23 @@ fy:
           museum: Museum
           picnic_site: Piknikplak
           theme_park: Ferdivedaasjepark
+          viewpoint: Utsjochpunt
+          wilderness_hut: Natuerhutte
           zoo: Dieretún
         tunnel:
+          building_passage: Geboutrochgong
           culvert: Dûker
           "yes": Tunnel
         waterway:
+          artificial: Keunstmjittige wetterwei
+          boatyard: Skipswerf
           canal: Kanaal
           dam: Daam
+          derelict_canal: Fertutearze kanaal
           ditch: Sleat
+          dock: Dok
+          drain: Ofwettering
+          lock: Slûs
           lock_gate: Slûsdoar
           mooring: Oanlisplak
           rapids: Streamfersnelling
@@ -523,10 +659,16 @@ fy:
           wadi: Wady
           waterfall: Wetterfal
           weir: Keardaam
+          "yes": Wetterwei
       admin_levels:
         level2: Lânsgrins
+        level3: Regiogrins
         level4: Steatsgrins
+        level5: Regiogrins
         level7: Gemeentegrins
+        level8: Stedsgrins
+        level9: Doarpsgrins
+        level11: Buertgrins
       types:
         cities: Grutte stêden
         towns: Stêden
@@ -630,8 +772,11 @@ fy:
       copyright_html: <span>&copy;</span>OpenStreetMap-<br>bydragers
       used_by_html: '%{name} leveret kaartdata foar tûzenen websteeën, mobile apps
         en kompjûterapparaten'
+      legal_title: Juridysk
       partners_title: Partners
     copyright:
+      foreign:
+        title: Oer dizze oersetting
       native:
         native_link: Frysktalige ferzje
       legal_babble:
@@ -661,7 +806,7 @@ fy:
         geofabrik:
           title: Geofabrik Downloads
           description: Geregeldwei bywurke parten mei kontininten, lannen en selektearre
-            grutte stêden
+            stêden
         metro:
           title: Metro Extracts
           description: Parten mei grutte wrâldstêden en harren omkriten
@@ -852,6 +997,8 @@ fy:
       all_traces: Alle trajekten
       traces_from: Iepenbiere trajekten fan %{user}
       remove_tag_filter: Lebelfilter weilitte
+    georss:
+      title: OpenStreetMap-GPS-trajekten
   oauth2_applications:
     application:
       edit: Bewurkje
@@ -874,13 +1021,20 @@ fy:
       my messages: Myn berjochten
       my profile: Myn profyl
       my settings: Myn ynstellings
+      my comments: Myn reäksjes
       my_preferences: Myn foarkarren
       edit_profile: Profyl bewurkje
+      send message: Berjocht stjoere
       diary: Deiboek
       edits: Bewurkings
+      traces: Trajekten
+      notes: Kaartopmerkings
+      add as friend: Freon tafoegje
+      mapper since: 'Kaartmakker sûnt:'
       email address: 'E-mailadres:'
       status: 'Status:'
       description: Beskriuwing
+      comments: Reäksjes
     account:
       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
@@ -911,7 +1065,7 @@ fy:
       title: Diele
       cancel: Annulearje
       image: Ofbylding
-      link: Keppeling as HTML
+      link: Keppeling of HTML
       long_link: Kepp.
       short_link: Lytse kepp.
       geo_uri: Geo-URI
@@ -986,8 +1140,8 @@ fy:
           meitsje wy it yn oarder. Sko de markearder op it krekte plak, en typ in
           opmerking oer it probleem.
         advice: Jo opmerking is iepenbier en kin brûkt wurde ta ferbettering fan 'e
-          kaart; dat fier neat persoanliks yn, gjin ynformaasje fan kaarten of yndeksen
-          mei auteursrjocht.
+          kaart; dat fier neat persoanliks yn, gjin ynfo fan kaarten of yndeksen mei
+          auteursrjocht.
         add: Opmerking taheakje
     edit_help: Sko de kaart en zoom yn op 'e lokaasje dy't jo bewurkje wolle, klik
       dan hjir.

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 6f2a3598e81e2a98306059937d6c12895c60cc2e..62543818eab16905e9d5642def82992c504bea75 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: J budissin
 # Author: Macofe
+# Author: McDutchie
 # Author: Michawiki
 # Author: Mikławš
 ---
@@ -1758,7 +1759,7 @@ hsb:
       email or username: 'E-mejlowa adresa abo wužiwarske mjeno:'
       password: 'Hesło:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Spomjatkować sej:'
+      remember: Spomjatkować sej
       lost password link: Swoje hesło zabył?
       login_button: Přizjewjenje
       register now: Nětko registrować

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index c51637059bc32b15dfef23237e327a98f8f918e9..697b360fca3a105f6963797e503f6c9b81ae37ce 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1792,7 +1792,7 @@ ia:
       email or username: 'Adresse de e-mail o nomine de usator:'
       password: 'Contrasigno:'
       openid_html: 'OpenID de %{logo}:'
-      remember: 'Memorar me:'
+      remember: Memorar me
       lost password link: Contrasigno perdite?
       login_button: Aperir session
       register now: Registrar ora

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 12231610927baaa8cd9151c638dbf5496d31cffa..1b563d8513ce531532f4a473b15a8b2725637fb2 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Macofe
+# Author: McDutchie
 # Author: Nemo bis
 # Author: Snævar
 # Author: Sveinki
@@ -1694,7 +1695,7 @@ is:
       email or username: 'Netfang eða notandanafn:'
       password: 'Lykilorð:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Muna innskráninguna:'
+      remember: Muna innskráninguna
       lost password link: Gleymdirðu lykilorðinu þínu?
       login_button: Innskrá
       register now: Skrá þig núna

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index b00886d574ea25061393d3c41e9d46ae4cfb57db..a24d392f4f37f8ae1ccfeb1aa997a3868a9dc91a 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: David1010
 # Author: MIKHEIL
+# Author: McDutchie
 # Author: Temuri rajavi
 # Author: Გიო ოქრო
 # Author: Იო ოქრო
@@ -893,7 +894,7 @@ ka:
       email or username: 'ელ. ფოსტის მისამართი, ან მომხმარებლის სახელი:'
       password: 'პაროლი:'
       openid_html: '%{logo} OpenID:'
-      remember: 'დამიმახსოვრე:'
+      remember: დამიმახსოვრე
       lost password link: დაგავიწყდათ პაროლი?
       login_button: შესვლა
       register now: დარეგისტრირდით ახლავე

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 12612439447649eb2222cddb4aa979229f3a20bc..74508bc83288144dff02667d63e4ade6750cf280 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -14,6 +14,8 @@
 # Author: SlimaneAmiri
 ---
 kab:
+  html:
+    dir: ltr
   time:
     formats:
       friendly: '%e %B %Y ɣef %H:%M'
@@ -164,6 +166,15 @@ kab:
         new_email: (werǧin ad d-iban s wudem azayez)
   datetime:
     distance_in_words_ago:
+      about_x_hours:
+        one: qrib 1 n usrag aya
+        other: qrib %{count} n yisragen aya
+      about_x_months:
+        one: 'qrib 1 n wayyur aya '
+        other: about %{count} n wagguren aya
+      about_x_years:
+        one: qrib 1 n useggas aya
+        other: qrib %{count} n yiseggasen aya
       half_a_minute: Azgen n tsedast aya
   editor:
     default: Amezwer (tura %{name})
@@ -383,6 +394,7 @@ kab:
       your location: Adig-ik
       friend: Amdakkel
     show:
+      my friends: Imeddukal-iw
       nearby users: Iseqdacen-nniḍen iqeṛben
       friends_changesets: Igrawen n usnifel n yidukkal
       friends_diaries: Inekcam n uɣmis n yimdukkal
@@ -392,20 +404,21 @@ kab:
     new:
       title: Anekcam amaynut n uɣmis
     form:
-      location: 'Adig:'
-      use_map_link: seqdec takarḍa
+      location: Adig
+      use_map_link: Seqdec takarḍa
     index:
-      title: Iɣmisen n useqdac
-      title_friends: Iɣmisen n imdukal
-      title_nearby: Iɣmisen n iseqdacen iqeṛben
+      title: Iɣmisen n yiseqdacen
+      title_friends: Iɣmisen n yimeddukal
+      title_nearby: Iɣmisen n yiseqdacen iqeṛben
       user_title: Aɣmis n %{user}
       in_language_title: Inekcam n uɣmis s %{language}
       new: Anekcam amaynut n uɣmis
       new_title: Aru anekcam amaynut deg uɣmis-ik n useqdac
-      no_entries: Ulac amagrad n uɣmis
-      recent_entries: Imagraden n melmi kan n uɣmis
+      my_diary: Aɣmis-iw
+      no_entries: Ulac anekcam n uɣmis
+      recent_entries: Inekcamen ineggura n uɣmis
       older_entries: Inekcam iqbuṛen
-      newer_entries: Inekcam n melmi kan
+      newer_entries: Inekcam ineggura
     edit:
       title: Ẓreg anekcam n uɣmis
       marker_text: Adig n unekcam n uɣmis
@@ -547,7 +560,7 @@ kab:
           gambling: Uraren yidrimen
           grave_yard: Tajebbant
           grit_bin: Asenduq n tasent
-          hospital: Sbiṭar
+          hospital: Asegnaf
           hunting_stand: Tanefsart n uselfeɣ
           ice_cream: Tamagrist
           kindergarten: Tibḥirt n warrac

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 32e064e38e9b9a5fe3ba5b65c50018f2fe6db93c..702042304c0b1300dcca2bbe9ee1547e416e6db2 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -2526,7 +2526,7 @@ lb:
       relation: Relatioun
     context:
       directions_from: Vun hei fort
-      directions_to: Heihinn
+      directions_to: Heihin
       add_note: Eng Notiz hei derbäisetzen
       show_address: Adress weisen
       query_features: Objetsoffro

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 09b4b1726e212a10b7bfd2fadb5b9e32b40a42d1..fefe8669bb9710e49d2db8386b925bd1855cd077 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -11,6 +11,7 @@
 # Author: Mantak111
 # Author: Manvydasz
 # Author: Matasg
+# Author: McDutchie
 # Author: Pauliuz
 # Author: Pdxx
 # Author: Perkunas
@@ -1473,7 +1474,7 @@ lt:
       email or username: 'E-pašto adresas arba naudotojo vardas:'
       password: 'Slaptažodis:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Prisiminti prisijungimą:'
+      remember: Prisiminti prisijungimą
       lost password link: Pamiršote slaptažodį?
       login_button: Prisijungti
       register now: Užsiregistruoti

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index e7bc2853b06586042aa1dd84e93cd825738c12f6..01a749915ccf8f5dd1aec62e8852f0514ad7963e 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -11,6 +11,7 @@
 # Author: Karlis
 # Author: Lafriks
 # Author: Macofe
+# Author: McDutchie
 # Author: Nemo bis
 # Author: Papuass
 # Author: PeterisP
@@ -1287,7 +1288,7 @@ lv:
       email or username: 'E-pasta adrese vai lietotājvārds:'
       password: 'Parole:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Atcerēties mani:'
+      remember: Atcerēties mani
       lost password link: Aizmirsi paroli?
       login_button: Pieslēgties
       register now: Reģistrēties

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index ea020b7fe3fa4446b3de9633a02d89cd26ffc1a3..0b233f470feb18497b9c8f1ddbf4cf799b468905 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -858,7 +858,7 @@ mk:
           "yes": Пат
         historic:
           aircraft: Историски воздухоплов
-          archaeological_site: Ð\90Ñ\80Ñ\85еолоÑ\88ки локалиÑ\82еÑ\82
+          archaeological_site: Ð\90Ñ\80Ñ\85еолоÑ\88ко наоÑ\93алиÑ\88Ñ\82е
           bomb_crater: Историски кратер од бомба
           battlefield: Бојно поле
           boundary_stone: Граничен камен

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 1ce593fa6d17f461c1bda86a4103a5d86bcebd44..33c2241a09732a1cb91dec51e60bbd21bcfe4400 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1848,7 +1848,7 @@ nl:
       email or username: 'E-mailadres of gebruikersnaam:'
       password: 'Wachtwoord:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Aanmeldgegevens onthouden:'
+      remember: Aanmeldgegevens onthouden
       lost password link: Wachtwoord vergeten?
       login_button: Aanmelden
       register now: Nu inschrijven
@@ -1977,7 +1977,7 @@ nl:
         intro_2_html: |-
           Het staat u vrij onze gegevens te kopiëren, te distribueren,
           weer te geven en aan te passen, zo lang u OpenStreetMap en haar
-          auteurs vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt,
+          bijdragers vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt,
           mag u het resultaat enkel onder dezelfde licentie distribueren. In de
           volledige <a href="https://opendatacommons.org/licenses/odbl/1.0/">juridische
           tekst</a> worden uw rechten en verantwoordelijkheden uitgelegd.
@@ -1989,15 +1989,13 @@ nl:
           We vereisen dat u het volgende vermeldt bij gebruik:
           &ldquo;&copy; OpenStreetMap-bijdragers&rdquo;.
         credit_2_1_html: "U moet ook duidelijk maken dat de gegevens beschikbaar zijn
-          onder de Open\nDatabase License, en als u onze kaarttegels gebruikt, dat
-          de cartografie\nde licentie CC BY-SA heeft. U kunt dit doen door te verwijzen
-          naar\n<a href=\"https://www.openstreetmap.org/copyright\">de auteursrechtenpagina</a>.
+          onder de Open\nDatabase License. U kunt dit doen door te verwijzen naar\n<a
+          href=\"https://www.openstreetmap.org/copyright\">de auteursrechtenpagina</a>.
           \nU kunt ook direct verwijzen naar de licentie(s). Dat laatste is verplicht
           als u OSM in gegevensvorm distribueert. In media waar\nhyperlinks niet mogelijk
           zijn, bijvoorbeeld in gedrukte werken, raden we u aan\nuw lezer te verwijzen
           naar openstreetmap.org (mogelijk door de naam \"OpenStreetMap\" naar dit
-          webadres uit te breiden), naar opendatacommons.org en naar, indien van toepassing,
-          creativecommons.org."
+          webadres uit te breiden) en naar opendatacommons.org."
         credit_3_1_html: De kaarttegels in de &ldquo;standaard stijl&rdquo; op www.openstreetmap.org
           zijn een geproduceerd werk van de OpenStreetMap Foundation met OpenStreetMap-gegevens
           onder de Open Database Licentie. Wanneer deze kaartstijl wordt gebruikt
@@ -2079,7 +2077,7 @@ nl:
           aansprakelijkheid aanvaardt.
         infringement_title_html: Auteursrechtenschending
         infringement_1_html: |-
-          Bijdragers aan OSM horen nooit gegevens toe te voegen
+          OSM-bijdragers horen nooit gegevens toe te voegen
           uit bronnen waarvan de licentie niet vrij is (bijvoorbeeld Google Maps of gedrukte kaarten)
           zonder expliciete toestemming van de auteursrechtenhouders.
         infringement_2_html: |-
@@ -2376,7 +2374,7 @@ nl:
     new:
       upload_trace: Gps-traject uploaden
       visibility_help: wat betekent dit?
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces‎
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/NL:Visibility_of_GPS_traces
       help: Hulp
       help_url: http://wiki.openstreetmap.org/wiki/NL:Upload
     create:
@@ -2398,6 +2396,7 @@ nl:
       title: Traject %{name} bewerken
       heading: Traject %{name} bewerken
       visibility_help: wat betekent dit?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/NL:Visibility_of_GPS_traces
     update:
       updated: Traject bijgewerkt
     trace_optionals:

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 94bdeed0ae29842686591d02376ed665f756f293..3cb800d0b5bd6dec2fe2da8f706c473fcf366de3 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -10,6 +10,7 @@
 # Author: Gunnernett
 # Author: Harald Khan
 # Author: Macofe
+# Author: McDutchie
 # Author: Nemo bis
 # Author: Nghtwlkr
 # Author: Njardarlogar
@@ -1219,7 +1220,7 @@ nn:
       email or username: 'E-postadresse eller brukarnamn:'
       password: 'Passord:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Hugs meg:'
+      remember: Hugs meg
       lost password link: Mista passordet ditt?
       login_button: Logg inn
       register now: Registrer deg no

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d8cfae2e9e0fc25a3b03df282a77b72cde23798f..96264732e39e512eefe3ad47635dd4065e2bd395 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -22,6 +22,7 @@
 # Author: D1g
 # Author: DCamer
 # Author: DDPAT
+# Author: Danieldegroot2
 # Author: Diralik
 # Author: Dmitry-s93
 # Author: Dr&mx
@@ -52,6 +53,7 @@
 # Author: Macofe
 # Author: Mavl
 # Author: MaxSem
+# Author: McDutchie
 # Author: Mechano
 # Author: Meerrahtar
 # Author: Megakott
@@ -1559,7 +1561,7 @@ ru:
       failed_to_import: 'сбой импорта. Произошла ошибка:'
       more_info_html: Более подробную информацию об ошибках импорта GPX и о том, как
         их избежать, можно найти на %{url}.
-      import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
+      import_failures_url: https://wiki.openstreetmap.org/wiki/RU:GPX_Import_Failures
       subject: '[OpenStreetMap] Сбой импорта GPX'
     gpx_success:
       hi: Здравствуйте, %{to_user},
@@ -1834,7 +1836,7 @@ ru:
       email or username: 'Эл. почта или имя пользователя:'
       password: 'Пароль:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Запомнить меня:'
+      remember: Запомнить меня
       lost password link: Забыли пароль?
       login_button: Представиться
       register now: Зарегистрируйтесь
@@ -2341,7 +2343,7 @@ ru:
     new:
       upload_trace: Передать GPS-трек на сервер
       visibility_help: Что это значит?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%92%D0%B8%D0%B4%D0%B8%D0%BC%D0%BE%D1%81%D1%82%D1%8C_GPS-%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/RU:%D0%92%D0%B8%D0%B4%D0%B8%D0%BC%D0%BE%D1%81%D1%82%D1%8C_GPS-%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
       help: Справка
       help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%97%D0%B0%D0%B3%D1%80%D1%83%D0%B7%D0%BA%D0%B0_%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
     create:

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 3b5bce6a9c85b8329d51340c491095dfc8dcc27a..773a2faa74241fa582aa19161d731f471451cf71 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -919,7 +919,7 @@ sr-Latn:
       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Zapamti me:'
+      remember: Zapamti me
       lost password link: Zaboravili ste lozinku?
       login_button: Prijavi me
       register now: Otvorite nalog

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index b92044e54a13f4c6fdaceb5511bcf80385d5f356..6e56ebddd64afacd361507da67c216b3f0401b47 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1199,7 +1199,9 @@ sv:
           baby_goods: Babyvaror
           bag: Väskbutik
           bakery: Bageri
+          bathroom_furnishing: Badrumsinredning
           beauty: Skönhetssalong
+          bed: Sängklädesbutik
           beverages: Dryckesbutik
           bicycle: Cykelaffär
           bookmaker: Vadförmedlare
@@ -1218,17 +1220,22 @@ sv:
           coffee: Kaffebutik
           computer: Datorbutik
           confectionery: Godisbutik
-          convenience: Närköp
+          convenience: Närbutik
           copyshop: Kopieringsfirma
           cosmetics: Parfymeri
+          craft: Hobbybutik
+          curtain: Gardinbutik
+          dairy: Mejeriaffär
           deli: Delikatessbutik
           department_store: Varuhus
           discount: Lågprisbutik
           doityourself: Gör-det-själv
           dry_cleaning: Kemtvätt
+          e-cigarette: E-cigarettbutik
           electronics: Elektronikbutik
           erotic: Sexbutik
           estate_agent: Egendomsmäklare
+          fabric: Tygaffär
           farm: Gårdsbutik
           fashion: Modebutik
           fishing: Fiskebutik
@@ -1238,12 +1245,13 @@ sv:
           funeral_directors: Begravningsentreprenör
           furniture: Möbler
           garden_centre: Trädgårdshandel
+          gas: Gasbutik
           general: Lanthandel
           gift: Presentaffär
           greengrocer: Grönsakshandlare
           grocery: Livsmedelsbutik
           hairdresser: Frisör
-          hardware: Järnhandel
+          hardware: Järnaffär
           health_food: Hälsokostbutik
           hearing_aids: Hörapparater
           herbalist: Örthandel
@@ -1259,6 +1267,7 @@ sv:
           lottery: Lotteri
           mall: Köpcentrum
           massage: Massage
+          medical_supply: Medicinsk utrustning
           mobile_phone: Mobiltelefonbutik
           money_lender: Pengautlånare
           motorcycle: Motorcykelhandlare
@@ -1273,7 +1282,7 @@ sv:
           paint: Färgbutik
           pastry: Kafeteria
           pawnbroker: Pantlånare
-          perfumery: Parfymaffär
+          perfumery: Parfymbutik
           pet: Djuraffär
           pet_grooming: Husdjursfrisör
           photo: Fotoaffär
@@ -1294,7 +1303,7 @@ sv:
           travel_agency: Resebyrå
           tyres: Däckaffär
           vacant: Ledig butik
-          variety_store: Varuhus
+          variety_store: Fyndbutik
           video: Videobutik
           video_games: TV-spelsbutik
           wholesale: Grosshandel
@@ -2554,6 +2563,8 @@ sv:
       client_secret: Klienthemlighet
       permissions: Behörigheter
       redirect_uris: Omdirigerings-URI:er
+    not_found:
+      sorry: Tyvärr kunde inte applikation hittas.
   oauth2_authorizations:
     new:
       title: Auktorisering krävs

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 4de30371a7107ff599450d3d5965f0d4aef93570..e08c61a7b036af7efb90360d675e568bf0e51315 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -5,6 +5,7 @@
 # Author: Chaduvari
 # Author: Gayatri
 # Author: Kiranmayee
+# Author: McDutchie
 # Author: Ravichandra
 # Author: Veeven
 # Author: రహ్మానుద్దీన్
@@ -583,7 +584,7 @@ te:
       heading: ప్రవేశం
       email or username: 'ఈమెయిల్ చిరునామా లేదా వాడుకరిపేరు:'
       password: 'సంకేతపదం:'
-      remember: 'నన్ను గుర్తుంచుకో:'
+      remember: నన్ను గుర్తుంచుకో
       lost password link: మీ సంకేతపదం పోయిందా?
       login_button: ప్రవేశించు
       register now: ఇప్పుడే నమోదవ్వండి

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 3b86fd4ef1908f66f7ac3859446f32beb9c15e3f..0ddf400daddb3b598c7ce2016e7539ddd326e689 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -12,6 +12,7 @@
 # Author: LR Guanzon
 # Author: Leeheonjin
 # Author: Macofe
+# Author: McDutchie
 # Author: 아라
 ---
 tl:
@@ -1174,7 +1175,7 @@ tl:
       email or username: 'Tirahan ng E-liham o Pangalan ng Tagagamit:'
       password: 'Password:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Tandaan ako:'
+      remember: Tandaan ako
       lost password link: Nawala ang hudyat mo?
       login_button: Lumagda
       register now: Magpatala na ngayon

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 589a931777c084c37823a3e518d1c59e411671e8..5a03f49f20ff627e947d07ee552c0e3062aad39a 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -68,8 +68,10 @@
 # Author: 沈澄心
 # Author: 神樂坂秀吉
 # Author: 羊羊32521
+# Author: 落花有意12138
 # Author: 铁桶
 # Author: 阿pp
+# Author: 魔琴
 # Author: 아라
 ---
 zh-CN:
@@ -812,6 +814,7 @@ zh-CN:
           warehouse: 仓库
           "yes": 建筑物
         club:
+          scout: 童子军营地
           sport: 体育俱乐部
           "yes": 俱乐部
         craft:
@@ -842,6 +845,7 @@ zh-CN:
           "yes": 工艺品店
         crossing: 十字路口
         emergency:
+          access_point: 存储点
           ambulance_station: 救护站
           assembly_point: 集合地点
           defibrillator: 除颤仪
@@ -913,6 +917,7 @@ zh-CN:
           bunker: 地堡
           cannon: 古炮
           castle: 城堡
+          charcoal_pile: 史上又名的碳堆
           church: 教堂
           city_gate: 城门
           citywalls: 城墙
@@ -1373,6 +1378,7 @@ zh-CN:
         level4: 州界(省界)
         level5: 地区界(地级行政区界)
         level6: 县界
+        level7: 市边界
         level8: 市界(乡级行政区界)
         level9: 村界
         level10: 郊区界(村级行政区界)
@@ -1514,7 +1520,7 @@ zh-CN:
     intro_2_create_account: 创建用户账户
     hosting_partners_html: 主机由%{ucl}、%{fastly}、%{bytemark}，以及其他%{partners}所支持。
     partners_ucl: 伦敦大学学院
-    partners_fastly: 快速的
+    partners_fastly: Fastly
     partners_bytemark: Bytemark主机
     partners_partners: 合作伙伴
     tou: 使用条款
@@ -2311,6 +2317,8 @@ zh-CN:
       read_gpx: 读取私人GPS轨迹
       write_gpx: 上传GPS轨迹
       write_notes: 修改备注
+      read_email: 查看用户邮箱地址
+      skip_authorization: 自动核准应用
   oauth_clients:
     new:
       title: 注册新应用程序

diff --git a/yarn.lock b/yarn.lock
index 1b70946e74249a7513c591dc23b94d2e62e26661..e707d5c4450d1a7b3ea087eebff00c6ab2501535 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@eslint/eslintrc@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.3.tgz#41f08c597025605f672251dcc4e8be66b5ed7366"
-  integrity sha512-DHI1wDPoKCBPoLZA3qDR91+3te/wDSc1YhKg3jR8NxKKRJq2hwHwcWv31cSwSYvIBrmbENoYMWcenW8uproQqg==
+"@eslint/eslintrc@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.4.tgz#dfe0ff7ba270848d10c5add0715e04964c034b31"
+  integrity sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -13,7 +13,7 @@
     globals "^13.9.0"
     ignore "^4.0.6"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
+    js-yaml "^4.1.0"
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
@@ -61,7 +61,7 @@ ansi-colors@^3.2.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-regex@^5.0.0:
+ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -74,13 +74,6 @@ ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -208,11 +201,11 @@ eslint-visitor-keys@^3.0.0:
   integrity sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==
 
 eslint@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.1.0.tgz#00f1f7dbf4134f26588e6c9f2efe970760f64664"
-  integrity sha512-JZvNneArGSUsluHWJ8g8MMs3CfIEzwaLx9KyH4tZ2i+R2/rPWzL8c0zg3rHdwYVpN/1sB9gqnjHwz9HoeJpGHw==
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.2.0.tgz#44d3fb506d0f866a506d97a0fc0e90ee6d06a815"
+  integrity sha512-erw7XmM+CLxTOickrimJ1SiF55jiNlVSp2qqm0NuBWPtHYQCegD5ZMaW0c3i5ytPqL+SSLaCxdvQXFPLJn+ABw==
   dependencies:
-    "@eslint/eslintrc" "^1.0.3"
+    "@eslint/eslintrc" "^1.0.4"
     "@humanwhocodes/config-array" "^0.6.0"
     ajv "^6.10.0"
     chalk "^4.0.0"
@@ -246,7 +239,7 @@ eslint@^8.0.0:
     progress "^2.0.0"
     regexpp "^3.2.0"
     semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
@@ -260,11 +253,6 @@ espree@^9.0.0:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^3.0.0"
 
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esquery@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
@@ -459,14 +447,6 @@ js-cookie@^3.0.0:
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
   integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
 
-js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -630,17 +610,12 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    ansi-regex "^5.0.0"
+    ansi-regex "^5.0.1"
 
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"