From: Tom Hughes <tom@compton.nu>
Date: Sun, 8 Sep 2024 14:37:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5157'
X-Git-Tag: live~692
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7df13ff2d3b369b571b6d85fd1a2997290c5541f?hp=5d17e74d714e27f3dd6ab3ef3bb4d6d30919d42c

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

diff --git a/Gemfile.lock b/Gemfile.lock
index a34976cd6..afc6463b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,8 +95,8 @@ GEM
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.968.0)
-    aws-sdk-core (3.201.5)
+    aws-partitions (1.970.0)
+    aws-sdk-core (3.202.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.9)
@@ -261,7 +261,7 @@ GEM
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     hashie (5.0.0)
-    highline (3.1.0)
+    highline (3.1.1)
       reline
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
@@ -319,7 +319,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.0)
+    logger (1.6.1)
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store
@@ -348,7 +348,7 @@ GEM
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    net-imap (0.4.14)
+    net-imap (0.4.15)
       date
       net-protocol
     net-pop (0.1.2)
@@ -361,7 +361,12 @@ GEM
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oauth (0.4.7)
+    oauth (1.1.0)
+      oauth-tty (~> 1.0, >= 1.0.1)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    oauth-tty (1.0.5)
+      version_gem (~> 1.1, >= 1.1.1)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
@@ -379,7 +384,7 @@ GEM
     omniauth-github (2.0.1)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.8)
-    omniauth-google-oauth2 (1.1.2)
+    omniauth-google-oauth2 (1.1.3)
       jwt (>= 2.0)
       oauth2 (~> 2.0)
       omniauth (~> 2.0)
@@ -498,24 +503,23 @@ GEM
     rouge (4.3.0)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
-    rubocop (1.65.1)
+    rubocop (1.66.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.1)
+    rubocop-ast (1.32.2)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-minitest (0.35.1)
+    rubocop-minitest (0.36.0)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-performance (1.21.1)
@@ -576,7 +580,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terser (1.2.3)
       execjs (>= 0.3.0, < 3)
-    thor (1.3.1)
+    thor (1.3.2)
     tilt (2.4.0)
     timeout (0.4.1)
     turbo-rails (2.0.6)
@@ -603,7 +607,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index c8d18b9aa..d6584f364 100644
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -20,7 +20,7 @@ class Ability
       can [:index, :rss, :show], DiaryEntry
       can :index, DiaryComment
       can [:index], Note
-      can [:new, :create, :edit, :update], :password
+      can [:new, :create, :update], :password
       can [:index, :show], Redaction
       can [:new, :create, :destroy], :session
       can [:index, :show, :data, :georss], Trace
@@ -34,10 +34,10 @@ class Ability
 
       if Settings.status != "database_offline"
         can [:subscribe, :unsubscribe], Changeset
-        can [:index, :new, :create, :show, :edit, :update, :destroy], :oauth2_application
+        can [:index, :new, :create, :show, :update, :destroy], :oauth2_application
         can [:index, :destroy], :oauth2_authorized_application
         can [:new, :show, :create, :destroy], :oauth2_authorization
-        can [:edit, :update, :destroy], :account
+        can [:update, :destroy], :account
         can [:show], :dashboard
         can [:new, :create, :subscribe, :unsubscribe], DiaryEntry
         can :update, DiaryEntry, :user => user
@@ -45,10 +45,10 @@ class Ability
         can [:make_friend, :remove_friend], Friendship
         can [:new, :create, :reply, :show, :inbox, :outbox, :muted, :mark, :unmute, :destroy], Message
         can [:close, :reopen], Note
-        can [:show, :edit, :update], :preference
-        can [:edit, :update], :profile
+        can [:show, :update], :preference
+        can :update, :profile
         can [:new, :create], Report
-        can [:mine, :new, :create, :edit, :update, :destroy], Trace
+        can [:mine, :new, :create, :update, :destroy], Trace
         can [:account, :go_public], User
         can [:index, :create, :destroy], UserMute
 
@@ -56,7 +56,7 @@ class Ability
           can [:hide, :unhide], [DiaryEntry, DiaryComment]
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
-          can [:new, :create, :edit, :update, :destroy], Redaction
+          can [:new, :create, :update, :destroy], Redaction
           can [:new, :create, :revoke_all], UserBlock
           can :update, UserBlock, :creator => user
           can :update, UserBlock, :revoker => user
diff --git a/app/abilities/api_capability.rb b/app/abilities/api_capability.rb
index 44e676345..07345d254 100644
--- a/app/abilities/api_capability.rb
+++ b/app/abilities/api_capability.rb
@@ -5,11 +5,7 @@ class ApiCapability
 
   def initialize(token)
     if Settings.status != "database_offline"
-      user = if token.respond_to?(:resource_owner_id)
-               User.find(token.resource_owner_id)
-             elsif token.respond_to?(:user)
-               token.user
-             end
+      user = User.find(token.resource_owner_id)
 
       if user&.active?
         can [:create, :comment, :close, :reopen], Note if scope?(token, :write_notes)
diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb
index 6bf86de3f..7d61366be 100644
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -71,7 +71,7 @@ class UserBlocksController < ApplicationController
   def update
     if @valid_params
       if cannot?(:update, @user_block)
-        flash[:error] = t(@user_block.revoker ? ".only_creator_or_revoker_can_edit" : ".only_creator_can_edit")
+        flash[:error] = @user_block.revoker ? t(".only_creator_or_revoker_can_edit") : t(".only_creator_can_edit")
         redirect_to :action => "edit"
       else
         user_block_was_active = @user_block.active?
diff --git a/app/models/node.rb b/app/models/node.rb
index 825336d16..1bec9a33c 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -199,10 +199,6 @@ class Node < ApplicationRecord
     save_with_history!
   end
 
-  def tags_as_hash
-    tags
-  end
-
   def tags
     @tags ||= node_tags.to_h { |t| [t.k, t.v] }
   end
diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index b323f0b4f..4585ed406 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -85,10 +85,6 @@ class OldNode < ApplicationRecord
 
   attr_writer :tags
 
-  def tags_as_hash
-    tags
-  end
-
   # Pretend we're not in any ways
   def ways
     []
diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb
index f87a4909d..56f468f2f 100644
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -4,7 +4,7 @@
 
 <% @sources.each do |source| %>
   <h4>
-    <%= t(".title.results_from_html", :results_link => link_to(t(".title.#{source[:name]}"), source[:url].to_s)) %>
+    <%= link_to t(".title.#{source[:name]}"), source[:url].to_s %>
   </h4>
   <div class="search_results_entry mx-n3" data-href="<%= url_for @params.merge(:action => "search_#{source[:name]}") %>">
     <div class="text-center loader">
diff --git a/app/views/oauth2_applications/_form.html.erb b/app/views/oauth2_applications/_form.html.erb
index 51267c069..7fde3e0e7 100644
--- a/app/views/oauth2_applications/_form.html.erb
+++ b/app/views/oauth2_applications/_form.html.erb
@@ -3,5 +3,5 @@
 <%= f.form_group :confidential do %>
   <%= f.check_box :confidential %>
 <% end %>
-<%= f.collection_check_boxes :scopes, Oauth.scopes(:oauth2 => true, :privileged => current_user.administrator?), :name, :description %>
+<%= f.collection_check_boxes :scopes, Oauth.scopes(:privileged => current_user.administrator?), :name, :description %>
 <%= f.primary %>
diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index 6cc32edd0..56e82f8f8 100644
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -27,9 +27,9 @@
             <circle cx="15" cy="15" r="13" fill="none" stroke="#c0c0c0" stroke-width="4" />
             <path d="m 15,22 c 0,0 5,-4.5199 5,-8 0,-3 -2,-5 -5,-5 -3,0 -5,2 -5,5 0,3.4801 5,8 5,8 z" fill="#c0c0c0" />
           </svg>
-          <h2 class="flex-grow-1 mb-0"><%= t "site.about.local_knowledge_title" %></h2>
+          <h2 class="flex-grow-1 mb-0"><%= t ".local_knowledge_title" %></h2>
         </div>
-        <p><%= t "site.about.local_knowledge_html" %></p>
+        <p><%= t ".local_knowledge_html" %></p>
       </section>
 
       <section>
@@ -38,17 +38,17 @@
             <circle cx="15" cy="15" r="13" fill="none" stroke="#c0c0c0" stroke-width="4" />
             <path d="m 15,7 -6,6 0,7 4,0 0,-4 4,0 0,4 4,0 0,-7 z" fill="#c0c0c0" />
           </svg>
-          <h2 class="flex-grow-1 mb-0"><%= t "site.about.community_driven_title" %></h2>
+          <h2 class="flex-grow-1 mb-0"><%= t ".community_driven_title" %></h2>
         </div>
         <p>
-          <%= t "site.about.community_driven_1_html", :osm_blog_link => link_to(t("site.about.community_driven_osm_blog"),
-                                                                                t("site.about.community_driven_osm_blog_url")),
-                                                      :user_diaries_link => link_to(t("site.about.community_driven_user_diaries"),
-                                                                                    diary_entries_path),
-                                                      :community_blogs_link => link_to(t("site.about.community_driven_community_blogs"),
-                                                                                       t("site.about.community_driven_community_blogs_url")),
-                                                      :osm_foundation_link => link_to(t("site.about.community_driven_osm_foundation"),
-                                                                                      t("site.about.community_driven_osm_foundation_url")) %>
+          <%= t ".community_driven_1_html", :osm_blog_link => link_to(t(".community_driven_osm_blog"),
+                                                                      t(".community_driven_osm_blog_url")),
+                                            :user_diaries_link => link_to(t(".community_driven_user_diaries"),
+                                                                          diary_entries_path),
+                                            :community_blogs_link => link_to(t(".community_driven_community_blogs"),
+                                                                             t(".community_driven_community_blogs_url")),
+                                            :osm_foundation_link => link_to(t(".community_driven_osm_foundation"),
+                                                                            t(".community_driven_osm_foundation_url")) %>
         </p>
       </section>
 
@@ -58,12 +58,12 @@
             <circle cx="15" cy="15" r="13" fill="none" stroke="#c0c0c0" stroke-width="4" />
             <path d="M20.196 18 a6 6 0 1 1 0 -6" fill="none" stroke="#c0c0c0" stroke-width="3" />
           </svg>
-          <h2 class="flex-grow-1 mb-0"><%= t "site.about.open_data_title" %></h2>
+          <h2 class="flex-grow-1 mb-0"><%= t ".open_data_title" %></h2>
         </div>
         <p>
-          <%= t "site.about.open_data_1_html", :open_data => tag.i(t("site.about.open_data_open_data")),
-                                               :copyright_license_link => link_to(t("site.about.open_data_copyright_license"),
-                                                                                  copyright_path) %></p>
+          <%= t ".open_data_1_html", :open_data => tag.i(t(".open_data_open_data")),
+                                     :copyright_license_link => link_to(t(".open_data_copyright_license"),
+                                                                        copyright_path) %></p>
       </section>
 
       <section id="legal">
@@ -77,25 +77,25 @@
                     d="M.5 1 a1 1 0 0 0 0 -2 h-2.5 a1 1 0 0 1 0 -2 h.5" />
             </g>
           </svg>
-          <h2 class="flex-grow-1 mb-0"><%= t "site.about.legal_title" %></h2>
+          <h2 class="flex-grow-1 mb-0"><%= t ".legal_title" %></h2>
         </div>
         <p>
-          <%= t "site.about.legal_1_1_html", :openstreetmap_foundation_link => link_to(t("site.about.legal_1_1_openstreetmap_foundation"),
-                                                                                       t("site.about.legal_1_1_openstreetmap_foundation_url")),
-                                             :terms_of_use_link => link_to(t("site.about.legal_1_1_terms_of_use"),
-                                                                           t("site.about.legal_1_1_terms_of_use_url")),
-                                             :aup_link => link_to(t("site.about.legal_1_1_aup"),
-                                                                  t("site.about.legal_1_1_aup_url")),
-                                             :privacy_policy_link => link_to(t("site.about.legal_1_1_privacy_policy"),
-                                                                             t("site.about.legal_1_1_privacy_policy_url")) %>
+          <%= t ".legal_1_1_html", :openstreetmap_foundation_link => link_to(t(".legal_1_1_openstreetmap_foundation"),
+                                                                             t(".legal_1_1_openstreetmap_foundation_url")),
+                                   :terms_of_use_link => link_to(t(".legal_1_1_terms_of_use"),
+                                                                 t(".legal_1_1_terms_of_use_url")),
+                                   :aup_link => link_to(t(".legal_1_1_aup"),
+                                                        t(".legal_1_1_aup_url")),
+                                   :privacy_policy_link => link_to(t(".legal_1_1_privacy_policy"),
+                                                                   t(".legal_1_1_privacy_policy_url")) %>
         </p>
         <p>
-          <%= t "site.about.legal_2_1_html", :contact_the_osmf_link => link_to(t("site.about.legal_2_1_contact_the_osmf"),
-                                                                               t("site.about.legal_2_1_contact_the_osmf_url")) %>
+          <%= t ".legal_2_1_html", :contact_the_osmf_link => link_to(t(".legal_2_1_contact_the_osmf"),
+                                                                     t(".legal_2_1_contact_the_osmf_url")) %>
         </p>
         <p>
-          <%= t "site.about.legal_2_2_html", :registered_trademarks_link => link_to(t("site.about.legal_2_2_registered_trademarks"),
-                                                                                    t("site.about.legal_2_2_registered_trademarks_url")) %>
+          <%= t ".legal_2_2_html", :registered_trademarks_link => link_to(t(".legal_2_2_registered_trademarks"),
+                                                                          t(".legal_2_2_registered_trademarks_url")) %>
         </p>
       </section>
 
@@ -108,7 +108,7 @@
               <line x1="15" y1="11" x2="15" y2="19" />
             </g>
           </svg>
-          <h2 class="flex-grow-1 mb-0"><%= t "site.about.partners_title" %></h2>
+          <h2 class="flex-grow-1 mb-0"><%= t ".partners_title" %></h2>
         </div>
         <p><%= t "layouts.hosting_partners_2024_html", :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
                                                        :corpmembers => link_to(t("layouts.partners_corpmembers"), "https://osmfoundation.org/wiki/Corporate_Members"),
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index c1d4e2f78..a2df9167f 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -225,7 +225,7 @@ Doorkeeper.configure do
   # https://doorkeeper.gitbook.io/guides/ruby-on-rails/scopes
 
   # default_scopes  :public
-  optional_scopes(*Oauth::SCOPES, *Oauth::PRIVILEGED_SCOPES, *Oauth::OAUTH2_SCOPES)
+  optional_scopes(*Oauth::SCOPES, *Oauth::PRIVILEGED_SCOPES)
 
   # Allows to restrict only certain scopes for grant_type.
   # By default, all the scopes will be available for all the grant types.
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 15c9f1272..43b998557 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -390,12 +390,6 @@ af:
       anonymous: Anoniem
       no_edits: (geen wysigings)
       view_changeset_details: Beskou die wysigingstel se besonderhede
-    changesets:
-      id: ID
-      saved_at: Gestoor op
-      user: Gebruiker
-      comment: Kommentaar
-      area: Gebied
     index:
       title: Wysigingstelle
       title_user: Veranderings deur %{user}
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 370cff65c..233f80bbb 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -186,12 +186,6 @@ aln:
       anonymous: Anonim
       no_edits: (Nuk ka redaktimet)
       view_changeset_details: Shikoni detajet changeset
-    changesets:
-      id: ID
-      saved_at: Ruhen në
-      user: Përdorues
-      comment: Koment
-      area: Zonë
     index:
       title: Changesets
       title_user: Changesets nga %{user}
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 7ace0fcb1..ee535c39f 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -524,12 +524,6 @@ ar:
       anonymous: مجهول
       no_edits: (لا تعديلات)
       view_changeset_details: اعرض تفاصيل حزمة التغييرات
-    changesets:
-      id: المعرف
-      saved_at: حُفِظ في
-      user: المستخدم
-      comment: التعليق
-      area: منطقة
     index:
       title: حزم التغييرات
       title_user: حزم التغييرات بواسطة %{user}
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index ae81e6c74..eee0fc469 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -154,12 +154,6 @@ arz:
       anonymous: مجهول
       no_edits: (لا تعديلات)
       view_changeset_details: اعرض تفاصيل حزمه التغييرات
-    changesets:
-      id: المعرّف
-      saved_at: حُفظ في
-      user: المستخدم
-      comment: التعليق
-      area: منطقة
     index:
       title: حزم التغييرات
       title_user: حزم التغييرات بواسطه %{user}
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 8023027f5..dc65ab459 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -360,12 +360,6 @@ ast:
       anonymous: Anónimu
       no_edits: (ensin ediciones)
       view_changeset_details: Ver detalles del conxuntu de cambeos
-    changesets:
-      id: ID
-      saved_at: Guardao el
-      user: Usuariu
-      comment: Comentariu
-      area: Área
     index:
       title: Conxuntos de cambeos
       title_user: Conxuntos de cambeos de %{user}
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 021e972ae..1166cd9ca 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -230,12 +230,6 @@ az:
       anonymous: Anonim
       no_edits: (redaktə yoxdur)
       view_changeset_details: Dəyişikliklər dəstinin ətraflı görüntüsü
-    changesets:
-      id: ID
-      saved_at: Saxlanıldı
-      user: İstifadəçi
-      comment: Şərh
-      area: Ərazi
     index:
       title: Dəyişikliklər dəsti
       title_user: '%{user} tərəfindən edilmiş dəyişikliklər dəsti'
diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index b165b73cc..3566d2555 100644
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -380,12 +380,6 @@ ba:
       anonymous: Аноним
       no_edits: (төҙәтеүҙәр юҡ)
       view_changeset_details: Төҙәтеүҙәр пакетының тәфсирен ҡарап сығырға
-    changesets:
-      id: ID
-      saved_at: Тамамланған
-      user: Ҡулланыусы
-      comment: Комментарий
-      area: Өлкә
     index:
       title: Төҙәтеүҙәр пакеты
       title_user: ' %{user} ҡулланыусыһының төҙәтеүҙәр пакеты'
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 90ae47830..975b521b5 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -374,12 +374,6 @@ be-Tarask:
       anonymous: Ананім
       no_edits: (без рэдагаваньняў)
       view_changeset_details: Паказаць падрабязнасьці набору зьменаў
-    changesets:
-      id: Ідэнтыфікатар
-      saved_at: Захаваны як
-      user: Карыстальнік
-      comment: Камэнтар
-      area: Абшар
     index:
       title: Наборы зьменаў
       title_user: Набор зьменаў %{user}
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 4f41c9e9f..d18bc7f97 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -518,12 +518,6 @@ be:
       anonymous: Ананімны
       no_edits: (без змен)
       view_changeset_details: Падрабязней пра пакет правак
-    changesets:
-      id: ID
-      saved_at: Захаваны
-      user: Карыстальнік
-      comment: Каментар
-      area: Мясцовасць
     index:
       title: Пакет правак
       title_user: Пакет правак ад %{user}
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 5ac43dc91..d3f6d679c 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -386,12 +386,6 @@ bg:
       anonymous: Анонимен
       no_edits: (без промяна)
       view_changeset_details: Подробности за списъка с промени
-    changesets:
-      id: ID
-      saved_at: Записан на
-      user: Потребител
-      comment: Коментар
-      area: Област
     index:
       title: Списък с промени
       title_user: Списък с промените на %{user}
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 1d0d2f028..1cc843089 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -453,12 +453,6 @@ bn:
       anonymous: বেনামী ব্যবহারকারী
       no_edits: (কোনো সম্পাদনা নেই)
       view_changeset_details: পরিবর্তনধার্যের বিস্তারিত দেখুন
-    changesets:
-      id: আইডি
-      saved_at: সংরক্ষণের তারিখ
-      user: ব্যবহারকারী
-      comment: মন্তব্য
-      area: এলাকা
     index:
       title: পরিবর্তনধার্য
       title_user: '%{user} কর্তৃক পরিবর্তন ধার্য'
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 2fca852c9..59f7e86bd 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -493,12 +493,6 @@ br:
       anonymous: Dizanv
       no_edits: (aozadenn ebet)
       view_changeset_details: Gwelet munudoù an hollad cheñchamantoù
-    changesets:
-      id: ID
-      saved_at: Enrollet an/ar
-      user: Implijer
-      comment: Evezhiadenn
-      area: Takad
     index:
       title: Hollad cheñchamantoù
       title_user: Hollad cheñchamantoù %{user}
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 70e8fb4dc..111be83d9 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -254,12 +254,6 @@ bs:
       anonymous: Anonimno
       no_edits: (nema izmjena)
       view_changeset_details: Pregled detalja o setu promjena
-    changesets:
-      id: ID
-      saved_at: Spremljeno
-      user: Korisnik
-      comment: Komentar
-      area: Područje
     index:
       title: Setovi promjena
       title_user: Setovi promjena od %{user}
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 3653ef41b..a7d3dbebe 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -479,12 +479,6 @@ ca:
       anonymous: Anònim
       no_edits: (no hi ha cap edició)
       view_changeset_details: Mostra els detalls del conjunt de canvis
-    changesets:
-      id: ID
-      saved_at: Desat a
-      user: Usuari
-      comment: Comentari
-      area: Àrea
     index:
       title: Conjunts de canvis
       title_user: Conjunts de canvis de %{user}
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index a2cdd5973..586e5fb01 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -448,12 +448,6 @@ ce:
       anonymous: Аноним
       no_edits: (нисдарш дац)
       view_changeset_details: Нисдаршка мадарра хьажа
-    changesets:
-      id: ID
-      saved_at: Чекхйаьлла
-      user: Декъашхо
-      comment: Коммент
-      area: Меттиг
     index:
       title: Нисдарш
       title_user: Декъашхочун %{user} нисдарш
@@ -2588,7 +2582,6 @@ ce:
         other: -ах GPX файл %{count}-тIера тIадамаш %{user}-ах
       description_without_count: GPX файл %{user} декъашхочун
   application:
-    basic_auth_disabled: 'HTTP коьрта аутентификаци дӀаяьккхина йу: %{link}'
     permission_denied: Хьан бакъо йац и гӀуллакх кхочушдан.
     require_cookies:
       cookies_needed: Хьан cookies дӀайайначух тера ду - дехар ду хьайн браузерехь
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 78429a2c8..e769bc753 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -527,12 +527,6 @@ cs:
       anonymous: Anonymní
       no_edits: (žádné změny)
       view_changeset_details: Zobrazit detaily sady změn
-    changesets:
-      id: ID
-      saved_at: Uloženo v
-      user: Uživatel
-      comment: Komentář
-      area: Oblast
     index:
       title: Sady změn
       title_user: Sady změn uživatele %{user}
@@ -2676,7 +2670,6 @@ cs:
         other: GPX soubor s %{count} body od uživatele %{user}
       description_without_count: GPX soubor od uživatele %{user}
   application:
-    basic_auth_disabled: 'HTTP Basic autentizace je zakázaná: %{link}'
     permission_denied: Pro přístup k této akci nemáte oprávnění
     require_cookies:
       cookies_needed: Vypadá to, že máte zakázány cookies – před pokračováním si je
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index a53e59bc4..4299b0f4e 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -487,12 +487,6 @@ cy:
       anonymous: Dienw
       no_edits: (dim golygiadau)
       view_changeset_details: Gweld manylion y grŵp newid
-    changesets:
-      id: ID
-      saved_at: Cadwyd am
-      user: Defnyddiwr
-      comment: Sylw
-      area: Ardal
     index:
       title: Grwpiau newid
       title_user: Grwpiau newid gan %{user}
@@ -1523,6 +1517,7 @@ cy:
     page:
       user_not_found: Nid yw'r defnyddiwr yn bodoli
       issues_not_found: Ni chanfuwyd unrhyw faterion o'r fath
+      reported_user: Defnyddiwr ag adroddwyd
       status: Statws
       reports: Adroddiadau
       last_updated: Diweddarwyd ddiwethaf
@@ -1535,6 +1530,12 @@ cy:
         many: '%{count} Adroddiad'
         other: '%{count} Adroddiad'
       reported_item: Eitem ag adroddwyd
+      states:
+        ignored: Anwybyddwyd
+        open: Agored
+        resolved: Wedi datrys
+      older_issues: Materion HÅ·n
+      newer_issues: Materion Newydd
     show:
       title: '%{status} Gwall #%{issue_id}'
       reports:
@@ -2419,7 +2420,6 @@ cy:
         other: Ffeil GPX â %{count} pwynt gan %{user}
       description_without_count: Ffeil GPX gan %{user}
   application:
-    basic_auth_disabled: 'Mae Dilysiad Sylfaenol HTTP wedi''i analluogi: %{link}'
     permission_denied: Nid oes gennych ganiatâd i gael mynediad at y weithred honno
     require_cookies:
       cookies_needed: Mae'n ymddangos eich bod wedi analluogi cwcis - galluogwch gwcis
@@ -2743,8 +2743,8 @@ cy:
       heading_html: Rhestr Blociau gan %{name}
       empty: Nid oes unrhyw blociau gan %{name} eto.
     show:
-      title: '%{block_on} a flociwyd gan %{block_by}'
-      heading_html: '%{block_on} a flociwyd gan %{block_by}'
+      title: Blociwyd %{block_on} gan %{block_by}
+      heading_html: Blociwyd %{block_on} gan %{block_by}
       created: 'Crëwyd:'
       duration: 'Cyfnod:'
       status: 'Statws:'
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 639ea7aab..bd802eb3e 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -480,12 +480,6 @@ da:
       anonymous: Anonym
       no_edits: (ingen ændringer)
       view_changeset_details: Vis detaljer for ændringssæt
-    changesets:
-      id: Id
-      saved_at: Gemt
-      user: Bruger
-      comment: Kommentar
-      area: Område
     index:
       title: Ændringssæt
       title_user: Ændringssæt af %{user}
@@ -2632,7 +2626,6 @@ da:
         other: GPX fil med %{count} punkter fra %{user}
       description_without_count: GPX fil fra %{user}
   application:
-    basic_auth_disabled: 'Basal HTTP-godkendelse (Basic Auth) er deaktiveret: %{link}'
     permission_denied: Du har ikke rettigheder til at udføre den handling
     require_cookies:
       cookies_needed: Du har tilsyneladende deaktiveret cookies i din browser. Aktivér
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 481376296..14f9b44e3 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -567,12 +567,6 @@ de:
       anonymous: Anonym
       no_edits: (keine Bearbeitungen)
       view_changeset_details: Details des Änderungssatzes anzeigen
-    changesets:
-      id: ID
-      saved_at: Gespeichert am
-      user: Benutzer
-      comment: Kommentar
-      area: Bereich
     index:
       title: Änderungssätze
       title_user: Änderungssätze von %{user}
@@ -2772,8 +2766,6 @@ de:
         other: GPX-Datei mit %{count} Punkten von %{user}
       description_without_count: GPX-Datei von %{user}
   application:
-    basic_auth_disabled: 'Die HTTP-Basisauthentifizierung ist deaktiviert: %{link}'
-    auth_disabled_link: https://wiki.openstreetmap.org/wiki/DE:2024_authentication_update
     permission_denied: Du hast keine Berechtigung, um auf diese Aktion zuzugreifen.
     require_cookies:
       cookies_needed: Es scheint als hättest du Cookies ausgeschaltet. Bitte aktiviere
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 1f819f24d..e2fe5855e 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -285,12 +285,6 @@ diq:
       anonymous: Anonim
       no_edits: (vırnayış çıniyo)
       view_changeset_details: Teferuatê vurnayışê seti bıvin
-    changesets:
-      id: ID
-      saved_at: Cayê qeydi
-      user: Karber
-      comment: Mışewre
-      area: Erd
     index:
       title: Qeydê vurnayışan
       title_user: Vurriyayışê qeydi %{user}
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 254ae1b5f..30a73b8fa 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -271,12 +271,6 @@ dsb:
       anonymous: Anonymny
       no_edits: (žedne změny)
       view_changeset_details: Drobnostki sajźbow změnow pokazaś
-    changesets:
-      id: ID
-      saved_at: Datum składowanja
-      user: Wužywaŕ
-      comment: Komentar
-      area: Wurězk
     index:
       title: Sajźby změnow
       title_user: Sajźby změnow wót %{user}
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 5b748dd7a..247d68e6e 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -495,12 +495,6 @@ el:
       anonymous: Ανώνυμος
       no_edits: (χωρίς επεξεργασίες)
       view_changeset_details: Προβολή λεπτομερειών αλλαγών
-    changesets:
-      id: ID
-      saved_at: Αποθηκεύτηκε στις
-      user: Χρήστης
-      comment: Σχόλιο
-      area: Περιοχή
     index:
       title: Αλλαγές
       title_user: Αλλαγές από %{user}
@@ -2698,8 +2692,6 @@ el:
         other: αρχείο GPX με %{count} σημεία από %{user}
       description_without_count: Αρχείο GPX από τον χρήστη %{user}
   application:
-    basic_auth_disabled: 'Ο Βασικός Έλεγχος Ταυτότητας HTTP είναι απενεργοποιημένος:
-      %{link}'
     permission_denied: Δεν έχετε τα απαραίτητα δικαιώματα για πρόσβαση σε αυτήν την
       ενέργεια
     require_cookies:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index f2d5b0987..14a925f14 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -376,12 +376,6 @@ en-GB:
       anonymous: Anonymous
       no_edits: (no edits)
       view_changeset_details: View changeset details
-    changesets:
-      id: ID
-      saved_at: Saved at
-      user: User
-      comment: Comment
-      area: Area
     index:
       title: Changesets
       title_user: Changesets by %{user}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a3bb71b12..99dcb6347 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -668,7 +668,6 @@ en:
   geocoder:
     search:
       title:
-        results_from_html: 'Results from %{results_link}'
         latlon: Internal
         osm_nominatim: OpenStreetMap Nominatim
         osm_nominatim_reverse: OpenStreetMap Nominatim
@@ -1573,16 +1572,11 @@ en:
     history: History
     export: Export
     issues: Issues
-    data: Data
-    export_data: Export Data
     gps_traces: GPS Traces
-    gps_traces_tooltip: Manage GPS traces
     user_diaries: User Diaries
     edit_with: Edit with %{editor}
-    tag_line: The Free Wiki World Map
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
-    intro_2_create_account: "Create a user account"
     hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."
     partners_fastly: "Fastly"
     partners_corpmembers: "OSMF corporate members"
@@ -1591,14 +1585,10 @@ en:
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     nothing_to_preview: "Nothing to preview."
-    donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
     help: Help
     about: About
     copyright: Copyright
     communities: Communities
-    community: Community
-    community_blogs: "Community Blogs"
-    community_blogs_title: "Blogs from members of the OpenStreetMap community"
     learn_more: "Learn More"
     more: More
   user_mailer:
@@ -1756,7 +1746,6 @@ en:
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
-      reply_button: "Reply"
       destroy_button: "Delete"
       unmute_button: "Move to Inbox"
     new:
@@ -1772,7 +1761,6 @@ en:
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"
-      actions: "Actions"
       messages:
         one: "You have %{count} sent message"
         other: "You have %{count} sent messages"
@@ -1909,7 +1897,6 @@ en:
       help: Help
   site:
     about:
-      next: Next
       heading_html: "%{copyright}OpenStreetMap %{br} contributors"
       copyright_symbol_html: "&copy;"
       used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
@@ -2299,7 +2286,6 @@ en:
       close: Close
     search:
       search: Search
-      get_directions: "Get directions"
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 66f0d6cc6..3878efada 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -469,12 +469,6 @@ eo:
       anonymous: Anonimulo
       no_edits: (neniu redakto)
       view_changeset_details: Vidi detalojn pri ŝanĝaro
-    changesets:
-      id: Identigilo
-      saved_at: Konservita je
-      user: Uzanto
-      comment: Komento
-      area: Areo
     index:
       title: Ŝanĝaroj
       title_user: Ŝanĝaroj de %{user}
@@ -2593,7 +2587,6 @@ eo:
         other: GPX-dosiero kun %{count} punktoj de %{user}
       description_without_count: GPX-dosiero de %{user}
   application:
-    basic_auth_disabled: 'Baza alira aÅ­tentigo estas malaktiva: %{link}'
     permission_denied: Vi ne rajtas fari tiun ĉi agon
     require_cookies:
       cookies_needed: Ŝajnas, ke vi malaktivigis 'kuketojn' - bonvolu aktivigi 'kuketojn'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4358419fb..884c82817 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -554,12 +554,6 @@ es:
       anonymous: Anónimo
       no_edits: (sin ediciones)
       view_changeset_details: Ver detalles del conjunto de cambios
-    changesets:
-      id: Id.
-      saved_at: Guardado en
-      user: Usuario
-      comment: Comentario
-      area: Área
     index:
       title: Conjuntos de cambios
       title_user: Conjunto de cambios de %{user}
@@ -2744,7 +2738,6 @@ es:
         other: Archivo GPX con %{count} puntos de %{user}
       description_without_count: Archivo GPX de %{user}
   application:
-    basic_auth_disabled: 'La autenticación básica de HTTPS está desactivada: %{link}'
     permission_denied: No tienes permisos para realizar esa acción
     require_cookies:
       cookies_needed: Parece que tienes las cookies deshabilitadas. Habilita las cookies
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 22c86cf86..f821bcfdf 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -447,12 +447,6 @@ et:
       anonymous: Anonüümne
       no_edits: (muudatused puuduvad)
       view_changeset_details: Vaata muudatuskogumi üksikasju
-    changesets:
-      id: ID
-      saved_at: Salvestatud
-      user: Kasutaja
-      comment: Kommentaar
-      area: Ala
     index:
       title: Muudatuskogumid
       title_user: Kasutaja %{user} muudatuskogumid
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index e4f70dd4a..fec81b33c 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -462,12 +462,6 @@ eu:
       anonymous: Anonimoa
       no_edits: (aldaketarik gabe)
       view_changeset_details: Ikusi aldaketen xehetasunak
-    changesets:
-      id: ID
-      saved_at: Noiz gordeta
-      user: Erabiltzailea
-      comment: Iruzkina
-      area: Eremua
     index:
       title: Aldaketak
       title_user: '%{user}k egindako aldaketak'
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 470a98c1f..a577e15bd 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -470,12 +470,6 @@ fa:
       anonymous: گمنام
       no_edits: (بدون ویرایش)
       view_changeset_details: نمایش جزئیات بستهٔ تغییر
-    changesets:
-      id: شناسه
-      saved_at: ذخیره‌شده در
-      user: کاربر
-      comment: نظر
-      area: منطقه
     index:
       title: بسته‌های تغییر
       title_user: بسته‌های تغییر %{user}
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 53c652174..27a43d5ad 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -468,12 +468,6 @@ fi:
       anonymous: Tuntematon
       no_edits: (ei muokkauksia)
       view_changeset_details: Näytä muutoskokoelman tarkemmat tiedot
-    changesets:
-      id: Tunniste
-      saved_at: Tallennettu
-      user: Käyttäjä
-      comment: Kommentti
-      area: Alue
     index:
       title: Muutoskokoelmat
       title_user: Käyttäjän %{user} muutoskokoelmat
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index bb60d9849..443ccc372 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -298,12 +298,6 @@ fit:
       anonymous: Tuntematon
       no_edits: (ei mookkauksia)
       view_changeset_details: Näytä muutoskokoelman tarkemmat tieot
-    changesets:
-      id: Tunniste
-      saved_at: Säästetty
-      user: Käyttäjä
-      comment: Kommentti
-      area: Alue
     index:
       title: Muutoskokoelmat
       title_user: Käyttäjän %{user} muutoskokoelmat
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index dd631f599..5fd93054d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -579,12 +579,6 @@ fr:
       anonymous: Anonyme
       no_edits: (aucune modification)
       view_changeset_details: Afficher les détails du groupe de modifications
-    changesets:
-      id: Identifiant
-      saved_at: Enregistré vers
-      user: Utilisateur
-      comment: Commentaire
-      area: Zone
     index:
       title: Groupes de modifications
       title_user: Groupes de modifications par %{user}
@@ -2794,7 +2788,6 @@ fr:
         other: Fichier GPX avec %{count} points de %{user}
       description_without_count: Fichier GPX de %{user}
   application:
-    basic_auth_disabled: 'L''authentification HTTP de base est désactivée : %{link}'
     permission_denied: Vous n’avez pas le droit d’accéder à cette action
     require_cookies:
       cookies_needed: Il semble que les témoins (cookies) soient désactivés dans votre
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index a078e39c5..4e193193a 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -371,12 +371,6 @@ fur:
       anonymous: Anonim
       no_edits: (nissun cambiament)
       view_changeset_details: Viôt detais dal grup di cambiaments
-    changesets:
-      id: ID
-      saved_at: Salvât ai
-      user: Utent
-      comment: Coment
-      area: Zone
     index:
       title: Grups di cambiaments
       title_user: Grups di cambiaments di %{user}
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 1d07d5f07..4b5b06ee2 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -411,12 +411,6 @@ fy:
       anonymous: Anonym
       no_edits: (gjin bewurkings)
       view_changeset_details: Wizigingssetgegevens besjen
-    changesets:
-      id: ID
-      saved_at: Bewarre op
-      user: Meidogger
-      comment: Beskriuwing
-      area: Krite
     index:
       title: Wizigingssets
       title_user: Wizigingssets fan %{user}
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 601db7610..d69be9536 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -303,12 +303,6 @@ ga:
       anonymous: Gan Ainm
       no_edits: (níl aon athrú ann)
       view_changeset_details: Amharc ar shonraí an tacair athruithe
-    changesets:
-      id: ID
-      saved_at: Sábháilte ag
-      user: Úsáideoir
-      comment: Nóta tráchta
-      area: Limistéar
     index:
       title: Tacair athruithe
       title_user: Tacair athruithe de chuid %{user}
diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 05f4db336..a3daecefc 100644
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -159,8 +159,6 @@ gcf:
     changeset_paging_nav:
       showing_page: Kotéfèy %{page}
       previous: Pwochenn
-    changesets:
-      comment: Komantasyon
     show:
       discussion: Bokantaj
       join_discussion: Konèkté-w pou jwenn bokantaj-la
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 27d8d8bb6..2306c1f51 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -387,12 +387,6 @@ gd:
       anonymous: Gun ainm
       no_edits: (cha deach a dheasachadh)
       view_changeset_details: Seall mion-fhiosrachadh air an t-seata atharraichean
-    changesets:
-      id: ID
-      saved_at: Air a shàbhaladh
-      user: Cleachdaiche
-      comment: Beachd
-      area: Raon
     index:
       title: Seataichean atharraichean
       title_user: Seataichean atharraichean le %{user}
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index d9fc51f34..30834939e 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -471,12 +471,6 @@ gl:
       anonymous: Anónimo
       no_edits: (sen edicións)
       view_changeset_details: Ollar os detalles do conxunto de modificacións
-    changesets:
-      id: ID
-      saved_at: Gardado o
-      user: Usuario
-      comment: Comentario
-      area: Zona
     index:
       title: Conxuntos de modificacións
       title_user: Conxuntos de modificacións por %{user}
@@ -2661,7 +2655,6 @@ gl:
         other: Ficheiro GPX con %{count} puntos de %{user}
       description_without_count: Ficheiro GPX de %{user}
   application:
-    basic_auth_disabled: 'A autenticación básica HTTP está desactivada: %{link}'
     permission_denied: Non ten permisos para acceder a esa acción
     require_cookies:
       cookies_needed: Semella que ten as cookies do navegador desactivadas. Actíveas
diff --git a/config/locales/gu.yml b/config/locales/gu.yml
index 5331679ae..3ab09381b 100644
--- a/config/locales/gu.yml
+++ b/config/locales/gu.yml
@@ -168,11 +168,6 @@ gu:
   changesets:
     changeset:
       no_edits: (કોઈ સંપાદન નહીં)
-    changesets:
-      id: ID
-      user: વપરાશકર્તા
-      comment: ટિપ્પણી
-      area: વિસ્તાર
     show:
       discussion: ચર્ચા
       hide_comment: છુપાવો
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 41aa3e864..b51e89f46 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -508,12 +508,6 @@ he:
       anonymous: אלמוני
       no_edits: (אין עריכות)
       view_changeset_details: הצגת פרטי ערכת שינויים
-    changesets:
-      id: מזהה
-      saved_at: נשמרו ב־
-      user: משתמש
-      comment: תגובה
-      area: שטח
     index:
       title: ערכות שינויים
       title_user: ערכות שינויים מאת %{user}
@@ -2635,7 +2629,6 @@ he:
         other: קובץ GPS עם %{count} נקודות מאת %{user}
       description_without_count: קובץ GPS מאת %{user}
   application:
-    basic_auth_disabled: 'אימות בסיסי ב־HTTP כבוי: %{link}'
     permission_denied: אין לך הרשאה לגשת לפעולה הזאת
     require_cookies:
       cookies_needed: נראה שהעוגיות כבויות אצלך – נא להפעיל עוגיות בדפדפן שלך כדי
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index dc9cd572e..0b08eb395 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -393,12 +393,6 @@ hi:
       anonymous: अनाम
       no_edits: (कोई सम्पादन नहीं है)
       view_changeset_details: इस changeset के विवरण देखे
-    changesets:
-      id: आईडी
-      saved_at: समय जब सुरक्षित किया गया
-      user: सदस्य
-      comment: टिप्पणी
-      area: क्षेत्र
     index:
       title: चेंजसेट
       title_user: '%{user} द्वारा चेंजसेट'
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 216a452e5..ee31c6054 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -375,12 +375,6 @@ hr:
       anonymous: Anoniman
       no_edits: (nema promjena)
       view_changeset_details: Prikaži detalje seta promjena
-    changesets:
-      id: ID
-      saved_at: Spremljeno
-      user: Korisnik
-      comment: Komentar
-      area: Područje
     index:
       title: Setovi promjena
       title_user: Setovi promjena od %{user}
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index c466e9325..75dee6502 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -436,12 +436,6 @@ hsb:
       anonymous: Anonymnje
       no_edits: (žane změny)
       view_changeset_details: Podrobnosće sadźby změnow pokazać
-    changesets:
-      id: ID
-      saved_at: 'Składowane:'
-      user: Wužiwar
-      comment: Komentar
-      area: Wobłuk
     index:
       title: Sadźby změnow
       title_user: Sadźby změnow wot %{user}
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 6bfc051b1..32dcdd1be 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -478,12 +478,6 @@ hu:
       anonymous: Névtelen
       no_edits: (nincs szerkesztés)
       view_changeset_details: Módosításcsomag részleteinek megtekintése
-    changesets:
-      id: Azonosító
-      saved_at: 'Mentve:'
-      user: Felhasználó
-      comment: Hozzászólás
-      area: Terület
     index:
       title: Módosításcsomagok
       title_user: '%{user} módosításcsomagjai'
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 20993249a..acc0dc332 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -455,12 +455,6 @@ ia:
       anonymous: Anonyme
       no_edits: (nulle modification)
       view_changeset_details: Vider detalios del gruppo de modificationes
-    changesets:
-      id: ID
-      saved_at: Salveguardate le
-      user: Usator
-      comment: Commento
-      area: Area
     index:
       title: Gruppos de modificationes
       title_user: Gruppos de modificationes facite per %{user}
@@ -2608,7 +2602,6 @@ ia:
         other: File GPX con %{count} punctos de %{user}
       description_without_count: File GPX de %{user}
   application:
-    basic_auth_disabled: 'Le authentication HTTP basic es disactivate: %{link}'
     permission_denied: Tu non ha le permission de acceder a iste action
     require_cookies:
       cookies_needed: Tu pare haber disactivate le cookies. Per favor activa le cookies
diff --git a/config/locales/id.yml b/config/locales/id.yml
index aeb3b298b..f014e978d 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -463,12 +463,6 @@ id:
       anonymous: Anonim
       no_edits: (tidak ada edit)
       view_changeset_details: Lihat informasi set perubahan
-    changesets:
-      id: ID
-      saved_at: Disimpan di
-      user: Pengguna
-      comment: Komentar
-      area: Area
     index:
       title: Set perubahan
       title_user: Set perubahan oleh %{user}
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 3474f1b46..e026583dd 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -479,12 +479,6 @@ is:
       anonymous: Nafnlaus
       no_edits: (engar breytingar)
       view_changeset_details: Skoða breytingasett nánar
-    changesets:
-      id: Auðkenni (ID)
-      saved_at: Vistað
-      user: Notandi
-      comment: Athugasemd
-      area: Svæði
     index:
       title: Breytingasett
       title_user: Breytingar eftir %{user}
@@ -2709,9 +2703,6 @@ is:
         other: GPX-skrá með %{count} punktum frá %{user}
       description_without_count: GPX-skrá frá %{user}
   application:
-    basic_auth_disabled: 'Einföld HTTP-auðkenning (Basic Authentication) er óvirk:
-      %{link}'
-    auth_disabled_link: https://wiki.openstreetmap.org/wiki/2024_authentication_update
     permission_denied: Þú hefur ekki réttindi til að nota þessa aðgerð
     require_cookies:
       cookies_needed: Þú virðist ekki vera með stuðning við vefkökur í vafranum þínum.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 6c215a321..c3f9ddc9b 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -513,12 +513,6 @@ it:
       anonymous: Anonimo
       no_edits: (nessuna modifica)
       view_changeset_details: Visualizza i dettagli del gruppo di modifiche
-    changesets:
-      id: ID
-      saved_at: Salvato il
-      user: Utente
-      comment: Commenta
-      area: Area
     index:
       title: Gruppi di modifiche
       title_user: Gruppi di modifiche di %{user}
@@ -2689,7 +2683,6 @@ it:
         other: File GPX con %{count} punti da %{user}
       description_without_count: File GPX da %{user}
   application:
-    basic_auth_disabled: 'L''autenticazione di base HTTP è disabilitata: %{link}'
     permission_denied: Non disponi dei permessi necessari per eseguire questa azione
     require_cookies:
       cookies_needed: Pare che tu abbia i cookie non abilitati - abilita i cookie
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 1aea757fb..f5c33b279 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -470,12 +470,6 @@ ja:
       anonymous: 匿名
       no_edits: (編集がありません)
       view_changeset_details: 変更セットの詳細を閲覧
-    changesets:
-      id: ID
-      saved_at: 保存日時
-      user: 利用者
-      comment: コメント
-      area: 領域
     index:
       title: 変更セット
       title_user: '%{user} による変更セット'
@@ -2377,7 +2371,6 @@ ja:
         ファイル}}'
       description_without_count: '%{user} による GPX ファイル'
   application:
-    basic_auth_disabled: 'HTTP Basic認証は無効化されています: %{link}'
     permission_denied: その処理をする権限がありません
     require_cookies:
       cookies_needed: ブラウザーの Cookie が無効になっているようです。続行する前にブラウザーの Cookie を有効にしてください。
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index da582536f..b70edcd04 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -206,12 +206,6 @@ ka:
     changeset:
       anonymous: ანონიმი
       no_edits: (რედაქტირება არ არის)
-    changesets:
-      id: ID
-      saved_at: შენახულია როგორც
-      user: მომხმარებელი
-      comment: კომენტარი
-      area: ტერიტორია
     index:
       title: ცვლილებების პაკეტი
       load_more: მეტის ჩატვირთვა
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 922cedcc1..1eb94c7e6 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -330,12 +330,6 @@ kab:
       anonymous: Udrig
       no_edits: (ulac abeddel)
       view_changeset_details: Sken talqayt n ugraw n yibeddilen
-    changesets:
-      id: Asulay
-      saved_at: Yettwasekles deg
-      user: Aseqdac
-      comment: Awennit
-      area: Tamnaḍt
     index:
       title: Agraw n usnifel
       title_user: Igrawen n usnifel sɣur %{user}
diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 8388047c8..4dd230a25 100644
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -324,9 +324,6 @@ kk-cyrl:
       anonymous: Аноним
       no_edits: (өңдемелер жоқ)
       view_changeset_details: Өңдеме дестесінің егжей-тегжейін көру
-    changesets:
-      id: ID
-      user: Қолданушы
     index:
       title: Өңдеме дестелері
       title_user: '%{user} жасаған өңдемелер дестелері'
diff --git a/config/locales/km.yml b/config/locales/km.yml
index 9d97dc8f6..3c6f60050 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -171,12 +171,6 @@ km:
       anonymous: អនាមិក
       no_edits: (គ្មានកំណែប្រែ​)
       view_changeset_details: មើលព័ត៌មានលម្អិតរបស់សំណុំបន្លាស់ប្តូរ​
-    changesets:
-      id: អត្តលេខ
-      saved_at: បានរក្សាទុក​នៅ​
-      user: អ្នកប្រើប្រាស់​
-      comment: មតិយោបល់​
-      area: តំបន់
     index:
       title: សំណុំបន្លាស់ប្ដូរ
       title_user: សំណុំបន្លាស់ប្ដូរធ្វើដោយ %{user}
diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 8759d6979..00f7bd44f 100644
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -290,12 +290,6 @@ kn:
       anonymous: ಅನಾಮಧೇಯ
       no_edits: (ಸಂಪಾದನೆಗಳಿಲ್ಲ)
       view_changeset_details: ಬದಲಾವಣೆಯ ವಿವರಗಳನ್ನು ತೋರಿಸಿ
-    changesets:
-      id: ಐಡಿ
-      saved_at: ಇಲ್ಲಿ ಉಳಿಸಲಾಗಿದೆ
-      user: ಬಳಕೆದಾರ
-      comment: ಟಿಪ್ಪಣಿ
-      area: ಪ್ರದೇಶ
     index:
       title: ಬದಲಾವಣೆಗಳು
       title_user: '%{user}ಅವರಿಂದಾದ ಬದಲಾವಣೆಗಳು'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index e6e6277e5..6ae7c57a4 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -34,6 +34,7 @@
 # Author: SeoJeongHo
 # Author: Stleamist
 # Author: Sukjong0406
+# Author: Suleiman the Magnificent Television
 # Author: Theshinster123
 # Author: Twotwo2019
 # Author: Wehwei
@@ -195,6 +196,8 @@ ko:
         pass_crypt_confirmation: 비밀번호 확인
     help:
       doorkeeper/application:
+        confidential: 클라이언트 비밀을 유지할 수 있는 곳에서 애플리케이션이 사용됩니다 (네이티브 모바일 앱과 싱글 페이지 앱은
+          기밀이 아닙니다).
         redirect_uri: URI마다 1줄 사용
       trace:
         tagstring: 쉼표로 구분
@@ -288,6 +291,7 @@ ko:
         retain_notes: 지도 메모와 메모에 달린 댓글이 있는 경우 유지되지만 보기에서 숨겨집니다.
         retain_changeset_discussions: 바뀜집합 토론이 있는 경우 유지됩니다.
         retain_email: 이메일 주소는 그대로 유지됩니다.
+        recent_editing_html: 최근 편집했으므로 현재 계정을 삭제할 수 없습니다. %{time} 후에 삭제가 가능합니다.
         confirm_delete: 확실합니까?
         cancel: 취소
   accounts:
@@ -451,12 +455,6 @@ ko:
       anonymous: 익명
       no_edits: (편집 없음)
       view_changeset_details: 바뀜집합의 자세한 사항 보기
-    changesets:
-      id: ID
-      saved_at: 저장된 시간
-      user: 사용자
-      comment: 의견
-      area: 구역
     index:
       title: 바뀜집합
       title_user: '%{user}님의 바뀜집합'
diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index 73866e347..33f91938c 100644
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -78,8 +78,6 @@ ksh:
     changeset_paging_nav:
       next: Nächs »
       previous: « Vörijje
-    changesets:
-      user: Metmaacher
   diary_entries:
     form:
       use_map_link: Landkaat bruche
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index a176736d8..6aed3610a 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -433,12 +433,6 @@ ku-Latn:
       anonymous: Anonîm
       no_edits: (nehatiye guhartin)
       view_changeset_details: Dêtayên qeyda guhartinan bibîne
-    changesets:
-      id: ID
-      saved_at: Dema qeydê
-      user: Bikarhêner
-      comment: Şîrove
-      area: Herêm
     index:
       title: Desteya guhartinan
       title_user: Desteyên guhartinan yên ji alî %{user} ve
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 04169e695..087fd442f 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -331,7 +331,7 @@ lb:
       history_title_html: 'Versioune vum Wee: %{name}'
       nodes: Kniet
       nodes_count:
-        one: 1 Knuet
+        one: '%{count} Knuet'
         other: '%{count} Kniet'
       also_part_of_html:
         one: Deel vum Wee %{related_ways}
@@ -381,7 +381,8 @@ lb:
         relation: Relatioun
     start_rjs:
       feature_warning: D'Luede vun %{num_features} Funktioune kann dëse Browser méi
-        lues maachen oder afréieren. Sollen dës Donnéeë wierklech ugewise ginn?
+        lues maachen oder afréieren. Sidd Dir sécher dat Dir dës Donnéeë wëllt ugewise
+        kréien?
       load_data: Donnéeë lueden
       loading: Lueden...
     tag_details:
@@ -423,12 +424,6 @@ lb:
       anonymous: Anonym
       no_edits: (keng Ännerungen)
       view_changeset_details: Detailer vum Ännerungssaz uweisen
-    changesets:
-      id: Nummer (ID)
-      saved_at: Gespäichert de(n)
-      user: Benotzer
-      comment: Bemierkung
-      area: Beräich
     index:
       title: Sette vun Ännerungen
       title_user: Sette vun Ännerunge vum %{user}
@@ -1640,7 +1635,7 @@ lb:
           deens du kommentéiert has, reaktivéiert.'
         commented_note_html: '%{commenter} huet en Hiweis an der Noperschaft vu(n)
           %{place}, deens du kommentéiert has, reaktivéiert.'
-      details: Méi Detailer iwwer d'Notiz fannt Dir op %{url}.
+      details: Äntweren oder méi gewuer ginn iwwer d'Notiz op %{url}.
       details_html: Méi Detailer iwwer d'Notiz fannt Dir op %{url}.
     changeset_comment_notification:
       hi: Salut %{to_user},
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index afb37ad88..30e211b7c 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -492,12 +492,6 @@ lt:
       anonymous: Anonimiškas
       no_edits: (nėra pakeitimų)
       view_changeset_details: Žiūrėti pakeitimo detales
-    changesets:
-      id: ID
-      saved_at: Įrašymo laikas
-      user: Naudotojas
-      comment: Komentaras
-      area: Plotas
     index:
       title: Pakeitimai
       title_user: Naudotojo %{user} pakeitimai
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index facf0d17e..d766ead9d 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -344,12 +344,6 @@ lv:
       anonymous: Anonīms
       no_edits: (nav labojumu)
       view_changeset_details: Skatīt sīkāku informāciju par izmaiņu kopu
-    changesets:
-      id: ID
-      saved_at: Saglabāts
-      user: Lietotājs
-      comment: Komentārs
-      area: Apgabals
     index:
       title: Izmaiņu kopas
       title_user: Lietotāja %{user} izmaiņu kopas
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 37566c98c..c7627b46b 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -447,12 +447,6 @@ mk:
       anonymous: Анонимец
       no_edits: (нема уредувања)
       view_changeset_details: Погл. поединости за измените
-    changesets:
-      id: Назнака
-      saved_at: Зачувано во
-      user: Корисник
-      comment: Коментар
-      area: Подрачје
     index:
       title: Измени
       title_user: Измени на %{user}
@@ -2609,7 +2603,6 @@ mk:
         other: GPX-податотеки со %{count} точки од %{user}
       description_without_count: GPX-податотека од %{user}
   application:
-    basic_auth_disabled: 'Оневозможена е основната заверка со HTTP: %{link}'
     permission_denied: Немате дозвола за ова дејство
     require_cookies:
       cookies_needed: Изгледа сте оневозможиле колачиња - дозволете колачиња во прелистувачот
diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 67eaf4b3c..a2b335246 100644
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -141,9 +141,6 @@ mo:
     changeset:
       anonymous: Аноним
       no_edits: (фэрэ модификэрь)
-    changesets:
-      user: Утилизатор
-      comment: Коментариу
     index:
       feed:
         created: Креат
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 7ce7874f5..70713aa8a 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -281,12 +281,6 @@ mr:
       anonymous: अनामिक
       no_edits: (संपादने नाहीत)
       view_changeset_details: बदलसंचाचा तपशील पहा
-    changesets:
-      id: ओळखसंख्या (आयडी)
-      saved_at: ला जतन केले
-      user: सदस्य
-      comment: टिप्पणी
-      area: क्षेत्र
     index:
       title: बदलसंच
       title_user: '%{user}चे बदलसंच'
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index d2ac33cda..61cc4772f 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -360,12 +360,6 @@ ms:
       anonymous: Awanama
       no_edits: (tiada suntingan)
       view_changeset_details: Lihat butiran set perubahan
-    changesets:
-      id: ID
-      saved_at: Disimpan pada
-      user: Pengguna
-      comment: Komen
-      area: Kawasan
     index:
       title: Set perubahan
       title_user: Set perubahan oleh %{user}
diff --git a/config/locales/my.yml b/config/locales/my.yml
index f6f956a2c..9950068bd 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -169,11 +169,6 @@ my:
     changeset:
       anonymous: အမည်မသိ
       no_edits: (တည်းဖြတ်မှု မရှိ)
-    changesets:
-      id: အိုင်ဒီ
-      user: အသုံးပြုသူ
-      comment: မှတ်ချက်
-      area: ဧရိယာ
     index:
       load_more: ပိုမိုခေါ်ယူရန်
       feed:
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 87737a27b..c1e1b8563 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -426,12 +426,6 @@ nb:
       anonymous: Anonym
       no_edits: (ingen redigeringer)
       view_changeset_details: Vis endringssettsdetaljer
-    changesets:
-      id: ID
-      saved_at: Lagret den
-      user: Bruker
-      comment: Kommentar
-      area: Område
     index:
       title: Endringssett
       title_user: Endringssett av %{user}
diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 38cbc38dd..15368461b 100644
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -104,12 +104,6 @@ nds:
     changeset:
       anonymous: Anonym
       no_edits: (keen Ännern)
-    changesets:
-      id: ID
-      saved_at: Spiekert an’n
-      user: Bruker
-      comment: Kommentar
-      area: Rebeed
   dashboards:
     contact:
       km away: '%{count} km weg'
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 3f3363c47..7995b9c07 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -365,12 +365,6 @@ ne:
       anonymous: बेनाम
       no_edits: (कुनै सम्पादनहरू छैनन्)
       view_changeset_details: परिवर्तनहरूको विवरण हेर्नुहोस्
-    changesets:
-      id: आईडी(ID)
-      saved_at: सुरक्षित गरिएको समय
-      user: प्रयोगकर्ता
-      comment: टिप्पणी
-      area: क्षेत्र
     index:
       title: परिवर्नहरू
       title_user: '%{user}द्वरा गरिएका परिवर्तनहरू'
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index bed7b088a..cf42ee1e2 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -514,12 +514,6 @@ nl:
       anonymous: Anoniem
       no_edits: (geen bewerkingen)
       view_changeset_details: Details wijzigingenset weergeven
-    changesets:
-      id: ID
-      saved_at: Opgeslagen op
-      user: Gebruiker
-      comment: Opmerking
-      area: Gebied
     index:
       title: Wijzigingensets
       title_user: Wijzigingensets door %{user}
@@ -2702,7 +2696,6 @@ nl:
         other: GPX-bestand met %{count} punten van %{user}
       description_without_count: GPX-bestand van %{user}
   application:
-    basic_auth_disabled: 'HTTP-basisauthenticatie is uitgeschakeld: %{link}'
     permission_denied: U hebt geen toestemming om toegang te krijgen tot die handeling
     require_cookies:
       cookies_needed: U hebt cookies waarschijnlijk uitgeschakeld in uw browser. Schakel
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index a6ed50c7e..8e8ef11a0 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -408,12 +408,6 @@ nn:
       anonymous: Anonym
       no_edits: (ingen redigeringar)
       view_changeset_details: Vis detaljar for endringssett
-    changesets:
-      id: ID
-      saved_at: Lagra
-      user: Brukar
-      comment: Kommentar
-      area: Område
     index:
       title: Endringssett
       title_user: Endringssett av %{user}
diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index d131f4021..99a507f2b 100644
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -379,12 +379,6 @@ nqo:
       anonymous: ߕߐ߯ߒߕߊ߲
       no_edits: (ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬)
       view_changeset_details: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲ ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
-    changesets:
-      id: ID
-      saved_at: ߊ߬ ߓߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
-      user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
-      comment: ߡߙߌߣߊ߲
-      area: ߦߙߐ
     index:
       title: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬ ߡߊߝߊ߬ߟߋ߲߫
       title_user: '%{user} ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫'
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 38c7fe17c..b9b0e26a2 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -431,12 +431,6 @@ oc:
       anonymous: Anonim
       no_edits: (sensa modificacion)
       view_changeset_details: Mostrar per lo menut lo grop de modificacions
-    changesets:
-      id: Identificant
-      saved_at: Sauvat a
-      user: Utilizaire
-      comment: Comentari
-      area: Airau
     index:
       title: Gropes de modificacions
       title_user: Gropes de modificacions per %{user}
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index be3625909..da5fb3214 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -316,11 +316,6 @@ pa:
     changeset:
       anonymous: ਬੇਪਛਾਣ
       no_edits: (ਕੋਈ ਸੋਧ ਨਹੀਂ)
-    changesets:
-      id: ਸ਼ਨਾਖ਼ਤ
-      user: ਵਰਤੋਂਕਾਰ
-      comment: ਟਿੱਪਣੀ
-      area: ਖੇਤਰ
     index:
       title: ਤਬਦੀਲੀਆਂ
       load_more: ਹੋਰ ਪੜ੍ਹੋ
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index d1ece5c96..5caf944b5 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -545,12 +545,6 @@ pl:
       anonymous: Anonim
       no_edits: (brak edycji)
       view_changeset_details: Zobacz szczegóły zestawu zmian
-    changesets:
-      id: ID
-      saved_at: Zapisano
-      user: Użytkownik
-      comment: Komentarz
-      area: Obszar
     index:
       title: Zestawy zmian
       title_user: Zestawy zmian użytkownika %{user}
diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 00f91ce5d..6d6ac9ec9 100644
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -384,12 +384,6 @@ pnb:
       anonymous: انام
       no_edits: (کوئی سودھ نہیں)
       view_changeset_details: تبدیلیاں وروے ویکھو
-    changesets:
-      id: آئی‌ڈی ایڈیٹر
-      saved_at: سانبھیئے
-      user: ورتنوالا
-      comment: ٹپݨی
-      area: علاقہ
     index:
       title: تبدیلیاں
       title_user: '%{user} دیاں تبدیلیاں'
diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index f2b980233..3b3d2be51 100644
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -113,11 +113,6 @@ ps:
   changesets:
     changeset:
       anonymous: ورکنومی
-    changesets:
-      id: پېژند
-      user: کارن
-      comment: تبصره
-      area: سيمه
     index:
       feed:
         created: جوړ شو
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 59e27a1a4..207867ed3 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -114,9 +114,9 @@ pt-PT:
       relation_tag: Etiqueta da relação
       report: Denúncia
       session: Sessão
-      trace: Trajeto
-      tracepoint: Ponto do trajeto
-      tracetag: Etiqueta do trajeto
+      trace: Rota
+      tracepoint: Ponto de Rota
+      tracetag: Etiqueta de Rota
       user: Utilizador
       user_preference: Preferências do utilizador
       user_token: Token do utilizador
@@ -442,8 +442,8 @@ pt-PT:
         relation: relação
     start_rjs:
       feature_warning: A carregar %{num_features} elementos. Isto poderá deixar o
-        navegador lento ou sem resposta. Tens a certeza de que queres ver estes elementos
-        todos?
+        navegador lento ou sem resposta. Tens a certeza de que queres mostrar estes
+        dados?
       load_data: Carregar Dados
       loading: A carregar…
     tag_details:
@@ -496,12 +496,6 @@ pt-PT:
       anonymous: Anónimo
       no_edits: (sem edições)
       view_changeset_details: Ver detalhes do conjunto de alterações
-    changesets:
-      id: ID
-      saved_at: Gravado em
-      user: Utilizador
-      comment: Comentário
-      area: Área
     index:
       title: Conjuntos de alterações
       title_user: Conjuntos de alterações de %{user}
@@ -681,6 +675,8 @@ pt-PT:
       comment: Comentário
       newer_comments: Comentários mais recentes
       older_comments: Comentários mais antigos
+    new:
+      heading: Adicionar um comentário à seguinte discussão de entrada no diário?
   doorkeeper:
     errors:
       messages:
@@ -922,6 +918,7 @@ pt-PT:
           college: Edifício de faculdade
           commercial: Edifício comercial
           construction: Edifício em construção
+          cowshed: Vacaria
           detached: Casa isolada
           dormitory: Dormitório
           duplex: Casa dupla
@@ -951,6 +948,7 @@ pt-PT:
           shed: Barracão
           stable: Estábulo
           static_caravan: Caravana
+          sty: Pocilga
           temple: Edíficio de templo
           terrace: Edifício geminado
           train_station: Edifício de estação dos comboios
@@ -1554,6 +1552,7 @@ pt-PT:
     page:
       user_not_found: O utilizador não existe
       issues_not_found: Não se encontraram problemas desse tipo
+      reported_user: Utilizador Denunciado
       status: Estado
       reports: Denúncias
       last_updated: Última atualização
@@ -1562,6 +1561,12 @@ pt-PT:
         one: '%{count} denúncia'
         other: '%{count} denúncias'
       reported_item: Elemento denunciado
+      states:
+        ignored: Ignorada
+        open: Aberta
+        resolved: Resolvida
+      older_issues: Problemas antigos
+      newer_issues: Problemas recentes
     show:
       title: '%{status} Denúncia #%{issue_id}'
       reports:
@@ -1668,6 +1673,7 @@ pt-PT:
       de manutenção.
     osm_read_only: A base de dados do OpenStreetMap encontra-se em modo de leitura
       devido a trabalhos de manutenção.
+    nothing_to_preview: Nada para pré-visualizar.
     donate: Apoia o OpenStreetMap %{link} para o Fundo de Atualização do Hardware.
     help: Ajuda
     about: Sobre
@@ -1711,15 +1717,21 @@ pt-PT:
       see_their_profile: Podes ver o perfil dele em %{userurl}.
       see_their_profile_html: Podes ver o seu perfil em %{userurl}.
       befriend_them: Também podes adicioná-lo como amigo em %{befriendurl}.
-      befriend_them_html: Também os podes adicionar como amigos em %{befriendurl}.
+      befriend_them_html: Também podes adicionar este utilizador como amigo em %{befriendurl}.
     gpx_description:
+      description_with_tags: 'Parece que o teu ficheiro GPX %{trace_name} com a descrição
+        %{trace_description} e as seguintes etiquetas: %{tags}'
       description_with_tags_html: 'Parece que o teu ficheiro GPX %{trace_name} com
         a descrição %{trace_description} e as etiquetas: %{tags}'
+      description_with_no_tags: Parece que o teu ficheiro GPX %{trace_name} com a
+        descrição %{trace_description} e sem etiquetas
       description_with_no_tags_html: Parece que o teu ficheiro GPX %{trace_name} com
         a descrição %{trace_description} e sem etiquetas
     gpx_failure:
       hi: Olá, %{to_user}.
       failed_to_import: 'falhou na importação. Eis o erro:'
+      more_info: Podes encontrar mais informações sobre falhas de importação de ficheiros
+        GPX e como as evitar em %{url}.
       more_info_html: Podes encontrar mais informações sobre falhas de importação
         GPX e como evitá-las em %{url}.
       import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=pt
@@ -1729,7 +1741,10 @@ pt-PT:
       loaded:
         one: carregado com sucesso com %{trace_points} de %{count} point possível.
         other: carregado com sucesso com %{trace_points} de %{count} pontos possíveis.
-      all_your_traces_html: Todos os trajetos GPX que enviaste podem ser encontrados
+      trace_location: A tua rota está disponível em %{trace_url}
+      all_your_traces: Todas as tuas rotas GPX enviadas com sucesso podem ser encontradas
+        em %{url}
+      all_your_traces_html: Todas as rotas GPX que enviaste podem ser encontradas
         em %{url}.
       subject: '[OpenStreetMap] Importação de GPX bem-sucedida'
     signup_confirm:
@@ -2028,6 +2043,7 @@ pt-PT:
     richtext_field:
       edit: Editar
       preview: Pré-visualizar
+      help: Ajuda
   site:
     about:
       next: Seguinte
@@ -2106,9 +2122,9 @@ pt-PT:
         credit_title_html: Como creditar o OpenStreetMap
         credit_1_html: 'Onde usar dados do OpenStreetMap, é necessário fazer as duas
           coisas seguintes:'
-        credit_2_1: Forneça os devidos créditos ao OpenStreetMap exibindo o nosso
+        credit_2_1: Fornecer os devidos créditos ao OpenStreetMap, exibindo o nosso
           aviso de direitos de autor.
-        credit_2_2: Deixe claro que os dados estão disponíveis sob a Licença de Base
+        credit_2_2: Deixar claro que os dados estão disponíveis sob a Licença de Base
           de Dados Abertos.
         credit_3_html: Para o aviso de direitos de autor, temos vários requisitos
           para a sua exibição, dependendo da forma como usa os nossos dados. Por exemplo,
@@ -2254,7 +2270,7 @@ pt-PT:
       title: Exportar
       manually_select: Selecionar manualmente outra área
       licence: Licença
-      licence_details_html: Os dados do OpenStreetMap são licenciados sob %{odbl_link}
+      licence_details_html: Os dados do OpenStreetMap são licenciados sob a %{odbl_link}
         (ODbL).
       odbl: Licença de Base de Dados Aberta de Open Data Commons
       too_large:
@@ -2631,7 +2647,6 @@ pt-PT:
         other: Ficheiro GPX com %{count} pontos de %{user}
       description_without_count: Ficheiro GPX de %{user}
   application:
-    basic_auth_disabled: 'A Autenticação Básica HTTP está desativada: %{link}'
     permission_denied: Não tens permissões para realizar essa operação
     require_cookies:
       cookies_needed: Parece que tens os "cookies" desativados - por favor, ativa-os
@@ -2650,25 +2665,26 @@ pt-PT:
       oauth2_authorizations: Autorizações OAuth 2
       muted_users: Utilizadores Silenciados
     auth_providers:
+      openid_url: URL OpenID
       openid_login_button: Continuar
       openid:
         title: Iniciar sessão com OpenID
-        alt: Iniciar sessão com um URL do OpenID
+        alt: Logótipo OpenID
       google:
         title: Iniciar sessão com Google
-        alt: Iniciar sessão com um OpenID do Google
+        alt: Logótipo Google
       facebook:
         title: Iniciar sessão com Facebook
-        alt: Iniciar sessão com uma conta Facebook
+        alt: Logótipo Facebook
       microsoft:
         title: Iniciar sessão com Microsoft
-        alt: Iniciar sessão com uma conta Microsoft
+        alt: Logótipo Microsoft
       github:
         title: Iniciar sessão com GitHub
-        alt: Iniciar sessão com uma conta GitHub
+        alt: Logótipo GitHub
       wikipedia:
         title: Iniciar sessão com a Wikipédia
-        alt: Iniciar sessão com uma conta Wikipédia
+        alt: Logótipo Wikipédia
   oauth:
     permissions:
       missing: Não deste permissão à aplicação para aceder a este serviço
@@ -2683,6 +2699,8 @@ pt-PT:
       write_notes: Modificar notas
       write_redactions: Rever dados do mapa
       read_email: ‎Ler e-mail de utilizador
+      consume_messages: Ler, atualizar estado e apagar mensagens de utilizadores
+      send_messages: Enviar mensagens privadas a outros utilizadores
       skip_authorization: Aprovar a aplicação automaticamente
     for_roles:
       moderator: Esta permissão é para ações disponíveis apenas para moderadores
@@ -2957,6 +2975,7 @@ pt-PT:
       heading_html: A editar o bloqueio em %{name}
       period: Por quanto tempo, com início agora, o utilizador será bloqueado na utilização
         da API.
+      revoke: Revogar bloqueio
     filter:
       block_period: O período de bloqueio tem de corresponder a um dos valores selecionáveis
         da lista.
@@ -2965,6 +2984,12 @@ pt-PT:
     update:
       only_creator_can_edit: Este bloqueio só pode ser editado pelo moderador que
         o criou.
+      only_creator_can_edit_without_revoking: Só o moderador que criou este bloqueio
+        é que o pode editar sem o revogar.
+      only_creator_or_revoker_can_edit: Só os moderadores que criaram ou revogaram
+        este bloqueio é que o podem editar.
+      inactive_block_cannot_be_reactivated: Este bloqueio está inativo e não pode
+        ser reativado.
       success: Bloqueio atualizado.
     index:
       title: Bloqueios do utilizador
@@ -3041,6 +3066,7 @@ pt-PT:
       blocks_by_me: Os meus bloqueios
       blocks_by_user: Bloqueios de %{user}
       block: 'Bloqueio #%{id}'
+      new_block: Novo Bloqueio
   user_mutes:
     index:
       title: Utilizadores Silenciados
@@ -3138,14 +3164,15 @@ pt-PT:
       custom_dimensions: Definir dimensões
       format: 'Formato:'
       scale: 'Escala:'
-      image_dimensions: A imagem mostrará a camada padrão com %{width} x %{height}
+      image_dimensions: A imagem mostrará a camada %{layer} com %{width} x %{height}
       download: Transferir
       short_url: URL curto
       include_marker: Incluir marcador
       center_marker: Centrar o mapa no marcador
       paste_html: Colar HTML para incorporar na página web
       view_larger_map: Ver mapa maior
-      only_standard_layer: Só a camada padrão pode ser exportada como imagem
+      only_standard_layer: Só as camadas Padrão, de Ciclismo e de Transporte é que
+        podem ser exportadas como imagem
     embed:
       report_problem: Reportar um problema
     key:
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index a2465dc74..c594d83e8 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -511,12 +511,6 @@ pt:
       anonymous: Anônimo
       no_edits: (sem alterações)
       view_changeset_details: Ver detalhes do conjunto de alterações
-    changesets:
-      id: ID
-      saved_at: Salvo em
-      user: Usuário
-      comment: Comentário
-      area: Área
     index:
       title: Conjuntos de alterações
       title_user: Conjuntos de alterações de %{user}
@@ -2676,7 +2670,6 @@ pt:
         other: Arquivo GPX com %{count} pontos de %{user}
       description_without_count: Arquivo GPX de %{user}
   application:
-    basic_auth_disabled: 'A autenticação básica HTTP está desativada: %{link}'
     permission_denied: Você não tem permissão para acessar essa ação
     require_cookies:
       cookies_needed: Parece que você está com os cookies desabilitados - habilite-os
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 384d6edee..400ab0b7a 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -8,6 +8,7 @@
 # Author: Cevamihnea
 # Author: Cristina S
 # Author: EddyPetrisor
+# Author: Firilacroco
 # Author: GabiBil
 # Author: Gravitystorm
 # Author: Heron702
@@ -466,12 +467,6 @@ ro:
       anonymous: Anonim
       no_edits: (nu există editări)
       view_changeset_details: Vizualizare detalii set de schimbări
-    changesets:
-      id: ID
-      saved_at: Salvat la
-      user: Utilizator
-      comment: Comentariu
-      area: Zonă
     index:
       title: Set de modificări
       title_user: Seturi de modificări făcute de %{user}
@@ -1661,7 +1656,7 @@ ro:
         other: ""
       subject: '[OpenStreetMap] succes import fișier GPX'
     signup_confirm:
-      subject: '[OpenStreetMap] Bun venit la OpenStreetMap'
+      subject: '[OpenStreetMap] Bun-venit la OpenStreetMap'
       greeting: Salut!
       created: Cineva (sperăm că tu) tocmai a creat un cont la %{site_url}.
       confirm: 'Înainte de a face orice altceva, trebuie să confirmați că această
@@ -2236,7 +2231,7 @@ ro:
         pentru a răspunde și pune întrebări și pentru a colaborara și documenta subiectele
         legate de cartografiere.
       welcome:
-        url: Bun venit
+        url: /welcome
         title: Bine ați venit la OpenStreetMap
         description: Începeți cu acest ghid rapid care acoperă elementele de bază
           OpenStreetMap.
@@ -2281,7 +2276,7 @@ ro:
         întrebări și pentru a discuta și a documenta colaborativ despre cartografiere.
         %{help_link}. Ești o organizație care are planuri pentru OpenStreetMap? %{welcome_mat_link}.
       get_help_here: Obțineți ajutor aici
-      welcome_mat: Consultați Pagina de Bun Venit
+      welcome_mat: Consultați pagina de bun-venit
     sidebar:
       search_results: Rezultatele căutării
       close: Închide
@@ -2374,11 +2369,10 @@ ro:
           bicycle_parking: Parcare pentru biciclete
           toilets: Toalete
     welcome:
-      title: Bun venit!
-      introduction: |-
-        Bun venit la OpenStreetMap, harta liberă și editabilă a lumii. Acum că sunteți autentificat
-        , ești pregătit să începi cartografierea. Iată un ghid rapid cu cele mai importante
-        lucruri pe care trebuie să le cunoașteți.
+      title: Bun-venit!
+      introduction: Bun-venit la OpenStreetMap, harta liberă și editabilă a lumii.
+        Acum că v-ați autentificat, sunteți gata să începeți cartografierea. Iată
+        un ghid rapid cu cele mai importante lucruri pe care trebuie să le cunoașteți.
       whats_on_the_map:
         title: Ce este pe Hartă
         on_the_map_html: |-
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 57aee8a33..626b0c647 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -592,12 +592,6 @@ ru:
       anonymous: Аноним
       no_edits: (нет правок)
       view_changeset_details: Просмотреть подробности пакета правок
-    changesets:
-      id: ID
-      saved_at: Завершено
-      user: Пользователь
-      comment: Комментарий
-      area: Область
     index:
       title: Пакеты правок
       title_user: Пакеты правок пользователя %{user}
diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index f4248f745..e5ed89e94 100644
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -200,11 +200,6 @@ sat:
     changeset:
       anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
       no_edits: (ᱥᱟᱯᱲᱟᱣ ᱵᱟᱝ)
-    changesets:
-      id: ID
-      user: ᱵᱮᱵᱷᱟᱨᱤᱡ
-      comment: ᱚᱠᱛᱟ
-      area: ᱡᱟᱭᱜᱟ
     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
       feed:
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 0000c00f7..82d3cd3bc 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -443,12 +443,6 @@ sc:
       anonymous: Anònimu
       no_edits: (peruna modìfica)
       view_changeset_details: Pòmpia sos detàllios de s'annantu de modìficas
-    changesets:
-      id: ID
-      saved_at: Sarvadu su
-      user: Impitadore
-      comment: Cummentu
-      area: Àrea
     index:
       title: Annantos de modìficas
       title_user: Annantos de modìficas de %{user}
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 6c55563ed..d3d6a6d33 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -341,12 +341,6 @@ scn:
       anonymous: Anònimu
       no_edits: (nuḍḍu canciamentu)
       view_changeset_details: Ammustra li dittagghî dû gruppu di canciamenti
-    changesets:
-      id: ID
-      saved_at: Sarvatu lu
-      user: Utenti
-      comment: Cummentu
-      area: Ària
     index:
       title: Gruppi di canciamenti
       title_user: Gruppi di canciamenti di %{user}
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 25ab55aad..f4133ff3e 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -184,12 +184,6 @@ sco:
       anonymous: Anonymous
       no_edits: (no eedits)
       view_changeset_details: View chyngeset details
-    changesets:
-      id: ID
-      saved_at: Saved at
-      user: Uiser
-      comment: Comment
-      area: Area
     index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 8b069b137..2dc952620 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -262,10 +262,6 @@ sh:
     changeset:
       anonymous: Anoniman
       no_edits: (nema izmjena)
-    changesets:
-      user: Korisnik
-      comment: Komentar
-      area: Područje
     index:
       title: Setovi promjena
       title_user: Setovi promjena od %{user}
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index cadc9c6c5..0aeb8e295 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -496,12 +496,6 @@ sk:
       anonymous: Anonym
       no_edits: (bez úprav)
       view_changeset_details: Zobraziť detaily sady zmien
-    changesets:
-      id: ID
-      saved_at: Uložené
-      user: Používateľ
-      comment: Komentár
-      area: Oblasť
     index:
       title: Sady zmien
       title_user: Sady zmien používateľa %{user}
@@ -2408,7 +2402,6 @@ sk:
     description:
       description_without_count: GPX súbor od používateľa %{user}
   application:
-    basic_auth_disabled: 'HTTP Základná autentifikácia je vypnutá: %{link}'
     permission_denied: Nemáte oprávnenie na prístup k tejto akcii
     require_cookies:
       cookies_needed: Zdá sa, že máte zakázané cookies – povoľte prosím cookies vo
diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index 7950e6604..8218ceab3 100644
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -247,12 +247,6 @@ skr-arab:
     changeset:
       anonymous: گمنام
       no_edits: (کوئی ترمیم کائنی)
-    changesets:
-      id: آئی ڈی
-      saved_at: تے محفوظ ہے
-      user: ورتݨ آلا
-      comment: رائے
-      area: علاقہ
     index:
       title: تبدیلیاں
       empty: تبدیلیاں کائنی لبھیاں۔
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index bfcdd42af..1d1af513d 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -495,12 +495,6 @@ sl:
       anonymous: Anonimen
       no_edits: (brez urejanj)
       view_changeset_details: Ogled podrobnosti nabora sprememb
-    changesets:
-      id: ID
-      saved_at: Shranjeno ob
-      user: Uporabnik
-      comment: Komentar
-      area: Območje
     index:
       title: Sklopi sprememb
       title_user: Sklopi sprememb od %{user}
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 3f5195016..a913b1b3f 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -250,12 +250,6 @@ sq:
       anonymous: Anonim
       no_edits: (nuk ka redaktime)
       view_changeset_details: Shikoni detajet e ndryshimeve
-    changesets:
-      id: ID
-      saved_at: Të ruajtura në
-      user: Përdoruesi
-      comment: Koment
-      area: Zona
     index:
       title: Ndryshimet
       title_user: Ndryshime fjalish nga %{user}
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index f78b4b071..872b281c1 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -200,12 +200,6 @@ sr-Latn:
       anonymous: Anonimno
       no_edits: (nema izmena)
       view_changeset_details: Pogledaj detalje skupa izmena
-    changesets:
-      id: Naznaka
-      saved_at: Sačuvano u
-      user: Korisnik
-      comment: Komentar
-      area: Područje
     index:
       title: Skupovi izmena
       title_user: Skupovi izmena korisnika %{user}
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index e2c5235ba..f3ab96e7f 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -410,12 +410,6 @@ sr:
       anonymous: Анонимно
       no_edits: (нема измена)
       view_changeset_details: Прикажи детаље скупа промена
-    changesets:
-      id: ID
-      saved_at: Сачувано у
-      user: Корисник
-      comment: Коментар
-      area: Област
     index:
       title: Скупови промена
       title_user: Скупови промена корисника %{user}
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 206f584e7..d46fd14bc 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -496,12 +496,6 @@ sv:
       anonymous: Anonym
       no_edits: (inga redigeringar)
       view_changeset_details: Visa detaljer om ändringsuppsättning
-    changesets:
-      id: ID
-      saved_at: Sparades den
-      user: Användare
-      comment: Kommentar
-      area: Område
     index:
       title: Ändringsuppsättningar
       title_user: Ändringsuppsättningar av %{user}
@@ -2635,7 +2629,6 @@ sv:
         other: GPX-fil med %{count} punkter från %{user}
       description_without_count: GPX-fil från %{user}
   application:
-    basic_auth_disabled: 'Grundläggande HTTP-autentisering är inaktiverat: %{link}'
     permission_denied: Du har inte behörighet för denna åtgärd
     require_cookies:
       cookies_needed: Du verkar ha inaktiverat kakor - aktivera kakor i din webbläsare
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index e502a163d..1a1580580 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -265,12 +265,6 @@ ta:
     changeset:
       anonymous: அடையாளமற்றவர்
       no_edits: (திருத்தங்கள் இல்லை)
-    changesets:
-      id: அடையாளம் (ID)
-      saved_at: சேமிக்கப்பட்ட
-      user: பயனர்
-      comment: கருத்து
-      area: பகுதி
     index:
       title: மாற்றங்கள்
       load_more: மேலும் படிக்க
diff --git a/config/locales/te.yml b/config/locales/te.yml
index dd6f31fb0..8546e8b15 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -412,12 +412,6 @@ te:
       anonymous: అనామకం
       no_edits: (మార్పులు లేవు)
       view_changeset_details: మార్పులసమితి వివరాలు చూడండి
-    changesets:
-      id: ఐడీ
-      saved_at: భద్రపరచిన సమయం
-      user: వాడుకరి
-      comment: వ్యాఖ్య
-      area: ప్రదేశం
     index:
       title: మార్పుల సమితులు
       title_user: '%{user} చేసిన మార్పులసమితులు'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 50965f6fb..e75ef779d 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -424,12 +424,6 @@ th:
       anonymous: ผู้ไม่ประสงค์ออกนาม
       no_edits: (ไม่มีรายการแก้ไข)
       view_changeset_details: ดูรายละเอียดชุดการเปลี่ยนแปลง
-    changesets:
-      id: รหัส
-      saved_at: บันทึกที่
-      user: ผู้ใช้
-      comment: แสดงความเห็น
-      area: พื้นที่
     index:
       title: ชุดการเปลี่ยนแปลง
       title_user: ชุดการเปลี่ยนแปลงที่ทำโดย %{user}
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index f774378b5..107fb89fb 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -372,12 +372,6 @@ tl:
       anonymous: Hindi nagpapakilala (anonimo)
       no_edits: (walang mga pamamatnugot)
       view_changeset_details: Tingnan ang mga detalye ng pangkat ng pagbabago
-    changesets:
-      id: ID
-      saved_at: Sinagip sa
-      user: Tagagamit
-      comment: Puna
-      area: Lugar
     index:
       title: Mga pangkat ng pagbabago
       title_user: Mga pangkat ng pagbabago ayon sa %{user}
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index e6b15bf91..02e4e669a 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -500,12 +500,6 @@ tr:
       anonymous: Anonim
       no_edits: (düzenleme yok)
       view_changeset_details: Değişiklik kaydı ayrıntılarını görüntüle
-    changesets:
-      id: ID
-      saved_at: Kaydedilme
-      user: Kullanıcı
-      comment: Yorum
-      area: Alan
     index:
       title: Değişiklik Kayıtları
       title_user: '%{user} kullanıcısının değişiklik kayıtları'
@@ -2658,7 +2652,6 @@ tr:
         other: '%{user} tarafından %{count} noktalı GPX dosyası'
       description_without_count: '%{user} tarafından GPX dosyası'
   application:
-    basic_auth_disabled: 'HTTP Temel Kimlik Doğrulaması devre dışı: %{link}'
     permission_denied: Bu eyleme erişme izniniz yok
     require_cookies:
       cookies_needed: Çerezleri devre dışı bırakmış görünüyorsunuz - devam etmeden
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index ad7f40997..9347fbd70 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -392,11 +392,6 @@ tt:
     changeset:
       anonymous: Аноним
       no_edits: (төзәтмәләр юк)
-    changesets:
-      id: ID
-      user: Кулланучы
-      comment: Шәрех
-      area: Өлкә
     index:
       title: Үзгәрешләр пакетлары
       load_more: Күбрәк төяү
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 1a2f38c71..1d2acf5f5 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -534,12 +534,6 @@ uk:
       anonymous: Анонім
       no_edits: (редагувань немає)
       view_changeset_details: Подивитися подробиці набору змін
-    changesets:
-      id: ID
-      saved_at: Збережено
-      user: Мапер
-      comment: Коментар
-      area: Ділянка
     index:
       title: Набори змін
       title_user: Набори змін від %{user}
@@ -2692,7 +2686,6 @@ uk:
         other: ""
       description_without_count: GPX файл від %{user}
   application:
-    basic_auth_disabled: 'HTTP Basic Authentication вимкнено: %{link}'
     permission_denied: Вибачте, у вас недостатньо прав для виконання цієї дії.
     require_cookies:
       cookies_needed: Схоже, що у вас вимкнені куки. Будь ласка, увімкніть куки у
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 0523bb118..c3cfc76f0 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -454,12 +454,6 @@ vi:
       anonymous: Vô danh
       no_edits: (không có thay đổi)
       view_changeset_details: Xem chi tiết của bộ thay đổi
-    changesets:
-      id: ID
-      saved_at: Lưu vào lúc
-      user: Người dùng
-      comment: Tóm lược
-      area: Vùng
     index:
       title: Bộ thay đổi
       title_user: Những bộ thay đổi bởi %{user}
@@ -2434,7 +2428,6 @@ vi:
         other: Tập tin GPX của %{user} có %{count} địa điểm
       description_without_count: Tập tin GPX của %{user}
   application:
-    basic_auth_disabled: 'Xác thực Cơ bản HTTP đã bị tắt: %{link}'
     permission_denied: Bạn không có quyền thực hiện tác vụ này
     require_cookies:
       cookies_needed: Hình như đã tắt cookie. Xin hãy bật lên chức năng cookie trong
diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 848a485a4..4ad123136 100644
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -381,12 +381,6 @@ xmf:
       anonymous: ანონიმი
       no_edits: (რედაქტირაფა ვა რე)
       view_changeset_details: თირუეფიშ პაკეტიშ კილიშკილი ინფორმაციაშ ძირაფა
-    changesets:
-      id: ID
-      saved_at: თებული რე
-      user: მახვარებუ
-      comment: კომენტარი
-      area: ტერიტორია
     index:
       title: თირუეფიშ პაკეტი
       title_user: მახვარებუ %{user}-შ თირუეფიშ პაკეტეფი
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index dc1c6a96c..7a351718c 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -502,12 +502,6 @@ zh-CN:
       anonymous: 匿名用户
       no_edits: (无编辑)
       view_changeset_details: 查看变更集详情
-    changesets:
-      id: ID
-      saved_at: 保存于
-      user: 用户
-      comment: 评论
-      area: 区域
     index:
       title: 变更集
       title_user: '%{user}的变更集'
@@ -1955,6 +1949,7 @@ zh-CN:
     richtext_field:
       edit: 编辑
       preview: 预览
+      help: 帮助
   site:
     about:
       next: 下一页
@@ -2455,7 +2450,6 @@ zh-CN:
         other: 来自 %{user} 的带 %{count} 点的GPX文件
       description_without_count: 来自 %{user} 的 GPX 文件
   application:
-    basic_auth_disabled: HTTP 基本身份验证已禁用：%{link}
     permission_denied: 您没有权限来执行此操作
     require_cookies:
       cookies_needed: 您似乎停用了 cookie - 请在继续操作前启用您的浏览器 cookie。
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 831c47d7a..ebcafca28 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -318,12 +318,6 @@ zh-HK:
       previous: « 上一頁
     changeset:
       anonymous: 匿名
-    changesets:
-      id: ID
-      saved_at: 已儲存於
-      user: 用戶
-      comment: 評論
-      area: 區域
     index:
       title: 變更集
       title_user: '%{user}的變更集'
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 3bf65aee5..f4a6edd9f 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -457,12 +457,6 @@ zh-TW:
       anonymous: 匿名
       no_edits: (沒有編輯)
       view_changeset_details: 檢視變更集詳細資料
-    changesets:
-      id: ID
-      saved_at: 已儲存於
-      user: 使用者
-      comment: 評論
-      area: 區域
     index:
       title: 變更集
       title_user: '%{user} 的變更集'
@@ -2434,7 +2428,6 @@ zh-TW:
         other: 由 %{user} 上傳的 GPX 檔案，含有 %{count} 點
       description_without_count: 由 %{user} 上傳的 GPX 檔案
   application:
-    basic_auth_disabled: HTTP 基本認證已停用：%{link}
     permission_denied: 你沒有權限來存取該操作。
     require_cookies:
       cookies_needed: 你似乎已停用 cookies - 請在瀏覽器中開啟 cookies 後再繼續。
diff --git a/lib/oauth.rb b/lib/oauth.rb
index a8f497621..679c564a6 100644
--- a/lib/oauth.rb
+++ b/lib/oauth.rb
@@ -1,8 +1,11 @@
 module Oauth
-  SCOPES = %w[read_prefs write_prefs write_diary write_api read_gpx write_gpx write_notes].freeze
+  SCOPES = %w[
+    read_prefs write_prefs write_diary
+    write_api read_gpx write_gpx write_notes write_redactions
+    consume_messages send_messages openid
+  ].freeze
   PRIVILEGED_SCOPES = %w[read_email skip_authorization].freeze
   MODERATOR_SCOPES = %w[write_redactions].freeze
-  OAUTH2_SCOPES = %w[write_redactions consume_messages send_messages openid].freeze
 
   class Scope
     attr_reader :name
@@ -16,10 +19,9 @@ module Oauth
     end
   end
 
-  def self.scopes(oauth2: false, privileged: false)
+  def self.scopes(privileged: false)
     scopes = SCOPES
     scopes += PRIVILEGED_SCOPES if privileged
-    scopes += OAUTH2_SCOPES if oauth2
     scopes.collect { |s| Scope.new(s) }
   end
 end
diff --git a/public/oauth/crossdomain.xml b/public/oauth/crossdomain.xml
deleted file mode 100644
index a8029a905..000000000
--- a/public/oauth/crossdomain.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
-
-<cross-domain-policy>
-	<allow-access-from domain="*" secure="false"/>
-	<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
-</cross-domain-policy>
diff --git a/test/abilities/api_capability_test.rb b/test/abilities/api_capability_test.rb
index bcfcaf74e..5e8396c67 100644
--- a/test/abilities/api_capability_test.rb
+++ b/test/abilities/api_capability_test.rb
@@ -88,12 +88,6 @@ end
 
 class UserApiCapabilityTest < ActiveSupport::TestCase
   test "user preferences" do
-    # a user with no tokens
-    capability = ApiCapability.new nil
-    [:index, :show, :update_all, :update, :destroy].each do |act|
-      assert capability.cannot? act, UserPreference
-    end
-
     # A user with empty tokens
     token = create(:oauth_access_token)
     capability = ApiCapability.new token
diff --git a/test/controllers/api/changeset_comments_controller_test.rb b/test/controllers/api/changeset_comments_controller_test.rb
index ca7fc3407..35e45e8c8 100644
--- a/test/controllers/api/changeset_comments_controller_test.rb
+++ b/test/controllers/api/changeset_comments_controller_test.rb
@@ -303,11 +303,11 @@ module Api
     # But writing oauth tests is hard, and so it's easier to put in a controller test.)
     def test_api_write_and_terms_agreed_via_token
       user = create(:user, :terms_agreed => nil)
-      token = create(:oauth_access_token, :resource_owner_id => user.id, :scopes => %w[write_api])
+      auth_header = bearer_authorization_header(user, :scopes => %w[write_api])
       changeset = create(:changeset, :closed)
 
       assert_difference "ChangesetComment.count", 0 do
-        post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => bearer_authorization_header(token.token)
+        post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => auth_header
       end
       assert_response :forbidden
 
@@ -316,7 +316,7 @@ module Api
       user.save!
 
       assert_difference "ChangesetComment.count", 1 do
-        post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => bearer_authorization_header(token.token)
+        post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => auth_header
       end
       assert_response :success
     end
diff --git a/test/controllers/api/messages_controller_test.rb b/test/controllers/api/messages_controller_test.rb
index 0b54be4dc..cbf8dc870 100644
--- a/test/controllers/api/messages_controller_test.rb
+++ b/test/controllers/api/messages_controller_test.rb
@@ -59,10 +59,7 @@ module Api
       recipient = create(:user)
       sender = create(:user)
 
-      sender_token = create(:oauth_access_token,
-                            :resource_owner_id => sender.id,
-                            :scopes => %w[send_messages consume_messages])
-      sender_auth = bearer_authorization_header(sender_token.token)
+      sender_auth = bearer_authorization_header(sender, :scopes => %w[send_messages consume_messages])
 
       msg = build(:message)
 
@@ -101,10 +98,7 @@ module Api
       recipient = create(:user)
 
       sender = create(:user)
-      sender_token = create(:oauth_access_token,
-                            :resource_owner_id => sender.id,
-                            :scopes => %w[send_messages consume_messages])
-      sender_auth = bearer_authorization_header(sender_token.token)
+      sender_auth = bearer_authorization_header(sender, :scopes => %w[send_messages consume_messages])
 
       assert_no_difference "Message.count" do
         assert_no_difference "ActionMailer::Base.deliveries.size" do
@@ -160,20 +154,9 @@ module Api
       sender = create(:user)
       user3 = create(:user)
 
-      sender_token = create(:oauth_access_token,
-                            :resource_owner_id => sender.id,
-                            :scopes => %w[consume_messages])
-      sender_auth = bearer_authorization_header(sender_token.token)
-
-      recipient_token = create(:oauth_access_token,
-                               :resource_owner_id => recipient.id,
-                               :scopes => %w[consume_messages])
-      recipient_auth = bearer_authorization_header(recipient_token.token)
-
-      user3_token = create(:oauth_access_token,
-                           :resource_owner_id => user3.id,
-                           :scopes => %w[send_messages consume_messages])
-      user3_auth = bearer_authorization_header(user3_token.token)
+      sender_auth = bearer_authorization_header(sender, :scopes => %w[consume_messages])
+      recipient_auth = bearer_authorization_header(recipient, :scopes => %w[consume_messages])
+      user3_auth = bearer_authorization_header(user3, :scopes => %w[send_messages consume_messages])
 
       msg = create(:message, :unread, :sender => sender, :recipient => recipient)
 
@@ -264,15 +247,8 @@ module Api
       sender = create(:user)
       user3 = create(:user)
 
-      recipient_token = create(:oauth_access_token,
-                               :resource_owner_id => recipient.id,
-                               :scopes => %w[consume_messages])
-      recipient_auth = bearer_authorization_header(recipient_token.token)
-
-      user3_token = create(:oauth_access_token,
-                           :resource_owner_id => user3.id,
-                           :scopes => %w[send_messages consume_messages])
-      user3_auth = bearer_authorization_header(user3_token.token)
+      recipient_auth = bearer_authorization_header(recipient, :scopes => %w[consume_messages])
+      user3_auth = bearer_authorization_header(user3, :scopes => %w[send_messages consume_messages])
 
       msg = create(:message, :unread, :sender => sender, :recipient => recipient)
 
@@ -339,22 +315,13 @@ module Api
 
     def test_delete
       recipient = create(:user)
-      recipient_token = create(:oauth_access_token,
-                               :resource_owner_id => recipient.id,
-                               :scopes => %w[consume_messages])
-      recipient_auth = bearer_authorization_header(recipient_token.token)
+      recipient_auth = bearer_authorization_header(recipient, :scopes => %w[consume_messages])
 
       sender = create(:user)
-      sender_token = create(:oauth_access_token,
-                            :resource_owner_id => sender.id,
-                            :scopes => %w[send_messages consume_messages])
-      sender_auth = bearer_authorization_header(sender_token.token)
+      sender_auth = bearer_authorization_header(sender, :scopes => %w[send_messages consume_messages])
 
       user3 = create(:user)
-      user3_token = create(:oauth_access_token,
-                           :resource_owner_id => user3.id,
-                           :scopes => %w[send_messages consume_messages])
-      user3_auth = bearer_authorization_header(user3_token.token)
+      user3_auth = bearer_authorization_header(user3, :scopes => %w[send_messages consume_messages])
 
       msg = create(:message, :read, :sender => sender, :recipient => recipient)
 
@@ -407,22 +374,13 @@ module Api
 
     def test_list_messages
       user1 = create(:user)
-      user1_token = create(:oauth_access_token,
-                           :resource_owner_id => user1.id,
-                           :scopes => %w[send_messages consume_messages])
-      user1_auth = bearer_authorization_header(user1_token.token)
+      user1_auth = bearer_authorization_header(user1, :scopes => %w[send_messages consume_messages])
 
       user2 = create(:user)
-      user2_token = create(:oauth_access_token,
-                           :resource_owner_id => user2.id,
-                           :scopes => %w[send_messages consume_messages])
-      user2_auth = bearer_authorization_header(user2_token.token)
+      user2_auth = bearer_authorization_header(user2, :scopes => %w[send_messages consume_messages])
 
       user3 = create(:user)
-      user3_token = create(:oauth_access_token,
-                           :resource_owner_id => user3.id,
-                           :scopes => %w[send_messages consume_messages])
-      user3_auth = bearer_authorization_header(user3_token.token)
+      user3_auth = bearer_authorization_header(user3, :scopes => %w[send_messages consume_messages])
 
       # create some messages between users
       # user | inbox | outbox
@@ -523,10 +481,7 @@ module Api
 
     def test_paged_list_messages_asc
       recipient = create(:user)
-      recipient_token = create(:oauth_access_token,
-                               :resource_owner_id => recipient.id,
-                               :scopes => %w[consume_messages])
-      recipient_auth = bearer_authorization_header(recipient_token.token)
+      recipient_auth = bearer_authorization_header(recipient, :scopes => %w[consume_messages])
 
       sender = create(:user)
 
@@ -559,10 +514,7 @@ module Api
 
     def test_paged_list_messages_desc
       recipient = create(:user)
-      recipient_token = create(:oauth_access_token,
-                               :resource_owner_id => recipient.id,
-                               :scopes => %w[consume_messages])
-      recipient_auth = bearer_authorization_header(recipient_token.token)
+      recipient_auth = bearer_authorization_header(recipient, :scopes => %w[consume_messages])
 
       sender = create(:user)
 
diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb
index 99c4dbb1b..64325fd28 100644
--- a/test/controllers/api/old_nodes_controller_test.rb
+++ b/test/controllers/api/old_nodes_controller_test.rb
@@ -239,38 +239,38 @@ module Api
     end
 
     def test_redact_node_by_regular_with_read_prefs_scope
-      auth_header = create_bearer_auth_header(create(:user), %w[read_prefs])
+      auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs])
       do_redact_redactable_node(auth_header)
       assert_response :forbidden, "should need to be moderator to redact."
     end
 
     def test_redact_node_by_regular_with_write_api_scope
-      auth_header = create_bearer_auth_header(create(:user), %w[write_api])
+      auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_api])
       do_redact_redactable_node(auth_header)
       assert_response :forbidden, "should need to be moderator to redact."
     end
 
     def test_redact_node_by_regular_with_write_redactions_scope
-      auth_header = create_bearer_auth_header(create(:user), %w[write_redactions])
+      auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions])
       do_redact_redactable_node(auth_header)
       assert_response :forbidden, "should need to be moderator to redact."
     end
 
     def test_redact_node_by_moderator_with_read_prefs_scope
-      auth_header = create_bearer_auth_header(create(:moderator_user), %w[read_prefs])
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs])
       do_redact_redactable_node(auth_header)
       assert_response :forbidden, "should need to have write_redactions scope to redact."
     end
 
     def test_redact_node_by_moderator_with_write_api_scope
-      auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_api])
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_api])
       do_redact_redactable_node(auth_header)
       assert_response :success, "should be OK to redact old version as moderator with write_api scope."
       # assert_response :forbidden, "should need to have write_redactions scope to redact."
     end
 
     def test_redact_node_by_moderator_with_write_redactions_scope
-      auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_redactions])
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions])
       do_redact_redactable_node(auth_header)
       assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
     end
@@ -432,13 +432,6 @@ module Api
 
     private
 
-    def create_bearer_auth_header(user, scopes)
-      token = create(:oauth_access_token,
-                     :resource_owner_id => user.id,
-                     :scopes => scopes)
-      bearer_authorization_header(token.token)
-    end
-
     def do_redact_redactable_node(headers = {})
       node = create(:node, :with_history, :version => 4)
       node_v3 = node.old_nodes.find_by(:version => 3)
diff --git a/test/controllers/api/old_relations_controller_test.rb b/test/controllers/api/old_relations_controller_test.rb
index 446fb5f14..8d750542f 100644
--- a/test/controllers/api/old_relations_controller_test.rb
+++ b/test/controllers/api/old_relations_controller_test.rb
@@ -78,38 +78,38 @@ module Api
     end
 
     def test_redact_relation_by_regular_with_read_prefs_scope
-      auth_header = create_bearer_auth_header(create(:user), %w[read_prefs])
+      auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs])
       do_redact_redactable_relation(auth_header)
       assert_response :forbidden, "should need to be moderator to redact."
     end
 
     def test_redact_relation_by_regular_with_write_api_scope
-      auth_header = create_bearer_auth_header(create(:user), %w[write_api])
+      auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_api])
       do_redact_redactable_relation(auth_header)
       assert_response :forbidden, "should need to be moderator to redact."
     end
 
     def test_redact_relation_by_regular_with_write_redactions_scope
-      auth_header = create_bearer_auth_header(create(:user), %w[write_redactions])
+      auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions])
       do_redact_redactable_relation(auth_header)
       assert_response :forbidden, "should need to be moderator to redact."
     end
 
     def test_redact_relation_by_moderator_with_read_prefs_scope
-      auth_header = create_bearer_auth_header(create(:moderator_user), %w[read_prefs])
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs])
       do_redact_redactable_relation(auth_header)
       assert_response :forbidden, "should need to have write_redactions scope to redact."
     end
 
     def test_redact_relation_by_moderator_with_write_api_scope
-      auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_api])
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_api])
       do_redact_redactable_relation(auth_header)
       assert_response :success, "should be OK to redact old version as moderator with write_api scope."
       # assert_response :forbidden, "should need to have write_redactions scope to redact."
     end
 
     def test_redact_relation_by_moderator_with_write_redactions_scope
-      auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_redactions])
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions])
       do_redact_redactable_relation(auth_header)
       assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
     end
@@ -315,13 +315,6 @@ module Api
       end
     end
 
-    def create_bearer_auth_header(user, scopes)
-      token = create(:oauth_access_token,
-                     :resource_owner_id => user.id,
-                     :scopes => scopes)
-      bearer_authorization_header(token.token)
-    end
-
     def do_redact_redactable_relation(headers = {})
       relation = create(:relation, :with_history, :version => 4)
       relation_v3 = relation.old_relations.find_by(:version => 3)
diff --git a/test/controllers/api/old_ways_controller_test.rb b/test/controllers/api/old_ways_controller_test.rb
index 482655754..c6596ec34 100644
--- a/test/controllers/api/old_ways_controller_test.rb
+++ b/test/controllers/api/old_ways_controller_test.rb
@@ -119,38 +119,38 @@ module Api
     end
 
     def test_redact_way_by_regular_with_read_prefs_scope
-      auth_header = create_bearer_auth_header(create(:user), %w[read_prefs])
+      auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs])
       do_redact_redactable_way(auth_header)
       assert_response :forbidden, "should need to be moderator to redact."
     end
 
     def test_redact_way_by_regular_with_write_api_scope
-      auth_header = create_bearer_auth_header(create(:user), %w[write_api])
+      auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_api])
       do_redact_redactable_way(auth_header)
       assert_response :forbidden, "should need to be moderator to redact."
     end
 
     def test_redact_way_by_regular_with_write_redactions_scope
-      auth_header = create_bearer_auth_header(create(:user), %w[write_redactions])
+      auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions])
       do_redact_redactable_way(auth_header)
       assert_response :forbidden, "should need to be moderator to redact."
     end
 
     def test_redact_way_by_moderator_with_read_prefs_scope
-      auth_header = create_bearer_auth_header(create(:moderator_user), %w[read_prefs])
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs])
       do_redact_redactable_way(auth_header)
       assert_response :forbidden, "should need to have write_redactions scope to redact."
     end
 
     def test_redact_way_by_moderator_with_write_api_scope
-      auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_api])
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_api])
       do_redact_redactable_way(auth_header)
       assert_response :success, "should be OK to redact old version as moderator with write_api scope."
       # assert_response :forbidden, "should need to have write_redactions scope to redact."
     end
 
     def test_redact_way_by_moderator_with_write_redactions_scope
-      auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_redactions])
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions])
       do_redact_redactable_way(auth_header)
       assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
     end
@@ -354,13 +354,6 @@ module Api
       end
     end
 
-    def create_bearer_auth_header(user, scopes)
-      token = create(:oauth_access_token,
-                     :resource_owner_id => user.id,
-                     :scopes => scopes)
-      bearer_authorization_header(token.token)
-    end
-
     def do_redact_redactable_way(headers = {})
       way = create(:way, :with_history, :version => 4)
       way_v3 = way.old_ways.find_by(:version => 3)
diff --git a/test/controllers/api/permissions_controller_test.rb b/test/controllers/api/permissions_controller_test.rb
index 1ee3365e7..2a7ac5e12 100644
--- a/test/controllers/api/permissions_controller_test.rb
+++ b/test/controllers/api/permissions_controller_test.rb
@@ -34,10 +34,8 @@ module Api
 
     def test_permissions_oauth2
       user = create(:user)
-      token = create(:oauth_access_token,
-                     :resource_owner_id => user.id,
-                     :scopes => %w[read_prefs write_api])
-      get permissions_path, :headers => bearer_authorization_header(token.token)
+      auth_header = bearer_authorization_header(user, :scopes => %w[read_prefs write_api])
+      get permissions_path, :headers => auth_header
       assert_response :success
       assert_select "osm > permissions", :count => 1 do
         assert_select "permission", :count => 2
diff --git a/test/controllers/api/user_preferences_controller_test.rb b/test/controllers/api/user_preferences_controller_test.rb
index e2c573532..816be9b6e 100644
--- a/test/controllers/api/user_preferences_controller_test.rb
+++ b/test/controllers/api/user_preferences_controller_test.rb
@@ -252,10 +252,10 @@ module Api
     # read preferences
     def test_show_using_token
       user = create(:user)
-      token = create(:oauth_access_token, :resource_owner_id => user.id, :scopes => %w[read_prefs])
+      auth_header = bearer_authorization_header(user, :scopes => %w[read_prefs])
       create(:user_preference, :user => user, :k => "key", :v => "value")
 
-      get user_preference_path(:preference_key => "key"), :headers => bearer_authorization_header(token.token)
+      get user_preference_path(:preference_key => "key"), :headers => auth_header
       assert_response :success
     end
 
@@ -264,10 +264,10 @@ module Api
     # by other methods.
     def test_show_using_token_fail
       user = create(:user)
-      token = create(:oauth_access_token, :resource_owner_id => user.id)
+      auth_header = bearer_authorization_header(user, :scopes => %w[])
       create(:user_preference, :user => user, :k => "key", :v => "value")
 
-      get user_preference_path(:preference_key => "key"), :headers => bearer_authorization_header(token.token)
+      get user_preference_path(:preference_key => "key"), :headers => auth_header
       assert_response :forbidden
     end
   end
diff --git a/test/controllers/api/users_controller_test.rb b/test/controllers/api/users_controller_test.rb
index 5086a09b3..874d91771 100644
--- a/test/controllers/api/users_controller_test.rb
+++ b/test/controllers/api/users_controller_test.rb
@@ -79,18 +79,14 @@ module Api
       user = create(:user,
                     :home_lat => 12.1, :home_lon => 23.4,
                     :languages => ["en"])
-      good_token = create(:oauth_access_token,
-                          :resource_owner_id => user.id,
-                          :scopes => %w[read_prefs])
-      bad_token = create(:oauth_access_token,
-                         :resource_owner_id => user.id,
-                         :scopes => %w[])
+      good_auth = bearer_authorization_header(user, :scopes => %w[read_prefs])
+      bad_auth = bearer_authorization_header(user, :scopes => %w[])
       other_user = create(:user,
                           :home_lat => 12.1, :home_lon => 23.4,
                           :languages => ["en"])
 
       # check that we can fetch our own details as XML with read_prefs
-      get api_user_path(:id => user.id), :headers => bearer_authorization_header(good_token.token)
+      get api_user_path(:id => user.id), :headers => good_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
 
@@ -98,7 +94,7 @@ module Api
       check_xml_details(user, true, false)
 
       # check that we can fetch a different user's details as XML with read_prefs
-      get api_user_path(:id => other_user.id), :headers => bearer_authorization_header(good_token.token)
+      get api_user_path(:id => other_user.id), :headers => good_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
 
@@ -106,7 +102,7 @@ module Api
       check_xml_details(other_user, false, false)
 
       # check that we can fetch our own details as XML without read_prefs
-      get api_user_path(:id => user.id), :headers => bearer_authorization_header(bad_token.token)
+      get api_user_path(:id => user.id), :headers => bad_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
 
@@ -114,7 +110,7 @@ module Api
       check_xml_details(user, false, false)
 
       # check that we can fetch our own details as JSON with read_prefs
-      get api_user_path(:id => user.id, :format => "json"), :headers => bearer_authorization_header(good_token.token)
+      get api_user_path(:id => user.id, :format => "json"), :headers => good_auth
       assert_response :success
       assert_equal "application/json", response.media_type
 
@@ -126,7 +122,7 @@ module Api
       check_json_details(js, user, true, false)
 
       # check that we can fetch a different user's details as JSON with read_prefs
-      get api_user_path(:id => other_user.id, :format => "json"), :headers => bearer_authorization_header(good_token.token)
+      get api_user_path(:id => other_user.id, :format => "json"), :headers => good_auth
       assert_response :success
       assert_equal "application/json", response.media_type
 
@@ -138,7 +134,7 @@ module Api
       check_json_details(js, other_user, false, false)
 
       # check that we can fetch our own details as JSON without read_prefs
-      get api_user_path(:id => user.id, :format => "json"), :headers => bearer_authorization_header(bad_token.token)
+      get api_user_path(:id => user.id, :format => "json"), :headers => bad_auth
       assert_response :success
       assert_equal "application/json", response.media_type
 
@@ -190,21 +186,16 @@ module Api
       user = create(:user,
                     :home_lat => 12.1, :home_lon => 23.4,
                     :languages => ["en"])
-      good_token = create(:oauth_access_token,
-                          :resource_owner_id => user.id,
-                          :scopes => %w[read_prefs])
-      bad_token = create(:oauth_access_token,
-                         :resource_owner_id => user.id)
-      email_token = create(:oauth_access_token,
-                           :resource_owner_id => user.id,
-                           :scopes => %w[read_prefs read_email])
+      good_auth = bearer_authorization_header(user, :scopes => %w[read_prefs])
+      bad_auth = bearer_authorization_header(user, :scopes => %w[])
+      email_auth = bearer_authorization_header(user, :scopes => %w[read_prefs read_email])
 
       # check that we can't fetch details as XML without read_prefs
-      get user_details_path, :headers => bearer_authorization_header(bad_token.token)
+      get user_details_path, :headers => bad_auth
       assert_response :forbidden
 
       # check that we can fetch details as XML without read_email
-      get user_details_path, :headers => bearer_authorization_header(good_token.token)
+      get user_details_path, :headers => good_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
 
@@ -212,7 +203,7 @@ module Api
       check_xml_details(user, true, false)
 
       # check that we can fetch details as XML with read_email
-      get user_details_path, :headers => bearer_authorization_header(email_token.token)
+      get user_details_path, :headers => email_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
 
@@ -220,11 +211,11 @@ module Api
       check_xml_details(user, true, true)
 
       # check that we can't fetch details as JSON without read_prefs
-      get user_details_path(:format => "json"), :headers => bearer_authorization_header(bad_token.token)
+      get user_details_path(:format => "json"), :headers => bad_auth
       assert_response :forbidden
 
       # check that we can fetch details as JSON without read_email
-      get user_details_path(:format => "json"), :headers => bearer_authorization_header(good_token.token)
+      get user_details_path(:format => "json"), :headers => good_auth
       assert_response :success
       assert_equal "application/json", response.media_type
 
@@ -236,7 +227,7 @@ module Api
       check_json_details(js, user, true, false)
 
       # check that we can fetch details as JSON with read_email
-      get user_details_path(:format => "json"), :headers => bearer_authorization_header(email_token.token)
+      get user_details_path(:format => "json"), :headers => email_auth
       assert_response :success
       assert_equal "application/json", response.media_type
 
@@ -325,10 +316,10 @@ module Api
       user1 = create(:user, :description => "test1", :terms_agreed => Date.yesterday)
       user2 = create(:user, :description => "test2", :terms_agreed => Date.yesterday)
       user3 = create(:user, :description => "test3", :terms_agreed => Date.yesterday)
-      good_token = create(:oauth_access_token, :resource_owner_id => user1.id, :scopes => %w[read_prefs])
-      bad_token = create(:oauth_access_token, :resource_owner_id => user1.id, :scopes => %w[])
+      good_auth = bearer_authorization_header(user1, :scopes => %w[read_prefs])
+      bad_auth = bearer_authorization_header(user1, :scopes => %w[])
 
-      get api_users_path, :params => { :users => user1.id }, :headers => bearer_authorization_header(good_token.token)
+      get api_users_path, :params => { :users => user1.id }, :headers => good_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
       assert_select "user", :count => 1 do
@@ -337,7 +328,7 @@ module Api
         assert_select "user[id='#{user3.id}']", :count => 0
       end
 
-      get api_users_path, :params => { :users => user2.id }, :headers => bearer_authorization_header(good_token.token)
+      get api_users_path, :params => { :users => user2.id }, :headers => good_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
       assert_select "user", :count => 1 do
@@ -346,7 +337,7 @@ module Api
         assert_select "user[id='#{user3.id}']", :count => 0
       end
 
-      get api_users_path, :params => { :users => "#{user1.id},#{user3.id}" }, :headers => bearer_authorization_header(good_token.token)
+      get api_users_path, :params => { :users => "#{user1.id},#{user3.id}" }, :headers => good_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
       assert_select "user", :count => 2 do
@@ -355,7 +346,7 @@ module Api
         check_xml_details(user3, false, false)
       end
 
-      get api_users_path, :params => { :users => "#{user1.id},#{user3.id}" }, :headers => bearer_authorization_header(bad_token.token)
+      get api_users_path, :params => { :users => "#{user1.id},#{user3.id}" }, :headers => bad_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
       assert_select "user", :count => 2 do
@@ -364,7 +355,7 @@ module Api
         check_xml_details(user3, false, false)
       end
 
-      get api_users_path, :params => { :users => user1.id, :format => "json" }, :headers => bearer_authorization_header(good_token.token)
+      get api_users_path, :params => { :users => user1.id, :format => "json" }, :headers => good_auth
       assert_response :success
       assert_equal "application/json", response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
@@ -372,7 +363,7 @@ module Api
       assert_equal 1, js["users"].count
       check_json_details(js["users"][0], user1, true, false)
 
-      get api_users_path, :params => { :users => user2.id, :format => "json" }, :headers => bearer_authorization_header(good_token.token)
+      get api_users_path, :params => { :users => user2.id, :format => "json" }, :headers => good_auth
       assert_response :success
       assert_equal "application/json", response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
@@ -380,7 +371,7 @@ module Api
       assert_equal 1, js["users"].count
       check_json_details(js["users"][0], user2, false, false)
 
-      get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :headers => bearer_authorization_header(good_token.token)
+      get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :headers => good_auth
       assert_response :success
       assert_equal "application/json", response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
@@ -389,7 +380,7 @@ module Api
       check_json_details(js["users"][0], user1, true, false)
       check_json_details(js["users"][1], user3, false, false)
 
-      get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :headers => bearer_authorization_header(bad_token.token)
+      get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :headers => bad_auth
       assert_response :success
       assert_equal "application/json", response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
@@ -398,17 +389,17 @@ module Api
       check_json_details(js["users"][0], user1, false, false)
       check_json_details(js["users"][1], user3, false, false)
 
-      get api_users_path, :params => { :users => create(:user, :suspended).id }, :headers => bearer_authorization_header(good_token.token)
+      get api_users_path, :params => { :users => create(:user, :suspended).id }, :headers => good_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
       assert_select "user", :count => 0
 
-      get api_users_path, :params => { :users => create(:user, :deleted).id }, :headers => bearer_authorization_header(good_token.token)
+      get api_users_path, :params => { :users => create(:user, :deleted).id }, :headers => good_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
       assert_select "user", :count => 0
 
-      get api_users_path, :params => { :users => 0 }, :headers => bearer_authorization_header(good_token.token)
+      get api_users_path, :params => { :users => 0 }, :headers => good_auth
       assert_response :success
       assert_equal "application/xml", response.media_type
       assert_select "user", :count => 0
diff --git a/yarn.lock b/yarn.lock
index 15d2c3b91..b3aa15696 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -43,16 +43,23 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@9.9.1":
-  version "9.9.1"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.9.1.tgz#4a97e85e982099d6c7ee8410aacb55adaa576f06"
-  integrity sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==
+"@eslint/js@9.10.0":
+  version "9.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.10.0.tgz#eaa3cb0baec497970bb29e43a153d0d5650143c6"
+  integrity sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==
 
 "@eslint/object-schema@^2.1.4":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843"
   integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==
 
+"@eslint/plugin-kit@^0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz#809b95a0227ee79c3195adfb562eb94352e77974"
+  integrity sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==
+  dependencies:
+    levn "^0.4.1"
+
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
@@ -251,15 +258,16 @@ eslint-visitor-keys@^4.0.0:
   integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
 
 eslint@^9.0.0:
-  version "9.9.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.9.1.tgz#147ac9305d56696fb84cf5bdecafd6517ddc77ec"
-  integrity sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==
+  version "9.10.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.10.0.tgz#0bd74d7fe4db77565d0e7f57c7df6d2b04756806"
+  integrity sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.11.0"
     "@eslint/config-array" "^0.18.0"
     "@eslint/eslintrc" "^3.1.0"
-    "@eslint/js" "9.9.1"
+    "@eslint/js" "9.10.0"
+    "@eslint/plugin-kit" "^0.1.0"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@humanwhocodes/retry" "^0.3.0"
     "@nodelib/fs.walk" "^1.2.8"
@@ -282,7 +290,6 @@ eslint@^9.0.0:
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"