From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 13 Mar 2024 15:51:41 +0000 (+0000)
Subject: Merge pull request #4557 from AntonKhorev/rename-api-old-version
X-Git-Tag: live~1388
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ac01ada27496434ff20394278faafb3a0277eb8d?hp=ad96da4518adbe378eedb072ef5834a992ea6576

Merge pull request #4557 from AntonKhorev/rename-api-old-version

Rename api old element actions and path helpers
---

diff --git a/Gemfile b/Gemfile
index 832b96c9a..0b7e25ec9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,6 +53,7 @@ gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "config"
 gem "delayed_job_active_record"
+gem "dry-validation"
 gem "frozen_record"
 gem "http_accept_language", "~> 2.1.1"
 gem "i18n-js", "~> 3.9.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 384a3055b..b8d62ae73 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.894.0)
+    aws-partitions (1.896.0)
     aws-sdk-core (3.191.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -123,8 +123,8 @@ GEM
       parser (>= 2.4)
       smart_properties
     bigdecimal (3.1.6)
-    binding_of_caller (1.0.0)
-      debug_inspector (>= 0.0.1)
+    binding_of_caller (1.0.1)
+      debug_inspector (>= 1.2.0)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
     bootstrap (5.3.2)
@@ -153,9 +153,8 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     concurrent-ruby (1.2.3)
-    config (5.1.0)
+    config (5.3.0)
       deep_merge (~> 1.2, >= 1.2.1)
-      dry-validation (~> 1.0, >= 1.0.0)
     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal
@@ -186,8 +185,7 @@ GEM
     doorkeeper-openid_connect (1.8.8)
       doorkeeper (>= 5.5, < 5.7)
       jwt (>= 2.5)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     dry-configurable (1.1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
@@ -260,7 +258,7 @@ GEM
     highline (3.0.1)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
@@ -291,7 +289,7 @@ GEM
     image_size (3.4.0)
     in_threads (1.6.0)
     io-console (0.7.2)
-    irb (1.11.2)
+    irb (1.12.0)
       rdoc
       reline (>= 0.4.2)
     jbuilder (2.11.5)
@@ -303,14 +301,14 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.7.1)
-    jwt (2.8.0)
+    jwt (2.8.1)
       base64
     kgio (2.11.4)
     kramdown (2.4.0)
       rexml
     language_server-protocol (3.17.0.3)
     libv8-node (18.16.0.0)
-    libxml-ruby (5.0.2)
+    libxml-ruby (5.0.3)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -325,7 +323,7 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
     maxminddb (0.1.22)
     mini_magick (4.12.0)
@@ -406,7 +404,7 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    pg (1.5.5)
+    pg (1.5.6)
     popper_js (2.11.8)
     progress (3.6.0)
     psych (5.1.2)
@@ -417,7 +415,7 @@ GEM
     quad_tile (1.0.1)
     racc (1.7.3)
     rack (2.2.8.1)
-    rack-cors (2.0.1)
+    rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
@@ -487,7 +485,7 @@ GEM
     rouge (4.2.0)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
-    rubocop (1.60.2)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -495,33 +493,32 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-minitest (0.34.5)
-      rubocop (>= 1.39, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-minitest (0.35.0)
+      rubocop (>= 1.61, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rails (2.23.1)
+    rubocop-rails (2.24.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sanitize (6.1.0)
       crass (~> 1.0.2)
@@ -557,7 +554,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stringio (3.1.0)
-    strong_migrations (1.7.0)
+    strong_migrations (1.8.0)
       activerecord (>= 5.2)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -619,6 +616,7 @@ DEPENDENCIES
   doorkeeper
   doorkeeper-i18n
   doorkeeper-openid_connect
+  dry-validation
   erb_lint
   factory_bot_rails
   faraday
diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js
index 5853193bc..43e2cf660 100644
--- a/app/assets/javascripts/login.js
+++ b/app/assets/javascripts/login.js
@@ -14,7 +14,8 @@ $(document).ready(function () {
   });
 
   // Add click handler to show OpenID field
-  $("#openid_open_url").click(function () {
+  $("#openid_open_url").click(function (e) {
+    e.preventDefault();
     $("#openid_url").val("http://");
     $("#login_auth_buttons").hide();
     $("#login_openid_url").show();
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 75db7f73b..686e81630 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -112,8 +112,6 @@ class ApiController < ApplicationController
       # authenticate per-scheme
       self.current_user = if username.nil?
                             nil # no authentication provided - perhaps first connect (client should retry after 401)
-                          elsif username == "token"
-                            User.authenticate(:token => passwd) # preferred - random token for user from db, passed in basic auth
                           else
                             User.authenticate(:username => username, :password => passwd) # basic auth
                           end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0a7df0994..488e6a818 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -44,8 +44,6 @@ class ApplicationController < ActionController::Base
           redirect_to :controller => "users", :action => "terms", :referer => request.fullpath
         end
       end
-    elsif session[:token]
-      session[:user] = current_user.id if self.current_user = User.authenticate(:token => session[:token])
     end
 
     session[:fingerprint] = current_user.fingerprint if current_user && session[:fingerprint].nil?
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index 48b8dabf2..7bbb3a093 100644
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@@ -15,10 +15,7 @@ class ConfirmationsController < ApplicationController
 
   def confirm
     if request.post?
-      token = params[:confirm_string]
-
-      user = User.find_by_token_for(:new_user, token) ||
-             UserToken.unexpired.find_by(:token => token)&.user
+      user = User.find_by_token_for(:new_user, params[:confirm_string])
 
       if !user
         flash[:error] = t(".unknown token")
@@ -34,7 +31,6 @@ class ConfirmationsController < ApplicationController
         flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)
         user.save!
         referer = safe_referer(params[:referer]) if params[:referer]
-        UserToken.delete_by(:token => token)
 
         pending_user = session.delete(:pending_user)
 
@@ -70,10 +66,7 @@ class ConfirmationsController < ApplicationController
 
   def confirm_email
     if request.post?
-      token = params[:confirm_string]
-
-      self.current_user = User.find_by_token_for(:new_email, token) ||
-                          UserToken.unexpired.find_by(:token => params[:confirm_string])&.user
+      self.current_user = User.find_by_token_for(:new_email, params[:confirm_string])
 
       if current_user&.new_email?
         current_user.email = current_user.new_email
@@ -89,7 +82,6 @@ class ConfirmationsController < ApplicationController
         else
           flash[:errors] = current_user.errors
         end
-        current_user.tokens.delete_all
         session[:user] = current_user.id
         session[:fingerprint] = current_user.fingerprint
       elsif current_user
diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb
index 25b2b9607..26b21b6d9 100644
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -19,8 +19,7 @@ class PasswordsController < ApplicationController
     @title = t ".title"
 
     if params[:token]
-      self.current_user = User.find_by_token_for(:password_reset, params[:token]) ||
-                          UserToken.unexpired.find_by(:token => params[:token])&.user
+      self.current_user = User.find_by_token_for(:password_reset, params[:token])
 
       if current_user.nil?
         flash[:error] = t ".flash token bad"
@@ -51,8 +50,7 @@ class PasswordsController < ApplicationController
 
   def update
     if params[:token]
-      self.current_user = User.find_by_token_for(:password_reset, params[:token]) ||
-                          UserToken.unexpired.find_by(:token => params[:token])&.user
+      self.current_user = User.find_by_token_for(:password_reset, params[:token])
 
       if current_user
         if params[:user]
@@ -62,7 +60,6 @@ class PasswordsController < ApplicationController
           current_user.email_valid = true
 
           if current_user.save
-            UserToken.delete_by(:token => params[:token])
             session[:fingerprint] = current_user.fingerprint
             flash[:notice] = t ".flash changed"
             successful_login(current_user)
diff --git a/app/models/user.rb b/app/models/user.rb
index 125e5e973..45ecbcc1b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -57,7 +57,6 @@ class User < ApplicationRecord
   has_many :muted_messages, -> { where(:to_user_visible => true, :muted => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :class_name => "Message", :foreign_key => :to_user_id
   has_many :friendships, -> { joins(:befriendee).where(:users => { :status => %w[active confirmed] }) }
   has_many :friends, :through => :friendships, :source => :befriendee
-  has_many :tokens, :class_name => "UserToken", :dependent => :destroy
   has_many :preferences, :class_name => "UserPreference"
   has_many :changesets, -> { order(:created_at => :desc) }, :inverse_of => :user
   has_many :changeset_comments, :foreign_key => :author_id, :inverse_of => :author
@@ -165,9 +164,6 @@ class User < ApplicationRecord
       else
         user = nil
       end
-    elsif options[:token]
-      token = UserToken.find_by(:token => options[:token])
-      user = token.user if token
     end
 
     if user &&
@@ -177,8 +173,6 @@ class User < ApplicationRecord
       user = nil
     end
 
-    token.update(:expiry => 1.week.from_now) if token && user
-
     user
   end
 
@@ -366,9 +360,9 @@ class User < ApplicationRecord
     diary_comment_score = diary_comments.visible.inject(0) { |acc, elem| acc + elem.body.spam_score }
 
     score = description.spam_score / 4.0
-    score += diary_entries.where("created_at > ?", 1.day.ago).count * 10
-    score += diary_entry_score / diary_entries.length unless diary_entries.empty?
-    score += diary_comment_score / diary_comments.length unless diary_comments.empty?
+    score += diary_entries.visible.where("created_at > ?", 1.day.ago).count * 10
+    score += diary_entry_score / diary_entries.visible.length unless diary_entries.visible.empty?
+    score += diary_comment_score / diary_comments.visible.length unless diary_comments.visible.empty?
     score -= changeset_score
     score -= trace_score
 
diff --git a/app/models/user_token.rb b/app/models/user_token.rb
deleted file mode 100644
index fbd276a6f..000000000
--- a/app/models/user_token.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# == Schema Information
-#
-# Table name: user_tokens
-#
-#  id      :bigint(8)        not null, primary key
-#  user_id :bigint(8)        not null
-#  token   :string           not null
-#  expiry  :datetime         not null
-#  referer :text
-#
-# Indexes
-#
-#  user_tokens_token_idx    (token) UNIQUE
-#  user_tokens_user_id_idx  (user_id)
-#
-# Foreign Keys
-#
-#  user_tokens_user_id_fkey  (user_id => users.id)
-#
-
-class UserToken < ApplicationRecord
-  belongs_to :user
-
-  scope :unexpired, -> { where("expiry >= now()") }
-
-  after_initialize :set_defaults
-
-  def expired?
-    expiry < Time.now.utc
-  end
-
-  private
-
-  def set_defaults
-    self.token = OSM.make_token if token.blank?
-    self.expiry = 1.week.from_now if expiry.blank?
-  end
-end
diff --git a/app/views/changesets/show.html.erb b/app/views/changesets/show.html.erb
index 57a3fdb56..fdaf7654c 100644
--- a/app/views/changesets/show.html.erb
+++ b/app/views/changesets/show.html.erb
@@ -80,11 +80,11 @@
     <%= render :partial => "paging_nav", :locals => { :type => "way", :pages => @way_pages } %>
     <ul class="list-unstyled">
       <% @ways.each do |way| %>
-        <%= element_list_item "way", way do %>
-          <%= t "printable_name.current_and_old_links_html",
+        <%= element_list_item "way", way do
+              t "printable_name.current_and_old_links_html",
                 :current_link => link_to(printable_element_name(way), way_path(way.way_id)),
-                :old_link => link_to(printable_element_version(way), old_way_path(way.way_id, way.version)) %>
-        <% end %>
+                :old_link => link_to(printable_element_version(way), old_way_path(way.way_id, way.version))
+            end %>
       <% end %>
     </ul>
   <% end %>
@@ -93,11 +93,11 @@
     <%= render :partial => "paging_nav", :locals => { :type => "relation", :pages => @relation_pages } %>
     <ul class="list-unstyled">
       <% @relations.each do |relation| %>
-        <%= element_list_item "relation", relation do %>
-          <%= t "printable_name.current_and_old_links_html",
+        <%= element_list_item "relation", relation do
+              t "printable_name.current_and_old_links_html",
                 :current_link => link_to(printable_element_name(relation), relation_path(relation.relation_id)),
-                :old_link => link_to(printable_element_version(relation), old_relation_path(relation.relation_id, relation.version)) %>
-        <% end %>
+                :old_link => link_to(printable_element_version(relation), old_relation_path(relation.relation_id, relation.version))
+            end %>
       <% end %>
     </ul>
   <% end %>
@@ -106,11 +106,11 @@
     <%= render :partial => "paging_nav", :locals => { :type => "node", :pages => @node_pages } %>
     <ul class="list-unstyled">
       <% @nodes.each do |node| %>
-        <%= element_list_item "node", node do %>
-          <%= t "printable_name.current_and_old_links_html",
+        <%= element_list_item "node", node do
+              t "printable_name.current_and_old_links_html",
                 :current_link => link_to(printable_element_name(node), node_path(node.node_id), { :rel => link_follow(node) }),
-                :old_link => link_to(printable_element_version(node), old_node_path(node.node_id, node.version), { :rel => link_follow(node) }) %>
-        <% end %>
+                :old_link => link_to(printable_element_version(node), old_node_path(node.node_id, node.version), { :rel => link_follow(node) })
+            end %>
       <% end %>
     </ul>
   <% end %>
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index f6a7473a4..9c1eb7020 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -44,10 +44,9 @@
       <div class="welcome p-3" hidden>
         <%= render "sidebar_header", :title => t("layouts.intro_header") %>
         <p class="fs-6 fw-light"><%= t "layouts.intro_text" %></p>
-        <p class="fs-6 fw-light"><%= t "layouts.hosting_partners_html",
-                                       :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
+        <p class="fs-6 fw-light"><%= t "layouts.hosting_partners_2024_html",
                                        :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
-                                       :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
+                                       :corpmembers => link_to(t("layouts.partners_corpmembers"), "https://osmfoundation.org/wiki/Corporate_Members"),
                                        :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
         </p>
         <div class="d-flex gap-2">
diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index f6f6ba137..619094e56 100644
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -66,10 +66,9 @@
       <% end %>
 
       <%= render :layout => "about_section", :locals => { :id => "partners", :icon => "partners", :title => "partners" } do %>
-        <p><%= t "layouts.hosting_partners_html", :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
-                                                  :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
-                                                  :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
-                                                  :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
+        <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"),
+                                                       :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
         </p>
       <% end %>
     </div>
diff --git a/config/locales/af.yml b/config/locales/af.yml
index d02140f27..f6374862e 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -278,8 +278,6 @@ af:
     update:
       success: Gebruikersbesonderhede suksesvol bygewerk.
   browse:
-    created: Geskep
-    closed: Gesluit
     version: Weergawe
     in_changeset: Wysigingstel
     anonymous: anoniem
@@ -295,21 +293,6 @@ af:
     view_history: Beskou geskiedenis
     view_details: Bekyk detail
     location: 'Ligging:'
-    changeset:
-      title: 'Wysigingstel: %{id}'
-      belongs_to: Skrywer
-      node: Knooppunte (%{count})
-      node_paginated: Knooppunte (%{x}-%{y} van %{count})
-      way: Weë (%{count})
-      way_paginated: Weë (%{x}-%{y} van %{count})
-      relation: Verwantskappe (%{count})
-      relation_paginated: Verwantskappe (%{x}-%{y} of %{count})
-      changesetxml: Wysigingstel XML
-      osmchangexml: osmWysiging XML
-      join_discussion: Meld aan en gesels saam
-      discussion: Bespreking
-      still_open: Wysigingstel is steeds oop - bespreking sal oopmaak sodra die wysigingstel
-        gesluit is.
     node:
       title_html: 'Knooppunt: %{name}'
       history_title_html: 'Knooppuntgeskiedenis: %{name}'
@@ -416,6 +399,24 @@ af:
       feed:
         title: Wysigingstel %{id}
         title_comment: Wysigingstel %{id} - %{comment}
+        created: Geskep
+        closed: Gesluit
+        belongs_to: Skrywer
+    show:
+      title: 'Wysigingstel: %{id}'
+      discussion: Bespreking
+      join_discussion: Meld aan en gesels saam
+      still_open: Wysigingstel is steeds oop - bespreking sal oopmaak sodra die wysigingstel
+        gesluit is.
+      changesetxml: Wysigingstel XML
+      osmchangexml: osmWysiging XML
+    paging_nav:
+      nodes: Knooppunte (%{count})
+      nodes_paginated: Knooppunte (%{x}-%{y} van %{count})
+      ways: Weë (%{count})
+      ways_paginated: Weë (%{x}-%{y} van %{count})
+      relations: Verwantskappe (%{count})
+      relations_paginated: Verwantskappe (%{x}-%{y} of %{count})
     timeout:
       sorry: Jammer, die lys wysigingstelle wat u versoek het, neem lank om uit te
         haal.
@@ -1525,8 +1526,6 @@ af:
       heading: Wagwoord vergeet?
       email address: 'E-posadres:'
       new password button: Herstel wagwoord
-    create:
-      notice email cannot find: E-posadres is ongelukkig onverkrygbaar, jammer.
     edit:
       title: Herstel wagwoord
       heading: Herstel wagwoord vir %{user}
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index b3bd19cf7..a54887498 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -144,10 +144,6 @@ aln:
         emailin per konfirmim.
       success: Informatat e shfrytëzuesit u ndryshuan me sukses.
   browse:
-    changeset:
-      title: Ndryshim
-      changesetxml: Ndryshim en XML
-      osmchangexml: Ndryshim i OSM-s en XML
     relation_member:
       entry_role_html: '%{type} %{name} asht si %{role}'
       type:
@@ -202,6 +198,10 @@ aln:
       feed:
         title: Ndryshim %{id}
         title_comment: Ndryshimi %{id} - %{comment}
+    show:
+      title: Ndryshim
+      changesetxml: Ndryshim en XML
+      osmchangexml: Ndryshim i OSM-s en XML
   dashboards:
     contact:
       km away: '%{count}km larg'
@@ -781,10 +781,6 @@ aln:
       new password button: Ndrysho fjalkalimin
       help_text: Shkrueje email adresen që je regjistrue me to, do t'ju deromi një
         lidhe rreth ksaj ku ju muni me ndrru fjalkalimin
-    create:
-      notice email on way: Na vjen keq që e keni hup :-( po ni email ka me ju ardh
-        së shpejti edhe muni me ricaktu.
-      notice email cannot find: Smujtëm me gjet qat email adres, na vjen keq.
     edit:
       title: Ricakto fjalëkalimin
       heading: Ricakto fjalëkalimin për %{user}
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 527d73710..6c5334204 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -404,12 +404,6 @@ ar:
     destroy:
       success: تم حذف الحساب.
   browse:
-    created: تم الإنشاء
-    closed: تم الإغلاق
-    created_ago_html: تم إنشاء %{time_ago}
-    closed_ago_html: مغلق %{time_ago}
-    created_ago_by_html: تم إنشاء %{time_ago} بواسطة %{user}
-    closed_ago_by_html: مغلق %{time_ago} بواسطة %{user}
     deleted_ago_by_html: تم حذف %{time_ago} بواسطة %{user}
     edited_ago_by_html: تم تحرير %{time_ago} بواسطة %{user}
     version: الإصدار
@@ -428,23 +422,6 @@ ar:
     view_history: عرض السجل
     view_details: شاهد التفاصيل
     location: 'الموقع:'
-    changeset:
-      title: حزمة التغييرات %{id}
-      belongs_to: الصانع
-      node: العقد (%{count})
-      node_paginated: العقد (%{x}-%{y} من %{count})
-      way: الطرق (%{count})
-      way_paginated: الطرق (%{x}-%{y} من %{count})
-      relation: الصلات (%{count})
-      relation_paginated: الصلات (%{x}-%{y} من %{count})
-      hidden_comment_by_html: تعليق مخفي من%{time_ago} %{user}
-      comment_by_html: تعليق من %{user}%{time_ago}
-      changesetxml: حزمة التغييرات XML
-      osmchangexml: osmChange XML
-      join_discussion: ادخل للاشتراك في المناقشة
-      discussion: مناقشة
-      still_open: ما زالت مجموعة التغييرات مفتوحة - سيتم فتح المناقشة بمجرد إغلاق
-        مجموعة التغييرات.
     node:
       title_html: 'عقدة: %{name}'
       history_title_html: 'تاريخ العقدة: %{name}'
@@ -546,6 +523,30 @@ ar:
       feed:
         title: حزمة التغييرات %{id}
         title_comment: حزمة التغييرات %{id} - %{comment}
+        created: تم الإنشاء
+        closed: تم الإغلاق
+        belongs_to: الصانع
+    show:
+      title: حزمة التغييرات %{id}
+      created_ago_html: تم إنشاء %{time_ago}
+      closed_ago_html: مغلق %{time_ago}
+      created_ago_by_html: تم إنشاء %{time_ago} بواسطة %{user}
+      closed_ago_by_html: مغلق %{time_ago} بواسطة %{user}
+      discussion: مناقشة
+      join_discussion: ادخل للاشتراك في المناقشة
+      still_open: ما زالت مجموعة التغييرات مفتوحة - سيتم فتح المناقشة بمجرد إغلاق
+        مجموعة التغييرات.
+      comment_by_html: تعليق من %{user}%{time_ago}
+      hidden_comment_by_html: تعليق مخفي من%{time_ago} %{user}
+      changesetxml: حزمة التغييرات XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: العقد (%{count})
+      nodes_paginated: العقد (%{x}-%{y} من %{count})
+      ways: الطرق (%{count})
+      ways_paginated: الطرق (%{x}-%{y} من %{count})
+      relations: الصلات (%{count})
+      relations_paginated: الصلات (%{x}-%{y} من %{count})
     timeout:
       sorry: عذرا، لقد استغرقت قائمة مجموعات التغييرات اللتي طلبتها وقتا طويلا لاستردادها.
   changeset_comments:
@@ -1823,10 +1824,6 @@ ar:
       new password button: أعد ضبط كلمة السر
       help_text: أدخل عنوان البريد الإلكتروني الذي استخدمته للتسجيل، وسوف نرسل عليه
         رابطا يمكنك استخدامه لإعادة تعيين كلمة المرور.
-    create:
-      notice email on way: نأسف لأنك أضعتها :-( ولكن هناك رسالة إلكترونية في طريقها
-        إليك ستمكنك من إعادة تعيينها قريبًا.
-      notice email cannot find: معذرةً، تعذر إيجاد عنوان البريد الإلكتروني.
     edit:
       title: إعادة ضبط كلمة السر
       heading: إعادة تعيين كلمة السر %{user}
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index a7fafef89..8b767471c 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -124,10 +124,6 @@ arz:
         لمذكره تأكيد العنوان الإلكترونى الجديد.
       success: تم تحديث معلومات المستخدم بنجاح.
   browse:
-    changeset:
-      title: 'حزمه التغييرات: %{id}'
-      changesetxml: حزمه التغييرات إكس إم إل
-      osmchangexml: osmChange XML
     relation_member:
       entry_role_html: '%{type} %{name} كــ %{role}'
       type:
@@ -170,6 +166,10 @@ arz:
       feed:
         title: حزمه التغييرات %{id}
         title_comment: حزمه التغييرات %{id} - %{comment}
+    show:
+      title: 'حزمه التغييرات: %{id}'
+      changesetxml: حزمه التغييرات إكس إم إل
+      osmchangexml: osmChange XML
   dashboards:
     contact:
       km away: على بعد %{count}كم
@@ -702,10 +702,6 @@ arz:
       new password button: إعاده ضبط كلمه المرور
       help_text: أدخل عنوان البريد الإلكترونى الذى استخدمته للتسجيل ، وسوف نرسل عليه
         رابط يمكنك استخدامه لإعاده تعيين كلمه المرور.
-    create:
-      notice email on way: نأسف لأنك أضعتها :-( ولكن هناك رساله إلكترونيه فى طريقها
-        إليك ستمكنك من إعاده تعيينها قريبًا.
-      notice email cannot find: تعذّر إيجاد عنوان البريد الإلكترونى، نحن آسفون.
     edit:
       title: إعاده ضبط كلمه المرور
       heading: إعاده تعيين كلمه المرور %{user}
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 4c7c087ab..08144489c 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -259,8 +259,6 @@ ast:
     destroy:
       success: Desanicióse la cuenta.
   browse:
-    created: Creáu
-    closed: Zarráu
     version: Versión
     in_changeset: Conxuntu de cambios
     anonymous: anónimu
@@ -270,21 +268,6 @@ ast:
     view_history: Ver historial
     view_details: Ver detalles
     location: 'Allugamientu:'
-    changeset:
-      title: 'Conxuntu de cambios: %{id}'
-      belongs_to: Autor
-      node: Nuedos (%{count})
-      node_paginated: Nuedos (%{x}-%{y} de %{count})
-      way: Víes (%{count})
-      way_paginated: Víes (%{x}-%{y} de %{count})
-      relation: Rellaciones (%{count})
-      relation_paginated: Rellaciones (%{x}-%{y} de %{count})
-      changesetxml: Conxuntu de cambeos XML
-      osmchangexml: osmChange XML
-      join_discussion: Anicia sesión pa xunite al alderique
-      discussion: Alderique
-      still_open: El conxuntu de cambios inda ta abiertu; l'alderique abriráse en
-        zarrando'l conxuntu de cambios.
     node:
       title_html: 'Nuedu: %{name}'
       history_title_html: 'Historial del nuedu: %{name}'
@@ -383,6 +366,24 @@ ast:
       feed:
         title: Conxuntu de cambeos %{id}
         title_comment: Conxuntu de cambeos %{id} - %{comment}
+        created: Creáu
+        closed: Zarráu
+        belongs_to: Autor
+    show:
+      title: 'Conxuntu de cambios: %{id}'
+      discussion: Alderique
+      join_discussion: Anicia sesión pa xunite al alderique
+      still_open: El conxuntu de cambios inda ta abiertu; l'alderique abriráse en
+        zarrando'l conxuntu de cambios.
+      changesetxml: Conxuntu de cambeos XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Nuedos (%{count})
+      nodes_paginated: Nuedos (%{x}-%{y} de %{count})
+      ways: Víes (%{count})
+      ways_paginated: Víes (%{x}-%{y} de %{count})
+      relations: Rellaciones (%{count})
+      relations_paginated: Rellaciones (%{x}-%{y} de %{count})
     timeout:
       sorry: Llevó demasiao tiempu baxar la llista de conxuntos de cambeos que pidisti.
   changeset_comments:
@@ -1425,10 +1426,6 @@ ast:
       new password button: Reestablecer contraseña
       help_text: Escribi les señes de corréu qu'usasti pa date d'alta, unviarémoste
         un enllaz que pues usar pa reestablecer la contraseña.
-    create:
-      notice email on way: Sentimos que la perdieres :-( pero hai un corréu en camín
-        pa que puedas reaniciala ceo.
-      notice email cannot find: Nun s'alcontró esa direición de corréu.
     edit:
       title: Reestablecer contraseña
       heading: Reestablecer la contraseña de %{user}
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 32e8bc347..53cbf4a77 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -162,8 +162,6 @@ az:
         link text: bu nədir?
       save changes button: Dəyişiklikləri yadda saxla
   browse:
-    created: Yaradılıb
-    closed: Bağlanıb
     version: Versiya
     in_changeset: Dəyişikliklər
     anonymous: anonim
@@ -173,12 +171,6 @@ az:
     view_history: Tarixçəyə bax
     view_details: Xüsusiyyətlərə bax
     location: 'Yerləşməsi:'
-    changeset:
-      title: 'Dəyişikliklər dəsti: %{id}'
-      belongs_to: Müəllif
-      node: (%{count}) nöqtə
-      changesetxml: XML dəyişikliklər dəsti
-      osmchangexml: osmChange XML
     relation:
       members: İştirakçılar
     relation_member:
@@ -247,6 +239,15 @@ az:
       feed:
         title: Dəyişikliklər dəsti  %{id}
         title_comment: Dəyişikliklər dəsti %{id} - %{comment}
+        created: Yaradılıb
+        closed: Bağlanıb
+        belongs_to: Müəllif
+    show:
+      title: 'Dəyişikliklər dəsti: %{id}'
+      changesetxml: XML dəyişikliklər dəsti
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: (%{count}) nöqtə
     timeout:
       sorry: Bağışlayın, tələb etdiyiniz dəyişikliklər dəstinin siyahısı, çıxarıla
         bilmək üçün cox böyükdür.
diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index ca53e54c5..131bbb2d8 100644
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -251,8 +251,6 @@ ba:
         comment: Комментарий
         full: Тулы текст
   browse:
-    created: Булдырылған
-    closed: Ябыҡ
     version: Версия
     in_changeset: Төҙәтеүҙәр пакеты
     anonymous: Аноним
@@ -268,21 +266,6 @@ ba:
     view_history: Тарих
     view_details: Ентекләберәк
     location: 'Географик урын:'
-    changeset:
-      title: 'Төҙәтеүҙәр пакеты: %{id}'
-      belongs_to: Автор
-      node: Нөктәләр (%{count})
-      node_paginated: Нөктәләр (%{x}-%{y} из %{count})
-      way: Һыҙыҡтар (%{count})
-      way_paginated: Юлдар (%{x}-%{y} %{count}һынан)
-      relation: Мөнәсәбәттәр (%{count})
-      relation_paginated: Мөнәсәбәттәр (%{x}-%{y} %{count}нан)
-      changesetxml: Төҙәтеүҙәр пакетының XML-ы
-      osmchangexml: osmChange XML
-      join_discussion: Фекер алышыуға ҡушылыу өсөн системаға инегеҙ
-      discussion: Фекер алышыу
-      still_open: Төҙәтмәләр пакеты әле асыҡ. Фекер алышыу, төҙәтмәләр пакеты ябылғандан
-        һуң ғына буласаҡ.
     node:
       title_html: 'Нөктә: %{name}'
       history_title_html: 'Нөктә тарихы: %{name}'
@@ -387,6 +370,24 @@ ba:
       feed:
         title: 'Төҙәтеүҙәр пакеты: %{id}'
         title_comment: Төҙәтеүҙәр пакеты %{id} — %{comment}
+        created: Булдырылған
+        closed: Ябыҡ
+        belongs_to: Автор
+    show:
+      title: 'Төҙәтеүҙәр пакеты: %{id}'
+      discussion: Фекер алышыу
+      join_discussion: Фекер алышыуға ҡушылыу өсөн системаға инегеҙ
+      still_open: Төҙәтмәләр пакеты әле асыҡ. Фекер алышыу, төҙәтмәләр пакеты ябылғандан
+        һуң ғына буласаҡ.
+      changesetxml: Төҙәтеүҙәр пакетының XML-ы
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Нөктәләр (%{count})
+      nodes_paginated: Нөктәләр (%{x}-%{y} из %{count})
+      ways: Һыҙыҡтар (%{count})
+      ways_paginated: Юлдар (%{x}-%{y} %{count}һынан)
+      relations: Мөнәсәбәттәр (%{count})
+      relations_paginated: Мөнәсәбәттәр (%{x}-%{y} %{count}нан)
     timeout:
       sorry: Ҡыҙғанысҡа ҡаршы, һеҙ һораған төҙәтмә пакеттары исемлеген алыу өсөн күп
         ваҡыт талап итә.
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 6825dd85c..a99fc301f 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -281,8 +281,6 @@ be-Tarask:
         пошты.
       success: Зьвесткі пра карыстальніка пасьпяхова абноўленыя.
   browse:
-    created: Створана
-    closed: Закрытае
     version: Вэрсія
     in_changeset: Набор зьменаў
     anonymous: ананім
@@ -302,17 +300,6 @@ be-Tarask:
     view_history: Паглядзець гісторыю
     view_details: Паглядзець зьвесткі
     location: 'Месцазнаходжаньне:'
-    changeset:
-      title: 'Набор зьменаў: %{id}'
-      belongs_to: Аўтар
-      node: Пункты (%{count})
-      node_paginated: Пункты (%{x}-%{y} з %{count})
-      way: Лініі (%{count})
-      way_paginated: Лініі (%{x}-%{y} з %{count})
-      relation: Сувязі (%{count})
-      relation_paginated: Сувязі (%{x}-%{y} з %{count})
-      changesetxml: Набор зьменаў у фармаце XML
-      osmchangexml: osmChange XML
     way:
       nodes: Вузлы
       nodes_count:
@@ -396,6 +383,20 @@ be-Tarask:
       feed:
         title: Набор зьменаў %{id}
         title_comment: Набор зьменаў %{id} - %{comment}
+        created: Створана
+        closed: Закрытае
+        belongs_to: Аўтар
+    show:
+      title: 'Набор зьменаў: %{id}'
+      changesetxml: Набор зьменаў у фармаце XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Пункты (%{count})
+      nodes_paginated: Пункты (%{x}-%{y} з %{count})
+      ways: Лініі (%{count})
+      ways_paginated: Лініі (%{x}-%{y} з %{count})
+      relations: Сувязі (%{count})
+      relations_paginated: Сувязі (%{x}-%{y} з %{count})
     timeout:
       sorry: Прабачце, сьпіс набораў зьменаў, які Вы запыталі, занадта вялікі для
         атрыманьня.
@@ -1039,11 +1040,6 @@ be-Tarask:
       new password button: Ачысьціць пароль
       help_text: Увядзіце адрас электроннай пошты, які Вы выкарыстоўвалі пры рэгістрацыі,
         і мы вышлем Вам спасылку, якую Вы зможаце выкарыстаць для зьмены паролю.
-    create:
-      notice email on way: Шкада, што Вы яго згубілі, але электронны ліст ужо дасланы,
-        таму Вы хутка зможаце яго зьмяніць.
-      notice email cannot find: Прабачце, не атрымалася знайсьці такога адрасу электроннай
-        пошты.
     edit:
       title: Ачысьціць пароль
       heading: Скінуць пароль для %{user}
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 0c3771d46..34f891672 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -317,8 +317,6 @@ be:
         сваю эл.пошту, вам павінен прыйсці запыт на пацвярджэнне вашага новага адраса.
       success: Звесткі аб карыстальніку паспяхова абноўленыя.
   browse:
-    created: Створаны
-    closed: Зачынены
     version: Версія
     in_changeset: Пакет правак
     anonymous: ананімны
@@ -328,21 +326,6 @@ be:
     view_history: Прагляд гісторыі
     view_details: Прагляд звестак
     location: 'Месца:'
-    changeset:
-      title: 'Набор змен: %{id}'
-      belongs_to: Аўтар
-      node: Пункты (%{count})
-      node_paginated: Пункты (%{x}-%{y} з %{count})
-      way: Лініі (%{count})
-      way_paginated: Лініі (%{x}-%{y} з %{count})
-      relation: Дачыненні (%{count})
-      relation_paginated: Дачыненні (%{x}-%{y} з %{count})
-      changesetxml: XML пакета правак
-      osmchangexml: osmChange XML
-      join_discussion: Увайдзіце ў сістэму, каб далучыцца да абмеркавання
-      discussion: Абмеркаванне
-      still_open: Пакет правак яшчэ адкрыты. Абмеркаванне стане даступным, як толькі
-        пакет правак закрыецца.
     node:
       title_html: 'Пункт: %{name}'
       history_title_html: 'Гісторыя пункта: %{name}'
@@ -441,6 +424,24 @@ be:
       feed:
         title: Набор змен %{id}
         title_comment: Набор змен %{id} - %{comment}
+        created: Створаны
+        closed: Зачынены
+        belongs_to: Аўтар
+    show:
+      title: 'Набор змен: %{id}'
+      discussion: Абмеркаванне
+      join_discussion: Увайдзіце ў сістэму, каб далучыцца да абмеркавання
+      still_open: Пакет правак яшчэ адкрыты. Абмеркаванне стане даступным, як толькі
+        пакет правак закрыецца.
+      changesetxml: XML пакета правак
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Пункты (%{count})
+      nodes_paginated: Пункты (%{x}-%{y} з %{count})
+      ways: Лініі (%{count})
+      ways_paginated: Лініі (%{x}-%{y} з %{count})
+      relations: Дачыненні (%{count})
+      relations_paginated: Дачыненні (%{x}-%{y} з %{count})
     timeout:
       sorry: Выбачайце, спіс набораў правак, што Вы запыталі, занадта вялікі для атрымання.
   changeset_comments:
@@ -1448,10 +1449,6 @@ be:
       new password button: Выслаць мне новы пароль
       help_text: Увядзіце адрас электроннай пошты, які Вы выкарыстоўвалі пры рэгістрацыі,
         і мы вышлем Вам спасылку, якую Вы зможаце выкарыстаць для змены паролю.
-    create:
-      notice email on way: Жаль, што вы яго згубілі :-( але ліст ужо адпраўлены, і
-        вы хутка зможаце яго скінуць.
-      notice email cannot find: Немагчыма знайсці гэтакі паштовы адрас, прабачце.
     edit:
       title: скінуць пароль
       heading: Скінуць пароль для %{user}
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 29c42a050..4cff01a9b 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -293,11 +293,6 @@ bg:
     destroy:
       success: Профилът е изтрит.
   browse:
-    created: Създадена
-    closed: Затворена
-    closed_ago_html: Затворен %{time_ago}
-    created_ago_by_html: Създаден %{time_ago} от %{user}
-    closed_ago_by_html: Затворен %{time_ago} от %{user}
     edited_ago_by_html: Редактирано %{time_ago} от %{user}
     version: Версия
     in_changeset: Списък с промени
@@ -308,21 +303,6 @@ bg:
     view_history: Показване на историята
     view_details: Показване на детайли
     location: 'Местоположение:'
-    changeset:
-      title: 'Списък с промени: %{id}'
-      belongs_to: Автор
-      node: Възли (%{count})
-      node_paginated: Възли (%{x}-%{y} от общо %{count})
-      way: Пътища (%{count})
-      way_paginated: Пътища (%{x}-%{y} от общо %{count})
-      relation: Релации (%{count})
-      relation_paginated: Релации(%{x}-%{y} от %{count})
-      changesetxml: XML на списъка с промени
-      osmchangexml: osmChange XML
-      join_discussion: Впишете се, за да се присъедините към обсъждането
-      discussion: Обсъждане
-      still_open: Списъкът с промени не е завършен - обсъждането ще започне след неговото
-        завършване.
     node:
       title_html: 'Възел: %{name}'
       history_title_html: 'История на възела: %{name}'
@@ -415,6 +395,27 @@ bg:
       feed:
         title: Списък с промени %{id}
         title_comment: Списък с промени %{id} - %{comment}
+        created: Създадена
+        closed: Затворена
+        belongs_to: Автор
+    show:
+      title: 'Списък с промени: %{id}'
+      closed_ago_html: Затворен %{time_ago}
+      created_ago_by_html: Създаден %{time_ago} от %{user}
+      closed_ago_by_html: Затворен %{time_ago} от %{user}
+      discussion: Обсъждане
+      join_discussion: Впишете се, за да се присъедините към обсъждането
+      still_open: Списъкът с промени не е завършен - обсъждането ще започне след неговото
+        завършване.
+      changesetxml: XML на списъка с промени
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Възли (%{count})
+      nodes_paginated: Възли (%{x}-%{y} от общо %{count})
+      ways: Пътища (%{count})
+      ways_paginated: Пътища (%{x}-%{y} от общо %{count})
+      relations: Релации (%{count})
+      relations_paginated: Релации(%{x}-%{y} от %{count})
     timeout:
       sorry: Съжаляваме, но списъка с промени който заявихте се зарежда твърде дълго.
   changeset_comments:
@@ -1434,8 +1435,6 @@ bg:
       help_text: Въведете имейл адреса, който сте използвали при регистрацията, и
         ние ще Ви изпратим връзка, която можете да използвате, за да промените паролата
         си.
-    create:
-      notice email cannot find: Съжаляваме, но този електронен адрес не е намерен.
     edit:
       title: Възстановяване на парола
       heading: Смени Парола за %{user}
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 6991fb8a4..ab9b7db6b 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -337,12 +337,6 @@ bn:
     destroy:
       success: অ্যাকাউন্ট অপসারণ করা হয়েছে।
   browse:
-    created: তৈরি হয়েছে
-    closed: বন্ধ হয়েছে
-    created_ago_html: '%{time_ago} তৈরি'
-    closed_ago_html: '%{time_ago} বন্ধকৃত'
-    created_ago_by_html: '%{user} কর্তৃক %{time_ago} তৈরিকৃত'
-    closed_ago_by_html: '%{user} কর্তৃক %{time_ago} বন্ধকৃত'
     deleted_ago_by_html: '%{user} কর্তৃক %{time_ago} অপসারিত'
     edited_ago_by_html: '%{user} কর্তৃক %{time_ago} সম্পাদিত'
     version: সংস্করণ
@@ -360,21 +354,6 @@ bn:
     view_history: ইতিহাস দেখুন
     view_details: বিস্তারিত দেখুন
     location: 'অবস্থান:'
-    changeset:
-      title: 'পরিবর্তনধার্য: %{id}'
-      belongs_to: লেখক
-      node: সংযোগস্থল (%{count}টি)
-      node_paginated: সংযোগস্থল (%{count}টির %{x}-%{y})
-      way: পথসমূহ (%{count}টি)
-      way_paginated: পথসমূহ (%{count}টির %{x}-%{y})
-      relation: সম্পর্ক (%{count}টি)
-      relation_paginated: সম্পর্ক (%{count}টির %{x}-%{y})
-      hidden_comment_by_html: '%{user} %{time_ago} মন্তব্যটি লুকিয়েছেন'
-      changesetxml: পরিবর্তনধার্য এক্সএমএল
-      osmchangexml: osmChange এক্সএমএল
-      join_discussion: আলোচনায় যোগ দিতে প্রবেশ করুন
-      discussion: আলোচনা
-      still_open: চেঞ্জসেট এখনও খোলা - চেঞ্জসেট বন্ধ হয়ে গেলে আলোচনা খোলা হবে।
     node:
       title_html: 'সংযোগস্থল: %{name}'
       history_title_html: 'সংযোগস্থলের ইতিহাস: %{name}'
@@ -482,6 +461,28 @@ bn:
       feed:
         title: পরিবর্তনধার্য %{id}
         title_comment: পরিবর্তনধার্য %{id} - %{comment}
+        created: তৈরি হয়েছে
+        closed: বন্ধ হয়েছে
+        belongs_to: লেখক
+    show:
+      title: 'পরিবর্তনধার্য: %{id}'
+      created_ago_html: '%{time_ago} তৈরি'
+      closed_ago_html: '%{time_ago} বন্ধকৃত'
+      created_ago_by_html: '%{user} কর্তৃক %{time_ago} তৈরিকৃত'
+      closed_ago_by_html: '%{user} কর্তৃক %{time_ago} বন্ধকৃত'
+      discussion: আলোচনা
+      join_discussion: আলোচনায় যোগ দিতে প্রবেশ করুন
+      still_open: চেঞ্জসেট এখনও খোলা - চেঞ্জসেট বন্ধ হয়ে গেলে আলোচনা খোলা হবে।
+      hidden_comment_by_html: '%{user} %{time_ago} মন্তব্যটি লুকিয়েছেন'
+      changesetxml: পরিবর্তনধার্য এক্সএমএল
+      osmchangexml: osmChange এক্সএমএল
+    paging_nav:
+      nodes: সংযোগস্থল (%{count}টি)
+      nodes_paginated: সংযোগস্থল (%{count}টির %{x}-%{y})
+      ways: পথসমূহ (%{count}টি)
+      ways_paginated: পথসমূহ (%{count}টির %{x}-%{y})
+      relations: সম্পর্ক (%{count}টি)
+      relations_paginated: সম্পর্ক (%{count}টির %{x}-%{y})
     timeout:
       sorry: দুঃখিত, আপনি যেই পরিবর্তনসেটটির জন্য আবেদন করছেন সেটি ফিরিয়ে আনতে আরও
         সময় লাগবে।
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 1399fb864..d860f1b11 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -352,12 +352,6 @@ br:
     destroy:
       success: Kont dilamet.
   browse:
-    created: Krouet
-    closed: Serret
-    created_ago_html: Krouet %{time_ago}
-    closed_ago_html: Serret %{time_ago}
-    created_ago_by_html: Bet krouet %{time_ago} gant %{user}
-    closed_ago_by_html: Bet serret %{time_ago} gant %{user}
     deleted_ago_by_html: Bet dilamet %{time_ago} gant %{user}
     edited_ago_by_html: Bet aozet %{time_ago} gant %{user}
     version: Stumm
@@ -381,23 +375,6 @@ br:
     view_history: Gwelet an istor
     view_details: ↓Gwelet ar munudoù
     location: 'Lec''hiadur:'
-    changeset:
-      title: 'Hollad cheñchamantoù: %{id}'
-      belongs_to: Aozer
-      node: Skoulmoù (%{count})
-      node_paginated: Skoulmoù (%{x}-%{y} diwar %{count})
-      way: Hentoù (%{count})
-      way_paginated: Hentoù (%{x}-%{y} diwar %{count})
-      relation: Darempredoù (%{count})
-      relation_paginated: Darempredoù (%{x}-%{y} diwar %{count})
-      hidden_comment_by_html: Kemennadenn kuzhet gant %{user} %{time_ago}
-      comment_by_html: Kemennadenn skrivet gant %{user} %{time_ago}
-      changesetxml: Hollad cheñchamantoù XML
-      osmchangexml: Cheñchoùosm XML
-      join_discussion: Kevreit evit mont er gaozeadenn
-      discussion: Kaozeadenn
-      still_open: Hollad cheñchamantoù digor - an diviz a zigoro ur wech ma vo serret
-        an hollad cheñchamantoù.
     node:
       title_html: 'Skoulm: %{name}'
       history_title_html: 'Istor ar skoulm: %{name}'
@@ -525,6 +502,9 @@ br:
       feed:
         title: Hollad cheñchamantoù %{id}
         title_comment: Hollad cheñchamantoù %{id} - %{comment}
+        created: Krouet
+        closed: Serret
+        belongs_to: Aozer
     subscribe:
       button: Koumanantiñ ouzh ar gaozeadenn
     unsubscribe:
@@ -533,7 +513,31 @@ br:
       title: Hollad cheñchamantoù %{id}
       created_by_html: Bet krouet gant %{link_user} d'an %{created}.
     no_such_entry:
+      title: N'eus ket eus an hollad cheñchamantoù-mañ
       heading: 'Enmont ebet gant an id: %{id}'
+    show:
+      title: 'Hollad cheñchamantoù: %{id}'
+      created: 'Krouet: %{when}'
+      closed: 'Serret: %{when}'
+      created_ago_html: Krouet %{time_ago}
+      closed_ago_html: Serret %{time_ago}
+      created_ago_by_html: Bet krouet %{time_ago} gant %{user}
+      closed_ago_by_html: Bet serret %{time_ago} gant %{user}
+      discussion: Kaozeadenn
+      join_discussion: Kevreit evit mont er gaozeadenn
+      still_open: Hollad cheñchamantoù digor - an diviz a zigoro ur wech ma vo serret
+        an hollad cheñchamantoù.
+      comment_by_html: Kemennadenn skrivet gant %{user} %{time_ago}
+      hidden_comment_by_html: Kemennadenn kuzhet gant %{user} %{time_ago}
+      changesetxml: Hollad cheñchamantoù XML
+      osmchangexml: Cheñchoùosm XML
+    paging_nav:
+      nodes: Skoulmoù (%{count})
+      nodes_paginated: Skoulmoù (%{x}-%{y} diwar %{count})
+      ways: Hentoù (%{count})
+      ways_paginated: Hentoù (%{x}-%{y} diwar %{count})
+      relations: Darempredoù (%{count})
+      relations_paginated: Darempredoù (%{x}-%{y} diwar %{count})
     timeout:
       sorry: Ho tigarez, re hir eo adtapout ar roll cheñchamantoù hoc'h eus goulennet.
   changeset_comments:
@@ -1869,10 +1873,6 @@ br:
       new password button: Adderaouekaat ar ger-tremen
       help_text: Ebarzhit ar chomlec'h postel ho poa implijet evit en em enskrivañ,
         kaset e vo deoc'h ul liamm a c'hallot implijout evit adderaouekaat ho ker-tremen.
-    create:
-      notice email on way: Kaset ez eus bet ur postel deoc'h evit adderaouekaat ho
-        ker-tremen.
-      notice email cannot find: Ho tigarez, n'eo ket bet kavet ar chomlec'h postel-se.
     edit:
       title: Adderaouekaat ar ger-tremen
       heading: Adderaouekaat ar ger-tremen evit %{user}
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index e661a4614..5e42b99a3 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -184,8 +184,6 @@ bs:
         e-mail za porukom za potvrdu nove e-mail adrese.
       success: Korisničke informacije su uspješno osvježene.
   browse:
-    created: Napravljeno
-    closed: Zatvoreno
     version: Verzija
     in_changeset: Skup izmjena
     anonymous: anonimno
@@ -195,18 +193,6 @@ bs:
     view_history: Historija
     view_details: Prikaži detalje
     location: 'Lokacija:'
-    changeset:
-      title: 'Skup promjena: %{id}'
-      belongs_to: Autor
-      node: Čvorovi (%{count})
-      node_paginated: Čvorovi (%{x}-%{y} of %{count})
-      way: Putevi (%{count})
-      way_paginated: Putevi (%{x}-%{y} of %{count})
-      relation: Relacije (%{count})
-      relation_paginated: Relacije (%{x}-%{y} of %{count})
-      changesetxml: XML seta promjena
-      osmchangexml: osmChange XML
-      discussion: Diskusija
     node:
       title_html: 'Čvor: %{name}'
     way:
@@ -282,6 +268,21 @@ bs:
       feed:
         title: Set promjena %{id}
         title_comment: Set promjena %{id} - %{comment}
+        created: Napravljeno
+        closed: Zatvoreno
+        belongs_to: Autor
+    show:
+      title: 'Skup promjena: %{id}'
+      discussion: Diskusija
+      changesetxml: XML seta promjena
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Čvorovi (%{count})
+      nodes_paginated: Čvorovi (%{x}-%{y} of %{count})
+      ways: Putevi (%{count})
+      ways_paginated: Putevi (%{x}-%{y} of %{count})
+      relations: Relacije (%{count})
+      relations_paginated: Relacije (%{x}-%{y} of %{count})
     timeout:
       sorry: Žao nam je, listi seta promjena koju ste tražili je predugo trajalo za
         preuzimanje.
@@ -1023,10 +1024,6 @@ bs:
       new password button: Ponovno postavljanje lozinke
       help_text: Unesite e-mail adresu koju ste koristili za otvaranje računa i poslaćemo
         Vam link kojim možete ponovo postaviti lozinku.
-    create:
-      notice email on way: Žao mi je što ste je izgubili :-( ali e-mail je na putu
-        tako da je možete pononvo postaviti uskoro.
-      notice email cannot find: Ne možemo pronaći tu e-mail adresu, žao nam je.
     edit:
       title: Ponovno postavljanje lozinke
       heading: Ponovno postavljanje lozinke za %{user}
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 54bbfeb27..63896de19 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -356,12 +356,6 @@ ca:
     destroy:
       success: Compte suprimit.
   browse:
-    created: Creat
-    closed: Tancat
-    created_ago_html: Creat %{time_ago}
-    closed_ago_html: Tancat %{time_ago}
-    created_ago_by_html: Creat %{time_ago} per %{user}
-    closed_ago_by_html: Tancat %{time_ago} per %{user}
     deleted_ago_by_html: Eliminat %{time_ago} per %{user}
     edited_ago_by_html: Editat %{time_ago} per %{user}
     version: Versió
@@ -379,23 +373,6 @@ ca:
     view_history: Mostra l’historial
     view_details: Mostra els detalls
     location: 'Ubicació:'
-    changeset:
-      title: 'Conjunt de canvis: %{id}'
-      belongs_to: Autor
-      node: Nodes (%{count})
-      node_paginated: Nodes (%{x}-%{y} de %{count})
-      way: Vies (%{count})
-      way_paginated: Vies (%{x}-%{y} de %{count})
-      relation: Relacions (%{count})
-      relation_paginated: Relacions (%{x}-%{y} de %{count})
-      hidden_comment_by_html: Comentari ocult de %{user} %{time_ago}
-      comment_by_html: Comentari de %{user} %{time_ago}
-      changesetxml: XML del conjunt de canvis
-      osmchangexml: XML en format osmChange
-      join_discussion: Inicieu una sessió per a unir-vos al debat
-      discussion: Debat
-      still_open: Conjunt de canvis encara obert - el debat començarà quan es tanqui
-        el conjunt de canvis.
     node:
       title_html: 'Node: %{name}'
       history_title_html: 'Historial del node: %{name}'
@@ -505,6 +482,30 @@ ca:
       feed:
         title: Conjunt de canvis %{id}
         title_comment: Conjunt de canvis %{id} - %{comment}
+        created: Creat
+        closed: Tancat
+        belongs_to: Autor
+    show:
+      title: 'Conjunt de canvis: %{id}'
+      created_ago_html: Creat %{time_ago}
+      closed_ago_html: Tancat %{time_ago}
+      created_ago_by_html: Creat %{time_ago} per %{user}
+      closed_ago_by_html: Tancat %{time_ago} per %{user}
+      discussion: Debat
+      join_discussion: Inicieu una sessió per a unir-vos al debat
+      still_open: Conjunt de canvis encara obert - el debat començarà quan es tanqui
+        el conjunt de canvis.
+      comment_by_html: Comentari de %{user} %{time_ago}
+      hidden_comment_by_html: Comentari ocult de %{user} %{time_ago}
+      changesetxml: XML del conjunt de canvis
+      osmchangexml: XML en format osmChange
+    paging_nav:
+      nodes: Nodes (%{count})
+      nodes_paginated: Nodes (%{x}-%{y} de %{count})
+      ways: Vies (%{count})
+      ways_paginated: Vies (%{x}-%{y} de %{count})
+      relations: Relacions (%{count})
+      relations_paginated: Relacions (%{x}-%{y} de %{count})
     timeout:
       sorry: La llista de conjunt de canvis que heu sol·licitat ha trigat massa a
         carregar-se.
@@ -1837,10 +1838,6 @@ ca:
       new password button: Restableix la contrasenya
       help_text: Introduïu l'adreça de correu electrònic que vau utilitzar per registrar-vos;
         us hi enviarem un enllaç per a restablir la contrasenya.
-    create:
-      notice email on way: Lamentem que l'hàgiu perdut :-( però ja us hem enviat un
-        correu i la podreu restablir ben aviat.
-      notice email cannot find: No s'ha trobat aquesta adreça de correu.
     edit:
       title: Restableix la contrasenya
       heading: Restableix la contrasenya per a %{user}
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 8029aa442..45a1707b3 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -183,8 +183,6 @@ ce:
         link text: хӀун йу хӀара?
       save changes button: Ӏалашбе хийцамаш
   browse:
-    created: Кхоьллина
-    closed: ДӀачӀагӀа
     version: Верси
     in_changeset: Нисдарш
     anonymous: аноним
@@ -194,19 +192,6 @@ ce:
     view_history: Хьажа истори
     view_details: Мадарра
     location: 'Географин йолу меттиг:'
-    changeset:
-      title: 'Нисдарш: %{id}'
-      belongs_to: Автор
-      node: ТӀадамаш (%{count})
-      node_paginated: ТӀадамаш (%{x}-%{y} чуьра %{count})
-      way: Сиз (%{count})
-      way_paginated: Сиз (%{x}-%{y} чуьра %{count})
-      relation: Хилар (%{count})
-      relation_paginated: Хилар (%{x}-%{y} чуьра %{count})
-      changesetxml: Нисдарийн XML
-      osmchangexml: osmChange XML
-      join_discussion: Дийцарехь дакъалаца системин чугӀо
-      discussion: Дийцар
     node:
       title_html: 'ТӀадам: %{name}'
       history_title_html: 'ТӀадаман истори: %{name}'
@@ -302,6 +287,22 @@ ce:
       feed:
         title: 'Нисдарш: %{id}'
         title_comment: Нисдарш %{id} — %{comment}
+        created: Кхоьллина
+        closed: ДӀачӀагӀа
+        belongs_to: Автор
+    show:
+      title: 'Нисдарш: %{id}'
+      discussion: Дийцар
+      join_discussion: Дийцарехь дакъалаца системин чугӀо
+      changesetxml: Нисдарийн XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: ТӀадамаш (%{count})
+      nodes_paginated: ТӀадамаш (%{x}-%{y} чуьра %{count})
+      ways: Сиз (%{count})
+      ways_paginated: Сиз (%{x}-%{y} чуьра %{count})
+      relations: Хилар (%{count})
+      relations_paginated: Хилар (%{x}-%{y} чуьра %{count})
     timeout:
       sorry: Ахьа бихина нисдарийн могӀа, арабаккха тӀехь беха бу.
   changeset_comments:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 2649ed220..ba9b12aab 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -386,12 +386,6 @@ cs:
     destroy:
       success: Účet smazán.
   browse:
-    created: Vytvořeno
-    closed: Uzavřeno
-    created_ago_html: Vytvořeno %{time_ago}
-    closed_ago_html: Uzavřeno %{time_ago}
-    created_ago_by_html: Vytvořeno %{time_ago} uživatelem %{user}
-    closed_ago_by_html: Uzavřeno %{time_ago} uživatelem %{user}
     deleted_ago_by_html: Smazáno %{time_ago} uživatelem %{user}
     edited_ago_by_html: Upraveno %{time_ago} uživatelem %{user}
     version: Verze
@@ -413,23 +407,6 @@ cs:
     view_history: Zobrazit historii
     view_details: Zobrazit detaily
     location: 'Pozice:'
-    changeset:
-      title: 'Sada změn: %{id}'
-      belongs_to: Autor
-      node: Uzly (%{count})
-      node_paginated: Uzly (%{x}-%{y} z %{count})
-      way: Cesty (%{count})
-      way_paginated: Cesty (%{x}-%{y} z %{count})
-      relation: Relace (%{count})
-      relation_paginated: Relace (%{x}–%{y} z %{count})
-      hidden_comment_by_html: Skrytý komentář od uživatele %{user} %{time_ago}
-      comment_by_html: Komentář od uživatele %{user} %{time_ago}
-      changesetxml: Sada změn XML
-      osmchangexml: osmChange XML
-      join_discussion: Chcete-li diskutovat, přihlaste se
-      discussion: Diskuse
-      still_open: Sada změn je stále otevřená – diskuse se zpřístupní, jakmile bude
-        sada změn uzavřena.
     node:
       title_html: 'Uzel: %{name}'
       history_title_html: 'Historie uzlu: %{name}'
@@ -541,6 +518,30 @@ cs:
       feed:
         title: Sada změn %{id}
         title_comment: Sada změn %{id} - %{comment}
+        created: Vytvořeno
+        closed: Uzavřeno
+        belongs_to: Autor
+    show:
+      title: 'Sada změn: %{id}'
+      created_ago_html: Vytvořeno %{time_ago}
+      closed_ago_html: Uzavřeno %{time_ago}
+      created_ago_by_html: Vytvořeno %{time_ago} uživatelem %{user}
+      closed_ago_by_html: Uzavřeno %{time_ago} uživatelem %{user}
+      discussion: Diskuse
+      join_discussion: Chcete-li diskutovat, přihlaste se
+      still_open: Sada změn je stále otevřená – diskuse se zpřístupní, jakmile bude
+        sada změn uzavřena.
+      comment_by_html: Komentář od uživatele %{user} %{time_ago}
+      hidden_comment_by_html: Skrytý komentář od uživatele %{user} %{time_ago}
+      changesetxml: Sada změn XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Uzly (%{count})
+      nodes_paginated: Uzly (%{x}-%{y} z %{count})
+      ways: Cesty (%{count})
+      ways_paginated: Cesty (%{x}-%{y} z %{count})
+      relations: Relace (%{count})
+      relations_paginated: Relace (%{x}–%{y} z %{count})
     timeout:
       sorry: Omlouváme se, ale vámi požadovaný seznam sad změn se načítal příliš dlouho.
   changeset_comments:
@@ -1899,10 +1900,6 @@ cs:
       new password button: Resetovat heslo
       help_text: Zadejte e-mailovou adresu, pod kterou jste se zaregistrovali, my
         vám na ni pošleme odkaz, pomocí kterého si nastavíte nové heslo.
-    create:
-      notice email on way: Škoda zapomenutého hesla :-( e-mail už je na cestě, takže
-        si budete brzy moci zvolit nové.
-      notice email cannot find: Je mi líto, ale nemohu najít tuto e-mailovou adresu.
     edit:
       title: Obnovit heslo
       heading: Resetovat heslo pro %{user}
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 24a8d086b..bada4729b 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -342,12 +342,6 @@ cy:
     destroy:
       success: Cyfrif wedi'i ddileu.
   browse:
-    created: Wedi creu
-    closed: Wedi cau
-    created_ago_html: Wedi creu %{time_ago}
-    closed_ago_html: Wedi cau %{time_ago}
-    created_ago_by_html: Wedi creu %{time_ago} gan %{user}
-    closed_ago_by_html: Wedi cau %{time_ago} gan %{user}
     deleted_ago_by_html: Wedi dileu %{time_ago} gan %{user}
     edited_ago_by_html: Golygwyd %{time_ago} gan %{user}
     version: Fersiwn
@@ -373,23 +367,6 @@ cy:
     view_history: Gweld hanes
     view_details: Gweld manylion
     location: Lleoliadː
-    changeset:
-      title: 'Grŵp newid: %{id}'
-      belongs_to: Awdur
-      node: Nodau (%{count})
-      node_paginated: Nodau (%{x}-%{y} o %{count})
-      way: Llwybrau %{count}
-      way_paginated: Llwybrau (%{x}-%{y} o %{count})
-      relation: Perthnasoedd (%{count})
-      relation_paginated: Perthnasoedd (%{x}-%{y} o %{count})
-      hidden_comment_by_html: Sylw cudd gan %{user} %{time_ago}
-      comment_by_html: Sylw gan %{user} %{time_ago}
-      changesetxml: XML grŵp newid
-      osmchangexml: XML osmChange
-      join_discussion: Mewngofnodwch i ymuno â'r sgwrs
-      discussion: Sgwrs
-      still_open: Mae'r grŵp newid dal ar agor - bydd trafodaeth yn agor pan fydd
-        y grŵp newid wedi cau.
     node:
       title_html: 'Nod: %{name}'
       history_title_html: 'Hanes y nod: %{name}'
@@ -509,6 +486,42 @@ cy:
       feed:
         title: Grŵp newid %{id}
         title_comment: Grŵp newid %{id} - %{comment}
+        created: Wedi creu
+        closed: Wedi cau
+        belongs_to: Awdur
+    subscribe:
+      button: Tanysgrifio i drafodaeth
+    unsubscribe:
+      button: Dad-danysgrifio o'r drafodaeth
+    heading:
+      title: Grŵp newid %{id}
+      created_by_html: Crëwyd gan %{link_user} ar %{created}.
+    no_such_entry:
+      title: Dim grŵp newid o'r fath
+      heading: 'Dim cofnod gyda''r id: %{id}'
+    show:
+      title: 'Grŵp newid: %{id}'
+      created: 'Crëwyd: %{when}'
+      closed: 'Caëwyd: %{when}'
+      created_ago_html: Wedi creu %{time_ago}
+      closed_ago_html: Wedi cau %{time_ago}
+      created_ago_by_html: Wedi creu %{time_ago} gan %{user}
+      closed_ago_by_html: Wedi cau %{time_ago} gan %{user}
+      discussion: Sgwrs
+      join_discussion: Mewngofnodwch i ymuno â'r sgwrs
+      still_open: Mae'r grŵp newid dal ar agor - bydd trafodaeth yn agor pan fydd
+        y grŵp newid wedi cau.
+      comment_by_html: Sylw gan %{user} %{time_ago}
+      hidden_comment_by_html: Sylw cudd gan %{user} %{time_ago}
+      changesetxml: XML grŵp newid
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Nodau (%{count})
+      nodes_paginated: Nodau (%{x}-%{y} o %{count})
+      ways: Llwybrau %{count}
+      ways_paginated: Llwybrau (%{x}-%{y} o %{count})
+      relations: Perthnasoedd (%{count})
+      relations_paginated: Perthnasoedd (%{x}-%{y} o %{count})
     timeout:
       sorry: Mae'n ddrwg gennym, cymerodd y rhestr o grwpiau newid y gofynnoch amdanynt
         rhy hir i'w hadalw.
@@ -1602,6 +1615,7 @@ cy:
       details: Ceir rhagor o fanylion am y nodyn ar %{url}.
       details_html: Ceir rhagor o fanylion am y nodyn ar %{url}.
     changeset_comment_notification:
+      description: 'Grŵp newid OpenStreetMap #%{id}'
       hi: Helo %{to_user},
       greeting: Helo,
       commented:
@@ -1716,10 +1730,6 @@ cy:
       heading: Wedi anghofio'ch cyfrinair?
       email address: Cyfeiriad E-bost
       new password button: Ailosod cyfrinair
-    create:
-      notice email on way: Sori eich bod wedi ei golli :-( ond mae e-bost ar y ffordd
-        er mwyn ichi ei ailosod yn fuan.
-      notice email cannot find: Methwyd dod o hyd i'r cyfeiriad ebost yno.
     edit:
       title: Ailosod cyfrinair
       heading: Ailosod cyfrinair ar gyfer %{user}
@@ -1731,9 +1741,9 @@ cy:
       title: Dewisiadau
       preferred_editor: Hoff Olygydd
       preferred_languages: Ieithoedd
-      edit_preferences: Dewisiadau Golygu
+      edit_preferences: Golygu Dewisiadau
     edit:
-      title: Dewisiadau Golygu
+      title: Golygu Dewisiadau
       save: Diweddaru Dewisiadau
       cancel: Canslo
     update:
@@ -2515,6 +2525,13 @@ cy:
     revoke:
       revoke: Dad-flocio!
     revoke_all:
+      active_blocks:
+        zero: '%{count} blociau cyfredol.'
+        one: '%{count} %{count} bloc cyfredol.'
+        two: '%{count} floc cyfredol.'
+        few: '%{count} bloc cyfredol.'
+        many: '%{count} bloc cyfredol.'
+        other: '%{count} bloc cyfredol.'
       revoke: Dad-flocio!
     helper:
       time_future_html: Yn dod i ben mewn %{time}.
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 82d1f61b2..b17966ea6 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -351,12 +351,6 @@ da:
     destroy:
       success: Kontoen er bleget slettet.
   browse:
-    created: Oprettet
-    closed: Lukket
-    created_ago_html: Oprettet %{time_ago}
-    closed_ago_html: Lukket %{time_ago}
-    created_ago_by_html: Oprettet %{time_ago} af %{user}
-    closed_ago_by_html: Lukket %{time_ago} af %{user}
     deleted_ago_by_html: Slettet %{time_ago} af %{user}
     edited_ago_by_html: Redigeret %{time_ago} af %{user}
     version: Version
@@ -374,23 +368,6 @@ da:
     view_history: Se historik
     view_details: Se detaljer
     location: 'Sted:'
-    changeset:
-      title: 'Ændringssæt: %{id}'
-      belongs_to: Forfatter
-      node: Punkter (%{count})
-      node_paginated: Punkter (%{x}-%{y} af %{count})
-      way: Veje (%{count})
-      way_paginated: Veje (%{x}-%{y} af %{count})
-      relation: Relationer (%{count})
-      relation_paginated: Relationer (%{x}-%{y} af %{count})
-      hidden_comment_by_html: Skjult kommentar fra %{user} %{time_ago}
-      comment_by_html: Kommentar fra %{user} %{time_ago}
-      changesetxml: XML for ændringssæt
-      osmchangexml: XML for osmChange
-      join_discussion: Log på for at deltage i diskussionen
-      discussion: Diskussion
-      still_open: Ændringssæt er stadig åben - diskussion vil åbne når ændringssættet
-        lukkes.
     node:
       title_html: 'Punkt: %{name}'
       history_title_html: 'Punkthistorik: %{name}'
@@ -508,6 +485,30 @@ da:
       feed:
         title: Ændringssæt %{id}
         title_comment: Ændringssæt %{id} - %{comment}
+        created: Oprettet
+        closed: Lukket
+        belongs_to: Forfatter
+    show:
+      title: 'Ændringssæt: %{id}'
+      created_ago_html: Oprettet %{time_ago}
+      closed_ago_html: Lukket %{time_ago}
+      created_ago_by_html: Oprettet %{time_ago} af %{user}
+      closed_ago_by_html: Lukket %{time_ago} af %{user}
+      discussion: Diskussion
+      join_discussion: Log på for at deltage i diskussionen
+      still_open: Ændringssæt er stadig åben - diskussion vil åbne når ændringssættet
+        lukkes.
+      comment_by_html: Kommentar fra %{user} %{time_ago}
+      hidden_comment_by_html: Skjult kommentar fra %{user} %{time_ago}
+      changesetxml: XML for ændringssæt
+      osmchangexml: XML for osmChange
+    paging_nav:
+      nodes: Punkter (%{count})
+      nodes_paginated: Punkter (%{x}-%{y} af %{count})
+      ways: Veje (%{count})
+      ways_paginated: Veje (%{x}-%{y} af %{count})
+      relations: Relationer (%{count})
+      relations_paginated: Relationer (%{x}-%{y} af %{count})
     timeout:
       sorry: Desværre tog det for lang tid at indlæse den liste af ændringssæt du
         har bedt om.
@@ -1869,10 +1870,6 @@ da:
       new password button: Nulstil adgangskode
       help_text: Indtast e-mailadressen du brugte da du oprettede kontoen. Vi sender
         et link til den som du kan bruge til at nulstille din adgangskode.
-    create:
-      notice email on way: Synd du har glemt den, men en e-mail er på vej så du kan
-        snart indstille en ny.
-      notice email cannot find: Kunne ikke finde den e-mailadresse, beklager.
     edit:
       title: Nulstil adgangskode
       heading: Nulstil adgangskode for %{user}
diff --git a/config/locales/de.yml b/config/locales/de.yml
index d105238ad..044715fba 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -430,12 +430,6 @@ de:
     destroy:
       success: Konto gelöscht.
   browse:
-    created: Erstellt
-    closed: Geschlossen
-    created_ago_html: Erstellt %{time_ago}
-    closed_ago_html: Geschlossen %{time_ago}
-    created_ago_by_html: Erstellt %{time_ago} von %{user}
-    closed_ago_by_html: Geschlossen %{time_ago} von %{user}
     deleted_ago_by_html: Gelöscht %{time_ago} von %{user}
     edited_ago_by_html: Bearbeitet %{time_ago} von %{user}
     version: Version
@@ -453,23 +447,6 @@ de:
     view_history: Verlauf anzeigen
     view_details: Details anzeigen
     location: 'Standort:'
-    changeset:
-      title: 'Änderungssatz: %{id}'
-      belongs_to: Autor
-      node: Knoten (%{count})
-      node_paginated: Knoten (%{x}–%{y} von %{count})
-      way: Wege (%{count})
-      way_paginated: Wege (%{x}–%{y} von %{count})
-      relation: Relationen (%{count})
-      relation_paginated: Relationen (%{x}–%{y} von %{count})
-      hidden_comment_by_html: Versteckter Kommentar von %{user} %{time_ago}
-      comment_by_html: Kommentar von %{user} %{time_ago}
-      changesetxml: Änderungssatz-XML
-      osmchangexml: osmChange-XML
-      join_discussion: Anmelden, um mitzudiskutieren
-      discussion: Diskussion
-      still_open: Der Änderungssatz ist noch offen. Die Diskussion wird eröffnet,
-        sobald der Änderungssatz geschlossen ist.
     node:
       title_html: 'Knoten: %{name}'
       history_title_html: 'Knotenverlauf: %{name}'
@@ -577,6 +554,30 @@ de:
       feed:
         title: 'Änderungssatz: %{id}'
         title_comment: Änderungssatz %{id} - %{comment}
+        created: Erstellt
+        closed: Geschlossen
+        belongs_to: Autor
+    show:
+      title: 'Änderungssatz: %{id}'
+      created_ago_html: Erstellt %{time_ago}
+      closed_ago_html: Geschlossen %{time_ago}
+      created_ago_by_html: Erstellt %{time_ago} von %{user}
+      closed_ago_by_html: Geschlossen %{time_ago} von %{user}
+      discussion: Diskussion
+      join_discussion: Anmelden, um mitzudiskutieren
+      still_open: Der Änderungssatz ist noch offen. Die Diskussion wird eröffnet,
+        sobald der Änderungssatz geschlossen ist.
+      comment_by_html: Kommentar von %{user} %{time_ago}
+      hidden_comment_by_html: Versteckter Kommentar von %{user} %{time_ago}
+      changesetxml: Änderungssatz-XML
+      osmchangexml: osmChange-XML
+    paging_nav:
+      nodes: Knoten (%{count})
+      nodes_paginated: Knoten (%{x}–%{y} von %{count})
+      ways: Wege (%{count})
+      ways_paginated: Wege (%{x}–%{y} von %{count})
+      relations: Relationen (%{count})
+      relations_paginated: Relationen (%{x}–%{y} von %{count})
     timeout:
       sorry: Es hat leider zu lange gedauert, die angeforderten Änderungssätze abzurufen.
   changeset_comments:
@@ -1952,11 +1953,6 @@ de:
       help_text: Bitte gib deine E-Mail-Adresse ein, mit der du dich angemeldet hast.
         Wir werden dir dann einen Link schicken, mit dem du dein Passwort zurücksetzen
         kannst.
-    create:
-      notice email on way: Eine E-Mail mit Hinweisen zum Zurücksetzen des Passworts
-        wurde an dich versandt.
-      notice email cannot find: Wir konnten die E-Mail-Adresse nicht finden. Du hast
-        dich möglicherweise vertippt oder mit einer anderen E-Mail-Adresse angemeldet.
     edit:
       title: Passwort zurücksetzen
       heading: Passwort für %{user} zurücksetzen
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 15aa85683..95d498f7b 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -178,8 +178,6 @@ diq:
     go_public:
       heading: 'Pêron rê akerde vırnayış:'
   browse:
-    created: Vıraziya
-    closed: Kerd kip
     version: Versiyon
     in_changeset: Qeydê Vurnayışan
     anonymous: anonim
@@ -195,19 +193,6 @@ diq:
     view_history: Verêni bıvêne
     view_details: Teferuatan Bıvêne
     location: 'Lokasyon:'
-    changeset:
-      title: 'Koma vurnayışi: %{id}'
-      belongs_to: Nuştekar
-      node: '%{count} noqtey'
-      node_paginated: pero piya (%{x}-%{y} - %{count}) noqtey
-      way: '%{count} ray'
-      way_paginated: Ray (%{x}-%{y} - pêro piya  %{count})
-      relation: Elaqeyi %{count}
-      relation_paginated: Elaqeyi %{x}-%{y} pêro piya %{count}
-      changesetxml: Vurnayışê peyênê XML
-      osmchangexml: OsmVurnayışê XML
-      join_discussion: Dekewtena vatenayışi rê qeyd bê
-      discussion: Werênayış
     node:
       title_html: Noqta:%{name}
       history_title_html: 'Verora nokta: %{name}'
@@ -288,6 +273,22 @@ diq:
       feed:
         title: 'Koma vurnayışi: %{id}'
         title_comment: '%{id} - %{comment} vurniyayışi'
+        created: Vıraziya
+        closed: Kerd kip
+        belongs_to: Nuştekar
+    show:
+      title: 'Koma vurnayışi: %{id}'
+      discussion: Werênayış
+      join_discussion: Dekewtena vatenayışi rê qeyd bê
+      changesetxml: Vurnayışê peyênê XML
+      osmchangexml: OsmVurnayışê XML
+    paging_nav:
+      nodes: '%{count} noqtey'
+      nodes_paginated: pero piya (%{x}-%{y} - %{count}) noqtey
+      ways: '%{count} ray'
+      ways_paginated: Ray (%{x}-%{y} - pêro piya  %{count})
+      relations: Elaqeyi %{count}
+      relations_paginated: Elaqeyi %{x}-%{y} pêro piya %{count}
   dashboards:
     contact:
       km away: '%{count} km duriyo'
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index e418bc832..2102e1a76 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -177,8 +177,6 @@ dsb:
         e-mail z napominanim, twóju e-mailowu adresu wobkšuśiś.
       success: Wužywarske informacije wuspěšnje zaktualizěrowane.
   browse:
-    created: Napórany
-    closed: Zacynjony
     version: Wersija
     in_changeset: Sajźba změnow
     anonymous: anonymny
@@ -188,17 +186,6 @@ dsb:
     view_history: Historiju pokazaś
     view_details: Drobnostki pokazaś
     location: 'Městno:'
-    changeset:
-      title: 'Sajźba změnow: %{id}'
-      belongs_to: Awtor
-      node: Suki (%{count})
-      node_paginated: Suki (%{x}-%{y} z %{count})
-      way: Puśe (%{count})
-      way_paginated: Puśe (%{x}-%{y} z %{count})
-      relation: Relacije (%{count})
-      relation_paginated: Relacije (%{x}-%{y} z %{count})
-      changesetxml: Sajźbu změnow XML
-      osmchangexml: osmChange XML
     node:
       title_html: 'Suk: %{name}'
       history_title_html: 'Sukowa historija: %{name}'
@@ -290,6 +277,20 @@ dsb:
       feed:
         title: Sajźba změnow %{id}
         title_comment: Sajźba změnow %{id} - %{comment}
+        created: Napórany
+        closed: Zacynjony
+        belongs_to: Awtor
+    show:
+      title: 'Sajźba změnow: %{id}'
+      changesetxml: Sajźbu změnow XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Suki (%{count})
+      nodes_paginated: Suki (%{x}-%{y} z %{count})
+      ways: Puśe (%{count})
+      ways_paginated: Puśe (%{x}-%{y} z %{count})
+      relations: Relacije (%{count})
+      relations_paginated: Relacije (%{x}-%{y} z %{count})
     timeout:
       sorry: Bóžko jo pśedłujko trało, kupki změnow, kótarež  sy póžedał, wótwołaś.
   dashboards:
@@ -302,6 +303,7 @@ dsb:
       nearby mapper: Kartěrowaŕ w bliskosći
       friend: Pśijaśel
     show:
+      title: Mój pśeglědowy bok
       no friends: Hyšći njejsy žednych pśijaśelow pśidał.
       nearby users: Druge wužywarje w bliskosći
       no nearby users: Hyšći njejsu žedne wužywarje, kótarež kartěruju w bliskosći.
@@ -884,6 +886,7 @@ dsb:
     help: Pomoc
     about: Wó
     copyright: Awtorske pšawo
+    communities: Zgromadnosći
     community: Zgromaźeństwo
     community_blogs: Blogi zgromaźeństwa
     community_blogs_title: Blogi cłonkow zgromaźeństwa OpenStreetMap
@@ -1065,10 +1068,6 @@ dsb:
       new password button: Gronidło slědk stajiś
       help_text: Zapódaj e-mailowu adresu, kótaruž sy za registrěrowanje wužył, pósćelomy
         wótkaz na nju, kótaryž móžoš wužywaś, aby swójo gronidło slědk stajił.
-    create:
-      notice email on way: Bóžko sy jo zabył :-(, ale e-mail jo k tebje ducy, tak
-        až móžoš jo skóro slědk stajiś.
-      notice email cannot find: Bóžko ta e-mailowa adresa njejo se namakała.
     edit:
       title: Gronidło slědk stajiś
       heading: Gronidło za %{user} slědk stajiś
@@ -1219,6 +1218,12 @@ dsb:
         title: Witaj k OSM
         description: Zachop z toś tym spěšnym rozpokazanim, kótarež wopsímujo zakłady
           OpenStreetMap.
+      community:
+        description: Zgromadne městno, źož móžośo za pomocu pytaś a se wó OpenStreetMap
+          rozgranjaś.
+      welcomemat:
+        description: Z organizaciju plany za OpenStreetMap cyniś? Wuslěźćo na boku
+          wuwitanja, což musyśo wěźeś.
       wiki:
         title: wiki.openstreetmap.org
         description: Pśepytaj wiki za nadrobneju OSM-dokumentaciju
@@ -1300,6 +1305,13 @@ dsb:
         title: Njamaš chyle za wobźěłowanje? Pśidaj pokazku!
         para_1: Jolic coš jano drobnosć korigěrowaś a njamaš chyle, aby se zregistrěrował
           a wuknuł, kak se wobźěłujo, móžoš jadnorje pokazku pśidaś.
+    communities:
+      title: Zgromadnosći
+      local_chapters:
+        title: Lokalne zwězki
+        list_text: 'Slědujuce zgromadnosći su oficielnje ako lokalne zwězki zregistrěrowane:'
+      other_groups:
+        title: Druge kupki
   traces:
     visibility:
       private: Priwatny (jano źělony ako anonymne, njezrědowane dypki)
@@ -1498,6 +1510,7 @@ dsb:
       my profile: Mój profil
       my settings: Móje nastajenja
       my comments: Móje komentary
+      my_dashboard: Mój pśeglědowy bok
       blocks on me: Dostane blokowanja
       blocks by me: Dane blokěrowanja
       send message: Powěsć pósłaś
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 0affff2bf..98daf1318 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -364,12 +364,6 @@ el:
     destroy:
       success: Ο λογαριασμός διαγράφηκε...
   browse:
-    created: Δημιουργήθηκε
-    closed: Έκλεισε
-    created_ago_html: Δημιουργήθηκε %{time_ago}
-    closed_ago_html: Έκλεισε %{time_ago}
-    created_ago_by_html: Δημιουργήθηκε %{time_ago} από %{user}
-    closed_ago_by_html: Έκλεισε %{time_ago} από %{user}
     deleted_ago_by_html: Διαγράφηκε %{time_ago} από %{user}
     edited_ago_by_html: Επεξεργάστηκε %{time_ago} από %{user}
     version: Έκδοση
@@ -387,23 +381,6 @@ el:
     view_history: Προβολή ιστορικού
     view_details: Προβολή λεπτομερειών
     location: 'Τοποθεσία:'
-    changeset:
-      title: 'Ομάδα αλλαγών: %{id}'
-      belongs_to: Συντάκτης
-      node: Kόμβοι (%{count})
-      node_paginated: Κόμβοι (%{x}-%{y} από %{count})
-      way: Διαδρομές (%{count})
-      way_paginated: Διαδρομές (%{x}-%{y} από %{count})
-      relation: Σχέσεις (%{count})
-      relation_paginated: Σχέσεις (%{x}-%{y} από %{count})
-      hidden_comment_by_html: Κρυφό σχόλιο από %{user} %{time_ago}
-      comment_by_html: Σχόλιο από %{user} %{time_ago}
-      changesetxml: Ομάδας αλλαγών XML
-      osmchangexml: osmChange XML
-      join_discussion: Συνδεθείτε για συμμετοχή στη συζήτηση
-      discussion: Συζήτηση
-      still_open: Η ομάδα αλλαγών παραμένει σε εκκρεμότητα - η συζήτηση θα ανοίξει
-        μόλις ολοκληρωθεί η ομάδα αλλαγών.
     node:
       title_html: 'Κόμβος: %{name}'
       history_title_html: 'Ιστορικό κόμβου: %{name}'
@@ -522,6 +499,30 @@ el:
       feed:
         title: Ομάδα αλλαγών %{id}
         title_comment: Ομάδα αλλαγών %{id} - %{comment}
+        created: Δημιουργήθηκε
+        closed: Έκλεισε
+        belongs_to: Συντάκτης
+    show:
+      title: 'Ομάδα αλλαγών: %{id}'
+      created_ago_html: Δημιουργήθηκε %{time_ago}
+      closed_ago_html: Έκλεισε %{time_ago}
+      created_ago_by_html: Δημιουργήθηκε %{time_ago} από %{user}
+      closed_ago_by_html: Έκλεισε %{time_ago} από %{user}
+      discussion: Συζήτηση
+      join_discussion: Συνδεθείτε για συμμετοχή στη συζήτηση
+      still_open: Η ομάδα αλλαγών παραμένει σε εκκρεμότητα - η συζήτηση θα ανοίξει
+        μόλις ολοκληρωθεί η ομάδα αλλαγών.
+      comment_by_html: Σχόλιο από %{user} %{time_ago}
+      hidden_comment_by_html: Κρυφό σχόλιο από %{user} %{time_ago}
+      changesetxml: Ομάδας αλλαγών XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Kόμβοι (%{count})
+      nodes_paginated: Κόμβοι (%{x}-%{y} από %{count})
+      ways: Διαδρομές (%{count})
+      ways_paginated: Διαδρομές (%{x}-%{y} από %{count})
+      relations: Σχέσεις (%{count})
+      relations_paginated: Σχέσεις (%{x}-%{y} από %{count})
     timeout:
       sorry: Λυπάμαι, ο κατάλογος των αλλαγών που ζητήσατε χρειάστηκε πολύ χρόνο για
         να ανακτηθεί.
@@ -1909,11 +1910,6 @@ el:
       help_text: Πληκτρολογήστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιήσατε
         για να εγγραφείτε. Θα στείλουμε έναν σύνδεσμο τον οποίον μπορείτε να χρησιμοποιήσετε
         για να επαναφέρετε το συνθηματικό σας.
-    create:
-      notice email on way: Λυπούμαστε που το χάσατε :-(, αλλά ένα μήνυμα ηλεκτρονικού
-        ταχυδρομείου εστάλη, ώστε να μπορέσετε να το επαναφέρετε σύντομα.
-      notice email cannot find: Λυπούμαστε, δεν βρέθηκε αυτή η διεύθυνση ηλεκτρονικού
-        ταχυδρομείου.
     edit:
       title: Επαναφορά συνθηματικού
       heading: Επαναφορά συνθηματικού για τον χρήστη %{user}
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 6d3be7da8..55077fc48 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -277,8 +277,6 @@ en-GB:
         for a note to confirm your new email address.
       success: User information updated successfully.
   browse:
-    created: Created
-    closed: Closed
     version: Version
     in_changeset: Changeset
     anonymous: anonymous
@@ -288,21 +286,6 @@ en-GB:
     view_history: View History
     view_details: View Details
     location: 'Location:'
-    changeset:
-      title: 'Changeset: %{id}'
-      belongs_to: Author
-      node: Nodes (%{count})
-      node_paginated: Nodes (%{x}-%{y} of %{count})
-      way: Ways (%{count})
-      way_paginated: Ways (%{x}-%{y} of %{count})
-      relation: Relations (%{count})
-      relation_paginated: Relations (%{x}-%{y} of %{count})
-      changesetxml: Changeset XML
-      osmchangexml: osmChange XML
-      join_discussion: Log in to join the discussion
-      discussion: Discussion
-      still_open: Changeset still open - discussion will open once the changeset is
-        closed.
     node:
       title_html: 'Node: %{name}'
       history_title_html: 'Node History: %{name}'
@@ -402,6 +385,24 @@ en-GB:
       feed:
         title: Changeset %{id}
         title_comment: Changeset %{id} - %{comment}
+        created: Created
+        closed: Closed
+        belongs_to: Author
+    show:
+      title: 'Changeset: %{id}'
+      discussion: Discussion
+      join_discussion: Log in to join the discussion
+      still_open: Changeset still open - discussion will open once the changeset is
+        closed.
+      changesetxml: Changeset XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Nodes (%{count})
+      nodes_paginated: Nodes (%{x}-%{y} of %{count})
+      ways: Ways (%{count})
+      ways_paginated: Ways (%{x}-%{y} of %{count})
+      relations: Relations (%{count})
+      relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.
   changeset_comments:
@@ -1341,10 +1342,6 @@ en-GB:
       new password button: Reset password
       help_text: Enter the e-mail address you used to sign up, we will send a link
         to it that you can use to reset your password.
-    create:
-      notice email on way: Sorry you lost it :-( but an email is on its way so you
-        can reset it soon.
-      notice email cannot find: Could not find that email address, sorry.
     edit:
       title: Reset password
       heading: Reset Password for %{user}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0cc35863b..251012d46 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1568,10 +1568,9 @@ en:
     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_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."
-    partners_ucl: "UCL"
+    hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."
     partners_fastly: "Fastly"
-    partners_bytemark: "Bytemark Hosting"
+    partners_corpmembers: "OSMF corporate members"
     partners_partners: "partners"
     tou: "Terms of Use"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 80a7be5b4..d9b285ba5 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -338,15 +338,10 @@ eo:
     destroy:
       success: Via konto estas forigita.
   browse:
-    created: Kreita
-    closed: Fermita
-    created_ago_html: Kreita %{time_ago}
-    closed_ago_html: Fermita %{time_ago}
-    created_ago_by_html: Kreita %{time_ago} de %{user}
-    closed_ago_by_html: Fermita %{time_ago} de %{user}
     deleted_ago_by_html: Forigita %{time_ago} de %{user}
     edited_ago_by_html: Redaktita %{time_ago} de %{user}
     version: Versio
+    redacted_version: Redaktita versio
     in_changeset: Ŝanĝaro
     anonymous: anonimulo
     no_comment: (neniu komento)
@@ -359,27 +354,13 @@ eo:
       other: '%{count} linioj'
     download_xml: Elŝuti XML
     view_history: Vidi historion
+    view_unredacted_history: Vidigi historion de neredaktitaj
     view_details: Montri detalojn
+    view_redacted_data: Vidigi redaktitajn datumojn
+    view_redaction_message: Vidigi mesaĝon pri la redaktado
     location: 'Pozicio:'
     common_details:
       coordinates_html: '%{latitude}; %{longitude}'
-    changeset:
-      title: 'Ŝanĝaro: %{id}'
-      belongs_to: AÅ­toro
-      node: Nodoj (%{count})
-      node_paginated: Nodoj (%{x}-%{y} el %{count})
-      way: Linioj (%{count})
-      way_paginated: Linioj (%{x}-%{y} el %{count})
-      relation: Rilatoj (%{count})
-      relation_paginated: Rilatoj (%{x}-%{y} el %{count})
-      hidden_comment_by_html: Kaŝita komento de %{time_ago} de %{user}
-      comment_by_html: Komento de %{time_ago} de %{user}
-      changesetxml: Ŝanĝaro XML
-      osmchangexml: osmŜanĝo XML
-      join_discussion: Ensalutu por aliĝi al la diskuto
-      discussion: Diskuto
-      still_open: Ŝanĝaro plue malfermita - diskuto estos malfermita ekde kiam la
-        ŝanĝaro estos fermita.
     node:
       title_html: 'Nodo: %{name}'
       history_title_html: 'Historio de nodo: %{name}'
@@ -497,6 +478,9 @@ eo:
       feed:
         title: Ŝanĝaro %{id}
         title_comment: Ŝanĝaro %{id} - %{comment}
+        created: Kreita
+        closed: Fermita
+        belongs_to: AÅ­toro
     subscribe:
       heading: Ĉu aboni diskuton pri tiu ĉi ŝanĝaro?
       button: Aboni diskuton
@@ -511,6 +495,29 @@ eo:
       heading: 'Neniu ŝanĝaro kun la identigilo: %{id}'
       body: Bedaŭrinde ne ekzistas ŝanĝaro kun la identigilo %{id}. Kontrolu pri liter-eraroj
         aÅ­ eble vi alklakis eraran ligilon.
+    show:
+      title: 'Ŝanĝaro: %{id}'
+      created: Kreita je %{when}
+      closed: Fermita je %{when}
+      created_ago_html: Kreita %{time_ago}
+      closed_ago_html: Fermita %{time_ago}
+      created_ago_by_html: Kreita %{time_ago} de %{user}
+      closed_ago_by_html: Fermita %{time_ago} de %{user}
+      discussion: Diskuto
+      join_discussion: Ensalutu por aliĝi al la diskuto
+      still_open: Ŝanĝaro plue malfermita - diskuto estos malfermita ekde kiam la
+        ŝanĝaro estos fermita.
+      comment_by_html: Komento de %{time_ago} de %{user}
+      hidden_comment_by_html: Kaŝita komento de %{time_ago} de %{user}
+      changesetxml: Ŝanĝaro XML
+      osmchangexml: osmŜanĝo XML
+    paging_nav:
+      nodes: Nodoj (%{count})
+      nodes_paginated: Nodoj (%{x}-%{y} el %{count})
+      ways: Linioj (%{count})
+      ways_paginated: Linioj (%{x}-%{y} el %{count})
+      relations: Rilatoj (%{count})
+      relations_paginated: Rilatoj (%{x}-%{y} el %{count})
     timeout:
       sorry: Bedaŭrinde daŭris tro longe kompili la petitan liston de ŝanĝaroj.
   changeset_comments:
@@ -1865,9 +1872,8 @@ eo:
       help_text: Entajpu la retpoŝtan adreson kiun vi uzis por ensaluto, ni sendos
         al vi ligilon, kiun vi povos uzi por restarigi vian pasvorton.
     create:
-      notice email on way: Bedaŭras, ke vi perdis ĝin :-( sed baldaŭ vi ricevos retleteron,
-        kiun vi uzos por restarigi ĝin.
-      notice email cannot find: BedaÅ­rinde, tiu retadreso ne troveblas.
+      send_paranoid_instructions: Se via retpoŝta adreso ekzistas en nia datumbazo,
+        vi ricevos ligilon por restarigi pasvorton en via retpoŝtujo post kelkaj minutoj.
     edit:
       title: Nuligi pasvorton
       heading: Nuligi Pasvorton por %{user}
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 42fe29783..5479e94a9 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -418,12 +418,6 @@ es:
     destroy:
       success: Cuenta eliminada.
   browse:
-    created: Creado
-    closed: Cerrado
-    created_ago_html: Creado %{time_ago}
-    closed_ago_html: Cerrado %{time_ago}
-    created_ago_by_html: Creado %{time_ago} por %{user}
-    closed_ago_by_html: Cerrado %{time_ago} por %{user}
     deleted_ago_by_html: Eliminado %{time_ago} por %{user}
     edited_ago_by_html: Editado %{time_ago} por %{user}
     version: Versión
@@ -441,23 +435,6 @@ es:
     view_history: Ver historial
     view_details: Ver detalles
     location: 'Ubicación:'
-    changeset:
-      title: 'Conjunto de cambios: %{id}'
-      belongs_to: Autor
-      node: Nodos (%{count})
-      node_paginated: Nodos (%{x}-%{y} de %{count})
-      way: Vías (%{count})
-      way_paginated: Vías (%{x}-%{y} de %{count})
-      relation: Relaciones (%{count})
-      relation_paginated: Relaciones (%{x}-%{y} de %{count})
-      hidden_comment_by_html: Comentario ocultado por %{user} %{time_ago}
-      comment_by_html: Comentario de %{user} %{time_ago}
-      changesetxml: XML del conjunto de cambios
-      osmchangexml: XML en formato osmChange
-      join_discussion: Inicia sesión para unirte a la discusión
-      discussion: Discusión
-      still_open: El conjunto de cambios sigue abierto; la discusión se abrirá cuando
-        se cierre el conjunto de cambios.
     node:
       title_html: 'Nodo: %{name}'
       history_title_html: 'Historial de nodo: %{name}'
@@ -576,6 +553,44 @@ es:
       feed:
         title: Conjunto de cambios %{id}
         title_comment: Conjunto de cambios %{id} - %{comment}
+        created: Creado
+        closed: Cerrado
+        belongs_to: Autor
+    subscribe:
+      heading: ¿Deseas suscribirte a la siguiente discusión del conjunto de cambios?
+      button: Suscribirse a la discusión
+    unsubscribe:
+      heading: ¿Deseas desuscribirte de la siguiente discusión del conjunto de cambios?
+      button: Desuscribirse de la discusión
+    heading:
+      title: Conjunto de cambios %{id}
+      created_by_html: Creado por %{link_user} el %{created}.
+    no_such_entry:
+      title: No existe tal conjunto de cambios
+      heading: 'No hay entrada con id: %{id}'
+      body: Lo sentimos, no existe algún conjunto de cambios con id %{id}. Revisa
+        los dígitos, o tal vez el enlace en el que hiciste clic sea incorrecto.
+    show:
+      title: 'Conjunto de cambios: %{id}'
+      created_ago_html: Creado %{time_ago}
+      closed_ago_html: Cerrado %{time_ago}
+      created_ago_by_html: Creado %{time_ago} por %{user}
+      closed_ago_by_html: Cerrado %{time_ago} por %{user}
+      discussion: Discusión
+      join_discussion: Inicia sesión para unirte a la discusión
+      still_open: El conjunto de cambios sigue abierto; la discusión se abrirá cuando
+        se cierre el conjunto de cambios.
+      comment_by_html: Comentario de %{user} %{time_ago}
+      hidden_comment_by_html: Comentario ocultado por %{user} %{time_ago}
+      changesetxml: XML del conjunto de cambios
+      osmchangexml: XML en formato osmChange
+    paging_nav:
+      nodes: Nodos (%{count})
+      nodes_paginated: Nodos (%{x}-%{y} de %{count})
+      ways: Vías (%{count})
+      ways_paginated: Vías (%{x}-%{y} de %{count})
+      relations: Relaciones (%{count})
+      relations_paginated: Relaciones (%{x}-%{y} de %{count})
     timeout:
       sorry: Lo sentimos, la lista de conjuntos de cambios que solicitó tardó demasiado
         en obtenerse.
@@ -694,6 +709,12 @@ es:
       comment: Comentario
       newer_comments: Comentarios más recientes
       older_comments: Comentarios más antiguos
+    subscribe:
+      heading: ¿Deseas suscribirte a la siguiente discusión sobre la entrada al diario?
+      button: Suscribirse a la discusión
+    unsubscribe:
+      heading: ¿Deseas desuscribirte de la siguiente discusión de entrada de diario?
+      button: Desuscribirse de la discusión
   doorkeeper:
     errors:
       messages:
@@ -1698,6 +1719,7 @@ es:
     more: Más
   user_mailer:
     diary_comment_notification:
+      description: 'Entrada de diario de OpenStreetMap #%{id}'
       subject: '[OpenStreetMap] %{user} ha comentado en una entrada de diario'
       hi: 'Hola, %{to_user}:'
       header: '%{from_user} ha comentado en la entrada de diario con asunto %{subject}:'
@@ -1706,6 +1728,8 @@ es:
         %{commenturl} o responder en %{replyurl}
       footer_html: También puedes leer el comentario en %{readurl} y puedes comentar
         en %{commenturl} o responder en %{replyurl}
+      footer_unsubscribe: Puedes cancelar la suscripción de la discusión en %{unsubscribeurl}
+      footer_unsubscribe_html: Puedes cancelar la suscripción de la discusión en %{unsubscribeurl}
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'
       hi: Hola %{to_user},
@@ -1768,6 +1792,7 @@ es:
       click_the_link: Si este eres tú, por favor, haz clic en el enlace siguiente
         para restablecer tu contraseña.
     note_comment_notification:
+      description: 'Nota de OpenStreetMap #%{id}'
       anonymous: Un usuario anónimo
       greeting: Hola,
       commented:
@@ -1807,6 +1832,7 @@ es:
       details: Más detalles acerca de la nota pueden encontrarse en %{url}.
       details_html: Puedes encontrar más detalles acerca de la nota en %{url}.
     changeset_comment_notification:
+      description: 'Conjunto de cambios de OpenStreetMap #%{id}'
       hi: Hola %{to_user},
       greeting: Hola,
       commented:
@@ -1828,10 +1854,10 @@ es:
       details: Puedes encontrar más detalles sobre el conjunto de cambios en %{url}.
       details_html: Puedes encontrar más detalles sobre el conjunto de cambios en
         %{url}.
-      unsubscribe: Para cancelar la suscripción a las actualizaciones de este conjunto
-        de cambios, visita %{url} y haz clic en "Cancelar suscripción".
-      unsubscribe_html: Para darte de baja de las actualizaciones de este conjunto
-        de cambios, visita %{url} y haz clic en "Cancelar suscripción".
+      unsubscribe: Puedes desinscrirte de las actualizaciones de este conjunto de
+        cambios en %{url}.
+      unsubscribe_html: Puedes desinscrirte de las actualizaciones de este conjunto
+        de cambios en %{url}.
   confirmations:
     confirm:
       heading: ¡Revisa tu correo electrónico!
@@ -1948,12 +1974,6 @@ es:
       help_text: Escribe la dirección de correo electrónico con la que te registraste,
         te enviaremos un enlace a esa dirección que podrás utilizar para restablecer
         tu contraseña.
-    create:
-      notice email on way: Sentimos que la hayas perdido :-( pero ya va de camino
-        un mensaje de correo electrónico que te servirá para restablecer tu contraseña
-        enseguida.
-      notice email cannot find: Lo sentimos, no se pudo encontrar esa dirección de
-        correo electrónico.
     edit:
       title: Restablecer contraseña
       heading: Restablecer contraseña para %{user}
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 49882ed9f..7af1f2f5c 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -297,12 +297,6 @@ et:
     destroy:
       success: Konto kustutatud.
   browse:
-    created: Loodud
-    closed: Suletud
-    created_ago_html: Loodud %{time_ago}
-    closed_ago_html: Suletud %{time_ago}
-    created_ago_by_html: Loonud %{user} %{time_ago}
-    closed_ago_by_html: Sulgenud %{user} %{time_ago}
     deleted_ago_by_html: Kustutanud %{user} %{time_ago}
     edited_ago_by_html: Muutnud %{user} %{time_ago}
     version: Versioon
@@ -320,23 +314,6 @@ et:
     view_history: Vaata ajalugu
     view_details: Vaata üksikasju
     location: 'Asukoht:'
-    changeset:
-      title: 'Muudatuskogum: %{id}'
-      belongs_to: Autor
-      node: Sõlmed (%{count})
-      node_paginated: Sõlmed (%{x}–%{y} %{count}-st)
-      way: Jooned (%{count})
-      way_paginated: Jooned (%{x}–%{y} %{count}-st)
-      relation: Relatsioonid (%{count})
-      relation_paginated: Relatsioonid (%{x}–%{y} %{count}-st)
-      hidden_comment_by_html: Peidetud kommentaar kasutajalt %{user} %{time_ago}
-      comment_by_html: Kommentaar kasutajalt %{user} %{time_ago}
-      changesetxml: Muudatuskogumi XML
-      osmchangexml: osmChange XML
-      join_discussion: Logi sisse, kui soovid arutelus osaleda
-      discussion: Arutelu
-      still_open: Muudatuskogum on veel avatud. Arutelu avaneb siis, kui muudatuskogum
-        on suletud.
     node:
       title_html: 'Sõlm: %{name}'
       history_title_html: 'Sõlme ajalugu: %{name}'
@@ -442,6 +419,30 @@ et:
       feed:
         title: Muudatuskogum %{id}
         title_comment: Muudatuskogum %{id} – %{comment}
+        created: Loodud
+        closed: Suletud
+        belongs_to: Autor
+    show:
+      title: 'Muudatuskogum: %{id}'
+      created_ago_html: Loodud %{time_ago}
+      closed_ago_html: Suletud %{time_ago}
+      created_ago_by_html: Loonud %{user} %{time_ago}
+      closed_ago_by_html: Sulgenud %{user} %{time_ago}
+      discussion: Arutelu
+      join_discussion: Logi sisse, kui soovid arutelus osaleda
+      still_open: Muudatuskogum on veel avatud. Arutelu avaneb siis, kui muudatuskogum
+        on suletud.
+      comment_by_html: Kommentaar kasutajalt %{user} %{time_ago}
+      hidden_comment_by_html: Peidetud kommentaar kasutajalt %{user} %{time_ago}
+      changesetxml: Muudatuskogumi XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Sõlmed (%{count})
+      nodes_paginated: Sõlmed (%{x}–%{y} %{count}-st)
+      ways: Jooned (%{count})
+      ways_paginated: Jooned (%{x}–%{y} %{count}-st)
+      relations: Relatsioonid (%{count})
+      relations_paginated: Relatsioonid (%{x}–%{y} %{count}-st)
     timeout:
       sorry: Kahjuks võttis taotletud muudatuskogumite laadimine liiga kaua aega.
   changeset_comments:
@@ -1340,10 +1341,6 @@ et:
       new password button: Lähtesta parool
       help_text: Sisesta e-posti aadress, mida kasutasid registreerumisel. Saadame
         sinna lingi, mida saad kasutada parooli lähtestamiseks.
-    create:
-      notice email on way: Kahju, et parooli kaotasid, kuid ära muretse. Peagi saad
-        e-kirja, mille abil saad parooli lähtestada.
-      notice email cannot find: Seda e-posti aadressi ei leitud.
     edit:
       title: Lähtesta parool
       heading: Kasutaja %{user} parooli lähtestamine
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index d4bd1c4e7..a8736cb0a 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -337,12 +337,6 @@ eu:
     destroy:
       success: Kontua ezabatu da.
   browse:
-    created: Sortua
-    closed: Itxita
-    created_ago_html: Sortua orain dela %{time_ago}
-    closed_ago_html: Itxia orain dela %{time_ago}
-    created_ago_by_html: '%{user}-ek %{time_ago} sortua'
-    closed_ago_by_html: '%{user}-ek %{time_ago} itxia'
     deleted_ago_by_html: '%{user}-ek %{time_ago} ezabatua'
     edited_ago_by_html: '%{user}-ek %{time_ago} editatua'
     version: Bertsioa
@@ -360,23 +354,6 @@ eu:
     view_history: Ikusi historia
     view_details: Ikusi xehetasunak
     location: 'Kokapena:'
-    changeset:
-      title: 'Aldaketa: %{id}'
-      belongs_to: Egilea
-      node: Nodoak (%{count})
-      node_paginated: Nodoak (%{x}-%{y} %{count}-tik)
-      way: Bideak (%{count})
-      way_paginated: Bideak (%{x}-%{y} %{count}-tik)
-      relation: Erlazioak (%{count})
-      relation_paginated: Erlazioak (%{x}-%{y} %{count}-tik)
-      hidden_comment_by_html: '%{user} -ren ezkutuko iruzkina %{time_ago} tik'
-      comment_by_html: '%{user} -ren iruzkina orain dela %{time_ago}'
-      changesetxml: Aldaketaren XML kodea
-      osmchangexml: osmChange XML kodea
-      join_discussion: Hasi saioa eztabaidan parte hartzeko
-      discussion: Eztabaida
-      still_open: Aldaketak oraindik zabalik - eztabaida aldaketak itxi ondoren irekiko
-        da.
     node:
       title_html: 'Nodoa: %{name}'
       history_title_html: 'Nodoaren historia: %{name}'
@@ -494,6 +471,30 @@ eu:
       feed:
         title: '%{id} aldaketak'
         title_comment: '%{id} aldaketa - %{comment}'
+        created: Sortua
+        closed: Itxita
+        belongs_to: Egilea
+    show:
+      title: 'Aldaketa: %{id}'
+      created_ago_html: Sortua orain dela %{time_ago}
+      closed_ago_html: Itxia orain dela %{time_ago}
+      created_ago_by_html: '%{user}-ek %{time_ago} sortua'
+      closed_ago_by_html: '%{user}-ek %{time_ago} itxia'
+      discussion: Eztabaida
+      join_discussion: Hasi saioa eztabaidan parte hartzeko
+      still_open: Aldaketak oraindik zabalik - eztabaida aldaketak itxi ondoren irekiko
+        da.
+      comment_by_html: '%{user} -ren iruzkina orain dela %{time_ago}'
+      hidden_comment_by_html: '%{user} -ren ezkutuko iruzkina %{time_ago} tik'
+      changesetxml: Aldaketaren XML kodea
+      osmchangexml: osmChange XML kodea
+    paging_nav:
+      nodes: Nodoak (%{count})
+      nodes_paginated: Nodoak (%{x}-%{y} %{count}-tik)
+      ways: Bideak (%{count})
+      ways_paginated: Bideak (%{x}-%{y} %{count}-tik)
+      relations: Erlazioak (%{count})
+      relations_paginated: Erlazioak (%{x}-%{y} %{count}-tik)
     timeout:
       sorry: Barkatu, zuk eskatutako aldaketen zerrenda berreskuratzeko denbora gehiegi
         behar izan da.
@@ -1848,10 +1849,6 @@ eu:
       new password button: Pasahitza berrezarri
       help_text: Sartu saioa hastean erabiltzen zenuen helbide elektronikoa, zure
         pasahitza berrezarri ahal izateko erabil dezakezu bidaliko dizugun esteka.
-    create:
-      notice email on way: Sentitzen duzu hau galdu izatea :-( baina posta elektronikoa
-        bidaltzen ari zaizu laster berrabiarazi dezakezun.
-      notice email cannot find: Eposta helbide hori ezin izan dugu aurkitu, barkatu.
     edit:
       title: Pasahitza berrezarri
       heading: '%{user}-ren pasahitza berrezarri'
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 4c2243872..76db09a1c 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -353,12 +353,6 @@ fa:
     destroy:
       success: حساب حذف شد.
   browse:
-    created: ایجاد شد
-    closed: بسته شد
-    created_ago_html: ایجاد شد %{time_ago}
-    closed_ago_html: بسته شد %{time_ago}
-    created_ago_by_html: '%{time_ago} %{user} ایجادش کرد'
-    closed_ago_by_html: '%{time_ago} %{user} بستش'
     deleted_ago_by_html: '%{time_ago} %{user} حذفش کرد'
     edited_ago_by_html: '%{time_ago} %{user} ویرایشش کرد'
     version: نسخهٔ
@@ -376,22 +370,6 @@ fa:
     view_history: نمایش تاریخچه
     view_details: نمایش جزئیات
     location: 'مکان: ‪'
-    changeset:
-      title: 'بستهٔ تغییر: %{id}'
-      belongs_to: پدیدآور
-      node: گره‌ها (%{count})
-      node_paginated: گره‌ها (%{x}-%{y} از %{count})
-      way: راه‌ها (%{count})
-      way_paginated: راه‌ها (%{x}-%{y} از %{count})
-      relation: رابطه‌ها (%{count})
-      relation_paginated: رابطه‌ها (%{x}-%{y} از %{count})
-      hidden_comment_by_html: نظر پنهان؛ نوشتهٔ %{user}‏ %{time_ago}
-      comment_by_html: نظر از %{user}‏ %{time_ago}
-      changesetxml: Changeset XML
-      osmchangexml: osmChange XML
-      join_discussion: وارد شوید تا به بحث بپیوندید
-      discussion: بحث
-      still_open: بستهٔ تغییر هنوز باز است - امکان بحث پس از بستن آن باز می‌شود.
     node:
       title_html: 'گره: %{name}'
       history_title_html: 'تاریخچهٔ گره: %{name}'
@@ -500,6 +478,29 @@ fa:
       feed:
         title: بستهٔ تغییر %{id}
         title_comment: بستهٔ تغییر %{id} - %{comment}
+        created: ایجاد شد
+        closed: بسته شد
+        belongs_to: پدیدآور
+    show:
+      title: 'بستهٔ تغییر: %{id}'
+      created_ago_html: ایجاد شد %{time_ago}
+      closed_ago_html: بسته شد %{time_ago}
+      created_ago_by_html: '%{time_ago} %{user} ایجادش کرد'
+      closed_ago_by_html: '%{time_ago} %{user} بستش'
+      discussion: بحث
+      join_discussion: وارد شوید تا به بحث بپیوندید
+      still_open: بستهٔ تغییر هنوز باز است - امکان بحث پس از بستن آن باز می‌شود.
+      comment_by_html: نظر از %{user}‏ %{time_ago}
+      hidden_comment_by_html: نظر پنهان؛ نوشتهٔ %{user}‏ %{time_ago}
+      changesetxml: Changeset XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: گره‌ها (%{count})
+      nodes_paginated: گره‌ها (%{x}-%{y} از %{count})
+      ways: راه‌ها (%{count})
+      ways_paginated: راه‌ها (%{x}-%{y} از %{count})
+      relations: رابطه‌ها (%{count})
+      relations_paginated: رابطه‌ها (%{x}-%{y} از %{count})
     timeout:
       sorry: شوربختانه بازیابی بسته‌های تغییر که درخواست نموده‌اید، خیلی طولانی شد.
   changeset_comments:
@@ -1771,10 +1772,6 @@ fa:
       new password button: بازنشانی رمز عبور
       help_text: رایانامه‌ای که با آن نام‌نویسی کرده‌اید را وارد کنید. ما پیوندی به
         آن می‌فرستیم تا بتوانید به وسیلهٔ آن گذرواژه‌تان را بازنشانی کنید.
-    create:
-      notice email on way: متأسفیم که آن را گم کرده‌اید :-( اما رایانامه‌ای در راه
-        است که می‌توانید به‌زودی آن را مجدد تنظیم کنید.
-      notice email cannot find: چنین رایانامه‌ای پیدا نشد، متأسفیم.
     edit:
       title: بازنشانی رمز عبور
       heading: بازنشانی رمز عبور برای %{user}
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index ae2c8151f..e2a53fe95 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -353,12 +353,6 @@ fi:
     destroy:
       success: Käyttäjä poistettu.
   browse:
-    created: Luotu
-    closed: Suljettu
-    created_ago_html: Luotu %{time_ago}
-    closed_ago_html: Suljettu %{time_ago}
-    created_ago_by_html: Luonut %{user}, %{time_ago}
-    closed_ago_by_html: Sulkenut %{user}, %{time_ago}
     deleted_ago_by_html: Poistanut %{user}, %{time_ago}
     edited_ago_by_html: Muokannut %{time_ago} %{user}
     version: Versio
@@ -376,23 +370,6 @@ fi:
     view_history: Näytä historia
     view_details: Näytä tiedot
     location: 'Sijainti:'
-    changeset:
-      title: 'Muutoskokoelma: %{id}'
-      belongs_to: Lähettäjä
-      node: Pisteet (%{count})
-      node_paginated: Pisteet (%{x}-%{y} / %{count})
-      way: Reitit (%{count})
-      way_paginated: Reitit (%{x}-%{y} of %{count})
-      relation: Relaatiot (%{count})
-      relation_paginated: Relaatiot (%{x}-%{y} / %{count})
-      hidden_comment_by_html: Piilotettu kommentti käyttäjältä %{user} %{time_ago}
-      comment_by_html: Kommentti käyttäjältä %{user}, %{time_ago}
-      changesetxml: Muutoskokoelman XML
-      osmchangexml: osmChange XML
-      join_discussion: Kirjaudu sisään osallistuaksesi keskusteluun
-      discussion: Keskustelu
-      still_open: Muutoskokoelma on edelleen avoimena - keskustelu avataan heti kun
-        muutoskokoelma on suljettu.
     node:
       title_html: 'Piste: %{name}'
       history_title_html: Pisteen %{name} historia
@@ -500,6 +477,30 @@ fi:
       feed:
         title: Muutoskokoelma %{id}
         title_comment: Muutoskokoelma %{id} - %{comment}
+        created: Luotu
+        closed: Suljettu
+        belongs_to: Lähettäjä
+    show:
+      title: 'Muutoskokoelma: %{id}'
+      created_ago_html: Luotu %{time_ago}
+      closed_ago_html: Suljettu %{time_ago}
+      created_ago_by_html: Luonut %{user}, %{time_ago}
+      closed_ago_by_html: Sulkenut %{user}, %{time_ago}
+      discussion: Keskustelu
+      join_discussion: Kirjaudu sisään osallistuaksesi keskusteluun
+      still_open: Muutoskokoelma on edelleen avoimena - keskustelu avataan heti kun
+        muutoskokoelma on suljettu.
+      comment_by_html: Kommentti käyttäjältä %{user}, %{time_ago}
+      hidden_comment_by_html: Piilotettu kommentti käyttäjältä %{user} %{time_ago}
+      changesetxml: Muutoskokoelman XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Pisteet (%{count})
+      nodes_paginated: Pisteet (%{x}-%{y} / %{count})
+      ways: Reitit (%{count})
+      ways_paginated: Reitit (%{x}-%{y} of %{count})
+      relations: Relaatiot (%{count})
+      relations_paginated: Relaatiot (%{x}-%{y} / %{count})
     timeout:
       sorry: Valitettavasti pyytämäsi muutoskokoelmien listan hakeminen kesti liian
         kauan.
@@ -1781,9 +1782,6 @@ fi:
       new password button: Lähetä salasanan palautusohjeet
       help_text: Kirjoita alapuolelle kirjautumissähköpostiosoitteesi. Osoitteeseen
         lähetetään salasanan palautusohjeet.
-    create:
-      notice email on way: Salasanan palautusohjeet on lähetetty annettuun sähköpostiosoitteeseen.
-      notice email cannot find: Annettu sähköpostiosoite ei ole käytössä.
     edit:
       title: Salasanan vaihto
       heading: Vaihda käyttäjän %{user} salasana
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index bc653f3a7..50fa71f75 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -200,8 +200,6 @@ fit:
       heading: 'Mookkaukset julkisia:'
       make_edits_public_button: Tee mookkauksistani julkisia
   browse:
-    created: Luotu
-    closed: Ratkaistu
     version: Versuuni
     in_changeset: Muutoskokoelma
     anonymous: tuntematon
@@ -211,21 +209,6 @@ fit:
     view_history: Näytä histuuria
     view_details: Näytä tieot
     location: 'Sijainti:'
-    changeset:
-      title: 'Muutoskokoelma: %{id}'
-      belongs_to: Lähättäjä
-      node: Pisteet (%{count})
-      node_paginated: Pisteet (%{x}-%{y} / %{count})
-      way: Reitit (%{count})
-      way_paginated: Reitit (%{x}-%{y} of %{count})
-      relation: Relaatiot (%{count})
-      relation_paginated: Relaatiot (%{x}-%{y} / %{count})
-      changesetxml: Muutoskokoelman XML
-      osmchangexml: osmChange XML
-      join_discussion: Lokkaa sisäle, jos halvaat osallistua keskusteluun
-      discussion: Keskustelu
-      still_open: Muutoskokoelma on edelleen avoimena - keskustelu avathaan heti kun
-        muutoskokoelma on suljettu.
     node:
       title_html: 'Piste: %{name}'
       history_title_html: Pisteen %{name} histuuria
@@ -323,6 +306,24 @@ fit:
       feed:
         title: Muutoskokoelma %{id}
         title_comment: Muutoskokoelma %{id} - %{comment}
+        created: Luotu
+        closed: Ratkaistu
+        belongs_to: Lähättäjä
+    show:
+      title: 'Muutoskokoelma: %{id}'
+      discussion: Keskustelu
+      join_discussion: Lokkaa sisäle, jos halvaat osallistua keskusteluun
+      still_open: Muutoskokoelma on edelleen avoimena - keskustelu avathaan heti kun
+        muutoskokoelma on suljettu.
+      changesetxml: Muutoskokoelman XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Pisteet (%{count})
+      nodes_paginated: Pisteet (%{x}-%{y} / %{count})
+      ways: Reitit (%{count})
+      ways_paginated: Reitit (%{x}-%{y} of %{count})
+      relations: Relaatiot (%{count})
+      relations_paginated: Relaatiot (%{x}-%{y} / %{count})
     timeout:
       sorry: Valitettavasti pyytämäsi muutoskokoelmien listan hakeminen kesti liian
         kauan.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index fa09fc52d..84fda351a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -56,6 +56,7 @@
 # Author: Ltrlg
 # Author: Lucky
 # Author: Lulucmy
+# Author: MacOS Weed
 # Author: Macofe
 # Author: Manaviko
 # Author: Mathieu
@@ -435,15 +436,10 @@ fr:
     destroy:
       success: Compte supprimé.
   browse:
-    created: Créé
-    closed: Fermé
-    created_ago_html: Créé %{time_ago}
-    closed_ago_html: Fermé %{time_ago}
-    created_ago_by_html: Créé %{time_ago} par %{user}
-    closed_ago_by_html: Fermé %{time_ago} par %{user}
     deleted_ago_by_html: Supprimé %{time_ago} par %{user}
     edited_ago_by_html: Modifié %{time_ago} par %{user}
     version: Version
+    redacted_version: Version censurée
     in_changeset: Groupe de modifications
     anonymous: anonyme
     no_comment: (aucun commentaire)
@@ -456,27 +452,12 @@ fr:
       other: '%{count} chemins'
     download_xml: Télécharger en XML
     view_history: Voir l’historique
+    view_unredacted_history: Voir l'historique non censuré
     view_details: Afficher les détails
+    view_redacted_data: Afficher les données censurées
     location: 'Emplacement :'
     common_details:
       coordinates_html: '%{latitude} ; %{longitude}'
-    changeset:
-      title: 'Groupe de modifications : %{id}'
-      belongs_to: Auteur
-      node: Nœuds (%{count})
-      node_paginated: Nœuds (%{x} à %{y} sur %{count})
-      way: Chemins (%{count})
-      way_paginated: Chemins (%{x} à %{y} sur %{count})
-      relation: Relations (%{count})
-      relation_paginated: Relations (%{x} à %{y} sur %{count})
-      hidden_comment_by_html: Commentaire caché de %{user} %{time_ago}
-      comment_by_html: Commentaire de %{user} %{time_ago}
-      changesetxml: XML du groupe de modifications
-      osmchangexml: XML osmChange
-      join_discussion: Se connecter pour rejoindre la discussion
-      discussion: Discussion
-      still_open: Ensemble de modifications toujours ouvert – la discussion s’ouvrira
-        une fois que l’ensemble de modifications sera fermé.
     node:
       title_html: 'Nœud : %{name}'
       history_title_html: 'Historique du nœud : %{name}'
@@ -596,6 +577,34 @@ fr:
       feed:
         title: Groupe de modifications %{id}
         title_comment: 'Groupe de modifications %{id} : %{comment}'
+        created: Créé
+        closed: Fermé
+        belongs_to: Auteur
+    unsubscribe:
+      button: Se désinscrire de la discussion
+    show:
+      title: 'Groupe de modifications : %{id}'
+      created: 'Créé : %{when}'
+      closed: 'Fermé : %{when}'
+      created_ago_html: Créé %{time_ago}
+      closed_ago_html: Fermé %{time_ago}
+      created_ago_by_html: Créé %{time_ago} par %{user}
+      closed_ago_by_html: Fermé %{time_ago} par %{user}
+      discussion: Discussion
+      join_discussion: Se connecter pour rejoindre la discussion
+      still_open: Ensemble de modifications toujours ouvert – la discussion s’ouvrira
+        une fois que l’ensemble de modifications sera fermé.
+      comment_by_html: Commentaire de %{user} %{time_ago}
+      hidden_comment_by_html: Commentaire caché de %{user} %{time_ago}
+      changesetxml: XML du groupe de modifications
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Nœuds (%{count})
+      nodes_paginated: Nœuds (%{x} à %{y} sur %{count})
+      ways: Chemins (%{count})
+      ways_paginated: Chemins (%{x} à %{y} sur %{count})
+      relations: Relations (%{count})
+      relations_paginated: Relations (%{x} à %{y} sur %{count})
     timeout:
       sorry: Désolé, la liste des groupes de modifications que vous avez demandée
         a mis trop de temps à récupérer.
@@ -717,6 +726,10 @@ fr:
       comment: Commentaire
       newer_comments: Commentaires plus récents
       older_comments: Commentaires plus anciens
+    subscribe:
+      button: S'abonner à la discussion
+    unsubscribe:
+      button: Se désinscrire de la discussion
   doorkeeper:
     errors:
       messages:
@@ -1733,6 +1746,7 @@ fr:
         sur %{commenturl} ou envoyer un message à l'auteur sur %{replyurl}
       footer_html: Vous pouvez aussi lire le commentaire sur %{readurl} et vous pouvez
         commenter sur %{commenturl} ou envoyer un message à l’auteur sur %{replyurl}
+      footer_unsubscribe: Vous pouvez vous désabonner de la discussion depuis %{unsubscribeurl}
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'
       hi: Bonjour %{to_user},
@@ -1856,10 +1870,10 @@ fr:
       details: Plus de détails sur l’ensemble de modifications à %{url}.
       details_html: Vous pouvez trouver plus de détails sur l’ensemble de modifications
         sur %{url}.
-      unsubscribe: Pour vous désabonner des mises à jour de cet ensemble de modifications,
-        visitez %{url} et cliquez sur « Désabonner ».
-      unsubscribe_html: Pour vous désabonner des mises à jour de cet ensemble de modifications,
-        visitez %{url} et cliquez sur « Désabonner ».
+      unsubscribe: Vous pouvez vous désabonner des mises à jour de cet ensemble de
+        modifications depuis %{url}.
+      unsubscribe_html: Vous pouvez vous désabonner des mises à jour de cet ensemble
+        de modifications depuis %{url}.
   confirmations:
     confirm:
       heading: Vérifiez votre courriel !
@@ -1981,9 +1995,9 @@ fr:
         nous enverrons à cette adresse un lien que vous pourrez utiliser pour réinitialiser
         votre mot de passe.
     create:
-      notice email on way: Désolé que vous ayez perdu votre mot de passe :-( Un courriel
-        vous a été envoyé pour que vous puissiez vite le réinitialiser.
-      notice email cannot find: Cette adresse de courriel est introuvable, désolé.
+      send_paranoid_instructions: Si votre adresse courriel existe dans notre base
+        de données, vous recevrez dans quelques minutes un courriel avec un lien de
+        récupération de mot de passe à votre adresse de courriel.
     edit:
       title: Réinitialiser le mot de passe
       heading: Réinitialiser le mot de passe de %{user}
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 9615be1f6..395aeb32e 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -264,12 +264,6 @@ fur:
     destroy:
       success: Profîl eliminât.
   browse:
-    created: Creât
-    closed: Sierât
-    created_ago_html: Creât %{time_ago}
-    closed_ago_html: Sierât %{time_ago}
-    created_ago_by_html: Creât di %{user} %{time_ago}
-    closed_ago_by_html: Sierât di %{user} %{time_ago}
     deleted_ago_by_html: Eliminât di %{user} %{time_ago}
     edited_ago_by_html: Modificât di %{user} %{time_ago}
     version: Version
@@ -287,21 +281,6 @@ fur:
     view_history: Cjale il storic
     view_details: Cjale i detais
     location: 'Lûc:'
-    changeset:
-      title: 'Grup di cambiaments: %{id}'
-      belongs_to: Autôr
-      node: Grops (%{count})
-      node_paginated: Grops (%{x}-%{y} su %{count})
-      way: Viis (%{count})
-      way_paginated: Viis (%{x}-%{y} su %{count})
-      relation: Relazions (%{count})
-      relation_paginated: Relazions (%{x}-%{y} su %{count})
-      hidden_comment_by_html: Coment platât di %{user} %{time_ago}
-      comment_by_html: Comentât di %{user} %{time_ago}
-      changesetxml: Grup di cambiaments XML
-      osmchangexml: XML in formât osmChange
-      join_discussion: Jentre par partecipâ ae discussion
-      discussion: Discussion
     node:
       title_html: 'Grop: %{name}'
       history_title_html: 'Storic dal grop: %{name}'
@@ -401,6 +380,28 @@ fur:
       feed:
         title: Grup di cambiaments %{id}
         title_comment: Grup di cambiaments %{id} - %{comment}
+        created: Creât
+        closed: Sierât
+        belongs_to: Autôr
+    show:
+      title: 'Grup di cambiaments: %{id}'
+      created_ago_html: Creât %{time_ago}
+      closed_ago_html: Sierât %{time_ago}
+      created_ago_by_html: Creât di %{user} %{time_ago}
+      closed_ago_by_html: Sierât di %{user} %{time_ago}
+      discussion: Discussion
+      join_discussion: Jentre par partecipâ ae discussion
+      comment_by_html: Comentât di %{user} %{time_ago}
+      hidden_comment_by_html: Coment platât di %{user} %{time_ago}
+      changesetxml: Grup di cambiaments XML
+      osmchangexml: XML in formât osmChange
+    paging_nav:
+      nodes: Grops (%{count})
+      nodes_paginated: Grops (%{x}-%{y} su %{count})
+      ways: Viis (%{count})
+      ways_paginated: Viis (%{x}-%{y} su %{count})
+      relations: Relazions (%{count})
+      relations_paginated: Relazions (%{x}-%{y} su %{count})
     timeout:
       sorry: Nus displâs, la liste dai grups di cambiaments che tu âs domandât e je
         stade masse timp a cjamâsi.
@@ -1104,8 +1105,6 @@ fur:
       new password button: Azere la password
       help_text: Scrîf la direzion di pueste eletroniche che tu âs doprât par iscrivîti
         e ti mandarin un leam par tornâ a impuestâ la tô password.
-    create:
-      notice email cannot find: No vin podût cjatâ la tô direzion di pueste, nus displâs.
     edit:
       title: Azere la password
       heading: Azere la password par %{user}
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index d50bb21d9..02ab1193a 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -300,8 +300,6 @@ fy:
     destroy:
       success: Akkount wiske.
   browse:
-    created: Makke
-    closed: Ofdien
     version: Ferzje
     in_changeset: Wizigingsset
     anonymous: anonym
@@ -317,21 +315,6 @@ fy:
     view_history: Skiednis besjen
     view_details: Gegevens besjen
     location: 'Lokaasje:'
-    changeset:
-      title: 'Wizigingsset: %{id}'
-      belongs_to: Makker
-      node: Punten (%{count})
-      node_paginated: Punten (%{x}-%{y} fan %{count})
-      way: Linen (%{count})
-      way_paginated: Linen (%{x}-%{y} fan %{count})
-      relation: Relaasjes (%{count})
-      relation_paginated: Relaasjes (%{x}-%{y} fan %{count})
-      changesetxml: Wizigingsset-XML
-      osmchangexml: osmWizigings-XML
-      join_discussion: Meld jo oan en oerlis mei
-      discussion: Oerlis
-      still_open: Wizigingsset net ree - it oerlis iepenet sa gau't de wizigingsset
-        ôfdien is.
     node:
       title_html: 'Punt: %{name}'
       history_title_html: 'Skiednis fan punt: %{name}'
@@ -437,6 +420,24 @@ fy:
       feed:
         title: Wizigingsset %{id}
         title_comment: Wizigingsset %{id} - %{comment}
+        created: Makke
+        closed: Ofdien
+        belongs_to: Makker
+    show:
+      title: 'Wizigingsset: %{id}'
+      discussion: Oerlis
+      join_discussion: Meld jo oan en oerlis mei
+      still_open: Wizigingsset net ree - it oerlis iepenet sa gau't de wizigingsset
+        ôfdien is.
+      changesetxml: Wizigingsset-XML
+      osmchangexml: osmWizigings-XML
+    paging_nav:
+      nodes: Punten (%{count})
+      nodes_paginated: Punten (%{x}-%{y} fan %{count})
+      ways: Linen (%{count})
+      ways_paginated: Linen (%{x}-%{y} fan %{count})
+      relations: Relaasjes (%{count})
+      relations_paginated: Relaasjes (%{x}-%{y} fan %{count})
     timeout:
       sorry: Spitich, it opheljen fan 'e list wizigingssets dy't jo fregen duorre
         te lang.
@@ -1727,10 +1728,6 @@ fy:
       help_text: Folje it e-mailadres yn dat jo by it ynskriuwen brûkt hawwe. Wy stjoere
         der dan in keppeling hinne dy't jo brûke kinne om jo wachtwurd op 'e nij yn
         te stellen.
-    create:
-      notice email on way: Spitich dat jo 'm kwyt binne :-( mar in e-mail is ûnderweis,
-        dat jo kinne gau in nijenien ynstelle.
-      notice email cannot find: Koe dat e-mailadres net fine, spitich.
     edit:
       title: Nij wachtwurd
       heading: Wachtwurd op 'e nij ynstelle foar %{user}
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index b64dc4fff..f2016986e 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -207,8 +207,6 @@ ga:
     go_public:
       heading: Eagarthóireacht phoiblí
   browse:
-    created: Cruthaithe ag
-    closed: Dúnta ag
     version: Leagan
     in_changeset: Tacar athruithe
     anonymous: gan ainm
@@ -218,19 +216,6 @@ ga:
     view_history: Féach ar Stair
     view_details: Amharc ar Shonraí
     location: 'Suíomh:'
-    changeset:
-      title: 'Tacar athruithe: %{id}'
-      belongs_to: Údar
-      node: Nóid (%{count})
-      node_paginated: Nóid (%{x}-%{y} de %{count})
-      way: Bealaí (%{count})
-      way_paginated: Bealaí (%{x}-%{y} de %{count})
-      relation: Gaolta (%{count})
-      relation_paginated: Gaolta (%{x}-%{y} de %{count})
-      changesetxml: XML an Tacair athruithe
-      osmchangexml: XML osmChange
-      join_discussion: Logáil isteach chun páirt a ghlacadh sa phlé
-      discussion: Plé
     node:
       title_html: 'Nód: %{name}'
       history_title_html: 'Stair an Nóid: %{name}'
@@ -327,6 +312,22 @@ ga:
       feed:
         title: Tacar athruithe %{id}
         title_comment: Tacar athruithe %{id} - %{comment}
+        created: Cruthaithe ag
+        closed: Dúnta ag
+        belongs_to: Údar
+    show:
+      title: 'Tacar athruithe: %{id}'
+      discussion: Plé
+      join_discussion: Logáil isteach chun páirt a ghlacadh sa phlé
+      changesetxml: XML an Tacair athruithe
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Nóid (%{count})
+      nodes_paginated: Nóid (%{x}-%{y} de %{count})
+      ways: Bealaí (%{count})
+      ways_paginated: Bealaí (%{x}-%{y} de %{count})
+      relations: Gaolta (%{count})
+      relations_paginated: Gaolta (%{x}-%{y} de %{count})
     timeout:
       sorry: Ár leithscéil, thóg sé rófhada an liosta de na tacair athruithe a d'iarr
         tú a aisghabháil.
@@ -1299,11 +1300,6 @@ ga:
       new password button: Athshocraigh an focal faire
       help_text: Iontráil an seoladh ríomhphoist a d'úsáid tú le clárú, agus seolfaimid
         nasc chugat a bheidh tú in ann a úsáid chun do phasfhocal a athshocrú.
-    create:
-      notice email on way: Is oth linn gur chaill tú é :-( ach tá ríomhphost ar an
-        mbealach chugat le go mbeidh tú in ann é a athshocrú go luath.
-      notice email cannot find: Níorbh fhéidir an seoladh ríomhphoist sin a aimsiú,
-        ár leithscéil faoi sin.
     edit:
       title: Focal faire a athshocrú
       heading: Focal Faire le haghaidh %{user} a Athshocrú
diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 05513dbe4..7881b7087 100644
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -104,13 +104,6 @@ gcf:
     no_comment: (pon komantasyon)
     download_xml: Chantyé XML
     location: 'Ki koté:'
-    changeset:
-      hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago}
-      comment_by_html: Komantasyon a %{user} %{time_ago}
-      changesetxml: Niméwo Chanjeman XML
-      osmchangexml: osmChanjeman XML
-      join_discussion: Konèkté-w pou jwenn bokantaj-la
-      discussion: Bokantaj
     containing_relation:
       entry_html: Rèlasion %{relation_name}
       entry_role_html: Rèlasion %{relation_name} (adan wol %{relation_role})
@@ -131,6 +124,13 @@ gcf:
       previous: Pwochenn
     changesets:
       comment: Komantasyon
+    show:
+      discussion: Bokantaj
+      join_discussion: Konèkté-w pou jwenn bokantaj-la
+      comment_by_html: Komantasyon a %{user} %{time_ago}
+      hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago}
+      changesetxml: Niméwo Chanjeman XML
+      osmchangexml: osmChanjeman XML
   dashboards:
     contact:
       km away: '%{count} km'
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 8082f2ae2..3a378003d 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -182,8 +182,6 @@ gd:
         Thoir sùil air a' phost-d agad gus an seòladh puist-d ùr agad a dhearbhadh.
       success: Chaidh fiosrachadh a' chleachdaiche ùrachadh gu soirbheachail.
   browse:
-    created: Air a chruthachadh
-    closed: Dùinte
     version: Tionndadh
     in_changeset: Seata atharraichean
     anonymous: gun ainm
@@ -193,19 +191,6 @@ gd:
     view_history: Seall an eachdraidh
     view_details: Seall am mion-fhiosrachadh
     location: 'Àite:'
-    changeset:
-      title: 'Seata atharraichean: %{id}'
-      belongs_to: Ùghdar
-      node: Nòdan (%{count})
-      node_paginated: Nòdan (%{x}-%{y} à %{count})
-      way: Slighean (%{count})
-      way_paginated: Slighean (%{x}-%{y} à %{count})
-      relation: Dàimhean (%{count})
-      relation_paginated: Dàimhean (%{x}-%{y} à %{count})
-      changesetxml: XML le seata atharraichean
-      osmchangexml: XML osmChange
-      join_discussion: Clàraich a-steach gus pàirt a ghabhail san deasbaireachd
-      discussion: Deasbaireachd
     node:
       title_html: 'Nòd: %{name}'
       history_title_html: 'Eachdraidh an nòd: %{name}'
@@ -304,6 +289,22 @@ gd:
       feed:
         title: Seata atharraichean %{id}
         title_comment: Seata atharraichean %{id} - %{comment}
+        created: Air a chruthachadh
+        closed: Dùinte
+        belongs_to: Ùghdar
+    show:
+      title: 'Seata atharraichean: %{id}'
+      discussion: Deasbaireachd
+      join_discussion: Clàraich a-steach gus pàirt a ghabhail san deasbaireachd
+      changesetxml: XML le seata atharraichean
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Nòdan (%{count})
+      nodes_paginated: Nòdan (%{x}-%{y} à %{count})
+      ways: Slighean (%{count})
+      ways_paginated: Slighean (%{x}-%{y} à %{count})
+      relations: Dàimhean (%{count})
+      relations_paginated: Dàimhean (%{x}-%{y} à %{count})
     timeout:
       sorry: Duilich ach thug e ro fhada gus an seata atharraichean a dh'iarr thu
         fhaighinn.
@@ -1139,11 +1140,6 @@ gd:
       help_text: Cuir a-steach an seòladh puist-d a chleachd thu gus an cunntas agad
         a chlàradh agus cuiridh sinn post-d dha as urrainn dhut cleachdadh gus am
         facal-faire agad ath-shuidheachadh.
-    create:
-      notice email on way: Tha sinn duilich gun do chaill thu e :-( ach tha post-d
-        gu bhith tighinn thugad ach an urrainn dhut ath-shuidheachadh a dh'aithghearr.
-      notice email cannot find: Duilich ach cha do rinn sinn lorg air an t-seòladh
-        puist-d ud.
     edit:
       title: Ath-shuidhich am facal-faire
       heading: Ath-shuidhich am facal-faire aig %{user}
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 987212e45..4a06b46e2 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -339,12 +339,6 @@ gl:
     destroy:
       success: Conta borrada.
   browse:
-    created: Creado
-    closed: Pechado
-    created_ago_html: Creado %{time_ago}
-    closed_ago_html: Pechado %{time_ago}
-    created_ago_by_html: Creado %{time_ago} por %{user}
-    closed_ago_by_html: Pechado %{time_ago} por %{user}
     deleted_ago_by_html: Borrado %{time_ago} por %{user}
     edited_ago_by_html: Editado %{time_ago} por %{user}
     version: Versión
@@ -362,23 +356,6 @@ gl:
     view_history: Ollar o historial
     view_details: Ollar os detalles
     location: 'Localización:'
-    changeset:
-      title: 'Conxunto de modificacións: %{id}'
-      belongs_to: Autor
-      node: Nós (%{count})
-      node_paginated: Nós (%{x}-%{y} de %{count})
-      way: Vías (%{count})
-      way_paginated: Vías (%{x}-%{y} de %{count})
-      relation: Relacións (%{count})
-      relation_paginated: Relacións (%{x}-%{y} de %{count})
-      hidden_comment_by_html: Comentario de %{user} agochado %{time_ago}
-      comment_by_html: Comentario de %{user} %{time_ago}
-      changesetxml: XML do conxunto de modificacións
-      osmchangexml: XML de osmChange
-      join_discussion: Inicia a sesión para unirte á parola
-      discussion: Parola
-      still_open: O conxunto de modificacións segue aberto. Abrirase a parola cando
-        o conxunto de modificacións estea pechado.
     node:
       title_html: 'Nó: %{name}'
       history_title_html: 'Historial do nó: %{name}'
@@ -496,6 +473,30 @@ gl:
       feed:
         title: Conxunto de modificacións %{id}
         title_comment: Conxunto de modificacións %{id} - %{comment}
+        created: Creado
+        closed: Pechado
+        belongs_to: Autor
+    show:
+      title: 'Conxunto de modificacións: %{id}'
+      created_ago_html: Creado %{time_ago}
+      closed_ago_html: Pechado %{time_ago}
+      created_ago_by_html: Creado %{time_ago} por %{user}
+      closed_ago_by_html: Pechado %{time_ago} por %{user}
+      discussion: Parola
+      join_discussion: Inicia a sesión para unirte á parola
+      still_open: O conxunto de modificacións segue aberto. Abrirase a parola cando
+        o conxunto de modificacións estea pechado.
+      comment_by_html: Comentario de %{user} %{time_ago}
+      hidden_comment_by_html: Comentario de %{user} agochado %{time_ago}
+      changesetxml: XML do conxunto de modificacións
+      osmchangexml: XML de osmChange
+    paging_nav:
+      nodes: Nós (%{count})
+      nodes_paginated: Nós (%{x}-%{y} de %{count})
+      ways: Vías (%{count})
+      ways_paginated: Vías (%{x}-%{y} de %{count})
+      relations: Relacións (%{count})
+      relations_paginated: Relacións (%{x}-%{y} de %{count})
     timeout:
       sorry: Desculpe que levase moito tempo obter a listaxe do conxunto de modificacións
         que solicitou.
@@ -1867,10 +1868,6 @@ gl:
       help_text: Escribe o enderezo de correo electrónico que empregaches para te
         rexistrares. Enviarémosche unha ligazón que poderás empregar para restablecer
         o teu contrasinal.
-    create:
-      notice email on way: Por desgraza perdeuno, pero hai en camiño unha mensaxe
-        de correo electrónico ca que o poderá restabelecelo axiña.
-      notice email cannot find: Non se puido atopar o enderezo de correo electrónico.
     edit:
       title: Restablecer o contrasinal
       heading: Restablecer o contrasinal de %{user}
diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index cf3854f93..595b47f34 100644
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@@ -93,8 +93,6 @@ gsw:
       name: externer Editor
       description: externer Editor (JOSM odda Merkaartor)
   browse:
-    created: Aagleit
-    closed: Zue
     version: Version
     in_changeset: Änderige
     anonymous: anonym
@@ -104,19 +102,6 @@ gsw:
     view_history: Versionsgschicht
     view_details: Details aagucke
     location: 'Ort:'
-    changeset:
-      title: 'Änderigssatz: %{id}'
-      belongs_to: Autor
-      node: Gnode (%{count})
-      node_paginated: Gnode (%{x}-%{y} of %{count})
-      way: Wäg (%{count})
-      way_paginated: Wäg (%{x}-%{y} von %{count})
-      relation: Relatione (%{count})
-      relation_paginated: Relatione (%{x}-%{y} of %{count})
-      changesetxml: Changeset-XML
-      osmchangexml: osmChange XML
-      join_discussion: Meld dich aa, wennd mitdiskutiere willsch.
-      discussion: Diskussion
     node:
       title_html: 'Gnode: %{name}'
       history_title_html: 'Versionsgschicht vum Gnote: %{name}'
@@ -168,6 +153,22 @@ gsw:
       feed:
         title: Changeset %{id}
         title_comment: Changeset %{id} - %{comment}
+        created: Aagleit
+        closed: Zue
+        belongs_to: Autor
+    show:
+      title: 'Änderigssatz: %{id}'
+      discussion: Diskussion
+      join_discussion: Meld dich aa, wennd mitdiskutiere willsch.
+      changesetxml: Changeset-XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Gnode (%{count})
+      nodes_paginated: Gnode (%{x}-%{y} of %{count})
+      ways: Wäg (%{count})
+      ways_paginated: Wäg (%{x}-%{y} von %{count})
+      relations: Relatione (%{count})
+      relations_paginated: Relatione (%{x}-%{y} of %{count})
   dashboards:
     popup:
       your location: Dyy Standort
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 5c3ce490b..da9c5fb83 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -371,15 +371,10 @@ he:
     destroy:
       success: חשבון נמחק.
   browse:
-    created: נוצרה
-    closed: נסגרה
-    created_ago_html: נוצרה %{time_ago}
-    closed_ago_html: נסגרה %{time_ago}
-    created_ago_by_html: נוצרה %{time_ago} על־ידי %{user}
-    closed_ago_by_html: נסגרה %{time_ago} על־ידי %{user}
     deleted_ago_by_html: נמחקה %{time_ago} על־ידי %{user}
     edited_ago_by_html: נערכה %{time_ago} על־ידי %{user}
     version: גרסה
+    redacted_version: גרסה שהוסר ממנה מידע
     in_changeset: ערכת שינויים
     anonymous: אלמוני
     no_comment: (אין הערות)
@@ -396,24 +391,11 @@ he:
       other: '%{count} דרכים'
     download_xml: הורדת XML
     view_history: הצגת ההיסטוריה
+    view_unredacted_history: הצגת היסטוריה ללא הסרות
     view_details: הצגת פרטים
+    view_redacted_data: הצגת הנתונים שהוסרו
+    view_redaction_message: הצגת הודעת הסרה
     location: 'מיקום:'
-    changeset:
-      title: 'ערכת שינויים: %{id}'
-      belongs_to: יוצר
-      node: נקודות (%{count})
-      node_paginated: נקודות (%{x}–%{y} מתוך %{count})
-      way: קווים (%{count})
-      way_paginated: קווים (%{x}–%{y} מתוך %{count})
-      relation: יחסים (%{count})
-      relation_paginated: יחסים (%{x}–%{y} מתוך %{count})
-      hidden_comment_by_html: הערה מוסתרת מאת %{user} %{time_ago}
-      comment_by_html: הערה מאת %{user} %{time_ago}
-      changesetxml: XML של ערכת השינויים
-      osmchangexml: osmChange XML
-      join_discussion: נא להיכנס לחשבון כדי להצטרף לדיון
-      discussion: דיון
-      still_open: ערכת השינויים עדיין פתוחה – הדיון ייפתח אחרי שערכת השיניים תיסגר.
     node:
       title_html: 'נקודה: %{name}'
       history_title_html: 'היסטוריית הנקודה: %{name}'
@@ -536,6 +518,9 @@ he:
       feed:
         title: ערכת שינויים %{id}
         title_comment: ערכת שינויים %{id} – %{comment}
+        created: נוצרה
+        closed: נסגרה
+        belongs_to: יוצר
     subscribe:
       heading: לעשות מינוי לדיון בערכת השינויים הבאה?
       button: מינוי לדיון
@@ -550,6 +535,28 @@ he:
       heading: 'אין רשומה עם המזהה: %{id}'
       body: סליחה, אין ערכת שינויים עם המזהה %{id}. אולי האיות לא נכון ואולי לחצת
         על קישור שגוי.
+    show:
+      title: 'ערכת שינויים: %{id}'
+      created: 'נוצרה: %{when}'
+      closed: 'נסגרה: %{when}'
+      created_ago_html: נוצרה %{time_ago}
+      closed_ago_html: נסגרה %{time_ago}
+      created_ago_by_html: נוצרה %{time_ago} על־ידי %{user}
+      closed_ago_by_html: נסגרה %{time_ago} על־ידי %{user}
+      discussion: דיון
+      join_discussion: נא להיכנס לחשבון כדי להצטרף לדיון
+      still_open: ערכת השינויים עדיין פתוחה – הדיון ייפתח אחרי שערכת השיניים תיסגר.
+      comment_by_html: הערה מאת %{user} %{time_ago}
+      hidden_comment_by_html: הערה מוסתרת מאת %{user} %{time_ago}
+      changesetxml: XML של ערכת השינויים
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: נקודות (%{count})
+      nodes_paginated: נקודות (%{x}–%{y} מתוך %{count})
+      ways: קווים (%{count})
+      ways_paginated: קווים (%{x}–%{y} מתוך %{count})
+      relations: יחסים (%{count})
+      relations_paginated: יחסים (%{x}–%{y} מתוך %{count})
     timeout:
       sorry: קבלת רשימת ערכות השינויים שביקשת אורכת זמן רב מדי, עמך הסליחה.
   changeset_comments:
@@ -1903,9 +1910,8 @@ he:
       help_text: נא להזין את כתובת הדוא״ל שהשתמשת בה כדי להירשם. אנו נשלח אליה קישור
         שאפשר להשתמש בו כדי לאפס את סיסמתך.
     create:
-      notice email on way: אנו מצטערים לשמוע שאיבדת אותה :-( אבל נשלח לדואר האלקטרוני
-        שלך מכתב שבאמצעותו אפשר לאפס אותה.
-      notice email cannot find: סליחה, הכתובת הזאת לא נמצאה.
+      send_paranoid_instructions: אם כתובת הדוא״ל שלך קיימת במסד הנתונים שלנו, יישלח
+        אליך קישור לשחזור סיסמה לכתובת הדוא״ל הזאת בעוד כמה דקות.
     edit:
       title: איפוס סיסמה
       heading: איפוס הסיסמה עבור %{user}
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index baf8275ce..afed0e0dd 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -280,8 +280,6 @@ hi:
         link text: यह क्या है?
       save changes button: बदलाव सहेजें
   browse:
-    created: बनाया गया
-    closed: बंद किया गया
     version: संस्करण
     in_changeset: Changeset
     anonymous: अनामक
@@ -297,21 +295,6 @@ hi:
     view_history: इतिहास देखें
     view_details: जानकारी देखें
     location: 'स्थान:'
-    changeset:
-      title: 'Changeset: %{id}'
-      belongs_to: लेखक
-      node: बिंदु (%{count})
-      node_paginated: नोड (%{count} का %{x}-%{y})
-      way: रेखाएं (%{count})
-      way_paginated: रास्तें (%{count} का %{x}-%{y})
-      relation: सम्बन्ध (%{count})
-      relation_paginated: सम्बन्ध (%{count} के %{x}-%{y})
-      changesetxml: Changeset XML
-      osmchangexml: osmChange XML
-      join_discussion: चर्चा में भाग लेने के लिए लॉग इन करें
-      discussion: चर्चा
-      still_open: चेंजसेट अभी भी खुला - चेंजसेट के एक बार बंद होने के पश्चात चर्चा
-        होगी।
     node:
       title_html: 'बिंदु: %{name}'
       history_title_html: 'नोड इतिहास: %{name}'
@@ -418,6 +401,24 @@ hi:
       feed:
         title: 'Changeset: %{id}'
         title_comment: Changeset %{id} - %{comment}
+        created: बनाया गया
+        closed: बंद किया गया
+        belongs_to: लेखक
+    show:
+      title: 'Changeset: %{id}'
+      discussion: चर्चा
+      join_discussion: चर्चा में भाग लेने के लिए लॉग इन करें
+      still_open: चेंजसेट अभी भी खुला - चेंजसेट के एक बार बंद होने के पश्चात चर्चा
+        होगी।
+      changesetxml: Changeset XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: बिंदु (%{count})
+      nodes_paginated: नोड (%{count} का %{x}-%{y})
+      ways: रेखाएं (%{count})
+      ways_paginated: रास्तें (%{count} का %{x}-%{y})
+      relations: सम्बन्ध (%{count})
+      relations_paginated: सम्बन्ध (%{count} के %{x}-%{y})
     timeout:
       sorry: माफ़ कीजिए, जिन चेंजसेट की आपने अनुरोध की थी उन्हें लाने में कुछ ज़्यादा
         ही वक्त लग गया।
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 561b54641..38c898289 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -266,8 +266,6 @@ hr:
         email za poruku potvrde nove email adrese.
       success: Korisničke informacije su uspješno ažurirane.
   browse:
-    created: Stvoreno
-    closed: Zatvoreno
     version: Inačica
     in_changeset: Set promjena
     anonymous: anonimno
@@ -285,19 +283,6 @@ hr:
     view_history: Prikaži povijest
     view_details: Prikaži detalje
     location: 'Lokacija:'
-    changeset:
-      title: 'Set promjena: %{id}'
-      belongs_to: Autor
-      node: Točaka (%{count})
-      node_paginated: Točke (%{x}-%{y} od %{count})
-      way: Putovi (%{count})
-      way_paginated: Putovi(%{x}-%{y} od %{count})
-      relation: Relacije (%{count})
-      relation_paginated: Relacije(%{x}-%{y} od %{count})
-      changesetxml: XLM Set promjena
-      osmchangexml: osmChange XML
-      join_discussion: Prijavi se za uključivanje u raspravu
-      discussion: Razgovor
     node:
       title_html: 'Točka: %{name}'
       history_title_html: 'Povijest točke: %{name}'
@@ -402,6 +387,22 @@ hr:
       feed:
         title: Set promjena %{id}
         title_comment: Set promjena %{id} - %{comment}
+        created: Stvoreno
+        closed: Zatvoreno
+        belongs_to: Autor
+    show:
+      title: 'Set promjena: %{id}'
+      discussion: Razgovor
+      join_discussion: Prijavi se za uključivanje u raspravu
+      changesetxml: XLM Set promjena
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Točaka (%{count})
+      nodes_paginated: Točke (%{x}-%{y} od %{count})
+      ways: Putovi (%{count})
+      ways_paginated: Putovi(%{x}-%{y} od %{count})
+      relations: Relacije (%{count})
+      relations_paginated: Relacije(%{x}-%{y} od %{count})
     timeout:
       sorry: Nažalost, preuzimanje popisa setova promjena predugo traje.
   changeset_comments:
@@ -1203,10 +1204,6 @@ hr:
       new password button: Reset lozinke
       help_text: Unesite email adresu koju ste koristili za otvaranje računa i poslati
         ćemo vam poveznicu kojom možete resetirati zaporku.
-    create:
-      notice email on way: Žao mi je što ste je izgubili :-( ali email je na putu
-        tako da je možete resetirati uskoro.
-      notice email cannot find: Ne mogu pronaći email adresu.
     edit:
       title: Reset lozinke
       heading: Reset lozinke za %{user}
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 20dd33bd1..90760ed80 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -45,6 +45,11 @@ hsb:
       messages:
         invalid_email_address: njezda so płaćiwa mejlkowa adresa być
         email_address_not_routable: njeje routojomna
+        display_name_is_user_n: njemóže wužiwar user_n być, chibazo n je twój wužiwarski
+          ID
+      models:
+        user_mute:
+          is_already_muted: je so hižo zněmił
     models:
       acl: Lisćina za přistupnu kontrolu
       changeset: Sadźba změnow
@@ -273,6 +278,8 @@ hsb:
           a bydlišćo so wotstronja.
         delete_display_name: Waše pokazowanske mjeno so wotstroni a da so z druhimi
           kontami znowa wužiwać.
+        confirm_delete: Sy sej wěsty?
+        cancel: Přetorhnyć
   accounts:
     edit:
       title: Konto wobdźěłać
@@ -297,6 +304,7 @@ hsb:
         agreed_with_pd: Sy tež deklarował, zo twoje změny su zjawne.
         link text: Å¡to to je?
       save changes button: Změny składować
+      delete_account: Konto zhašeć…
     go_public:
       heading: Zjawne wobdźěłowanje
       make_edits_public_button: Wšě moje změny zjawne činić
@@ -304,9 +312,9 @@ hsb:
       success_confirm_needed: Wužiwarske informacije wuspěšnje zaktualizowane. Dóstanješ
         e-mejl z namołwu, swoju nowu e-mejlowu adresu wobkrućić.
       success: Wužiwarske informacije wuspěšnje zaktualizowane.
+    destroy:
+      success: Konto je so zhašało.
   browse:
-    created: Wutworjeny
-    closed: 'Začinjeny:'
     version: Wersija
     in_changeset: Sadźba změnow
     anonymous: anonymny
@@ -326,21 +334,6 @@ hsb:
     view_history: Historiju pokazać
     view_details: Podrobnosće pokazać
     location: 'Městno:'
-    changeset:
-      title: 'Sadźba změnow: %{id}'
-      belongs_to: Awtor
-      node: Suki (%{count})
-      node_paginated: Suki (%{x}-%{y} z %{count})
-      way: Puće (%{count})
-      way_paginated: Puće (%{x}-%{y} z %{count})
-      relation: Relacije (%{count})
-      relation_paginated: Relacije (%{x}-%{y} z %{count})
-      changesetxml: Sadźba změnow XML
-      osmchangexml: osmChange XML
-      join_discussion: Přizjew so, zo by móhł(a) sobu diskutować
-      discussion: Diskusija
-      still_open: Sadźba změnow je hišće wočinjena. Diskusija so wočinja, ručež je
-        sadźba změnow začinjena.
     node:
       title_html: 'Suk: %{name}'
       history_title_html: 'Sukata historija: %{name}'
@@ -417,6 +410,7 @@ hsb:
       wikimedia_commons_link: Element %{page} na Wikimedija Commons
       telephone_link: '%{phone_number} zawołać'
       colour_preview: Přehlad barba %{colour_value}
+      email_link: E-mejl %{email}
     query:
       title: Funkcije naprašować
       introduction: Klikń na kartu, zo by susodne objekty namakał(a).
@@ -452,6 +446,36 @@ hsb:
       feed:
         title: Sadźba změnow %{id}
         title_comment: Sadźba změnow %{id} - %{comment}
+        created: Wutworjeny
+        closed: 'Začinjeny:'
+        belongs_to: Awtor
+    subscribe:
+      button: Diskusiju abonować
+    unsubscribe:
+      button: Diskusiju wotskazać
+    show:
+      title: 'Sadźba změnow: %{id}'
+      created: 'Wutworjeny: %{when}'
+      closed: 'Začinjeny: %{when}'
+      created_ago_html: Wutworjene %{time_ago}
+      closed_ago_html: Začinjeny %{time_ago}
+      created_ago_by_html: Wutworjeny %{time_ago} wot wužiwarja %{user}
+      closed_ago_by_html: Začinjeny %{time_ago} wot wužiwarja %{user}
+      discussion: Diskusija
+      join_discussion: Přizjew so, zo by móhł(a) sobu diskutować
+      still_open: Sadźba změnow je hišće wočinjena. Diskusija so wočinja, ručež je
+        sadźba změnow začinjena.
+      comment_by_html: Komentar wot %{user} %{time_ago}
+      hidden_comment_by_html: Schowany komentar wot %{user} %{time_ago}
+      changesetxml: Sadźba změnow XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Suki (%{count})
+      nodes_paginated: Suki (%{x}-%{y} z %{count})
+      ways: Puće (%{count})
+      ways_paginated: Puće (%{x}-%{y} z %{count})
+      relations: Relacije (%{count})
+      relations_paginated: Relacije (%{x}-%{y} z %{count})
     timeout:
       sorry: Bohužel je předołho trało, požadanu lisćinu změnow wotwołać.
   changeset_comments:
@@ -475,6 +499,7 @@ hsb:
       nearby mapper: Kartěrowar w bliskosći
       friend: Přećel
     show:
+      title: Moja přehladna strona
       no_home_location_html: '%{edit_profile_link} a nastaj swoje ródne město, zo
         by wužiwarjow w bliskosći widźał.'
       edit_your_profile: Wobdźěłaj swój profil
@@ -511,6 +536,7 @@ hsb:
     show:
       title: Dźenik %{user} | %{title}
       user_title: dźenik wužiwarja %{user}
+      discussion: Diskusija
       leave_a_comment: Spisaj komentar
       login_to_leave_a_comment_html: '%{login_link}, zo by komentar spisał(a)'
       login: Přizjew so
@@ -525,11 +551,11 @@ hsb:
       comment_link: Komentar k tutomu zapiskej
       reply_link: Awtorej powěsć pósłać
       comment_count:
-        few: '%{count} komentary'
-        one: Jedyn komentar
+        one: '%{count} komentar'
         two: '%{count} komentaraj'
-        zero: Žane komentary
+        few: '%{count} komentary'
         other: '%{count} komentarow'
+      no_comments: Žane komentary
       edit_link: Tutón zapisk wobdźěłać
       hide_link: Tutón zapisk schować
       unhide_link: Tutón zapisk zaso pokazać
@@ -557,17 +583,38 @@ hsb:
         title: OpenStreetMap dźenikowe zapiski
         description: Najnowše dźenikowe zapiski wužiwarjow OpenStreetMap
     comments:
+      title: Dźenikowe komentary přidate wot wužiwarja %{user}
+      heading: Dźenikowe komentary wot wužiwarja %{user}
+      subheading_html: Dźenikowe komentary přidate wot wužiwarja %{user}
       no_comments: Žane dźenikowe komentary
       post: Zapisk
       when: Hdy
       comment: Komentar
       newer_comments: Nowše komentary
       older_comments: Starše komentary
+    subscribe:
+      button: Diskusiju abonować
+    unsubscribe:
+      button: Diskusiju wotskazać
   doorkeeper:
     flash:
       applications:
         create:
           notice: Nałoženje je zregistrowane.
+    scopes:
+      email: Wašu e-mejlowu adresu pokazać
+      openid: Waše konto awtentifikować
+      phone: Waše telefonowe čisło pokazać
+      profile: Waše profilowe informacije pokazać
+  errors:
+    contact:
+      contact: kontakt
+    forbidden:
+      title: Zakazany
+    internal_server_error:
+      title: Nałoženski zmylk
+    not_found:
+      title: Dataja njeje so namakała
   friendships:
     make_friend:
       heading: '%{user} jako přećela přidać?'
@@ -583,6 +630,10 @@ hsb:
       success: '%{name} je so jako přećel wotstronił.'
       not_a_friend: '%{name} twój přećel njeje.'
   geocoder:
+    search:
+      title:
+        results_from_html: Wuslědki z %{results_link}
+        latlon: Interny
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -599,8 +650,8 @@ hsb:
         aeroway:
           aerodrome: Lětanišćo
           airstrip: Startowa čara
-          apron: Lětanske předpolo
-          gate: Wrota
+          apron: Předpolo lětanišća
+          gate: Lětanske nastupišćo
           hangar: Hangar
           helipad: Helikoptrowe přizemišćo
           holding_position: Zastanišćo
@@ -609,7 +660,7 @@ hsb:
           runway: Startowa a přizemjenska čara
           taxilane: Taksijowa jězdnja
           taxiway: Lětadłowa jězdnja
-          terminal: Terminal
+          terminal: Terminal lětanišća
           windsock: Wětrowy měšk
         amenity:
           animal_boarding: Zwěrjaca pensija
@@ -669,6 +720,7 @@ hsb:
           loading_dock: Nakładna rampa
           love_hotel: Lubosćinski hotel
           marketplace: torhošćo
+          mobile_money_agent: Mobilny pjenjezowy agent
           monastery: klóšter
           money_transfer: Pjenježne přepokazanje
           motorcycle_parking: parkowanišćo za motorske
@@ -908,8 +960,8 @@ hsb:
           brownfield: lado
           cemetery: pohrjebnišćo
           commercial: přemysłownišćo
-          conservation: přirodoškitne pasmo
-          construction: twarnišćo
+          conservation: Přirodoškitne pasmo
+          construction: Twarnišćo
           farmland: rola
           farmyard: burski statok
           forest: lěs
@@ -930,7 +982,7 @@ hsb:
           reservoir: zběranski basenk
           reservoir_watershed: wodowe přitočnišćo
           residential: sydlišćo
-          retail: wobchody
+          retail: Nakupowanišćo
           village_green: nawjes
           vineyard: winica
           "yes": wužiwanje zemje
@@ -950,7 +1002,7 @@ hsb:
           fitness_station: fitnesowa stacija
           garden: zahroda
           golf_course: golfownišćo
-          horse_riding: jěchanišćo
+          horse_riding: Jěchanišćo
           ice_rink: smykanišćo
           marina: sportowy přistaw
           miniature_golf: minigolf
@@ -1191,7 +1243,7 @@ hsb:
           deli: delikatesowy wobchod
           department_store: kupnica
           discount: wobchod za tunje artikle
-          doityourself: wobchod za twaršćizny
+          doityourself: Wobchod za twaršćizny
           dry_cleaning: čisćernja
           e-cigarette: Wobcho za E-cigarety
           electronics: wobchod za elektroniku
@@ -1216,7 +1268,7 @@ hsb:
           health_food: Wobchod za přirodnu jědź
           hearing_aids: Słuchanske nastroje
           herbalist: Zelowy wobchod
-          hifi: Hi-fi
+          hifi: Wobchod Hi-Fi
           houseware: wobchod za domjace twory
           ice_cream: Lodarnja
           interior_decoration: nutřkowne wuhotowanje
@@ -1273,7 +1325,7 @@ hsb:
           artwork: wuměłska twórba
           attraction: atrakcija
           bed_and_breakfast: přenocowanje ze snědanju
-          cabin: chěžka
+          cabin: Chěžka
           camp_pitch: Campingowanišćo
           camp_site: stanowanišćo
           caravan_site: campingowanišćo za caravany
@@ -1348,8 +1400,10 @@ hsb:
       last_updated: Poslednja aktualizacija
       link_to_reports: Rozprawy sej wobhladać
       reports_count:
-        one: Jedna rozprawa
-        other: '%{count} rozprawje'
+        one: '%{count} rozprawa'
+        two: '%{count} rozprawje'
+        few: '%{count} rozprawy'
+        other: '%{count} rozprawow'
       reported_item: Zjewjeny objekt
       states:
         ignored: Ignorowany
@@ -1358,9 +1412,11 @@ hsb:
     show:
       title: '%{status} Problem čo. %{issue_id}'
       reports:
-        zero: Žane rozprawy
-        one: Jedna rozprawa
-        other: '%{count} rozprawje'
+        one: '%{count} rozprawa'
+        two: '%{count} rozprawje'
+        few: '%{count} rozprawy'
+        other: '%{count} rozprawow'
+      no_reports: Žane rozprawy
       report_created_at_html: Prěni raz rozprawjene dnja %{datetime}
       last_resolved_at_html: Posledni raz rozrisany dnja %{datetime}
       last_updated_at_html: Posledni raz aktualizowany dnja %{datetime} wot %{displayname}
@@ -1451,8 +1507,8 @@ hsb:
     intro_text: OpenStreetMap je karta swěta, wutworjena wot ludźi kaž tebje a hodźi
       so swobodnje pod wotewrjenej licencu wužiwać.
     intro_2_create_account: Załož wužiwarske konto
-    hosting_partners_html: Hosting podpěruje je so wot %{ucl}, %{bytemark} a druhich
-      %{partners}.
+    hosting_partners_html: Hosting so wot %{ucl}, %{fastly}, %{bytemark} a druhich
+      %{partners} podpěruje.
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: partnerow
@@ -1465,6 +1521,7 @@ hsb:
     help: Pomoc
     about: Wo projekće
     copyright: Awtorske prawo
+    communities: Zhromadnosće
     community: Zhromadźenstwo
     community_blogs: Dźeniki zhromadźenstwa
     community_blogs_title: Dźeniki čłonow zhromadźenstwa OpenStreetMap
@@ -1598,10 +1655,8 @@ hsb:
         partial_changeset_without_comment: bjez komentara
       details: Dalše podrobnosće wo sadźbje změnow namakaš na %{url}.
       details_html: Dalše podrobnosće wo sadźbje změnow namakaš na %{url}.
-      unsubscribe: Zo by aktualizacije wo tutej sadźbje změnow wotskazał(a), wopytaj
-        %{url} a klikń na „wotzjewić“
-      unsubscribe_html: Zo by aktualizacije wo tutej sadźbje změnow wotskazał, wopytaj
-        %{url} a klikń na „wotskazać“
+      unsubscribe: Móžeće aktualizacije na tutej sadźbje změnow na %{url}wotskazać.
+      unsubscribe_html: Móžeće aktualizacije na tutej sadźbje změnow na %{url}wotskazać.
   confirmations:
     confirm:
       heading: Přepruwuj swoju e-mejl!
@@ -1652,6 +1707,7 @@ hsb:
       to: Komu
       subject: Tema
       date: Datum
+      actions: Akcije
     message_summary:
       unread_button: Jako njepřečitanu markěrować
       read_button: Jako přečitanu markěrować
@@ -1671,6 +1727,7 @@ hsb:
       body: Bohužel njeje powěsć z tutej ID.
     outbox:
       title: Pósłane
+      actions: Akcije
       messages:
         few: Sy %{count} powěsće pósłał(a)
         one: Sy %{count} powěsć pósłał(a)
@@ -1679,6 +1736,13 @@ hsb:
       no_sent_messages_html: Hišće njejsy žane powěsće pósłał(a). Chceš z %{people_mapping_nearby_link}
         styki nawjazać?
       people_mapping_nearby: ludźimi, kotřiž w bliskosći kartěruja
+    muted:
+      title: Zněmjene powěsće
+      messages:
+        one: '%{count} zněmjena powěsć'
+        two: Maš %{count} zněmjenej powěsći
+        few: Maš %{count} zněmjene powěsće
+        other: Maš %{count} zněmjenych powěsćow
     reply:
       wrong_user: Sy jako `%{user}' přizjewjeny, ale powěsć, na kotruž chceš wotmołwić,
         bu na druheho wužiwarja pósłana. Prošu přizjew so z prawym kontom, zo by wotmołwił(a).
@@ -1695,6 +1759,7 @@ hsb:
     heading:
       my_inbox: Moja póšta
       my_outbox: Mój póstowy wuchad
+      muted_messages: Zněmjene powěsće
     mark:
       as_read: Powěsć jako přečitanu markěrowana
       as_unread: Powěsć jako njepřečitanu markěrowana
@@ -1704,14 +1769,10 @@ hsb:
     new:
       title: Hesło zabyte
       heading: Sy hesło zabył?
-      email address: 'E-mejlowa adresa:'
+      email address: E-mejlowa adresa
       new password button: Hesło wróćo stajić
       help_text: Zapódaj mejlowu adresu, kotruž sy za registrowanje wužił, pósćelemy
         wotkaz na nju, kotryž móžeš za wróćostajenje hesła wužić.
-    create:
-      notice email on way: Sy jo zabył :-(, ale e-mejl je po puću, zo by móhł jo borze
-        wróćo stajić.
-      notice email cannot find: Wodaj, ale njemóžachmy tutu e-mejlowu adresu namakać.
     edit:
       title: Hesło wróćo stajić
       heading: Hesło za wužiwarja %{user} wróćo stajić
@@ -1753,6 +1814,9 @@ hsb:
       home location: Domjace stejnišćo
       no home location: Njejsy swoje domjace stejnišćo zapodał.
       update home location on click: Domjace stejnišćo při kliknjenju na kartu aktualizować?
+      show: Pokazać
+      delete: Zhašeć
+      undelete: Zhašenje cofnyć
     update:
       success: Profil je so zaktualizował.
       failure: Profil njeda so aktualizować.
@@ -1760,8 +1824,8 @@ hsb:
     new:
       title: Přizjewjenje
       heading: Přizjewjenje
-      email or username: 'E-mejlowa adresa abo wužiwarske mjeno:'
-      password: 'Hesło:'
+      email or username: E-mejlowa adresa abo wužiwarske mjeno
+      password: Hesło
       remember: Spomjatkować sej
       lost password link: Swoje hesło zabył?
       login_button: Přizjewjenje
@@ -1781,8 +1845,8 @@ hsb:
           title: Přizjewjenje z Facebook
           alt: Přizjewjenje z facebookowym kontom
         microsoft:
-          title: Přizjewjenje z Windows Live
-          alt: Přizjewjenje z kontom Windows Live
+          title: Přizjewjenje z Microsoft
+          alt: Přizjewjenje z kontom Microsoft
         github:
           title: Z GitHub přizjewić
           alt: Z kontom GitHub přizjewić
@@ -1799,6 +1863,8 @@ hsb:
       title: Wotzjewić
       heading: Z OpenStreetMap wotzjewić
       logout_button: Wotzjewić
+    suspended_flash:
+      support: pomoc
   shared:
     markdown_help:
       headings: Nadpisy
@@ -1813,14 +1879,15 @@ hsb:
       image: Wobraz
       alt: Alternatiwny tekst
       url: URL
+      codeblock: Kodowy blok
     richtext_field:
       edit: Wobdźěłać
       preview: Přehlad
   site:
     about:
       next: Dale
-      used_by_html: '%{name} staja kartowe daty za tysacy webstronow, aplikacijow
-        a nastroje k dispoziciji'
+      used_by_html: '%{name} kartowe daty za tysacy websydłow, mobilnych nałoženjow
+        a gratwo k dispoziciji staja'
       lede_text: OpenStreetMap twori so wot zhromadźenstwa kartěrowarjow, kiž přinošuja
         a hladaja daty wo pućach, twarjenjach, dwórnišćach a wjele wjace na cyłym
         swěće.
@@ -1829,8 +1896,15 @@ hsb:
         wužiwaja powětrowe wobrazy, GPS-nastroje a pólne karty za přepruwowanje, zo
         by OSM dokładny a aktualny był.
       community_driven_title: Wot zhromadźenstwa wutworjene
+      community_driven_osm_blog: Blog OpenStreetMap
+      community_driven_user_diaries: wužiwarske dźeniki
+      community_driven_osm_foundation: Załožba OSM
       open_data_title: Zjawne daty
+      open_data_open_data: wotewrjene daty
       legal_title: Prawniske pokiwy
+      legal_1_1_openstreetmap_foundation: Załožba OpenStreetMap
+      legal_1_1_terms_of_use: Wužiwanske wuměnjenja
+      legal_1_1_privacy_policy: Prawidła priwatnosće
       partners_title: Partnerojo
     copyright:
       foreign:
@@ -1847,8 +1921,11 @@ hsb:
         mapping_link: z kartěrowanjom započeć
       legal_babble:
         title_html: Awtorske prawo a licenca
+        introduction_1_open_data: wotewrjene daty
+        introduction_1_osm_foundation: Załožba OpenStreetMap
         credit_title_html: Kak ma so na awtorstwo OpenStreetMap pokazać
-        credit_1_html: Žadamy sej wužiwanje pokazki „&copy; sobuskutkowacy OpenStreetMap“.
+        credit_1_html: 'Hdyž daty OpenStreetMap wužiwaš, dyrbiš slědowacej dwě wěcy
+          činić:'
         attribution_example:
           alt: Přikład, kak so na webstronje na OpenStreetMap pokazuje
           title: Přikład za mjenowanje na webstronje z elektroniskej kartu
@@ -1857,6 +1934,24 @@ hsb:
         contributors_intro_html: 'Naši sobuskutkowacy su tysacy jednotliwcow. Zapřijamy
           tež wotewrjenje licencowane daty narodnych kartowych agenturow a z druhich
           žórłow, mjez nimi:'
+        contributors_at_austria: Awstriska
+        contributors_at_stadt_wien: Město Wien
+        contributors_at_land_vorarlberg: Kraj Vorarlberg
+        contributors_au_australia: Awstralija
+        contributors_ca_canada: Kanada
+        contributors_cz_czechia: Čěska
+        contributors_fi_finland: Finska
+        contributors_fi_nlsfi_license: Licenca NLSFI
+        contributors_fr_france: Francoska
+        contributors_nl_netherlands: Nižozemska
+        contributors_nz_new_zealand: Nowoseelandska
+        contributors_nz_linz_data_service: Datowa słužba LINZ
+        contributors_nz_cc_by: CC BY 4.0
+        contributors_rs_serbia: Serbiska
+        contributors_si_slovenia: Słowjenska
+        contributors_es_spain: Å paniska
+        contributors_za_south_africa: Južna Afrika
+        contributors_gb_united_kingdom: Zjednoćene kralestwo
         contributors_footer_2_html: Zapřijimanje datow do OpenStreetMap njerěka, zo
           poskićowar originalnych datow OpenStreetMap připóznawa, někajku garantiju
           dodawa abo rukowanje přewozmje.
@@ -1864,6 +1959,7 @@ hsb:
         infringement_1_html: Sobuskutkowacych OSM namołwjamy, zo ženje daty ze žórłow,
           kotrež su přez awtorske prawo škitane (na př. z Google Maps abo z wućišćanych
           kartow) bjez wurazneje dowolnosće awtorow  njepřidawaja.
+        trademarks_title: Tworowe znamjenja
     index:
       js_1: Pak wužiwaš wobhladowak, kotryž JavaScript njepodpěruje, pak sy JavaScript
         znjemóžnił.
@@ -1921,6 +2017,7 @@ hsb:
             zhromadźenstwu OpenStreetMap přiidružić a sam daty přidać abo korigować.
       other_concerns:
         title: Druhe naležnosće
+        working_group: Dźěłowa skupina OSMF
     help:
       title: Wo pomoc prosyć
       introduction: OpenStreetMap ma wšelake resursy za zeznaće projekta, prašenja
@@ -1935,6 +2032,10 @@ hsb:
         url: http://wiki.openstreetmap.org/wiki/hsb:Beginners%27_guide
         title: Instrukcije za nowačkow
         description: Přez zhromadźenstwo wothladowany nawod za započatkowarjow.
+      community:
+        title: Pomoc a forum zhromadnosće
+        description: Zhromadne městno, hdźež móžeće za pomocu pytać a so wo OpenStreetMap
+          rozmołwjeć.
       mailing_lists:
         title: Rozesyłanske lisćiny
         description: Staj prašenje abo diskutuj zajimawe wěcy w šěrokim wobłuku temow
@@ -1948,6 +2049,8 @@ hsb:
           słužbach bazuja a k OpenStreetMap přeńdu.
       welcomemat:
         title: Za organizacije
+        description: Z organizaciju plany za OpenStreetMap činić? Wuslědźće na stronje
+          na powitanje, štož dyrbiće wědźeć.
       wiki:
         title: Wiki OpenStreetMap
         description: Přepytaj wiki za nadrobnej dokumentaciju OpenStreetMap
@@ -1983,15 +2086,26 @@ hsb:
           cycleway_local: Lokalna kolesowarska šćežka
           footway: Chódnik
           rail: Železnica
+          train: Ćah
           subway: Podzemska železnica
+          ferry: Přewoz
+          light_rail: Měšćanska železnica
+          tram: Nadróžna
+          trolleybus: Obus
+          bus: Bus
           cable_car: Kablowa nadróžna
-          chair_lift: sydłowy lift
+          chair_lift: Sydłowy lift
           runway: Přizemišćo
-          taxiway: lětadłowa jězdnja
+          taxiway: Lětadłowa jězdnja
           apron: Lětanišćowe předpolo
           admin: Zarjadniska hranica
+          city: Město
           forest: Hajina
           wood: Lěs
+          grass: Trawa
+          meadow: Łuka
+          bare_rock: Naha skała
+          sand: Pěsk
           golf: Golfownišćo
           park: Park
           common: Powšitkowny
@@ -2001,26 +2115,31 @@ hsb:
           commercial: Přemysłowa kónčina
           heathland: Hola
           lake: Jězor
-          reservoir: spjaty jězor
+          reservoir: Reservoir
+          glacier: Lodowc
+          reef: Rif
           farm: Farma
           brownfield: Industrijowe lado
           cemetery: Kěrchow
           allotments: Małozahrodki
           pitch: Sportnišćo
           centre: Sportowy centrum
+          beach: Brjóh
           reserve: Přirodoškitne pasmo
           military: Wojerske pasmo
           school: Å ula
-          university: uniwersita
+          university: Uniwersita
+          hospital: Chorownja
           building: Wuznamne twarjenje
           station: Dwórnišćo
           summit: Wjeršk
-          peak: kónčk hory
+          peak: Wjeršk hory
           tunnel: Smužkowana kroma = tunl
           bridge: Čorna kroma = móst
           private: Priwatny přistup
           destination: Jenož za přidróžnych
           construction: Dróhi w twarje
+          bus_stop: Busowe zastanišćo
           bicycle_shop: Kolesarnja
           bicycle_parking: Kólaso parkowanišćo
           toilets: Nuzniki
@@ -2035,13 +2154,29 @@ hsb:
         title: Zakładne zapřijeća za kartěrowanje
         paragraph_1: OpenStreetMap někotre wosebite zapřijeća wužiwa. Tu su někotre
           z nich, kotrež móhli ći wužitne być.
+        editor: wobdźěłar
+        node: suk
+        way: puć
+        tag: značka
       rules:
         title: Prawidła!
+        imports: Importy
+        automated_edits: Awtomatizowane wobdźěłanja
       start_mapping: Kartěrowanje započeć
+      continue_authorization: Z awtorizaciju pokročować
       add_a_note:
         title: Nimaš chwile za wobdźěłowanje? Přidaj pokazku!
         para_1: Jeli chceš jenož drobnosć korigować a nimaš chwile, zo by so zregistrował
           a wuknył, kak so wobdźěłuje, móžeš prosće pokazku přidać.
+        the_map: karta
+    communities:
+      title: Zhromadnosće
+      local_chapters:
+        title: Lokalne zwjazki
+        list_text: 'Slědowace zhromadnosće su oficielnje jako lokalne zwjazki zregistrowane:'
+      other_groups:
+        title: Druhe skupiny
+        communities_wiki: Wikistrona zhromadnosćow
   traces:
     visibility:
       private: Priwatna (jenož jako anonymna, njezrjadowane dypki )
@@ -2124,6 +2259,8 @@ hsb:
       public_traces_from: Zjawne GPS-ćěrje wot %{user}
       description: Najnowše nahraća GPS-čarow přepytać
       tagged_with: Markěrowane přez %{tags}
+      empty_title: Hišće ničo njeje
+      wiki_page: wikistrona
       upload_trace: Ćěr nahrać
       all_traces: Wšě ćěrje
       my_traces: Moje ćěrje
@@ -2164,6 +2301,7 @@ hsb:
       oauth1_settings: Nastajenja OAUTH 1
       oauth2_applications: Nastajenja OAUTH 2
       oauth2_authorizations: Prawa OAUTH 2
+      muted_users: Zněmjeni wužiwarjo
   oauth:
     authorize:
       title: Přistup na twoje konto awtorizować
@@ -2286,6 +2424,7 @@ hsb:
       title: Registrować
       no_auto_account_create: Bohužel njemóžemy tuchwilu žane konto za tebje awtomatisce
         załožić.
+      support: pomoc
       about:
         header: Swobodny a wobdźěłujomny
       display name description: Sy wužiwarske mjeno zjawnje pokazał. Móžeš to pozdźišo
@@ -2296,6 +2435,7 @@ hsb:
         někotrym přidatnym funkcijam abo serweram móhło być trjeba.
       continue: Registrować
       terms accepted: Dźakujemy so, zo sy nowe wuměnjenja za sobuskutkowarjow akceptował!
+      privacy_policy: prawidła priwatnosće
     terms:
       title: Wuměnjenja
       heading: Wuměnjenja
@@ -2336,8 +2476,11 @@ hsb:
       my settings: Moje nastajenja
       my comments: Moje komentary
       my_preferences: Moje nastajenja
+      my_dashboard: Moja přehladna strona
       blocks on me: Dostane blokowanja
       blocks by me: Date blokowanja
+      create_mute: Tutoho wužiwarja zněmić
+      destroy_mute: Zněmjenje tutoho wužiwarja zběhnyć
       edit_profile: Profil wobdźěłać
       send message: Powěsć pósłać
       diary: Dźenik
@@ -2347,6 +2490,7 @@ hsb:
       remove as friend: Přećela wotstronić
       add as friend: Přećela přidać
       mapper since: 'Kartěrowar wot:'
+      uid: 'Wužiwarski ID:'
       ct status: 'Wuměnjenja za sobuskutkowarjow:'
       ct undecided: Njerozsudźeny
       ct declined: Wotpokazany
@@ -2357,6 +2501,7 @@ hsb:
       role:
         administrator: Tutón wužiwar je administrator
         moderator: Tutón wužiwar je moderator.
+        importer: Tutón wužiwar je importer
         grant:
           administrator: Prawa administratora dać
           moderator: Prawa moderatora dać
@@ -2465,6 +2610,15 @@ hsb:
       confirm: Chceš woprawdźe tute blokowanje zběhnyć?
       revoke: Zběhnyć!
       flash: Tute blokowanje je so zběhnyło.
+    revoke_all:
+      empty: '%{name} aktiwne zablokowanja nima.'
+      active_blocks:
+        one: '%{count} aktiwne zablokowanje'
+        two: '%{count} aktiwnej zablokowani'
+        few: '%{count} aktiwne zablokowanja'
+        other: '%{count} aktiwnych zablokowanjow'
+      revoke: Zběhnyć!
+      flash: Wšě aktiwne zablokowanja su zběhnjene.
     helper:
       time_future_html: Kónči so %{time}.
       until_login: Aktiwne, doniž so wužiwar njepřizjewja.
@@ -2473,9 +2627,9 @@ hsb:
       time_past_html: Je so před %{time} skónčiło.
       block_duration:
         hours:
-          few: '%{count} hodźiny'
-          one: 1 hodźina
+          one: '%{count} hodźina'
           two: '%{count} hodźinje'
+          few: '%{count} hodźiny'
           other: '%{count} hodźin'
         days:
           one: '%{count} dźeń'
@@ -2533,11 +2687,36 @@ hsb:
       showing_page: Strona %{page}
       next: Přichodny »
       previous: « Předchadny
+  user_mutes:
+    index:
+      title: Zněmjeni wužiwarjo
+      my_muted_users: Moji zněmjeni wužiwarjo
+      you_have_muted_n_users:
+        one: Sy %{count} wužiwarja zněmił
+        two: Sy %{count} wužiwarjow zněmił
+        few: Sy %{count} wužiwarjow zněmił
+        other: Sy %{count} wužiwarjow zněmił
+      user_mute_explainer: Powěsće zněmjenych wužiwarjow so do separatneho póstoweho
+        dochada přesuwaja a sy e-mejlowe zdźělenki njedóstawaš.
+      user_mute_admins_and_moderators: Móžeš administratorow a moderatorow zněmić,
+        ale jich powěsće so njezněmja.
+      table:
+        thead:
+          muted_user: Zněmjeny wužiwar
+          actions: Akcije
+        tbody:
+          unmute: Zněmjenje zběhnyć
+          send_message: Powěsć pósłać
+    create:
+      notice: Sy wužiwarja %{name} zněmił.
+      error: Wužiwar %{name} njeda so zněmić. %{full_message}.
   notes:
     index:
       title: Pokazki, kotrež su so wot %{user} dali abo komentowali
       heading: Pokazki wužiwarja %{user}
-      subheading_html: Pokazki, kotrež su so wot %{user} dali abo komentowali
+      subheading_html: Pokazki, kotrež su so wot %{user} %{submitted} abo %{commented}
+      subheading_submitted: pósłali
+      subheading_commented: komentowali
       no_notes: Žane pokazy
       id: ID
       creator: Tworićel
@@ -2550,7 +2729,10 @@ hsb:
       open_title: 'Njesčinjena pokazka #%{note_name}'
       closed_title: 'Sčinjena pokazka #%{note_name}'
       hidden_title: 'Schowana pokazka #%{note_name}'
-      report: Tutón pokiw zdźělić
+      event_commented_by_html: Komentar wot %{user} %{time_ago}
+      event_commented_by_anonymous_html: Komentar wot anonymneho wužiwarja %{time_ago}
+      event_hidden_by_html: Schowany wot %{user} %{time_ago}
+      report: tutón pokazku zdźělić
       anonymous_warning: Tuta pokazka wobsahuje komentary wot anonymnych wužiwarjow,
         kotrež měli so njewotwisnje přepruwować.
       hide: Schować
@@ -2558,6 +2740,7 @@ hsb:
       reactivate: Znowa aktiwizować
       comment_and_resolve: Komentować a sčinić
       comment: Komentar
+      log_in_to_comment: Přizjewće so, zo by tutu pokazku komentował
     new:
       title: Nowa pokazka
       intro: Sy zmylk widźał abo zo něšto faluje? Informuj druhich kartografow, zo
@@ -2599,19 +2782,20 @@ hsb:
       locate:
         title: Aktualne městno pokazać
         metersPopup:
-          one: Sće mjenje hač %{count} meter wot tutoho dypka zdaleny
-          two: Sće mjenje hač %{count} metraj wot tutoho dypka zdaleny
-          few: Sće mjenje hač %{count} metry wot tutoho dypka zdaleny
-          other: Sće mjenje hač %{count} metrow wot tutoho dypka zdaleny
+          one: Sy mjenje hač %{count} meter wot tutoho dypka zdaleny
+          two: Sy mjenje hač %{count} metraj wot tutoho dypka zdaleny
+          few: Sy mjenje hač %{count} metry wot tutoho dypka zdaleny
+          other: Sy mjenje hač %{count} metrow wot tutoho dypka zdaleny
         feetPopup:
-          one: Sće mjenje hač %{count} stopu wot tutoho dypka zdaleny
-          two: Sće mjenje hač %{count} stopje wot tutoho dypka zdaleny
-          few: Sće mjenje hač %{count} stopy wot tutoho dypka zdaleny
-          other: Sće mjenje hač %{count} stopow wot tutoho dypka zdaleny
+          one: Sy mjenje hač %{count} stopu wot tutoho dypka zdaleny
+          two: Sy mjenje hač %{count} stopje wot tutoho dypka zdaleny
+          few: Sy mjenje hač %{count} stopy wot tutoho dypka zdaleny
+          other: Sy mjenje hač %{count} stopow wot tutoho dypka zdaleny
       base:
         standard: Standard
         cycle_map: Kolesowa karta
         transport_map: Wobchadna karta
+        tracestracktop_topo: Tracestrack Topo
         hot: Sobuskutkowacy humanitarneje pomocy
       layers:
         header: Kartowe runiny
@@ -2620,6 +2804,11 @@ hsb:
         gps: Zjawne GPS-ćěrje
         overlays: Woršty za pytanje za zmylkami na karće zmóžnić
         title: Runiny
+      openstreetmap_contributors: Sobuskutkowarjo OpenStreetMap
+      make_a_donation: Darić
+      website_and_api_terms: Wuměnjenja websydła a API
+      osm_france: OpenStreetMap Francoska
+      andy_allan: Andy Allan
     site:
       edit_tooltip: Kartu wobdźěłać
       edit_disabled_tooltip: Za wobdźěłanje karty powjetšić
@@ -2647,9 +2836,14 @@ hsb:
         graphhopper_bicycle: Koleso (GraphHopper)
         graphhopper_car: Awto (GraphHopper)
         graphhopper_foot: Pěši (GraphHopper)
+        fossgis_valhalla_bicycle: Koleso (Valhalla)
+        fossgis_valhalla_car: Awto (Valhalla)
+        fossgis_valhalla_foot: Pěši (Valhalla)
       descend: Spadowacy
       directions: Směry
       distance: Zdalenosć
+      distance_m: '%{distance} m'
+      distance_km: '%{distance} km'
       errors:
         no_route: Njenamakach čaru mjez tutymaj městnomaj.
         no_place: Bohužel njemóžachmy městno „%{place}“ namakać.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 106e86b5b..c96b6eadc 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -348,12 +348,6 @@ hu:
     destroy:
       success: Fiók törölve.
   browse:
-    created: Létrehozva
-    closed: Lezárva
-    created_ago_html: Létrehozva %{time_ago}
-    closed_ago_html: Lezárva %{time_ago}
-    created_ago_by_html: Létrehozta %{user} %{time_ago}
-    closed_ago_by_html: Lezárta %{user} %{time_ago}
     deleted_ago_by_html: Törölte %{user} %{time_ago}
     edited_ago_by_html: Szerkesztette %{user} %{time_ago}
     version: Verzió
@@ -371,23 +365,6 @@ hu:
     view_history: Előzmények megtekintése
     view_details: Részletek megtekintése
     location: 'Hely:'
-    changeset:
-      title: '%{id} módosításcsomag'
-      belongs_to: Szerző
-      node: Pontok (%{count})
-      node_paginated: 'Pontok (%{x}-%{y} ennyiből: %{count})'
-      way: Vonalak (%{count})
-      way_paginated: 'Vonalak (%{x}-%{y} ennyiből: %{count})'
-      relation: Kapcsolatok (%{count})
-      relation_paginated: 'Kapcsolatok (%{x}-%{y} ennyiből: %{count})'
-      hidden_comment_by_html: Rejtett hozzászólás %{user} felhasználótól %{time_ago}
-      comment_by_html: Hozzászólt %{user} %{time_ago}
-      changesetxml: Módosításcsomag adatai (XML)
-      osmchangexml: Módosításcsomag tartalma (osmChange XML)
-      join_discussion: Jelentkezz be, hogy bekapcsolódhass a megbeszélésbe
-      discussion: Megbeszélés
-      still_open: A módosításcsomag még nyitva van – a megbeszélés akkor nyílik meg,
-        ha a módosításcsomag lezárul.
     node:
       title_html: '%{name} pont'
       history_title_html: '%{name} pont előzményei'
@@ -496,6 +473,30 @@ hu:
       feed:
         title: '%{id} módosításcsomag'
         title_comment: '%{id} módosításcsomag - %{comment}'
+        created: Létrehozva
+        closed: Lezárva
+        belongs_to: Szerző
+    show:
+      title: '%{id} módosításcsomag'
+      created_ago_html: Létrehozva %{time_ago}
+      closed_ago_html: Lezárva %{time_ago}
+      created_ago_by_html: Létrehozta %{user} %{time_ago}
+      closed_ago_by_html: Lezárta %{user} %{time_ago}
+      discussion: Megbeszélés
+      join_discussion: Jelentkezz be, hogy bekapcsolódhass a megbeszélésbe
+      still_open: A módosításcsomag még nyitva van – a megbeszélés akkor nyílik meg,
+        ha a módosításcsomag lezárul.
+      comment_by_html: Hozzászólt %{user} %{time_ago}
+      hidden_comment_by_html: Rejtett hozzászólás %{user} felhasználótól %{time_ago}
+      changesetxml: Módosításcsomag adatai (XML)
+      osmchangexml: Módosításcsomag tartalma (osmChange XML)
+    paging_nav:
+      nodes: Pontok (%{count})
+      nodes_paginated: 'Pontok (%{x}-%{y} ennyiből: %{count})'
+      ways: Vonalak (%{count})
+      ways_paginated: 'Vonalak (%{x}-%{y} ennyiből: %{count})'
+      relations: Kapcsolatok (%{count})
+      relations_paginated: 'Kapcsolatok (%{x}-%{y} ennyiből: %{count})'
     timeout:
       sorry: Sajnáljuk, az általad kért módosításcsomagok listájának beolvasása túl
         sokáig tartott.
@@ -1856,10 +1857,6 @@ hu:
       new password button: Jelszó alaphelyzetbe állítása
       help_text: Add meg az e-mail-címed, amellyel regisztráltál. Küldeni fogunk egy
         hivatkozást, amellyel visszaállíthatod a jelszavad.
-    create:
-      notice email on way: Sajnáljuk, hogy elvesztetted :-( de már úton van egy e-mail,
-        így nemsokára alaphelyzetbe állíthatod.
-      notice email cannot find: Sajnáljuk, az e-mail-cím nem található.
     edit:
       title: Jelszó alaphelyzetbe állítása
       heading: '%{user} jelszavának alaphelyzetbe állítása'
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 714f65380..b349832e8 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -323,12 +323,6 @@ ia:
     destroy:
       success: Conto delite.
   browse:
-    created: Create a
-    closed: Claudite a
-    created_ago_html: Create %{time_ago}
-    closed_ago_html: Claudite %{time_ago}
-    created_ago_by_html: Create %{time_ago} per %{user}
-    closed_ago_by_html: Claudite %{time_ago} per %{user}
     deleted_ago_by_html: Delite %{time_ago} per %{user}
     edited_ago_by_html: Modificate %{time_ago} per %{user}
     version: Version
@@ -346,23 +340,6 @@ ia:
     view_history: Vider historia
     view_details: Vider detalios
     location: 'Loco:'
-    changeset:
-      title: 'Gruppo de modificationes: %{id}'
-      belongs_to: Autor
-      node: Nodos (%{count})
-      node_paginated: Nodos (%{x}-%{y} de %{count})
-      way: Vias (%{count})
-      way_paginated: Vias (%{x}-%{y} de %{count})
-      relation: Relationes (%{count})
-      relation_paginated: Relationes (%{x}-%{y} de %{count})
-      hidden_comment_by_html: Commento celate de %{user} %{time_ago}
-      comment_by_html: Commento de %{user} %{time_ago}
-      changesetxml: XML del gruppo de modificationes
-      osmchangexml: XML osmChange
-      join_discussion: Aperi session pro unir te al discussion
-      discussion: Discussion
-      still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira
-        quando le gruppo de modificationes essera claudite.
     node:
       title_html: 'Nodo: %{name}'
       history_title_html: 'Historia del nodo: %{name}'
@@ -480,6 +457,30 @@ ia:
       feed:
         title: Gruppo de modificationes %{id}
         title_comment: Gruppo de modificationes %{id} - %{comment}
+        created: Create a
+        closed: Claudite a
+        belongs_to: Autor
+    show:
+      title: 'Gruppo de modificationes: %{id}'
+      created_ago_html: Create %{time_ago}
+      closed_ago_html: Claudite %{time_ago}
+      created_ago_by_html: Create %{time_ago} per %{user}
+      closed_ago_by_html: Claudite %{time_ago} per %{user}
+      discussion: Discussion
+      join_discussion: Aperi session pro unir te al discussion
+      still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira
+        quando le gruppo de modificationes essera claudite.
+      comment_by_html: Commento de %{user} %{time_ago}
+      hidden_comment_by_html: Commento celate de %{user} %{time_ago}
+      changesetxml: XML del gruppo de modificationes
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Nodos (%{count})
+      nodes_paginated: Nodos (%{x}-%{y} de %{count})
+      ways: Vias (%{count})
+      ways_paginated: Vias (%{x}-%{y} de %{count})
+      relations: Relationes (%{count})
+      relations_paginated: Relationes (%{x}-%{y} de %{count})
     timeout:
       sorry: Le lista de gruppos de modificationes que tu requestava tardava troppo
         de tempore pro esser recuperate.
@@ -1734,10 +1735,10 @@ ia:
         %{url}.
       details_html: Plus detalios sur le gruppo de modificationes pote esser trovate
         a %{url}.
-      unsubscribe: Pro disabonar te del actualisationes de iste gruppo de modificationes,
-        visita %{url} e clicca sur "Disabonar".
-      unsubscribe_html: Pro disabonar te del actualisationes de iste gruppo de modificationes,
-        visita %{url} e clicca sur "Disabonar".
+      unsubscribe: Tu pote disabonar te del actualisationes de iste gruppo de modificationes
+        sur %{url}.
+      unsubscribe_html: Tu pote disabonar te del actualisationes de iste gruppo de
+        modificationes sur %{url}.
   confirmations:
     confirm:
       heading: Verifica tu e-mail!
@@ -1854,10 +1855,6 @@ ia:
       new password button: Reinitialisar contrasigno
       help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
         inviara un ligamine que tu pote usar pro reinitialisar tu contrasigno.
-    create:
-      notice email on way: Es infortunate que tu lo perdeva :-( ma nos te ha inviate
-        un e-mail que te permittera de reinitialisar lo.
-      notice email cannot find: Non poteva trovar iste adresse de e-mail, pardono.
     edit:
       title: Reinitialisar contrasigno
       heading: Reinitialisar le contrasigno de %{user}
@@ -2268,8 +2265,8 @@ ia:
         title: Guida pro comenciantes
         description: Guida pro comenciantes, mantenite per le communitate.
       community:
-        title: Foro del communitate
-        description: Un sito commun de conversation sur OpenStreetMap.
+        title: Foro de assistentia e communitate
+        description: Un loco commun ubi cercar adjuta e conversar sur OpenStreetMap.
       mailing_lists:
         title: Listas de diffusion
         description: Pone un question o discute cosas interessante sur un varietate
diff --git a/config/locales/id.yml b/config/locales/id.yml
index c930a0a2b..c57c8c6f0 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -342,12 +342,6 @@ id:
     destroy:
       success: Akun Telah Dihapus.
   browse:
-    created: Dibuat
-    closed: Ditutup
-    created_ago_html: Dibuat %{time_ago}
-    closed_ago_html: Ditutup %{time_ago}
-    created_ago_by_html: Dibuat %{time_ago} oleh %{user}
-    closed_ago_by_html: Ditutup %{time_ago} oleh %{user}
     deleted_ago_by_html: Dihapus %{time_ago} oleh %{user}
     edited_ago_by_html: Disunting %{time_ago} oleh %{user}
     version: Versi
@@ -363,23 +357,6 @@ id:
     view_history: Versi terdahulu
     view_details: Lihat Rincian
     location: 'Lokasi:'
-    changeset:
-      title: 'Set Perubahan: %{id}'
-      belongs_to: Pembuat
-      node: Simpul (%{count})
-      node_paginated: Simpul (%{x}-%{y} dari %{count})
-      way: Jalan (%{count})
-      way_paginated: Jalan (%{x}-%{y} dari %{count})
-      relation: Hubungan (%{count})
-      relation_paginated: Hubungan (%{x}-%{y} dari %{count})
-      hidden_comment_by_html: Komentar tersembunyi dari %{user} %{time_ago}
-      comment_by_html: Komentar dari %{user} %{time_ago}
-      changesetxml: Set Perubahan XML
-      osmchangexml: osmChange XML
-      join_discussion: Masuk untuk bergabung diskusi
-      discussion: Diskusi
-      still_open: Set perubahan masih terbuka - diskusi akan dibuka ketika set perubahan
-        telah ditutup.
     node:
       title_html: 'Simpul: %{name}'
       history_title_html: 'Riwayat Simpul: %{name}'
@@ -494,6 +471,30 @@ id:
       feed:
         title: Set Perubahan %{id}
         title_comment: Set Perubahan %{id} - %{comment}
+        created: Dibuat
+        closed: Ditutup
+        belongs_to: Pembuat
+    show:
+      title: 'Set Perubahan: %{id}'
+      created_ago_html: Dibuat %{time_ago}
+      closed_ago_html: Ditutup %{time_ago}
+      created_ago_by_html: Dibuat %{time_ago} oleh %{user}
+      closed_ago_by_html: Ditutup %{time_ago} oleh %{user}
+      discussion: Diskusi
+      join_discussion: Masuk untuk bergabung diskusi
+      still_open: Set perubahan masih terbuka - diskusi akan dibuka ketika set perubahan
+        telah ditutup.
+      comment_by_html: Komentar dari %{user} %{time_ago}
+      hidden_comment_by_html: Komentar tersembunyi dari %{user} %{time_ago}
+      changesetxml: Set Perubahan XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Simpul (%{count})
+      nodes_paginated: Simpul (%{x}-%{y} dari %{count})
+      ways: Jalan (%{count})
+      ways_paginated: Jalan (%{x}-%{y} dari %{count})
+      relations: Hubungan (%{count})
+      relations_paginated: Hubungan (%{x}-%{y} dari %{count})
     timeout:
       sorry: Maaf, daftar kumpulan set perubahan yang Anda minta terlalu lama untuk
         diambil.
@@ -1857,10 +1858,6 @@ id:
       help_text: Masukkan alamat email yang Anda gunakan untuk mendaftar, kami akan
         mengirim link ke alamat tersebut yang dapat Anda gunakan untuk menyetel ulang
         kata sandi Anda.
-    create:
-      notice email on way: Maaf sudah hilang :-( namun sebuah email telah dikirimkan
-        agar Anda dapat segera mengatur ulang.
-      notice email cannot find: Tidak dapat menemukan alamat email tersebut, maaf.
     edit:
       title: Setel ulang kata sandi
       heading: Setel ulang kata sandi untuk %{user}
diff --git a/config/locales/is.yml b/config/locales/is.yml
index dc7dd7427..11cece8ee 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -330,12 +330,6 @@ is:
     destroy:
       success: Aðgangi eytt.
   browse:
-    created: Búið til
-    closed: Lokað
-    created_ago_html: Búið til %{time_ago}
-    closed_ago_html: Lokað %{time_ago}
-    created_ago_by_html: Búið til %{time_ago} af %{user}
-    closed_ago_by_html: Lokað %{time_ago} af %{user}
     deleted_ago_by_html: Eytt %{time_ago} af %{user}
     edited_ago_by_html: Breytt %{time_ago} af %{user}
     version: Útgáfa
@@ -355,23 +349,6 @@ is:
     location: 'Staðsetning:'
     common_details:
       coordinates_html: '%{latitude}, %{longitude}'
-    changeset:
-      title: 'Breytingasett: %{id}'
-      belongs_to: Höfundur
-      node: Liðir (%{count})
-      node_paginated: Liðir (%{x}-%{y} af %{count})
-      way: Leiðir (%{count})
-      way_paginated: Leiðir (%{x}-%{y} af %{count})
-      relation: Vensl (%{count})
-      relation_paginated: Vensl (%{x}-%{y} af %{count})
-      hidden_comment_by_html: Falin umsögn frá %{user} %{time_ago}
-      comment_by_html: Umsögn frá %{user} %{time_ago}
-      changesetxml: XML breytingasetts
-      osmchangexml: XML osmChange
-      join_discussion: Skráðu þig inn til að taka þátt í umræðunni
-      discussion: Umræða
-      still_open: Breytingasett er enn opið - Umræða mun opnast þegar breytingasettinu
-        hefur verið lokað.
     node:
       title_html: 'Liður: %{name}'
       history_title_html: 'Saga hnúts: %{name}'
@@ -482,6 +459,30 @@ is:
       feed:
         title: Breytingasett %{id}
         title_comment: Breytingasett %{id} - %{comment}
+        created: Búið til
+        closed: Lokað
+        belongs_to: Höfundur
+    show:
+      title: 'Breytingasett: %{id}'
+      created_ago_html: Búið til %{time_ago}
+      closed_ago_html: Lokað %{time_ago}
+      created_ago_by_html: Búið til %{time_ago} af %{user}
+      closed_ago_by_html: Lokað %{time_ago} af %{user}
+      discussion: Umræða
+      join_discussion: Skráðu þig inn til að taka þátt í umræðunni
+      still_open: Breytingasett er enn opið - Umræða mun opnast þegar breytingasettinu
+        hefur verið lokað.
+      comment_by_html: Umsögn frá %{user} %{time_ago}
+      hidden_comment_by_html: Falin umsögn frá %{user} %{time_ago}
+      changesetxml: XML breytingasetts
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Liðir (%{count})
+      nodes_paginated: Liðir (%{x}-%{y} af %{count})
+      ways: Leiðir (%{count})
+      ways_paginated: Leiðir (%{x}-%{y} af %{count})
+      relations: Vensl (%{count})
+      relations_paginated: Vensl (%{x}-%{y} af %{count})
     timeout:
       sorry: Því miður, það tók of langan tíma að ná í listann yfir þau breytingasett
         sem þú baðst um.
@@ -1824,9 +1825,6 @@ is:
       new password button: Endurstilla lykilorð
       help_text: Sláðu inn netfangið sem þú skráðir þig með, við munum senda tengil
         á það sem þú getur notað til að breyta lykilorðinu þínu.
-    create:
-      notice email on way: Nýtt lykilorð er á leiðinni í innhólfið þitt.
-      notice email cannot find: Þetta netfang fannst ekki.
     edit:
       title: Endurstilla lykilorð
       heading: Endurstilla lykilorð fyrir %{user}
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 846ec9139..8971883bc 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -26,6 +26,7 @@
 # Author: Jlrb+
 # Author: Kaitu
 # Author: Karika
+# Author: LametinoWiki
 # Author: Lollo
 # Author: Lorelai87
 # Author: Lorem Ipsum
@@ -379,12 +380,6 @@ it:
     destroy:
       success: Account eliminato.
   browse:
-    created: Creato
-    closed: Chiuso
-    created_ago_html: Creato %{time_ago}
-    closed_ago_html: Chiuso %{time_ago}
-    created_ago_by_html: Creato %{time_ago} da %{user}
-    closed_ago_by_html: Chiuso %{time_ago} da %{user}
     deleted_ago_by_html: Cancellato %{time_ago} da %{user}
     edited_ago_by_html: Modificato %{time_ago} da %{user}
     version: Versione
@@ -400,25 +395,9 @@ it:
       other: '%{count} percorsi'
     download_xml: Scarica XML
     view_history: Visualizza cronologia
+    view_unredacted_history: Visualizza la cronologia non oscurata
     view_details: Vedi dettagli
     location: 'Posizione:'
-    changeset:
-      title: 'Gruppo di modifiche: %{id}'
-      belongs_to: Autore
-      node: Nodi (%{count})
-      node_paginated: Nodi (%{x}-%{y} di %{count})
-      way: Percorsi (%{count})
-      way_paginated: Percorsi (%{x}-%{y} di %{count})
-      relation: Relazioni (%{count})
-      relation_paginated: Relazioni (%{x}-%{y} di %{count})
-      hidden_comment_by_html: Commento nascosto da %{user} %{time_ago}
-      comment_by_html: Commento da %{user} %{time_ago}
-      changesetxml: Gruppo di modifiche XML
-      osmchangexml: XML in formato osmChange
-      join_discussion: Accedi per unirti alla discussione
-      discussion: Discussione
-      still_open: Il gruppo di modifiche è ancora aperto - le discussioni saranno
-        disponibili quando verrà chiuso.
     node:
       title_html: 'Nodo: %{name}'
       history_title_html: 'Cronologia nodo: %{name}'
@@ -528,6 +507,30 @@ it:
       feed:
         title: Gruppo di modifiche %{id}
         title_comment: Gruppo di modifiche %{id} - %{comment}
+        created: Creato
+        closed: Chiuso
+        belongs_to: Autore
+    show:
+      title: 'Gruppo di modifiche: %{id}'
+      created_ago_html: Creato %{time_ago}
+      closed_ago_html: Chiuso %{time_ago}
+      created_ago_by_html: Creato %{time_ago} da %{user}
+      closed_ago_by_html: Chiuso %{time_ago} da %{user}
+      discussion: Discussione
+      join_discussion: Accedi per unirti alla discussione
+      still_open: Il gruppo di modifiche è ancora aperto - le discussioni saranno
+        disponibili quando verrà chiuso.
+      comment_by_html: Commento da %{user} %{time_ago}
+      hidden_comment_by_html: Commento nascosto da %{user} %{time_ago}
+      changesetxml: Gruppo di modifiche XML
+      osmchangexml: XML in formato osmChange
+    paging_nav:
+      nodes: Nodi (%{count})
+      nodes_paginated: Nodi (%{x}-%{y} di %{count})
+      ways: Percorsi (%{count})
+      ways_paginated: Percorsi (%{x}-%{y} di %{count})
+      relations: Relazioni (%{count})
+      relations_paginated: Relazioni (%{x}-%{y} di %{count})
     timeout:
       sorry: Spiacenti, l'elenco dei gruppi di modifiche che hai richiesto ha impiegato
         troppo tempo per poter essere recuperato.
@@ -1899,11 +1902,6 @@ it:
       help_text: Inserire l'indirizzo email che si è utilizzato per l'iscrizione,
         a cui verrà inviato un collegamento che permetterà la reimpostazione della
         propria password.
-    create:
-      notice email on way: Siamo spiacenti che tu l'abbia persa :-( ma una email ti
-        è stata spedita in modo che tu la possa presto reimpostare.
-      notice email cannot find: Spiacenti, ma non è possibile trovare l'indirizzo
-        email.
     edit:
       title: Reimposta password
       heading: Reimposta password per %{user}
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index f719d5538..dfb3cc153 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -342,12 +342,6 @@ ja:
     destroy:
       success: アカウントを削除しました
   browse:
-    created: 作成
-    closed: クローズ
-    created_ago_html: '%{time_ago} に作成'
-    closed_ago_html: '%{time_ago}に閉じられました'
-    created_ago_by_html: '%{user}が%{time_ago}に作成'
-    closed_ago_by_html: '%{user}が%{time_ago}に閉じました'
     deleted_ago_by_html: '%{user}が%{time_ago}に削除'
     edited_ago_by_html: '%{user}が%{time_ago}に編集'
     version: バージョン
@@ -363,20 +357,6 @@ ja:
     view_history: 履歴を表示
     view_details: 詳細を表示
     location: '場所:'
-    changeset:
-      title: '変更セット: %{id}'
-      belongs_to: 著者
-      node: ノード (%{count})
-      node_paginated: ノード (%{x}-%{y} / %{count})
-      way: ウェイ (%{count}件)
-      way_paginated: ウェイ (%{x}-%{y} / %{count})
-      relation: リレーション (%{count}件)
-      relation_paginated: リレーション (%{x}-%{y} / %{count})
-      changesetxml: 変更セット XML
-      osmchangexml: OSM 差分 XML
-      join_discussion: 議論に参加するにはログインしてください
-      discussion: 議論
-      still_open: 変更セットが開いたままです - 議論を行うには変更セットを閉じる必要があります。
     node:
       title_html: 'ノード: %{name}'
       history_title_html: 'ノード: %{name} の履歴'
@@ -480,8 +460,29 @@ ja:
       feed:
         title: 変更セット %{id}
         title_comment: 変更セット %{id} - %{comment}
+        created: 作成
+        closed: クローズ
+        belongs_to: 著者
     subscribe:
       button: 議論に参加する
+    show:
+      title: '変更セット: %{id}'
+      created_ago_html: '%{time_ago} に作成'
+      closed_ago_html: '%{time_ago}に閉じられました'
+      created_ago_by_html: '%{user}が%{time_ago}に作成'
+      closed_ago_by_html: '%{user}が%{time_ago}に閉じました'
+      discussion: 議論
+      join_discussion: 議論に参加するにはログインしてください
+      still_open: 変更セットが開いたままです - 議論を行うには変更セットを閉じる必要があります。
+      changesetxml: 変更セット XML
+      osmchangexml: OSM 差分 XML
+    paging_nav:
+      nodes: ノード (%{count})
+      nodes_paginated: ノード (%{x}-%{y} / %{count})
+      ways: ウェイ (%{count}件)
+      ways_paginated: ウェイ (%{x}-%{y} / %{count})
+      relations: リレーション (%{count}件)
+      relations_paginated: リレーション (%{x}-%{y} / %{count})
     timeout:
       sorry: 申し訳ありませんが、要求した変更セットの一覧は時間がかかりすぎたため取得できませんでした。
   changeset_comments:
@@ -1713,9 +1714,6 @@ ja:
       email address: 'メールアドレス:'
       new password button: パスワードを再設定
       help_text: ユーザー登録に使用したメール アドレスを入力してください。そのアドレス宛に、パスワードを再設定するためのリンクをお送りします。
-    create:
-      notice email on way: すみません。紛失してしまいました :-( しかし、メールをお送りしたので、すぐにリセットできるでしょう。
-      notice email cannot find: 申し訳ありませんが、このメール アドレスは見つかりません。
     edit:
       title: パスワードの再設定
       heading: '%{user} のパスワードのリセット'
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index baf9f28ed..a92fa8016 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -137,8 +137,6 @@ ka:
         link text: რა არის ეს?
       save changes button: ცვლილებების შენახვა
   browse:
-    created: შეიქმნა
-    closed: დახურულია
     version: ვერსია
     in_changeset: ცვლილებების პაკეტი
     anonymous: ანონიმი
@@ -147,18 +145,6 @@ ka:
     view_history: ისტორიის ნახვა
     view_details: დეტალების ნახვა
     location: 'მდებარეობა:'
-    changeset:
-      title: 'ცვლილებების პაკეტი: %{id}'
-      belongs_to: ავტორი
-      node: წერტილები (%{count})
-      node_paginated: წერტილები (%{x}-%{y} %{count}-დან)
-      way: ხაზები (%{count})
-      way_paginated: ხაზები (%{x}-%{y} %{count}-დან)
-      relation: ურთიერთობები (%{count})
-      relation_paginated: ურთიერთობები (%{x}-%{y} %{count}-დან)
-      changesetxml: ცვლილებების პაკეტის XML
-      osmchangexml: osmChange XML
-      discussion: განხილვა
     node:
       title_html: 'წერტილი: %{name}'
       history_title_html: 'წერტილის ისტორია: %{name}'
@@ -228,6 +214,21 @@ ka:
       feed:
         title: ცვლილებების პაკეტი %{id}
         title_comment: ცვლილებების პაკეტი %{id} - %{comment}
+        created: შეიქმნა
+        closed: დახურულია
+        belongs_to: ავტორი
+    show:
+      title: 'ცვლილებების პაკეტი: %{id}'
+      discussion: განხილვა
+      changesetxml: ცვლილებების პაკეტის XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: წერტილები (%{count})
+      nodes_paginated: წერტილები (%{x}-%{y} %{count}-დან)
+      ways: ხაზები (%{count})
+      ways_paginated: ხაზები (%{x}-%{y} %{count}-დან)
+      relations: ურთიერთობები (%{count})
+      relations_paginated: ურთიერთობები (%{x}-%{y} %{count}-დან)
   changeset_comments:
     comment:
       commented_at_by_html: განაახლა %{when} წინ მომხმარებელმა %{user}
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index bde2c84e1..5182c2053 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -232,8 +232,6 @@ kab:
     update:
       success: Talɣut n useqdac tettwasnifel akken iwata
   browse:
-    created: Yettwarna
-    closed: Yemdel
     version: Lqem
     in_changeset: Agraw n usnifel
     anonymous: udrig
@@ -243,21 +241,6 @@ kab:
     view_history: Sken amazray
     view_details: Wali talqayt
     location: 'Adig:'
-    changeset:
-      title: 'Agraw n usnifel: %{id}'
-      belongs_to: Ameskar
-      node: Tikerras (%{count})
-      node_paginated: Tikerras (%{x}-%{y} si %{count})
-      way: Iberdan (%{count})
-      way_paginated: Iberdan (%{x}-%{y} si %{count})
-      relation: Assaɣen (%{count})
-      relation_paginated: Assaɣen (%{x}-%{y} si %{count})
-      changesetxml: XML n ugraw n ibeddilen
-      osmchangexml: XML osmChange
-      join_discussion: Qqen akken ad tedduḍ ar usqerdec
-      discussion: Asqerdec
-      still_open: Tagrumma isenfilen zgan ldin - asqerdec ad yili mara isenfilen meṛṛa
-        ttwamedlen.
     node:
       title_html: 'Takerrist: %{name}'
       history_title_html: 'Amazray n tkerrist: %{name}'
@@ -356,6 +339,24 @@ kab:
       feed:
         title: Agraw n usnifel %{id}
         title_comment: Agraw n ubeddel %{id} - %{comment}
+        created: Yettwarna
+        closed: Yemdel
+        belongs_to: Ameskar
+    show:
+      title: 'Agraw n usnifel: %{id}'
+      discussion: Asqerdec
+      join_discussion: Qqen akken ad tedduḍ ar usqerdec
+      still_open: Tagrumma isenfilen zgan ldin - asqerdec ad yili mara isenfilen meṛṛa
+        ttwamedlen.
+      changesetxml: XML n ugraw n ibeddilen
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Tikerras (%{count})
+      nodes_paginated: Tikerras (%{x}-%{y} si %{count})
+      ways: Iberdan (%{count})
+      ways_paginated: Iberdan (%{x}-%{y} si %{count})
+      relations: Assaɣen (%{count})
+      relations_paginated: Assaɣen (%{x}-%{y} si %{count})
     timeout:
       sorry: Suref-aɣ, tabdart n igrawen n usnifel i d-sutreḍ tettwai ddeqs n wakud
         akkena d d-ali.
diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index da3d4ddfc..388713462 100644
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -228,7 +228,6 @@ kk-cyrl:
     destroy:
       success: Тіркелгі жойылды.
   browse:
-    closed: Жабық
     version: Нұсқа
     in_changeset: Өңдеме дестесі
     anonymous: аноним
@@ -243,14 +242,6 @@ kk-cyrl:
     view_history: Тарихын көру
     view_details: Егжей-тегжейін көру
     location: 'Географиялық орны:'
-    changeset:
-      title: 'Өңдеме дестесі: %{id}'
-      node: Нүктелер (%{count})
-      way: Сызықтар (%{count})
-      relation: Қатынастар (%{count})
-      changesetxml: Өңдеме дестесінің XML-і
-      osmchangexml: osmChange XML
-      discussion: Талқылау
     node:
       title_html: 'Нүкте: %{name}'
       history_title_html: 'Нүкте тарихы: %{name}'
@@ -321,6 +312,16 @@ kk-cyrl:
       load_more: Көбірек жүктеу
       feed:
         title: Өңдеме дестесі %{id}
+        closed: Жабық
+    show:
+      title: 'Өңдеме дестесі: %{id}'
+      discussion: Талқылау
+      changesetxml: Өңдеме дестесінің XML-і
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Нүктелер (%{count})
+      ways: Сызықтар (%{count})
+      relations: Қатынастар (%{count})
   changeset_comments:
     comment:
       commented_at_by_html: '%{when} %{user} жаңартқан'
diff --git a/config/locales/km.yml b/config/locales/km.yml
index 88cc6e7b8..0fcf1a91a 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -111,8 +111,6 @@ km:
         ដើម្បីបញ្ជាក់អាសយដ្ឋានអ៊ីមែលថ្មីរបស់អ្នក។
       success: ព័ត៌មានអ្នកប្រើប្រាស់​ បានបន្ទាន់សម័យដោយជោគជ័យ​។
   browse:
-    created: បាន​បង្កើត​
-    closed: បាន​បិទ
     version: កំណែ
     in_changeset: សំណុំបន្លាស់ប្ដូរ
     anonymous: អនាមិក
@@ -122,18 +120,6 @@ km:
     view_history: មើល​ប្រវត្តិ​
     view_details: មើលព័ត៌មានលម្អិត​
     location: ទីតាំង​៖​
-    changeset:
-      title: សំណុំបន្លាស់ប្ដូរ៖ %{id}
-      belongs_to: អ្នក​បង្កើត
-      node: ខ្នែងចំនួន (%{count})
-      node_paginated: ខ្នែងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
-      way: ផ្លូវចំនួន (%{count})
-      way_paginated: ផ្លូវចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
-      relation: ទំនាក់ទំនងចំនួន (%{count})
-      relation_paginated: ទំនាក់ទំនងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
-      changesetxml: សំណុំបន្លាស់ប្ដូរ​ XML
-      join_discussion: កត់ឈ្មោះចូលដើម្បីចូលរួមពិភាក្សា
-      discussion: ការពិភាក្សា
     node:
       title_html: ខ្នែង៖ %{name}
       history_title_html: ប្រវត្តិខ្នែង៖ %{name}
@@ -206,6 +192,21 @@ km:
       feed:
         title: សំណុំបន្លាស់ប្ដូរ​ %{id}
         title_comment: សំណុំបន្លាស់ប្តូរ​ %{id} - %{comment}
+        created: បាន​បង្កើត​
+        closed: បាន​បិទ
+        belongs_to: អ្នក​បង្កើត
+    show:
+      title: សំណុំបន្លាស់ប្ដូរ៖ %{id}
+      discussion: ការពិភាក្សា
+      join_discussion: កត់ឈ្មោះចូលដើម្បីចូលរួមពិភាក្សា
+      changesetxml: សំណុំបន្លាស់ប្ដូរ​ XML
+    paging_nav:
+      nodes: ខ្នែងចំនួន (%{count})
+      nodes_paginated: ខ្នែងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
+      ways: ផ្លូវចំនួន (%{count})
+      ways_paginated: ផ្លូវចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
+      relations: ទំនាក់ទំនងចំនួន (%{count})
+      relations_paginated: ទំនាក់ទំនងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
   dashboards:
     contact:
       km away: ចម្ងាយ %{count} គ.ម.
diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index af159d052..0a6378faf 100644
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -218,8 +218,6 @@ kn:
     destroy:
       success: ಖಾತೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ.
   browse:
-    created: ಸೃಷ್ಟಿಸಲ್ಪಟ್ಟ
-    closed: ಮುಚ್ಚಲಾಗಿದೆ
     version: ಆವೃತ್ತಿ
     in_changeset: ಬದಲಾವಣೆಗಳು
     anonymous: ಅನಾಮಧೇಯ
@@ -229,17 +227,6 @@ kn:
     view_history: ಇತಿಹಾಸವನ್ನು ನೋಡಿ
     view_details: ವಿವರಣೆ ನೋಡಿ
     location: 'ಸ್ಥಳ:'
-    changeset:
-      title: 'ಬದಲಾವಣೆಗಳು: %{id}'
-      belongs_to: ಕರ್ತೃ
-      node: ನೋಡ್ಸ್  (%{count})
-      node_paginated: ನೋಡ್ಸ್  (%{x}-%{y} ರ %{count})
-      way: ರೀತಿಯಲ್ಲಿ (%{count})
-      way_paginated: ದಾರಿಗಳು (%{x}-%{y} ರ %{count})
-      relation: ಸಂಬಂಧಗಳು (%{count})
-      relation_paginated: ಸಂಬಂಧಗಳು(%{x}-%{y} of %{count})
-      join_discussion: ‍ಚರ್ಚೆಗೆ ಸೇರಲು ಲಾಗ್ ಇನ್ ಆಗಿರಿ
-      discussion: ಚರ್ಚೆ
     node:
       title_html: 'ನೋಡ್: %{name}'
       history_title_html: 'ನೊಡ್ ನ ಇತಿಹಾಸ: %{name}'
@@ -317,6 +304,20 @@ kn:
       feed:
         title: ಬದಲಾವಣೆಗಳು %{id}
         title_comment: ಬದಲಾವಣೆಗಳು %{id} - %{comment}
+        created: ಸೃಷ್ಟಿಸಲ್ಪಟ್ಟ
+        closed: ಮುಚ್ಚಲಾಗಿದೆ
+        belongs_to: ಕರ್ತೃ
+    show:
+      title: 'ಬದಲಾವಣೆಗಳು: %{id}'
+      discussion: ಚರ್ಚೆ
+      join_discussion: ‍ಚರ್ಚೆಗೆ ಸೇರಲು ಲಾಗ್ ಇನ್ ಆಗಿರಿ
+    paging_nav:
+      nodes: ನೋಡ್ಸ್  (%{count})
+      nodes_paginated: ನೋಡ್ಸ್  (%{x}-%{y} ರ %{count})
+      ways: ರೀತಿಯಲ್ಲಿ (%{count})
+      ways_paginated: ದಾರಿಗಳು (%{x}-%{y} ರ %{count})
+      relations: ಸಂಬಂಧಗಳು (%{count})
+      relations_paginated: ಸಂಬಂಧಗಳು(%{x}-%{y} of %{count})
     timeout:
       sorry: ಕ್ಷಮಿಸಿ, ನೀವು ಕೇಳಿದ ಬದಲಾವಣಾ ಪಟ್ಟಿ ಪಡೆಯಲು ದೀರ್ಘ ಸಮಯ ಬೇಕಾಯಿತು.
   changeset_comments:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 6e1f58c76..54ad2c481 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -323,12 +323,6 @@ ko:
     destroy:
       success: 계정이 삭제되었습니다.
   browse:
-    created: 만들어짐
-    closed: 닫힘
-    created_ago_html: '%{time_ago}에 생성됨'
-    closed_ago_html: '%{time_ago}에 닫힘'
-    created_ago_by_html: '%{time_ago}에 %{user}님이 생성함'
-    closed_ago_by_html: '%{time_ago}에 %{user}님이 닫음'
     deleted_ago_by_html: '%{time_ago}에 %{user}님이 삭제함'
     edited_ago_by_html: '%{time_ago}에 %{user}님이 편집함'
     version: 버전
@@ -344,22 +338,6 @@ ko:
     view_history: 역사 보기
     view_details: 자세한 내용 보기
     location: '위치:'
-    changeset:
-      title: '바뀜집합: %{id}'
-      belongs_to: 저자
-      node: 교점(%{count})
-      node_paginated: 교점(%{count}개 중 %{x}-%{y})
-      way: 길(%{count})
-      way_paginated: 길(%{count}개 중 %{x}-%{y})
-      relation: 관계(%{count})
-      relation_paginated: 관계(%{count}개 중 %{x}-%{y})
-      hidden_comment_by_html: '%{time_ago} %{user}님의 비밀 의견'
-      comment_by_html: '%{time_ago} %{user}님의 의견'
-      changesetxml: 바뀜집합 XML
-      osmchangexml: osmChange XML
-      join_discussion: 토론에 참여하려면 로그인하세요
-      discussion: 토론
-      still_open: 바뀜집합이 아직 열려 있습니다 - 토론은 바뀜집합이 닫히면 시작됩니다.
     node:
       title_html: '교점: %{name}'
       history_title_html: '교점 역사: %{name}'
@@ -465,6 +443,30 @@ ko:
       feed:
         title: 바뀜집합 %{id}
         title_comment: 바뀜집합 %{id} - %{comment}
+        created: 만들어짐
+        closed: 닫힘
+        belongs_to: 저자
+    show:
+      title: '바뀜집합: %{id}'
+      created: '생성 시기: %{when}'
+      created_ago_html: '%{time_ago}에 생성됨'
+      closed_ago_html: '%{time_ago}에 닫힘'
+      created_ago_by_html: '%{time_ago}에 %{user}님이 생성함'
+      closed_ago_by_html: '%{time_ago}에 %{user}님이 닫음'
+      discussion: 토론
+      join_discussion: 토론에 참여하려면 로그인하세요
+      still_open: 바뀜집합이 아직 열려 있습니다 - 토론은 바뀜집합이 닫히면 시작됩니다.
+      comment_by_html: '%{time_ago} %{user}님의 의견'
+      hidden_comment_by_html: '%{time_ago} %{user}님의 비밀 의견'
+      changesetxml: 바뀜집합 XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: 교점(%{count})
+      nodes_paginated: 교점(%{count}개 중 %{x}-%{y})
+      ways: 길(%{count})
+      ways_paginated: 길(%{count}개 중 %{x}-%{y})
+      relations: 관계(%{count})
+      relations_paginated: 관계(%{count}개 중 %{x}-%{y})
     timeout:
       sorry: 죄송합니다, 요청하는 바뀜집합 목록을 가져오는 데 너무 오래 걸렸습니다.
   changeset_comments:
@@ -1714,9 +1716,6 @@ ko:
       email address: '이메일 주소:'
       new password button: 비밀번호 재설정
       help_text: 가입할 때 사용한 이메일 주소를 입력하세요, 비밀번호를 재설정하여 사용할 수 있는 링크를 보내드립니다.
-    create:
-      notice email on way: 비밀번호를 잊었다니, 안타깝습니다 :-( 비밀번호 재설정을 할 수 있도록 이메일이 발송되었습니다.
-      notice email cannot find: 이메일 주소를 찾지 못해 죄송합니다.
     edit:
       title: 비밀번호 재설정
       heading: '%{user}의 비밀번호 재설정'
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 45a4c5007..5eab4650a 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -317,8 +317,6 @@ ku-Latn:
     destroy:
       success: Hesab Hate Jêbirin.
   browse:
-    created: Hate çêkirin
-    closed: Hate girtin
     version: Guherto
     in_changeset: Qeyda Guhartinan
     anonymous: anonîm
@@ -334,23 +332,6 @@ ku-Latn:
     view_history: Dîrokê Bibîne
     view_details: Detayan Bibîne
     location: 'Cih:'
-    changeset:
-      title: Desteya guhertinanː %{id}
-      belongs_to: Xwedî
-      node: Nuqte (%{count})
-      node_paginated: Nuqte (%{x}-%{y} ji %{count} heban)
-      way: Rê (%{count})
-      way_paginated: Rê (%{x}-%{y} ji %{count})
-      relation: Eleqe (%{count})
-      relation_paginated: Eleqe (%{x}-%{y} bi tevahî %{count})
-      hidden_comment_by_html: Şîroveya veşartî ji %{user} %{time_ago}
-      comment_by_html: Şîroveya ji %{user} %{time_ago}
-      changesetxml: Desteya guhartinan a XML
-      osmchangexml: osmChange XML
-      join_discussion: Ji bo ku beșdarî guftûgoyan bibî têkeve
-      discussion: Gotûbêj
-      still_open: Qeyda guhartinan hê jî vekirî ye - wê gotûbêj piştî ku qeyda guhartinan
-        hate girtin vebibe.
     node:
       title_html: 'Girêk: %{name}'
       history_title_html: Dîroka Nuqteyêː %{name}
@@ -460,6 +441,26 @@ ku-Latn:
       feed:
         title: Desteya guhartinan %{id}
         title_comment: Desteya guhartinan %{id} - %{comment}
+        created: Hate çêkirin
+        closed: Hate girtin
+        belongs_to: Xwedî
+    show:
+      title: Desteya guhertinanː %{id}
+      discussion: Gotûbêj
+      join_discussion: Ji bo ku beșdarî guftûgoyan bibî têkeve
+      still_open: Qeyda guhartinan hê jî vekirî ye - wê gotûbêj piştî ku qeyda guhartinan
+        hate girtin vebibe.
+      comment_by_html: Şîroveya ji %{user} %{time_ago}
+      hidden_comment_by_html: Şîroveya veşartî ji %{user} %{time_ago}
+      changesetxml: Desteya guhartinan a XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Nuqte (%{count})
+      nodes_paginated: Nuqte (%{x}-%{y} ji %{count} heban)
+      ways: Rê (%{count})
+      ways_paginated: Rê (%{x}-%{y} ji %{count})
+      relations: Eleqe (%{count})
+      relations_paginated: Eleqe (%{x}-%{y} bi tevahî %{count})
     timeout:
       sorry: Bibore, bidestxistina lîsteya desteyên guhartinan ê ku te xwest demeke
         dirêj girt.
@@ -1793,10 +1794,6 @@ ku-Latn:
       new password button: Şîfreyê nû bike
       help_text: E-peyama ku te pê xwe qeydkiribû binivîse, em ê ji te re lînkek bişînin
         tu yê bi wê lînkê bikaribî şîfreya xwe nû bikî.
-    create:
-      notice email on way: Bibore, te wê wenda kir :-( lê belê e-peyamekî nû di rê
-        de ye. Lewma tu dikarî di nêz de wê nû bikî.
-      notice email cannot find: Bibore, ev adrêsa e-peyamê nehate dîtin.
     edit:
       title: Şîfreyê nû bike
       heading: Şîfreyê nû bike ji bo %{user}
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index f4569fa30..d81af26d2 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -309,8 +309,6 @@ lb:
     destroy:
       success: Benotzerkont geläscht.
   browse:
-    created: Ugeluecht
-    closed: Zou
     version: Versioun
     in_changeset: Set vun Ännerungen
     anonymous: anonym
@@ -326,21 +324,6 @@ lb:
     view_history: Versioune weisen
     view_details: Detailer weisen
     location: 'Plaz:'
-    changeset:
-      title: 'Set vun Ännerungen: %{id}'
-      belongs_to: Auteur
-      node: Kniet (%{count})
-      node_paginated: Kniet (%{x}–%{y} vu(n) %{count})
-      way: Weeër (%{count})
-      way_paginated: Weeër (%{x}–%{y} vu(n) %{count})
-      relation: Relatiounen (%{count})
-      relation_paginated: Relatiounen (%{x}-%{y} vu(n) %{count})
-      changesetxml: XML mam Set vun Ännerungen
-      osmchangexml: osmChange XML
-      join_discussion: Loggt Iech an, fir bei der Diskussioun matzemaachen
-      discussion: Diskussioun
-      still_open: Den Ännerungssaz ass nach op. 'Diskussioun gëtt opgemaach, esoubal
-        wéi den Ännerungssaz zou ass.
     node:
       title_html: 'Knuet: %{name}'
       history_title_html: 'Versioune vum Knuet: %{name}'
@@ -449,6 +432,24 @@ lb:
       feed:
         title: 'Set vun Ännerungen: %{id}'
         title_comment: Set vun Ännerungen %{id} - %{comment}
+        created: Ugeluecht
+        closed: Zou
+        belongs_to: Auteur
+    show:
+      title: 'Set vun Ännerungen: %{id}'
+      discussion: Diskussioun
+      join_discussion: Loggt Iech an, fir bei der Diskussioun matzemaachen
+      still_open: Den Ännerungssaz ass nach op. 'Diskussioun gëtt opgemaach, esoubal
+        wéi den Ännerungssaz zou ass.
+      changesetxml: XML mam Set vun Ännerungen
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Kniet (%{count})
+      nodes_paginated: Kniet (%{x}–%{y} vu(n) %{count})
+      ways: Weeër (%{count})
+      ways_paginated: Weeër (%{x}–%{y} vu(n) %{count})
+      relations: Relatiounen (%{count})
+      relations_paginated: Relatiounen (%{x}-%{y} vu(n) %{count})
     timeout:
       sorry: Et leider ze laang gedauert, déi ugefuerdert Ännerungssätz ofzeruffen.
   changeset_comments:
@@ -1764,10 +1765,6 @@ lb:
       help_text: Wannechgelift gëff deng E-Mail-Adress an, mat däers du dech ugemellt
         has. Mir wäerten dir dann e Link schécken, mat dems du däi Passwuert zerécksetze
         kanns.
-    create:
-      notice email on way: Eng E-Mail mat Hiweiser fir d'Zerécksetze vum Passwuert
-        gouf un dech versent.
-      notice email cannot find: Déi E-Mail-Adress konnt net fonnt ginn, pardon.
     edit:
       title: Passwuert zrécksetzen
       heading: Passwuert fir %{user} zrécksetzen
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 7c569cd16..e9e07104a 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -366,12 +366,6 @@ lt:
     destroy:
       success: Paskyra ištrinta.
   browse:
-    created: Sukurtas
-    closed: Uždarytas
-    created_ago_html: Sukurta %{time_ago}
-    closed_ago_html: Uždaryta %{time_ago}
-    created_ago_by_html: Sukurta %{user} %{time_ago}
-    closed_ago_by_html: Uždaryta %{user} %{time_ago}
     deleted_ago_by_html: IÅ¡trinta %{user} %{time_ago}
     edited_ago_by_html: Redaguota %{user} %{time_ago}
     version: Versija
@@ -393,23 +387,6 @@ lt:
     view_history: Žiūrėti istoriją
     view_details: Žiūrėti detales
     location: 'Vieta:'
-    changeset:
-      title: 'Pakeitimas: %{id}'
-      belongs_to: Autorius
-      node: Taškų (%{count})
-      node_paginated: Taškų (%{x}-%{y} iš %{count})
-      way: Keliai (%{count})
-      way_paginated: Keliai (%{x}-%{y} iš %{count})
-      relation: Ryšiai (%{count})
-      relation_paginated: Ryšiai (%{x}-%{y} iš %{count})
-      hidden_comment_by_html: Paslėptas komentaras nuo %{user} %{time_ago}
-      comment_by_html: Komentaras nuo %{user} %{time_ago}
-      changesetxml: Pakeitimo XML
-      osmchangexml: osmChange XML
-      join_discussion: Prisijunkite norėdami dalyvauti aptarime
-      discussion: Diskusija
-      still_open: Pakeitimas vis dar atidarytas - diskusija prasidės tik uždarius
-        pakeitimą.
     node:
       title_html: 'Taškas: %{name}'
       history_title_html: 'Taško istorija: %{name}'
@@ -525,6 +502,30 @@ lt:
       feed:
         title: Pakeitimas %{id}
         title_comment: Pakeitimas %{id} - %{comment}
+        created: Sukurtas
+        closed: Uždarytas
+        belongs_to: Autorius
+    show:
+      title: 'Pakeitimas: %{id}'
+      created_ago_html: Sukurta %{time_ago}
+      closed_ago_html: Uždaryta %{time_ago}
+      created_ago_by_html: Sukurta %{user} %{time_ago}
+      closed_ago_by_html: Uždaryta %{user} %{time_ago}
+      discussion: Diskusija
+      join_discussion: Prisijunkite norėdami dalyvauti aptarime
+      still_open: Pakeitimas vis dar atidarytas - diskusija prasidės tik uždarius
+        pakeitimą.
+      comment_by_html: Komentaras nuo %{user} %{time_ago}
+      hidden_comment_by_html: Paslėptas komentaras nuo %{user} %{time_ago}
+      changesetxml: Pakeitimo XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Taškų (%{count})
+      nodes_paginated: Taškų (%{x}-%{y} iš %{count})
+      ways: Keliai (%{count})
+      ways_paginated: Keliai (%{x}-%{y} iš %{count})
+      relations: Ryšiai (%{count})
+      relations_paginated: Ryšiai (%{x}-%{y} iš %{count})
     timeout:
       sorry: Atsiprašome, bet jūsų prašytų pakeitimų ištraukimas užtruko per ilgai.
   changeset_comments:
@@ -1832,10 +1833,6 @@ lt:
       help_text: Įveskite elektroninio pašto adresą, kurį naudojote užsiregistruodami.
         Mes atsiųsime nuorodą į elektroninį paštą, kurią galėsite naudoti norėdami
         iš naujo nustatyti slaptažodį.
-    create:
-      notice email on way: Apgailestaujame, kad praradote slaptažodį :-( bet elektroninis
-        laiškas jau išsiųstas, tad greitai slaptažodį atstatysite.
-      notice email cannot find: Gaila, bet toks e-pašto adresas nerastas.
     edit:
       title: Iš naujo nustatyti slaptažodį
       heading: Iš naujo nustatyti naudotojo %{user} slaptažodį
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 7dfbe95f7..7731a84f5 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -250,10 +250,6 @@ lv:
     destroy:
       success: Konts dzēsts.
   browse:
-    created: Izveidots
-    closed: Aizvērts
-    created_ago_html: Izveidots %{time_ago}
-    closed_ago_html: Slēgts %{time_ago}
     version: Versija
     in_changeset: Izmaiņu kopa
     anonymous: anonīms
@@ -267,19 +263,6 @@ lv:
     view_history: Skatīt vēsturi
     view_details: Skatīt detaļas
     location: 'Atrašanās vieta:'
-    changeset:
-      title: 'Izmaiņu kopa: %{id}'
-      belongs_to: Autors
-      node: Punkti (%{count})
-      node_paginated: Punkti (%{x}-%{y} no %{count})
-      way: Ceļi (%{count})
-      way_paginated: Ceļi (%{x}-%{y} no %{count})
-      relation: Relācijas (%{count})
-      relation_paginated: Relācijas (%{x}-%{y} no %{count})
-      changesetxml: Izmaiņu kopas XML
-      osmchangexml: osmChange XML
-      join_discussion: Ieejiet sistēmā lai pievienotos diskusijai
-      discussion: Diskusija
     node:
       title_html: 'Punkts: %{name}'
       history_title_html: 'Punkta vēsture: %{name}'
@@ -375,6 +358,24 @@ lv:
       feed:
         title: Izmaiņu kopa %{id}
         title_comment: Izmaiņu kopa %{id} - %{comment}
+        created: Izveidots
+        closed: Aizvērts
+        belongs_to: Autors
+    show:
+      title: 'Izmaiņu kopa: %{id}'
+      created_ago_html: Izveidots %{time_ago}
+      closed_ago_html: Slēgts %{time_ago}
+      discussion: Diskusija
+      join_discussion: Ieejiet sistēmā lai pievienotos diskusijai
+      changesetxml: Izmaiņu kopas XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Punkti (%{count})
+      nodes_paginated: Punkti (%{x}-%{y} no %{count})
+      ways: Ceļi (%{count})
+      ways_paginated: Ceļi (%{x}-%{y} no %{count})
+      relations: Relācijas (%{count})
+      relations_paginated: Relācijas (%{x}-%{y} no %{count})
     timeout:
       sorry: Atvainojiet, jūsu pieprasīto izmaiņu kopu ielāde prasīja pārāk daudz
         laika.
@@ -1413,10 +1414,6 @@ lv:
       new password button: Atiestatīt paroli
       help_text: Ievadiet e-pasta adresi, kuru izmantojāt, lai reģistrētos, mēs Jums
         nosūtīsim saiti uz to, lai Jūs varētu atjaunot savu paroli.
-    create:
-      notice email on way: Atvaino, tu to pazaudēji :-( , bet e-pasts jau ir ceļā,
-        lai tu viņu drīz varētu atjaunot.
-      notice email cannot find: Atvaino, nevaru atrast Å¡o epasta adresi.
     edit:
       title: Atiestatīt paroli
       heading: Atcelt %{user} paroli
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 758e16149..c189e2297 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -320,15 +320,10 @@ mk:
     destroy:
       success: Сметката е избришана.
   browse:
-    created: Создадено
-    closed: Затворено
-    created_ago_html: Создадено %{time_ago}
-    closed_ago_html: Затворено %{time_ago}
-    created_ago_by_html: Создадено %{time_ago} од %{user}
-    closed_ago_by_html: Затворено %{time_ago} од %{user}
     deleted_ago_by_html: Избришано %{time_ago} од %{user}
     edited_ago_by_html: Изменето %{time_ago} од %{user}
     version: Верзија
+    redacted_version: Исправена верзија
     in_changeset: Измени
     anonymous: анонимец
     no_comment: (нема коментари)
@@ -341,25 +336,11 @@ mk:
       other: '%{count} патишта'
     download_xml: Преземи XML
     view_history: Погл. историја
+    view_unredacted_history: Погл. неизменета историја
     view_details: Погл. подробности
+    view_redacted_data: Погл. исправена верзија
+    view_redaction_message: Погл. порака за измената
     location: 'Местоположба:'
-    changeset:
-      title: 'Измена: %{id}'
-      belongs_to: Автор
-      node: Јазли (%{count})
-      node_paginated: Јазли (%{x}-%{y} од вкупно %{count})
-      way: Патишта (%{count})
-      way_paginated: Патишта (%{x}-%{y} од вкупно %{count})
-      relation: Односи (%{count})
-      relation_paginated: Односи (%{x}-%{y} од вкупно %{count})
-      hidden_comment_by_html: Скриен коментар од %{user} %{time_ago}
-      comment_by_html: Коментар од %{user} %{time_ago}
-      changesetxml: XML за измените
-      osmchangexml: osmChange XML
-      join_discussion: Најавете се за да се приклучите во разговорот
-      discussion: Разговор
-      still_open: Измените сè уште се отворени — разговорот ќе се отвори штом ќе се
-        затворат измените.
     node:
       title_html: 'Јазол: %{name}'
       history_title_html: 'Историја на јазолот: %{name}'
@@ -476,6 +457,9 @@ mk:
       feed:
         title: Измени %{id}
         title_comment: Измени %{id} - %{comment}
+        created: Создадено
+        closed: Затворено
+        belongs_to: Автор
     subscribe:
       heading: Да ве претплатам на слединов разговор за измени?
       button: Претплати се на разговорот
@@ -490,6 +474,29 @@ mk:
       heading: 'Нема ставка со назнаката: %{id}'
       body: Жалиме, но не постојат измени со назнаката %{id}. Проверете да не сте
         згрешиле во пишувањето, или пак да не сте стиснале на погрешна врска.
+    show:
+      title: 'Измена: %{id}'
+      created: 'Создадено: %{when}'
+      closed: 'Затворено: %{when}'
+      created_ago_html: Создадено %{time_ago}
+      closed_ago_html: Затворено %{time_ago}
+      created_ago_by_html: Создадено %{time_ago} од %{user}
+      closed_ago_by_html: Затворено %{time_ago} од %{user}
+      discussion: Разговор
+      join_discussion: Најавете се за да се приклучите во разговорот
+      still_open: Измените сè уште се отворени — разговорот ќе се отвори штом ќе се
+        затворат измените.
+      comment_by_html: Коментар од %{user} %{time_ago}
+      hidden_comment_by_html: Скриен коментар од %{user} %{time_ago}
+      changesetxml: XML за измените
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Јазли (%{count})
+      nodes_paginated: Јазли (%{x}-%{y} од вкупно %{count})
+      ways: Патишта (%{count})
+      ways_paginated: Патишта (%{x}-%{y} од вкупно %{count})
+      relations: Односи (%{count})
+      relations_paginated: Односи (%{x}-%{y} од вкупно %{count})
     timeout:
       sorry: За жал, на списокот на промени што го побаравте му требаше предолго за
         да се добие.
@@ -1863,9 +1870,8 @@ mk:
       help_text: Внесете ја е-поштенската адреса со која се зачленивте, и ќе ви пратиме
         врска каде ќе наведете нова лозинка.
     create:
-      notice email on way: Жалиме, ова истече :-( но ви пративме нова порака на е-пошта,
-        па наскоро повторно ќе можете да ја смените.
-      notice email cannot find: Жалам, не можев да ја пронајдам таа адреса
+      send_paranoid_instructions: Ако вашата е-пошта е веќе заведена во нашата база,
+        за неколку минути на неа ќе добиете напатствија за лозинката.
     edit:
       title: Смени лозинка
       heading: Смени лозинка за %{user}
diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 0588febb3..8fbfe9017 100644
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -93,8 +93,6 @@ mo:
     go_public:
       heading: 'Редактаря публикэ:'
   browse:
-    created: Креат
-    closed: Ынкис
     version: Версиуне
     anonymous: аноним
     no_comment: (фэрэ коментариу)
@@ -103,16 +101,6 @@ mo:
     view_history: Екзаминаря историкулуй
     view_details: Май деталият
     location: 'Ситуаре:'
-    changeset:
-      belongs_to: Аутор
-      node: Пункте (%{count})
-      node_paginated: Пункте (%{x}-%{y} дин %{count})
-      way: Кэй (%{count})
-      way_paginated: Кэй (%{x}-%{y} дин %{count})
-      relation: Релаций (%{count})
-      relation_paginated: Релаций (%{x}-%{y} дин %{count})
-      join_discussion: Вэ ругэм сэ ынтраць ын конт пентру а вэ алэтура дискуцией
-      discussion: Дискуцие
     node:
       title_html: 'Пункт: %{name}'
     way:
@@ -156,6 +144,21 @@ mo:
     changesets:
       user: Утилизатор
       comment: Коментариу
+    index:
+      feed:
+        created: Креат
+        closed: Ынкис
+        belongs_to: Аутор
+    show:
+      discussion: Дискуцие
+      join_discussion: Вэ ругэм сэ ынтраць ын конт пентру а вэ алэтура дискуцией
+    paging_nav:
+      nodes: Пункте (%{count})
+      nodes_paginated: Пункте (%{x}-%{y} дин %{count})
+      ways: Кэй (%{count})
+      ways_paginated: Кэй (%{x}-%{y} дин %{count})
+      relations: Релаций (%{count})
+      relations_paginated: Релаций (%{x}-%{y} дин %{count})
   dashboards:
     show:
       my friends: Приетений мей
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index f5d0fcc0e..b7ef14752 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -194,8 +194,6 @@ mr:
         link text: हे काय आहे?
       save changes button: बदल जतन करा
   browse:
-    created: बनविले
-    closed: बंद केले
     version: आवृत्ती
     in_changeset: बदलसंच
     anonymous: अनामिक
@@ -211,18 +209,6 @@ mr:
     view_history: इतिहास पहा
     view_details: तपशील पहा
     location: 'ठिकाण:'
-    changeset:
-      title: 'बदलसंच: %{id}'
-      belongs_to: लेखक
-      node: गाठी (%{count})
-      node_paginated: गाठी (%{x}-%{y}, %{count} पैकी)
-      way: मार्ग (%{count})
-      way_paginated: मार्ग (%{x}-%{y}, %{count} पैकी)
-      relation: संबंध (%{count})
-      relation_paginated: संबंध (%{x}-%{y}, %{count} पैकी)
-      changesetxml: बदलसंच XML
-      osmchangexml: osmChange XML
-      join_discussion: चर्चेत सहभागी होण्यासाठी सनोंद प्रवेश करा
     node:
       title_html: 'गाठ: %{name}'
       history_title_html: 'गाठीचा इतिहास: %{name}'
@@ -311,6 +297,21 @@ mr:
       feed:
         title: बदलसंच %{id}
         title_comment: बदलसंच %{id} - %{comment}
+        created: बनविले
+        closed: बंद केले
+        belongs_to: लेखक
+    show:
+      title: 'बदलसंच: %{id}'
+      join_discussion: चर्चेत सहभागी होण्यासाठी सनोंद प्रवेश करा
+      changesetxml: बदलसंच XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: गाठी (%{count})
+      nodes_paginated: गाठी (%{x}-%{y}, %{count} पैकी)
+      ways: मार्ग (%{count})
+      ways_paginated: मार्ग (%{x}-%{y}, %{count} पैकी)
+      relations: संबंध (%{count})
+      relations_paginated: संबंध (%{x}-%{y}, %{count} पैकी)
     timeout:
       sorry: क्षमा असावी, आपण मागितलेली बदलसंचाची यादी मिळविण्यास फार वेळ लागला.
   changeset_comments:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 7f6054720..a512e9ba6 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -270,8 +270,6 @@ ms:
     destroy:
       success: Akaun Terhapus.
   browse:
-    created: Tercipta
-    closed: Tertutup
     version: Versi
     in_changeset: Set Ubah
     anonymous: awanama
@@ -281,19 +279,6 @@ ms:
     view_history: Lihat Sejarah
     view_details: Lihat Butiran
     location: 'Lokasi:'
-    changeset:
-      title: 'Set Ubah: %{id}'
-      belongs_to: Pengarang
-      node: Nod (%{count})
-      node_paginated: Nod (%{x}-%{y} / %{count})
-      way: Jalan (%{count})
-      way_paginated: Jalan (%{x}-%{y} / %{count})
-      relation: Hubungan (%{count})
-      relation_paginated: Hubungan (%{x}-%{y} / %{count})
-      changesetxml: XML Set Ubah
-      osmchangexml: XML osmChange
-      join_discussion: Daftar masuk untuk perbincangan
-      discussion: Perbincangan
     node:
       title_html: 'Nod: %{name}'
       history_title_html: 'Sejarah Nod: %{name}'
@@ -392,6 +377,22 @@ ms:
       feed:
         title: Set Ubah %{id}
         title_comment: Set Ubah %{id} - %{comment}
+        created: Tercipta
+        closed: Tertutup
+        belongs_to: Pengarang
+    show:
+      title: 'Set Ubah: %{id}'
+      discussion: Perbincangan
+      join_discussion: Daftar masuk untuk perbincangan
+      changesetxml: XML Set Ubah
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Nod (%{count})
+      nodes_paginated: Nod (%{x}-%{y} / %{count})
+      ways: Jalan (%{count})
+      ways_paginated: Jalan (%{x}-%{y} / %{count})
+      relations: Hubungan (%{count})
+      relations_paginated: Hubungan (%{x}-%{y} / %{count})
     timeout:
       sorry: Maaf, senarai set perubahan yang anda minta mengambil masa yang terlalu
         lama untuk diambil.
@@ -1399,11 +1400,6 @@ ms:
       new password button: Set semula kata laluan
       help_text: Isikan alamat e-mel yang anda gunakan untuk mendaftar. Kami akan
         menge-melkan pautan untuk anda mengeset semula kata laluan anda.
-    create:
-      notice email on way: Kesiannya anda sudah terlupa kata laluan :-( tetapi kami
-        akan menghantar satu pesanan e-mel untuk anda mengesetnya semula tidak lama
-        lagi.
-      notice email cannot find: Maaf, alamat e-mel itu tidak dapat dijumpai.
     edit:
       title: Set semula kata laluan
       heading: Set Semula Kata Laluan untuk %{user}
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 3cd4ae52b..1af177af9 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -136,18 +136,12 @@ my:
       current email address: လက်ရှိ အီးမေးလ်လိပ်စာ
       save changes button: ပြောင်းလဲမှုများကို သိမ်းရန်
   browse:
-    created: ဖန်တီးလိုက်သည်
-    closed: ပိတ်လိုက်သည်
     version: ဗားရှင်း
     anonymous: အမည်မသိ
     no_comment: (မှတ်ချက် မရှိ)
     view_history: ရာဇဝင်ကြည့်ရန်
     view_details: အသေးစိပ် ကြည့်ရန်
     location: 'တည်နေရာ:'
-    changeset:
-      belongs_to: စာရေးသူ
-      join_discussion: ဆွေးနွေးရန် လော့အင်ဝင်ပါ
-      discussion: ဆွေးနွေးချက်
     relation:
       members: အဖွဲ့ဝင်များ
     not_found:
@@ -178,6 +172,13 @@ my:
       area: ဧရိယာ
     index:
       load_more: ပိုမိုခေါ်ယူရန်
+      feed:
+        created: ဖန်တီးလိုက်သည်
+        closed: ပိတ်လိုက်သည်
+        belongs_to: စာရေးသူ
+    show:
+      discussion: ဆွေးနွေးချက်
+      join_discussion: ဆွေးနွေးရန် လော့အင်ဝင်ပါ
   changeset_comments:
     comment:
       commented_at_by_html: '%{user} က %{when} အကြာက မွမ်းမံခဲ့သည်'
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 2ddd305c0..3021bf65d 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -317,8 +317,6 @@ nb:
     destroy:
       success: Kontoen er slettet.
   browse:
-    created: Opprettet
-    closed: Lukket
     version: Versjon
     in_changeset: Endringssett
     anonymous: anonym
@@ -334,21 +332,6 @@ nb:
     view_history: Vis historikk
     view_details: Vis detaljer
     location: 'Posisjon:'
-    changeset:
-      title: 'Endringssett: %{id}'
-      belongs_to: Forfatter
-      node: Noder (%{count})
-      node_paginated: Noder (%{x}-%{y} av %{count})
-      way: Strekninger (%{count})
-      way_paginated: Strekninger (%{x}-%{y} av %{count})
-      relation: Forbindelser (%{count})
-      relation_paginated: Forbindelser (%{x}-%{y} av %{count})
-      changesetxml: XML for endringssett
-      osmchangexml: osmChange-XML
-      join_discussion: Logg inn for å delta i diskusjonen
-      discussion: Diskusjon
-      still_open: Endringssettet er fortsatt åpent – diskusjonen åpner når endringssettet
-        er lukket.
     node:
       title_html: 'Node: %{name}'
       history_title_html: 'Node-historikk: %{name}'
@@ -452,8 +435,26 @@ nb:
       feed:
         title: Endringssett %{id}
         title_comment: 'Endringsforløp: %{id} - %{comment}'
+        created: Opprettet
+        closed: Lukket
+        belongs_to: Forfatter
     no_such_entry:
       heading: 'Ingen oppføring med ID-en: %{id}'
+    show:
+      title: 'Endringssett: %{id}'
+      discussion: Diskusjon
+      join_discussion: Logg inn for å delta i diskusjonen
+      still_open: Endringssettet er fortsatt åpent – diskusjonen åpner når endringssettet
+        er lukket.
+      changesetxml: XML for endringssett
+      osmchangexml: osmChange-XML
+    paging_nav:
+      nodes: Noder (%{count})
+      nodes_paginated: Noder (%{x}-%{y} av %{count})
+      ways: Strekninger (%{count})
+      ways_paginated: Strekninger (%{x}-%{y} av %{count})
+      relations: Forbindelser (%{count})
+      relations_paginated: Forbindelser (%{x}-%{y} av %{count})
     timeout:
       sorry: Listen over endringssett du ba om tok for lang tid å hente.
   changeset_comments:
@@ -1608,10 +1609,6 @@ nb:
       new password button: Nullstill passord
       help_text: Skriv inn e-postadressen du brukte for å registrere deg, og vi vil
         sende deg ei lenke som du kan bruke til å nullstille passordet ditt.
-    create:
-      notice email on way: Synd at du mistet det, men en e-post er på vei slik at
-        du kan tilbakestille det snart.
-      notice email cannot find: Klarte ikke finne den e-postadressen. Beklager.
     edit:
       title: Nullstill passord
       heading: Nullstill passord for %{user}
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 79f9b8674..5f7004ab2 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -150,8 +150,6 @@ ne:
         Check your email for a note to confirm your new email address.
       success: प्रयोगकर्ताको जानकारीहरू सफलतापूर्वक अध्यावधिक गरियो।
   browse:
-    created: सृजना गरिएको
-    closed: समापन भएको
     version: संस्करण
     in_changeset: परिवर्नहरू
     anonymous: अज्ञात
@@ -161,19 +159,6 @@ ne:
     view_history: इतिहास हेर्नुहोस्
     view_details: बिस्तृतमा हेर्नुहोस्
     location: 'स्थान:'
-    changeset:
-      title: 'परिवर्तनहरू: %{id}'
-      belongs_to: रचयिता
-      node: अंशहरू (%{count})
-      node_paginated: अंशहरू (जम्मा %{count} मध्येबाट %{x}-%{y})
-      way: बाटोहरू (%{count})
-      way_paginated: बाटोहरू (जम्मा %{count} मध्येबाट %{x}-%{y})
-      relation: सम्बन्धहरू (%{count})
-      relation_paginated: सम्बन्धहरू (जम्मा %{count} मध्येबाट %{x}-%{y})
-      changesetxml: चेन्जसेट XML
-      osmchangexml: osmChange XML
-      join_discussion: छलफलमा भाग लिन लग इन गर्नुहोस्
-      discussion: छलफल
     node:
       title_html: 'अंश: %{name}'
       history_title_html: 'अंशको इतिहास: %{name}'
@@ -271,6 +256,22 @@ ne:
       feed:
         title: 'परिवर्तनहरू: %{id}'
         title_comment: परिवर्तनहरू %{id} - %{comment}
+        created: सृजना गरिएको
+        closed: समापन भएको
+        belongs_to: रचयिता
+    show:
+      title: 'परिवर्तनहरू: %{id}'
+      discussion: छलफल
+      join_discussion: छलफलमा भाग लिन लग इन गर्नुहोस्
+      changesetxml: चेन्जसेट XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: अंशहरू (%{count})
+      nodes_paginated: अंशहरू (जम्मा %{count} मध्येबाट %{x}-%{y})
+      ways: बाटोहरू (%{count})
+      ways_paginated: बाटोहरू (जम्मा %{count} मध्येबाट %{x}-%{y})
+      relations: सम्बन्धहरू (%{count})
+      relations_paginated: सम्बन्धहरू (जम्मा %{count} मध्येबाट %{x}-%{y})
     timeout:
       sorry: माफ गर्नुहोला, तपाईंले खोज्नुभएको परिवर्तनहरूको सूची प्राप्त गर्न निकै
         समय लाग्यो ।
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index fdfb6a8ef..e9ac68cce 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -379,12 +379,6 @@ nl:
     destroy:
       success: Account verwijderd.
   browse:
-    created: Aangemaakt
-    closed: Gesloten
-    created_ago_html: Gemaakt %{time_ago}
-    closed_ago_html: Gesloten %{time_ago}
-    created_ago_by_html: '%{time_ago} gemaakt door %{user}'
-    closed_ago_by_html: '%{time_ago} gesloten door %{user}'
     deleted_ago_by_html: '%{time_ago} verwijderd door %{user}'
     edited_ago_by_html: '%{time_ago} bewerkt door %{user}'
     version: Versie
@@ -402,23 +396,6 @@ nl:
     view_history: Geschiedenis weergeven
     view_details: Details weergeven
     location: 'Locatie:'
-    changeset:
-      title: 'Wijzigingenset: %{id}'
-      belongs_to: Auteur
-      node: Knooppunten (%{count})
-      node_paginated: Knooppunten (%{x}-%{y} van %{count})
-      way: Wegen (%{count})
-      way_paginated: Wegen (%{x}-%{y} van %{count})
-      relation: Relaties (%{count})
-      relation_paginated: Relaties (%{x}-%{y} van %{count})
-      hidden_comment_by_html: Verborgen reactie van %{user}, %{time_ago}
-      comment_by_html: Reactie van %{user}, %{time_ago}
-      changesetxml: Wijzigingenset-XML
-      osmchangexml: osmChange-XML
-      join_discussion: Meld u aan om mee te praten
-      discussion: Overleg
-      still_open: Wijzigingenset is nog open – overleg gaat open zodra de wijzigingenset
-        wordt afgesloten.
     node:
       title_html: 'Knooppunt: %{name}'
       history_title_html: 'Knooppuntgeschiedenis: %{name}'
@@ -538,6 +515,30 @@ nl:
       feed:
         title: Wijzigingenset %{id}
         title_comment: Wijzigingenset %{id} - %{comment}
+        created: Aangemaakt
+        closed: Gesloten
+        belongs_to: Auteur
+    show:
+      title: 'Wijzigingenset: %{id}'
+      created_ago_html: Gemaakt %{time_ago}
+      closed_ago_html: Gesloten %{time_ago}
+      created_ago_by_html: '%{time_ago} gemaakt door %{user}'
+      closed_ago_by_html: '%{time_ago} gesloten door %{user}'
+      discussion: Overleg
+      join_discussion: Meld u aan om mee te praten
+      still_open: Wijzigingenset is nog open – overleg gaat open zodra de wijzigingenset
+        wordt afgesloten.
+      comment_by_html: Reactie van %{user}, %{time_ago}
+      hidden_comment_by_html: Verborgen reactie van %{user}, %{time_ago}
+      changesetxml: Wijzigingenset-XML
+      osmchangexml: osmChange-XML
+    paging_nav:
+      nodes: Knooppunten (%{count})
+      nodes_paginated: Knooppunten (%{x}-%{y} van %{count})
+      ways: Wegen (%{count})
+      ways_paginated: Wegen (%{x}-%{y} van %{count})
+      relations: Relaties (%{count})
+      relations_paginated: Relaties (%{x}-%{y} van %{count})
     timeout:
       sorry: Het oproepen van de lijst met wijzigingensets die u hebt opgevraagd duurde
         te lang.
@@ -1901,10 +1902,6 @@ nl:
       help_text: Voer het e-mailadres in dat u hebt opgegeven bij uw registratie.
         We sturen u dan een webkoppeling die u kunt gebruiken om uw wachtwoord opnieuw
         in te stellen.
-    create:
-      notice email on way: Spijtig om te horen dat u het vergeten bent, maar er is
-        een e-mail onderweg zodat u uw wachtwoord opnieuw kunt instellen.
-      notice email cannot find: Dat e-mailadres kon helaas niet worden gevonden.
     edit:
       title: Wachtwoord opnieuw instellen
       heading: Wachtwoord voor %{user} opnieuw instellen
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index ef6732bec..f620fd5e0 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -296,12 +296,6 @@ nn:
     destroy:
       success: Kontoen er sletta.
   browse:
-    created: Oppretta
-    closed: Attlaten
-    created_ago_html: Oppretta %{time_ago}
-    closed_ago_html: Lukka %{time_ago}
-    created_ago_by_html: Oppretta %{time_ago} av %{user}
-    closed_ago_by_html: Lukka %{time_ago} av %{user}
     deleted_ago_by_html: Sletta %{time_ago} av %{user}
     edited_ago_by_html: Redigert %{time_ago} av %{user}
     version: 'Versjon:'
@@ -319,23 +313,6 @@ nn:
     view_history: Vis historikk
     view_details: Vis detaljar
     location: 'Plassering:'
-    changeset:
-      title: Endringssett %{id}
-      belongs_to: Skapar
-      node: Punkt (%{count})
-      node_paginated: Punkt (%{x}-%{y} av %{count})
-      way: Strekningar (%{count})
-      way_paginated: Strekningar (%{x}-%{y} av %{count})
-      relation: Samhøve (%{count})
-      relation_paginated: Samhøve (%{x}–%{y} av %{count})
-      hidden_comment_by_html: Skylt kommentar frå %{user} %{time_ago}
-      comment_by_html: Kommentar frå %{user} %{time_ago}
-      changesetxml: XML for endringssett
-      osmchangexml: osmChange XML
-      join_discussion: Logg inn for å vere med i diskusjonen
-      discussion: Ordskifte
-      still_open: Endringssettet er framleis ope – det vert opna for diskusjon når
-        endringssettet vert lukka.
     node:
       title_html: 'Punkt: %{name}'
       history_title_html: 'Punkthistorikk: %{name}'
@@ -442,6 +419,30 @@ nn:
       feed:
         title: Endringssett %{id}
         title_comment: 'Endringssett: %{id} - %{comment}'
+        created: Oppretta
+        closed: Attlaten
+        belongs_to: Skapar
+    show:
+      title: Endringssett %{id}
+      created_ago_html: Oppretta %{time_ago}
+      closed_ago_html: Lukka %{time_ago}
+      created_ago_by_html: Oppretta %{time_ago} av %{user}
+      closed_ago_by_html: Lukka %{time_ago} av %{user}
+      discussion: Ordskifte
+      join_discussion: Logg inn for å vere med i diskusjonen
+      still_open: Endringssettet er framleis ope – det vert opna for diskusjon når
+        endringssettet vert lukka.
+      comment_by_html: Kommentar frå %{user} %{time_ago}
+      hidden_comment_by_html: Skylt kommentar frå %{user} %{time_ago}
+      changesetxml: XML for endringssett
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Punkt (%{count})
+      nodes_paginated: Punkt (%{x}-%{y} av %{count})
+      ways: Strekningar (%{count})
+      ways_paginated: Strekningar (%{x}-%{y} av %{count})
+      relations: Samhøve (%{count})
+      relations_paginated: Samhøve (%{x}–%{y} av %{count})
     timeout:
       sorry: Lista over endringssett du ba om tok for lang tid å hente.
   changeset_comments:
@@ -1726,10 +1727,6 @@ nn:
       new password button: Nullstill passord
       help_text: Skriv inn e-postadressa du brukte for å registrere deg, og me vil
         sende deg ei lenkje som du kan bruke til å nullstille passordet ditt.
-    create:
-      notice email on way: Synd at du mista det, men ein e-post er på veg slik at
-        du kan tilbakestille det snart.
-      notice email cannot find: Klarte ikkje finne den e-postadressa. Beklagar.
     edit:
       title: Nullstill passord
       heading: Nullstill passord for %{user}
diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index e9ed1945f..b4a863563 100644
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -278,12 +278,6 @@ nqo:
     destroy:
       success: ߖߊ߬ߕߋ߬ߘߊ ߓߘߊ߫ ߖߏ߰ߛߌ߫.
   browse:
-    created: ߛߌ߲ߘߌߣߍ߲
-    closed: ߘߊߕߎ߲߯ߣߍ߲
-    created_ago_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago}
-    closed_ago_html: ߘߊߕߎ߯ߣߍ߲߫ ߦߋ߫ %{time_ago}
-    created_ago_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} %{user} ߓߟߏ߫
-    closed_ago_by_html: ߘߊߕߎ߲߯ߣߍ߲߫ ߦߋ߫ %{time_ago} ߟߊ߫ %{user} ߓߟߏ߫
     deleted_ago_by_html: ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
     edited_ago_by_html: ߡߊߙߟߍ߬ߡߊ߲߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
     version: ߦߌߟߡߊ
@@ -295,23 +289,6 @@ nqo:
     view_history: ߘߐ߬ߝߐ ߘߐߜߍ߫
     view_details: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
     location: ߘߌ߲߬ߞߌߙߊ
-    changeset:
-      title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}'
-      belongs_to: ߛߓߍߦߟߊ
-      node: ߥߎߙߋ߲ߛߋ߲ %{count}
-      node_paginated: ߥߎߙߋ߲ߛߋ߲ %{x}-%{y} ߦߋ߫ %{count}
-      way: ߛߌߟߊ (%{count})
-      way_paginated: ߛߌߟߊ (%{x}-%{y} ߦߋ߫ %{count})
-      relation: ߕߍߓߊ߯ߦߊ (%{count})
-      relation_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count})
-      hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫
-      comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬
-      changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
-      osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
-      join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
-      discussion: ߘߊߘߐߖߊߥߏ
-      still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ
-        ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫.
     node:
       title_html: 'ߥߎߙߋ߲ߛߋ߲: %{name}'
       history_title_html: 'ߥߎߙߋ߲ߛߋ߲ ߘߐ߬ߝߐ: %{name}'
@@ -409,6 +386,30 @@ nqo:
       feed:
         title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id}
         title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}
+        created: ߛߌ߲ߘߌߣߍ߲
+        closed: ߘߊߕߎ߲߯ߣߍ߲
+        belongs_to: ߛߓߍߦߟߊ
+    show:
+      title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}'
+      created_ago_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago}
+      closed_ago_html: ߘߊߕߎ߯ߣߍ߲߫ ߦߋ߫ %{time_ago}
+      created_ago_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} %{user} ߓߟߏ߫
+      closed_ago_by_html: ߘߊߕߎ߲߯ߣߍ߲߫ ߦߋ߫ %{time_ago} ߟߊ߫ %{user} ߓߟߏ߫
+      discussion: ߘߊߘߐߖߊߥߏ
+      join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
+      still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ
+        ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫.
+      comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬
+      hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫
+      changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
+      osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
+    paging_nav:
+      nodes: ߥߎߙߋ߲ߛߋ߲ %{count}
+      nodes_paginated: ߥߎߙߋ߲ߛߋ߲ %{x}-%{y} ߦߋ߫ %{count}
+      ways: ߛߌߟߊ (%{count})
+      ways_paginated: ߛߌߟߊ (%{x}-%{y} ߦߋ߫ %{count})
+      relations: ߕߍߓߊ߯ߦߊ (%{count})
+      relations_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count})
     timeout:
       sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ ߘߐ߫ ߌ ߓߟߏ߫߸
         ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߕߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
@@ -1296,10 +1297,6 @@ nqo:
       new password button: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       help_text: ߢ:ߞߏ߲ߘߏ ߟߊߘߏ߲߬ ߌ ߞߊ߬ ߡߍ߲ ߠߊߓߊ߯ߙߊ߫ ߞߵߌ ߜߊ߲߬ߞߎ߲߫߸ ߊ߲ ߘߌ߫ ߛߘߌ߬ߜߋ߲ ߗߴߌ
         ߡߵߊ߬ ߟߊ߫ ߌ ߘߴߏ߬ ߟߊߓߊ߯ߙߊ߫ ߞߵߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫.
-    create:
-      notice email on way: ߤߊߞߍ߬ߕߏ߫ ߌ ߓߘߊ߫ ߓߐߣߵߊ߬ ߘߐ߫:-(ߒ߬ߞߊ߬ ߗߋߛߓߍ ߘߏ߫ ߦߴߊ߬ ߞߣߐ߫
-        ߏ߬ ߘߐ߫ ߌ ߘߌ߫ ߛߴߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫ ߖߏߣߊ߫.
-      notice email cannot find: ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߕߴߛߋ߫ ߢߌߣߌ߲߫ ߠߊ߫߸ ߤߊߞߍ߬ߕߏ߫.
     edit:
       title: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       heading: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫ %{user} ߦߋ߫
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index d1ff013c1..aadca117d 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -7,6 +7,7 @@
 # Author: Gasconoc
 # Author: Gravitystorm
 # Author: Guilhelma
+# Author: Lhanars
 # Author: Macofe
 # Author: OpenStreetMap-oc
 # Author: Quentí
@@ -314,8 +315,6 @@ oc:
     destroy:
       success: Còmpte suprimit...
   browse:
-    created: Creat
-    closed: Plegat
     version: Version
     in_changeset: Grop de modificacions
     anonymous: anonim
@@ -331,21 +330,6 @@ oc:
     view_history: Mostrar l’istoric
     view_details: Mostrar lei detalhs
     location: 'Emplaçament :'
-    changeset:
-      title: 'Grop de modificacions : %{id}'
-      belongs_to: Autor
-      node: Nos (%{count})
-      node_paginated: Nos (%{x} a %{y} sus %{count})
-      way: Linha (%{count})
-      way_paginated: Linhas (%{x} a %{y} sus %{count})
-      relation: Relacions (%{count})
-      relation_paginated: Relacions (%{x} a %{y} sus %{count})
-      changesetxml: Grop de modificacions XML
-      osmchangexml: osmChange XML
-      join_discussion: Se connectar per rejónher la discussion
-      discussion: Discussion
-      still_open: Ensemble de modificacions totjorn dobèrt — la discussion se dobrirà
-        un còp que l’ensemble de modificacions serà plegat.
     node:
       title_html: 'Nos : %{name}'
       history_title_html: 'Istoric dau nos : %{name}'
@@ -453,6 +437,24 @@ oc:
       feed:
         title: Grop de modificacions %{id}
         title_comment: Grop de modificacions %{id} – %{comment}
+        created: Creat
+        closed: Plegat
+        belongs_to: Autor
+    show:
+      title: 'Grop de modificacions : %{id}'
+      discussion: Discussion
+      join_discussion: Se connectar per rejónher la discussion
+      still_open: Ensemble de modificacions totjorn dobèrt — la discussion se dobrirà
+        un còp que l’ensemble de modificacions serà plegat.
+      changesetxml: Grop de modificacions XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Nos (%{count})
+      nodes_paginated: Nos (%{x} a %{y} sus %{count})
+      ways: Linha (%{count})
+      ways_paginated: Linhas (%{x} a %{y} sus %{count})
+      relations: Relacions (%{count})
+      relations_paginated: Relacions (%{x} a %{y} sus %{count})
     timeout:
       sorry: O planhèm, la lista deis gropes de modificacions qu'avètz demandada met
         tròp de temps per èsser recuperada.
@@ -577,6 +579,9 @@ oc:
       applications:
         create:
           notice: S'es enregistrat l'aplicacion.
+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/Contact
   friendships:
     make_friend:
       heading: Ajustar %{user} per amic ?
@@ -1734,10 +1739,6 @@ oc:
       heading: Avètz perdut vòstre senhal ?
       email address: 'Adreça de corrièr electronic :'
       new password button: Mandar un senhal novèl
-    create:
-      notice email on way: Un e-mail vos es estat mandat per reïnicializar vòstre
-        senhal.
-      notice email cannot find: Adreça email introbabla, o planhèm.
     edit:
       title: Reïnicializar lo senhal
       heading: Reïnicializar lo senhal de %{user}
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index de583cce9..2c779fc47 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -157,8 +157,6 @@ pa:
     go_public:
       make_edits_public_button: ਮੇਰੀਆਂ ਸਾਰੀਆਂ ਸੋਧਾਂ ਜਨਤਕ ਕਰੋ
   browse:
-    created: ਬਣਾਇਆ ਗਿਆ
-    closed: ਬੰਦ ਹੋਇਆ
     version: ਵਰਜਨ
     in_changeset: ਤਬਦੀਲੀਆਂ
     anonymous: ਬੇਪਛਾਣ
@@ -168,11 +166,6 @@ pa:
     view_history: ਅਤੀਤ ਵੇਖੋ
     view_details: ਵੇਰਵੇ ਵੇਖੋ
     location: 'ਸਥਿਤੀ:'
-    changeset:
-      title: 'ਤਬਦੀਲੀ ਲੜੀ: %{id}'
-      belongs_to: ਲੇਖਕ
-      changesetxml: ਤਬਦੀਲੀ ਲੜੀ XML
-      discussion: ਚਰਚਾ
     relation:
       members: ਜੀਅ
     relation_member:
@@ -226,6 +219,13 @@ pa:
       feed:
         title: ਤਬਦੀਲੀ ਲੜੀ %{id}
         title_comment: ਤਬਦੀਲੀ ਲੜੀ %{id} - %{comment}
+        created: ਬਣਾਇਆ ਗਿਆ
+        closed: ਬੰਦ ਹੋਇਆ
+        belongs_to: ਲੇਖਕ
+    show:
+      title: 'ਤਬਦੀਲੀ ਲੜੀ: %{id}'
+      discussion: ਚਰਚਾ
+      changesetxml: ਤਬਦੀਲੀ ਲੜੀ XML
   dashboards:
     contact:
       km away: '%{count}ਕਿ.ਮੀ. ਪਰ੍ਹਾਂ'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 9c36ded2e..a601e9a45 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -406,12 +406,6 @@ pl:
     destroy:
       success: Konto zostało usunięte.
   browse:
-    created: Utworzone
-    closed: Zamknięte
-    created_ago_html: Utworzone %{time_ago}
-    closed_ago_html: Zamknięte %{time_ago}
-    created_ago_by_html: Utworzone %{time_ago} przez %{user}
-    closed_ago_by_html: Zamknięte %{time_ago} przez %{user}
     deleted_ago_by_html: Usunięte %{time_ago} przez %{user}
     edited_ago_by_html: Edytowane %{time_ago} przez %{user}
     version: Wersja
@@ -433,23 +427,6 @@ pl:
     view_history: Wyświetl historię
     view_details: Wyświetl szczegóły
     location: 'Położenie:'
-    changeset:
-      title: 'Zestaw zmian: %{id}'
-      belongs_to: Autor
-      node: Węzły (%{count})
-      node_paginated: Węzły (%{x}-%{y} z %{count})
-      way: Linie (%{count})
-      way_paginated: Linie (%{x}-%{y} z %{count})
-      relation: Relacje (%{count})
-      relation_paginated: Relacje (%{x}-%{y} z %{count})
-      hidden_comment_by_html: Ukryty komentarz od użytkownika %{user} %{time_ago}
-      comment_by_html: Komentarz od %{user} %{time_ago}
-      changesetxml: XML w formacie zestawu zmian
-      osmchangexml: XML w formacie osmChange
-      join_discussion: Zaloguj się, aby dołączyć do dyskusji
-      discussion: Dyskusja
-      still_open: Zestaw zmian jest wciąż otwarty – dyskusja będzie możliwa, gdy zostanie
-        on zamknięty.
     node:
       title_html: 'Węzeł: %{name}'
       history_title_html: 'Historia węzła: %{name}'
@@ -562,6 +539,34 @@ pl:
       feed:
         title: Zestaw zmian %{id}
         title_comment: Zestaw zmian %{id} - %{comment}
+        created: Utworzone
+        closed: Zamknięte
+        belongs_to: Autor
+    heading:
+      title: Zestaw zmian %{id}
+    show:
+      title: 'Zestaw zmian: %{id}'
+      created: 'Utworzony: %{when}'
+      closed: 'Zamknięty: %{when}'
+      created_ago_html: Utworzone %{time_ago}
+      closed_ago_html: Zamknięte %{time_ago}
+      created_ago_by_html: Utworzone %{time_ago} przez %{user}
+      closed_ago_by_html: Zamknięte %{time_ago} przez %{user}
+      discussion: Dyskusja
+      join_discussion: Zaloguj się, aby dołączyć do dyskusji
+      still_open: Zestaw zmian jest wciąż otwarty – dyskusja będzie możliwa, gdy zostanie
+        on zamknięty.
+      comment_by_html: Komentarz od %{user} %{time_ago}
+      hidden_comment_by_html: Ukryty komentarz od użytkownika %{user} %{time_ago}
+      changesetxml: XML w formacie zestawu zmian
+      osmchangexml: XML w formacie osmChange
+    paging_nav:
+      nodes: Węzły (%{count})
+      nodes_paginated: Węzły (%{x}-%{y} z %{count})
+      ways: Linie (%{count})
+      ways_paginated: Linie (%{x}-%{y} z %{count})
+      relations: Relacje (%{count})
+      relations_paginated: Relacje (%{x}-%{y} z %{count})
     timeout:
       sorry: Niestety, pobieranie listy żądanych zestawów zmian trwało zbyt długo.
   changeset_comments:
@@ -624,6 +629,7 @@ pl:
     show:
       title: Dziennik użytkownika %{user} | %{title}
       user_title: Dziennik użytkownika %{user}
+      discussion: Dyskusja
       leave_a_comment: Zostaw komentarz
       login_to_leave_a_comment_html: '%{login_link}, aby dodać komentarz'
       login: Zaloguj się
@@ -1905,10 +1911,6 @@ pl:
       new password button: Wyczyść hasło
       help_text: Proszę wprowadzić adres e-mail używany do logowania. Zostanie wysłany
         na niego odnośnik służący do wyczyszczenia hasła.
-    create:
-      notice email on way: Przykro nam z powodu utraty hasła. Wiadomość, która umożliwi
-        jego wyczyszczenie, jest już w drodze.
-      notice email cannot find: Niestety, nie odnaleziono tego adresu e-mail.
     edit:
       title: Wyczyść hasło
       heading: Czyszczenie hasła użytkownika %{user}
diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index b429a70a1..7e545358a 100644
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -276,8 +276,6 @@ pnb:
     destroy:
       success: کھاتہ مٹایا۔
   browse:
-    created: 'بݨاؤݨ:'
-    closed: 'بند کرن:'
     version: ورژن
     in_changeset: تبدیلیاں
     anonymous: بے پچاݨ
@@ -295,19 +293,6 @@ pnb:
     location: 'ستھتی:'
     common_details:
       coordinates_html: '%{latitude}; %{longitude}'
-    changeset:
-      title: 'تبدیلیاں: %{id}'
-      belongs_to: لیکھک
-      node: نوڈ (⁠%{count}⁠)
-      node_paginated: نوڈ (⁠%{count} وچ %{x} توں %{y}⁠)
-      way: راہ (⁠%{count}⁠)
-      way_paginated: راہ (⁠%{count} وچ %{x} توں %{y}⁠)
-      relation: سمبندھ (⁠%{count}⁠)
-      relation_paginated: سمبندھ (⁠%{count} وچ %{x} توں %{y}⁠)
-      changesetxml: تبدیلیاں لئی سروت دی فائل
-      osmchangexml: تبدیلیاں لئی سروت دی فائل فارماٹ
-      join_discussion: ایہہ گل بات جوڑن لئی تسیں لوگ‌این کر سکدیو
-      discussion: گل بات
     node:
       title_html: 'نوڈ: %{name}'
       history_title_html: 'نوڈ دا اتیت: %{name}'
@@ -409,6 +394,22 @@ pnb:
       feed:
         title: 'تبدیلیاں: %{id}'
         title_comment: تبدیلیاں نمبر %{id} • %{comment}
+        created: 'بݨاؤݨ:'
+        closed: 'بند کرن:'
+        belongs_to: لیکھک
+    show:
+      title: 'تبدیلیاں: %{id}'
+      discussion: گل بات
+      join_discussion: ایہہ گل بات جوڑن لئی تسیں لوگ‌این کر سکدیو
+      changesetxml: تبدیلیاں لئی سروت دی فائل
+      osmchangexml: تبدیلیاں لئی سروت دی فائل فارماٹ
+    paging_nav:
+      nodes: نوڈ (⁠%{count}⁠)
+      nodes_paginated: نوڈ (⁠%{count} وچ %{x} توں %{y}⁠)
+      ways: راہ (⁠%{count}⁠)
+      ways_paginated: راہ (⁠%{count} وچ %{x} توں %{y}⁠)
+      relations: سمبندھ (⁠%{count}⁠)
+      relations_paginated: سمبندھ (⁠%{count} وچ %{x} توں %{y}⁠)
     timeout:
       sorry: افسوس، تبدیلیاں دیاں لڑیاں نہیں لبھ سکیاں، ٹائم آؤٹ ہوگیا سی۔
   changeset_comments:
@@ -1394,9 +1395,6 @@ pnb:
       email address: 'ای‌میل پتہ:'
       new password button: پاس‌ورڈ فیر بݨایو
       help_text: تہاڈے ای‌میل دا پتہ جو پاس‌ورڈ فیر بݨاؤݨ دی کڑی بھیج سکاں‌گی اے۔
-    create:
-      notice email on way: اچھا، ای‌میل تے مدد دی کڑی بھیجاں‌گی اے
-      notice email cannot find: افسوس، اوہ ای‌میل دا پتہ نہیں لبھ سکیا
     edit:
       title: پاس‌ورڈ فیر بݨایو
       reset: پاس‌ورڈ فیر بݨایو
diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index a118d65ed..279640846 100644
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -94,8 +94,6 @@ ps:
         link text: دا څه دی؟
       save changes button: بدلونونه خوندي کول
   browse:
-    created: جوړ شو
-    closed: تړل شوی
     relation:
       members: غړي
     relation_member:
@@ -120,6 +118,10 @@ ps:
       user: کارن
       comment: تبصره
       area: سيمه
+    index:
+      feed:
+        created: جوړ شو
+        closed: تړل شوی
   dashboards:
     popup:
       friend: ملگری
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index b7c94fe4a..48b3164a1 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -361,12 +361,6 @@ pt-PT:
     destroy:
       success: Conta apagada.
   browse:
-    created: Criado
-    closed: Fechado
-    created_ago_html: Criado há %{time_ago}
-    closed_ago_html: Fechado há %{time_ago}
-    created_ago_by_html: Criado há %{time_ago} por %{user}
-    closed_ago_by_html: Fechado há %{time_ago} por %{user}
     deleted_ago_by_html: Eliminado há %{time_ago} por %{user}
     edited_ago_by_html: Editado há %{time_ago} por %{user}
     version: Versão
@@ -384,23 +378,6 @@ pt-PT:
     view_history: Ver histórico
     view_details: Ver detalhes
     location: 'Localização:'
-    changeset:
-      title: 'Conjunto de alterações: %{id}'
-      belongs_to: Autor
-      node: Nós (%{count})
-      node_paginated: Nós (%{x}-%{y} of %{count})
-      way: Linhas (%{count})
-      way_paginated: Linhas (%{x}-%{y} de %{count})
-      relation: Relações (%{count})
-      relation_paginated: Relações (%{x}-%{y} of %{count})
-      hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago}
-      comment_by_html: Comentário de %{user} há %{time_ago}
-      changesetxml: XML do conjunto de alterações
-      osmchangexml: XML no formato osmChange
-      join_discussion: Inicia sessão para te juntares à discussão
-      discussion: Discussão
-      still_open: O conjunto de alterações continua aberto. A discussão será iniciada
-        assim que o conjunto de alterações for fechado.
     node:
       title_html: 'Nó: %{name}'
       history_title_html: 'Histórico do Nó: %{name}'
@@ -511,6 +488,30 @@ pt-PT:
       feed:
         title: Conjunto de alterações %{id}
         title_comment: Conjunto de alterações %{id} - %{comment}
+        created: Criado
+        closed: Fechado
+        belongs_to: Autor
+    show:
+      title: 'Conjunto de alterações: %{id}'
+      created_ago_html: Criado há %{time_ago}
+      closed_ago_html: Fechado há %{time_ago}
+      created_ago_by_html: Criado há %{time_ago} por %{user}
+      closed_ago_by_html: Fechado há %{time_ago} por %{user}
+      discussion: Discussão
+      join_discussion: Inicia sessão para te juntares à discussão
+      still_open: O conjunto de alterações continua aberto. A discussão será iniciada
+        assim que o conjunto de alterações for fechado.
+      comment_by_html: Comentário de %{user} há %{time_ago}
+      hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago}
+      changesetxml: XML do conjunto de alterações
+      osmchangexml: XML no formato osmChange
+    paging_nav:
+      nodes: Nós (%{count})
+      nodes_paginated: Nós (%{x}-%{y} of %{count})
+      ways: Linhas (%{count})
+      ways_paginated: Linhas (%{x}-%{y} de %{count})
+      relations: Relações (%{count})
+      relations_paginated: Relações (%{x}-%{y} of %{count})
     timeout:
       sorry: Lamentamos, mas a lista de conjuntos de alterações que pediste excedeu
         o tempo limite de resposta.
@@ -1882,11 +1883,6 @@ pt-PT:
       new password button: Repor palavra-passe
       help_text: Introduz o endereço de correio eletrónico que usaste para criar a
         conta. Enviar-te-emos uma ligação que poderás usar para repor a palavra-passe.
-    create:
-      notice email on way: Lamentamos que a tenhas perdido :-( mas já te enviámos
-        um e-mail para que possas repô-la em breve.
-      notice email cannot find: Lamentamos, mas não foi possível encontrar esse endereço
-        eletrónico.
     edit:
       title: Repor palavra-passe
       heading: Repor palavra-passe para %{user}
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 23b5298a7..839256b19 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -380,12 +380,6 @@ pt:
     destroy:
       success: Conta eliminada.
   browse:
-    created: Criado
-    closed: Fechado
-    created_ago_html: Criado há %{time_ago}
-    closed_ago_html: Fechado %{time_ago}
-    created_ago_by_html: Criado há %{time_ago} por %{user}
-    closed_ago_by_html: Fechado %{time_ago} por %{user}
     deleted_ago_by_html: Excluído há %{time_ago} por %{user}
     edited_ago_by_html: Editado há %{time_ago} por %{user}
     version: Versão
@@ -403,23 +397,6 @@ pt:
     view_history: Ver histórico
     view_details: Ver detalhes
     location: 'Localização:'
-    changeset:
-      title: 'Conjunto de alterações: %{id}'
-      belongs_to: Autor
-      node: Pontos (%{count})
-      node_paginated: Pontos (%{x}-%{y} de %{count})
-      way: Linhas (%{count})
-      way_paginated: Linhas (%{x}-%{y} de %{count})
-      relation: Relações (%{count})
-      relation_paginated: Relações (%{x}-%{y} de %{count})
-      hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago}
-      comment_by_html: Comentário de %{user} há %{time_ago}
-      changesetxml: XML do conjunto de alterações
-      osmchangexml: XML osmChange
-      join_discussion: Entrar para participar da discussão
-      discussion: Discussão
-      still_open: O conjunto de alterações continua em aberto - A discussão será iniciada
-        assim que for fechado o conjunto de alterações.
     node:
       title_html: 'Ponto: %{name}'
       history_title_html: 'Histórico do ponto: %{name}'
@@ -527,6 +504,30 @@ pt:
       feed:
         title: Conjunto de alterações %{id}
         title_comment: Conjunto de alterações %{id} - %{comment}
+        created: Criado
+        closed: Fechado
+        belongs_to: Autor
+    show:
+      title: 'Conjunto de alterações: %{id}'
+      created_ago_html: Criado há %{time_ago}
+      closed_ago_html: Fechado %{time_ago}
+      created_ago_by_html: Criado há %{time_ago} por %{user}
+      closed_ago_by_html: Fechado %{time_ago} por %{user}
+      discussion: Discussão
+      join_discussion: Entrar para participar da discussão
+      still_open: O conjunto de alterações continua em aberto - A discussão será iniciada
+        assim que for fechado o conjunto de alterações.
+      comment_by_html: Comentário de %{user} há %{time_ago}
+      hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago}
+      changesetxml: XML do conjunto de alterações
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Pontos (%{count})
+      nodes_paginated: Pontos (%{x}-%{y} de %{count})
+      ways: Linhas (%{count})
+      ways_paginated: Linhas (%{x}-%{y} de %{count})
+      relations: Relações (%{count})
+      relations_paginated: Relações (%{x}-%{y} de %{count})
     timeout:
       sorry: A lista de conjuntos de alterações solicitada está demorando demais para
         chegar.
@@ -1893,10 +1894,6 @@ pt:
       new password button: Redefinir senha
       help_text: Digite o endereço de e-mail que você usou para se conectar e enviaremos
         um link que você poderá usar para redefinir a sua senha.
-    create:
-      notice email on way: Um e-mail foi enviado para que você possa escolher outra
-        senha.
-      notice email cannot find: Não foi possível encontrar esse endereço de e-mail.
     edit:
       title: Redefinir senha
       heading: Redefinir Senha de %{user}
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index a99bce959..5e2d5e548 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -345,12 +345,6 @@ ro:
     destroy:
       success: Contul Este Șters.
   browse:
-    created: Creat
-    closed: Închis
-    created_ago_html: Creat %{time_ago}
-    closed_ago_html: Închis %{time_ago}
-    created_ago_by_html: Creat %{time_ago} de %{user}
-    closed_ago_by_html: Închis %{time_ago} de către %{user}
     deleted_ago_by_html: Șters %{time_ago} de %{user}
     edited_ago_by_html: Editat %{time_ago} de %{user}
     version: Versiune
@@ -370,23 +364,6 @@ ro:
     view_history: Vezi istoric
     view_details: Vezi detalii
     location: 'Amplasament:'
-    changeset:
-      title: 'Set de modificări: %{id}'
-      belongs_to: Autor
-      node: Noduri (%{count})
-      node_paginated: Noduri (%{x}-%{y} din %{count})
-      way: Căi (%{count})
-      way_paginated: Căi (%{x}-%{y} din %{count})
-      relation: Comunicații (%{count})
-      relation_paginated: Comunicații (%{x}-%{y} din %{count})
-      hidden_comment_by_html: Comentariu ascuns de la %{user} %{time_ago}
-      comment_by_html: Comentariu de la %{user} %{time_ago}
-      changesetxml: Set de modificări XML
-      osmchangexml: XML osmChange
-      join_discussion: Conectați-vă pentru a vă alătura discuției
-      discussion: Discuție
-      still_open: Setul de schimbări este deschis - discuția se va deschide atunci
-        când setul de schimbări este închis.
     node:
       title_html: 'Nod: %{name}'
       history_title_html: 'Istoricul nodului: %{name}'
@@ -498,6 +475,30 @@ ro:
       feed:
         title: 'Set de modificări: %{id}'
         title_comment: Set de modificări %{id} — %{comment}
+        created: Creat
+        closed: Închis
+        belongs_to: Autor
+    show:
+      title: 'Set de modificări: %{id}'
+      created_ago_html: Creat %{time_ago}
+      closed_ago_html: Închis %{time_ago}
+      created_ago_by_html: Creat %{time_ago} de %{user}
+      closed_ago_by_html: Închis %{time_ago} de către %{user}
+      discussion: Discuție
+      join_discussion: Conectați-vă pentru a vă alătura discuției
+      still_open: Setul de schimbări este deschis - discuția se va deschide atunci
+        când setul de schimbări este închis.
+      comment_by_html: Comentariu de la %{user} %{time_ago}
+      hidden_comment_by_html: Comentariu ascuns de la %{user} %{time_ago}
+      changesetxml: Set de modificări XML
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Noduri (%{count})
+      nodes_paginated: Noduri (%{x}-%{y} din %{count})
+      ways: Căi (%{count})
+      ways_paginated: Căi (%{x}-%{y} din %{count})
+      relations: Comunicații (%{count})
+      relations_paginated: Comunicații (%{x}-%{y} din %{count})
     timeout:
       sorry: Ne pare rău, preluarea listei de modificări pe care ați solicitat-o a
         durat prea mult.
@@ -1850,10 +1851,6 @@ ro:
       new password button: Resetare parolă
       help_text: Introduceți adresa de e-mail pe care ați utilizat-o pentru a vă înscrie,
         vom trimite un link la aceasta pe care îl puteți utiliza pentru a reseta parola.
-    create:
-      notice email on way: Ne pare rău că ați pierdut-o :-( dar un e-mail este pe
-        drum, astfel încât să puteți să-l resetați în curând.
-      notice email cannot find: Nu am putut găsi adresa de e-mail, îmi pare rău.
     edit:
       title: Resetare parolă
       heading: Resetați parola pentru %{user}
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d22c9bbf1..4f8c413ee 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -423,11 +423,6 @@ ru:
     destroy:
       success: Учётная запись удалена.
   browse:
-    created: Создано
-    closed: Закрыто
-    created_ago_html: Создано %{time_ago}
-    closed_ago_html: Закрыто %{time_ago}
-    created_ago_by_html: Создал %{time_ago} %{user}
     edited_ago_by_html: Редактировал %{time_ago} %{user}
     version: Версия
     in_changeset: Пакет правок
@@ -448,22 +443,6 @@ ru:
     view_history: Посмотреть историю
     view_details: Подробнее
     location: 'Географическое положение:'
-    changeset:
-      title: 'Пакет правок: %{id}'
-      belongs_to: Автор
-      node: Точки (%{count})
-      node_paginated: Точки (%{x}-%{y} из %{count})
-      way: Линии (%{count})
-      way_paginated: Линии (%{x}-%{y} из %{count})
-      relation: Отношения (%{count})
-      relation_paginated: Отношения (%{x}-%{y} из %{count})
-      comment_by_html: Комментарий от %{user} %{time_ago}
-      changesetxml: XML пакета правок
-      osmchangexml: osmChange XML
-      join_discussion: Войдите в систему, чтобы присоединиться к обсуждению
-      discussion: Обсуждение
-      still_open: Пакет правок ещё открыт. Обсуждение будет доступно, как только пакет
-        правок будет закрыт.
     node:
       title_html: 'Точка: %{name}'
       history_title_html: 'История точки: %{name}'
@@ -576,6 +555,28 @@ ru:
       feed:
         title: Пакет правок %{id}
         title_comment: Пакет правок %{id} — %{comment}
+        created: Создано
+        closed: Закрыто
+        belongs_to: Автор
+    show:
+      title: 'Пакет правок: %{id}'
+      created_ago_html: Создано %{time_ago}
+      closed_ago_html: Закрыто %{time_ago}
+      created_ago_by_html: Создал %{time_ago} %{user}
+      discussion: Обсуждение
+      join_discussion: Войдите в систему, чтобы присоединиться к обсуждению
+      still_open: Пакет правок ещё открыт. Обсуждение будет доступно, как только пакет
+        правок будет закрыт.
+      comment_by_html: Комментарий от %{user} %{time_ago}
+      changesetxml: XML пакета правок
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Точки (%{count})
+      nodes_paginated: Точки (%{x}-%{y} из %{count})
+      ways: Линии (%{count})
+      ways_paginated: Линии (%{x}-%{y} из %{count})
+      relations: Отношения (%{count})
+      relations_paginated: Отношения (%{x}-%{y} из %{count})
     timeout:
       sorry: К сожалению, список пакетов правок, который вы запросили, требует слишком
         много времени для извлечения.
@@ -1894,10 +1895,6 @@ ru:
       new password button: Вышлите мне новый пароль
       help_text: Введите адрес вашей электронной почты, который вы использовали для
         подписки, и мы вышлем инструкции, как можно обновить ваш пароль.
-    create:
-      notice email on way: Жаль, что вы потеряли пароль :-( но ничего, скоро придёт
-        письмо и вы сможете поменять свой пароль.
-      notice email cannot find: Такой адрес не зарегистрирован.
     edit:
       title: Повторная установка пароля
       heading: Повторная установка пароля для %{user}
diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index bc6fff49d..52697ac88 100644
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -140,21 +140,12 @@ sat:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
   browse:
-    created: ᱛᱮᱭᱟᱨᱱᱟ
-    closed: ᱵᱚᱸᱫᱚ
     anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
     no_comment: (ᱚᱠᱛᱚ ᱵᱟᱝ)
     download_xml: XML ᱰᱟᱩᱱᱞᱚᱰ ᱢᱮ
     view_history: ᱱᱟᱜᱟᱢ ᱧᱮᱞᱢᱮ
     view_details: ᱵᱤᱵᱨᱚᱱ ᱧᱮᱞ ᱢᱮ
     location: 'ᱡᱟᱭᱜᱟ:'
-    changeset:
-      belongs_to: ᱚᱱᱚᱞᱤᱭᱟᱹ
-      node: (%{count}) ᱜᱟᱸᱴᱷᱠᱚ
-      way: (%{count}) ᱦᱚᱨᱠᱚ
-      relation: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{count})
-      relation_paginated: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{x}-%{y} of %{count})
-      discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ
     node:
       title_html: ᱜᱟᱸᱴᱷ:%{name}
       history_title_html: 'ᱜᱟᱸᱴᱷ ᱨᱮᱭᱟᱜ ᱦᱤᱛᱟᱹᱞ: %{name}'
@@ -216,6 +207,17 @@ sat:
       area: ᱡᱟᱭᱜᱟ
     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
+      feed:
+        created: ᱛᱮᱭᱟᱨᱱᱟ
+        closed: ᱵᱚᱸᱫᱚ
+        belongs_to: ᱚᱱᱚᱞᱤᱭᱟᱹ
+    show:
+      discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ
+    paging_nav:
+      nodes: (%{count}) ᱜᱟᱸᱴᱷᱠᱚ
+      ways: (%{count}) ᱦᱚᱨᱠᱚ
+      relations: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{count})
+      relations_paginated: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{x}-%{y} of %{count})
   dashboards:
     popup:
       your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index b96c20584..e393cc7b5 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -326,12 +326,6 @@ sc:
     destroy:
       success: Contu iscantzelladu.
   browse:
-    created: Creadu
-    closed: Serradu
-    created_ago_html: Creadu %{time_ago}
-    closed_ago_html: Tancadu %{time_ago}
-    created_ago_by_html: Creadu %{time_ago} dae %{user}
-    closed_ago_by_html: Tancadu %{time_ago} dae %{user}
     deleted_ago_by_html: Iscantzelladu %{time_ago} dae %{user}
     edited_ago_by_html: Modificadu %{time_ago} dae %{user}
     version: Versione
@@ -349,23 +343,6 @@ sc:
     view_history: Càstia sa cronologia
     view_details: Mustrat sos detàllios
     location: 'Logu:'
-    changeset:
-      title: 'Annantu de modìficas: %{id}'
-      belongs_to: Autore
-      node: Nodos (%{count})
-      node_paginated: Nodos (%{x}-%{y} de %{count})
-      way: Lìnias (%{count})
-      way_paginated: Lìnias (%{x}-%{y} de %{count})
-      relation: Relatziones (%{count})
-      relation_paginated: Relatziones (%{x}-%{y} de %{count})
-      hidden_comment_by_html: Cummentu cuadu de %{user} %{time_ago}
-      comment_by_html: Cummentu de %{user} %{time_ago}
-      changesetxml: XML de s'annantu de modìficas
-      osmchangexml: XML in formadu osmChange
-      join_discussion: Intra pro t'aunire a s'arresonu
-      discussion: Arresonu
-      still_open: Annantu de modìficas galu abertu - s'arresonu s'at a abèrrere cando
-        s'annantu de modìficas s'at a serrare.
     node:
       title_html: 'Nodu: %{name}'
       history_title_html: 'Istòria de su nodu: %{name}'
@@ -476,6 +453,30 @@ sc:
       feed:
         title: Annantu de modìficas %{id}
         title_comment: Grupu de modìficas %{id} - %{comment}
+        created: Creadu
+        closed: Serradu
+        belongs_to: Autore
+    show:
+      title: 'Annantu de modìficas: %{id}'
+      created_ago_html: Creadu %{time_ago}
+      closed_ago_html: Tancadu %{time_ago}
+      created_ago_by_html: Creadu %{time_ago} dae %{user}
+      closed_ago_by_html: Tancadu %{time_ago} dae %{user}
+      discussion: Arresonu
+      join_discussion: Intra pro t'aunire a s'arresonu
+      still_open: Annantu de modìficas galu abertu - s'arresonu s'at a abèrrere cando
+        s'annantu de modìficas s'at a serrare.
+      comment_by_html: Cummentu de %{user} %{time_ago}
+      hidden_comment_by_html: Cummentu cuadu de %{user} %{time_ago}
+      changesetxml: XML de s'annantu de modìficas
+      osmchangexml: XML in formadu osmChange
+    paging_nav:
+      nodes: Nodos (%{count})
+      nodes_paginated: Nodos (%{x}-%{y} de %{count})
+      ways: Lìnias (%{count})
+      ways_paginated: Lìnias (%{x}-%{y} de %{count})
+      relations: Relatziones (%{count})
+      relations_paginated: Relatziones (%{x}-%{y} de %{count})
     timeout:
       sorry: S'elencu de annantos de modìficas chi as pedidu at bisongiadu de tropu
         tempus pro lu recuperare.
@@ -1840,11 +1841,6 @@ sc:
       help_text: Inserta s'indiritzu de posta chi as impreadu pro ti registrare, l'amus
         a imbiare unu ligàmene chi as a pòdere impreare pro ripristinare sa crae de
         intrada tua.
-    create:
-      notice email on way: Nos dispraghet chi l'apas pèrdida :-( ma t'amus imbiadu
-        unu messàgiu de posta eletrònica pro chi la potzas ripristinare.
-      notice email cannot find: A dolu mannu non semus resèssidos a agatare custu
-        indiritzu de posta eletrònica.
     edit:
       title: Riprìstina sa crae de intrada
       heading: Riprìstina sa crae de intrada pro %{user}
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index a5f351844..c1fc274eb 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Ajeje Brazorf
 # Author: Gmelfi
+# Author: LametinoWiki
 # Author: Macofe
 # Author: Pippinu
 # Author: Sarvaturi
@@ -29,6 +30,7 @@ scn:
         create: Riggistra
         update: Agghiorna
       oauth2_application:
+        create: Riggistrati
         update: Aggiorna
       redaction:
         create: Crea l'occultamentu
@@ -80,6 +82,8 @@ scn:
       client_application:
         callback_url: URL di callback
         support_url: URL di l'assistenza
+        allow_write_prefs: canciari li mpustazzioni d'utenti.
+        allow_write_diary: criari vuci dû diariu, cummenti e fari amici.
         allow_write_api: cancia la cartina
         allow_read_gpx: lèggi li sò tracciati GPS privati.
         allow_write_gpx: càrrica li tracciati GPS
@@ -89,11 +93,13 @@ scn:
       diary_entry:
         user: Utenti
         title: Oggettu
+        body: Corpu
         latitude: Latitùdini
         longitude: Loncitùdini
         language_code: Lingua
       doorkeeper/application:
         name: Nomu
+        redirect_uri: URI di rimannu
       friend:
         user: Utenti
         friend: Amicu
@@ -119,6 +125,7 @@ scn:
         description: Discrizzioni
       user:
         email: Posta elittrònica
+        email_confirmation: 'Cunvàlida dâ posta elittrònica:'
         new_email: Nnirizzu di posta elittrònica novu
         active: Attivu
         display_name: Nomu ammustratu
@@ -233,8 +240,6 @@ scn:
     destroy:
       success: Cuntu cancillatu.
   browse:
-    created: Criatu
-    closed: Chiudutu
     version: Virsioni
     in_changeset: Gruppu di canciamenti
     anonymous: anònimu
@@ -244,19 +249,6 @@ scn:
     view_history: Talìa la crunuluggìa
     view_details: Talìa li dittagghî
     location: 'Locu:'
-    changeset:
-      title: 'Gruppu di canciamenti: %{id}'
-      belongs_to: Auturi
-      node: Gruppa (%{count})
-      node_paginated: Gruppa (%{x}-%{y} di %{count})
-      way: Camini (%{count})
-      way_paginated: Camini (%{x}-%{y} di %{count})
-      relation: Rilazzioni (%{count})
-      relation_paginated: Rilazzioni (%{x}-%{y} di %{count})
-      changesetxml: XML dû gruppu di canciamenti
-      osmchangexml: XML osmChange
-      join_discussion: Pi participari ntâ discussioni trasi
-      discussion: Discussioni
     node:
       title_html: 'Gruppu: %{name}'
       history_title_html: 'Crunuluggìa dû gruppu: %{name}'
@@ -361,6 +353,22 @@ scn:
       feed:
         title: Gruppu di canciamenti %{id}
         title_comment: Gruppu di canciamenti %{id} - %{comment}
+        created: Criatu
+        closed: Chiudutu
+        belongs_to: Auturi
+    show:
+      title: 'Gruppu di canciamenti: %{id}'
+      discussion: Discussioni
+      join_discussion: Pi participari ntâ discussioni trasi
+      changesetxml: XML dû gruppu di canciamenti
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Gruppa (%{count})
+      nodes_paginated: Gruppa (%{x}-%{y} di %{count})
+      ways: Camini (%{count})
+      ways_paginated: Camini (%{x}-%{y} di %{count})
+      relations: Rilazzioni (%{count})
+      relations_paginated: Rilazzioni (%{x}-%{y} di %{count})
     timeout:
       sorry: Purtroppu, ci vosi troppu tempu pi pigghiari la lista dî gruppi di canciamenti
         c'addumannasti.
@@ -1239,10 +1247,6 @@ scn:
       new password button: Azzera la palora d'òrdini
       help_text: Scrivi lu nnirizzu di posta elittrònica c'adupirasti quannu ti scrivisti,
         e ci mannamu nu culligamentu chi poi adupirari p'azzirari la tò palora d'òrdini.
-    create:
-      notice email on way: Ni dispiaci chi la pirdisti :-( pirò ti sta arrivannu nu
-        missaggiu di posta elittrònica pi menzu dû quali prestu la poi azzirari.
-      notice email cannot find: Putroppu nun s'attrova stu nnirizzu di posta elittrònica.
     edit:
       title: Azzera la palora d'òrdini
       heading: Azziramentu dâ palora d'òrdini di %{user}
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 53982031b..474d1f4c7 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -104,8 +104,6 @@ sco:
     edit:
       title: Eedit accoont
   browse:
-    created: Creatit
-    closed: Closed
     version: Version
     in_changeset: Chyngeset
     anonymous: anonymous
@@ -115,19 +113,6 @@ sco:
     view_history: View History
     view_details: View Details
     location: 'Location:'
-    changeset:
-      title: 'Chyngeset: %{id}'
-      belongs_to: Author
-      node: Nodes (%{count})
-      node_paginated: Nodes (%{x}-%{y} of %{count})
-      way: Ways (%{count})
-      way_paginated: Ways (%{x}-%{y} of %{count})
-      relation: Relations (%{count})
-      relation_paginated: Relations (%{x}-%{y} of %{count})
-      changesetxml: Chyngeset XML
-      osmchangexml: osmChange XML
-      join_discussion: Log in tae jyn the discussion
-      discussion: Discussion
     node:
       title_html: 'Node: %{name}'
       history_title_html: 'Node History: %{name}'
@@ -216,6 +201,22 @@ sco:
       feed:
         title: Chyngeset %{id}
         title_comment: Chyngeset %{id} - %{comment}
+        created: Creatit
+        closed: Closed
+        belongs_to: Author
+    show:
+      title: 'Chyngeset: %{id}'
+      discussion: Discussion
+      join_discussion: Log in tae jyn the discussion
+      changesetxml: Chyngeset XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Nodes (%{count})
+      nodes_paginated: Nodes (%{x}-%{y} of %{count})
+      ways: Ways (%{count})
+      ways_paginated: Ways (%{x}-%{y} of %{count})
+      relations: Relations (%{count})
+      relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.
   changeset_comments:
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 2644b50e0..ae047e325 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -249,9 +249,6 @@ sh:
         imejl za porukom za potvrdu nove adrese.
       success: Korisničke informacije su uspješno osvježene.
   browse:
-    changeset:
-      join_discussion: Prijavite se za uključivanje u raspravu
-      discussion: Razgovor
     tag_details:
       wikidata_link: '%{page} stavka na Wikidata'
       wikipedia_link: Članak o %{page} na Wikipediji
@@ -276,6 +273,9 @@ sh:
       title_user_link_html: Setovi promjena od %{user_link}
       title_friend: Promjene mojih prijatelja
       title_nearby: Promjene obližnjih korisnika
+    show:
+      discussion: Razgovor
+      join_discussion: Prijavite se za uključivanje u raspravu
   diary_entries:
     new:
       title: Novi zapis u dnevnik
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index be2e6014a..c59b5bc86 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -345,12 +345,6 @@ sk:
     destroy:
       success: Účet bol odstránený.
   browse:
-    created: Vytvorené
-    closed: Uzavreté
-    created_ago_html: Vytvorené %{time_ago}
-    closed_ago_html: Zatvorené %{time_ago}
-    created_ago_by_html: Vytvorené %{time_ago} používateľom %{user}
-    closed_ago_by_html: Zatvorené %{time_ago} používateľom %{user}
     deleted_ago_by_html: Odstránené %{time_ago} používateľom %{user}
     edited_ago_by_html: Upravené %{time_ago} používateľom %{user}
     version: Verzia
@@ -372,23 +366,6 @@ sk:
     view_history: Zobraziť históriu
     view_details: Zobraziť detaily
     location: 'Poloha:'
-    changeset:
-      title: 'Sada zmien: %{id}'
-      belongs_to: Autor
-      node: Uzly (%{count})
-      node_paginated: Uzly (%{x}–%{y} z %{count})
-      way: Cesty (%{count})
-      way_paginated: Cesty (%{x}–%{y} z %{count})
-      relation: Relácie (%{count})
-      relation_paginated: Relácie (%{x}–%{y} z %{count})
-      hidden_comment_by_html: Skrytý komentár od používateľa %{user} %{time_ago}
-      comment_by_html: Komentár od používateľa %{user} %{time_ago}
-      changesetxml: XML sady zmien
-      osmchangexml: osmChange XML
-      join_discussion: Zapojte sa do diskusie
-      discussion: Diskusia
-      still_open: Sada zmien stále otvorená - diskusia bude otvorená, keď bude sada
-        zmien uzatvorená.
     node:
       title_html: 'Uzol: %{name}'
       history_title_html: 'História uzla: %{name}'
@@ -501,6 +478,30 @@ sk:
       feed:
         title: Sada zmien %{id}
         title_comment: Sada zmien %{id} - %{comment}
+        created: Vytvorené
+        closed: Uzavreté
+        belongs_to: Autor
+    show:
+      title: 'Sada zmien: %{id}'
+      created_ago_html: Vytvorené %{time_ago}
+      closed_ago_html: Zatvorené %{time_ago}
+      created_ago_by_html: Vytvorené %{time_ago} používateľom %{user}
+      closed_ago_by_html: Zatvorené %{time_ago} používateľom %{user}
+      discussion: Diskusia
+      join_discussion: Zapojte sa do diskusie
+      still_open: Sada zmien stále otvorená - diskusia bude otvorená, keď bude sada
+        zmien uzatvorená.
+      comment_by_html: Komentár od používateľa %{user} %{time_ago}
+      hidden_comment_by_html: Skrytý komentár od používateľa %{user} %{time_ago}
+      changesetxml: XML sady zmien
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Uzly (%{count})
+      nodes_paginated: Uzly (%{x}–%{y} z %{count})
+      ways: Cesty (%{count})
+      ways_paginated: Cesty (%{x}–%{y} z %{count})
+      relations: Relácie (%{count})
+      relations_paginated: Relácie (%{x}–%{y} z %{count})
     timeout:
       sorry: Ľutujeme, ale vami požadovaný zoznam sád zmien sa načítaval príliš dlho.
   changeset_comments:
@@ -1728,10 +1729,6 @@ sk:
       new password button: Resetnúť heslo
       help_text: Vložte emailovú adresu, ktorú ste uviedli pri registrácii, pošleme
         vám odkaz, pomocou ktorého si budete môcť nastaviť nové heslo.
-    create:
-      notice email on way: Škoda zabudnutého hesla :-( ale e-mail je už na ceste,
-        takže si čoskoro budete môcť zvoliť nové.
-      notice email cannot find: Ľutujeme, túto e-mailovú adresu nie je možné nájsť.
     edit:
       title: Resetnúť heslo
       heading: Resetnúť heslo pre %{user}
diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index ef823dfc9..1dee6c57a 100644
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -189,10 +189,6 @@ skr-arab:
     destroy:
       success: کھاتہ مٹ ڳیا۔
   browse:
-    created: بݨ ڳیا
-    closed: بند تھیا
-    created_ago_html: '%{time_ago} خلقیا'
-    closed_ago_html: '%{time_ago} بند تھیا'
     version: ورژن
     in_changeset: تبدیلیاں
     anonymous: گمنام
@@ -202,12 +198,6 @@ skr-arab:
     view_history: تاریخچہ ݙیکھو
     view_details: تفصیل ݙکھاؤ
     location: 'محل وقوع:'
-    changeset:
-      title: تبدیلیاں:%{id}
-      belongs_to: مصنف
-      node: نوݙاں(%{count})
-      way: رستے(%{count})
-      discussion: بحث مباحثہ
     node:
       title_html: 'نوڈ: %{name}'
       history_title_html: نوݙ تاریخچہ:%{name}
@@ -268,6 +258,18 @@ skr-arab:
       title: تبدیلیاں
       empty: تبدیلیاں کائنی لبھیاں۔
       load_more: ٻئے لوݙ کرو
+      feed:
+        created: بݨ ڳیا
+        closed: بند تھیا
+        belongs_to: مصنف
+    show:
+      title: تبدیلیاں:%{id}
+      created_ago_html: '%{time_ago} خلقیا'
+      closed_ago_html: '%{time_ago} بند تھیا'
+      discussion: بحث مباحثہ
+    paging_nav:
+      nodes: نوݙاں(%{count})
+      ways: رستے(%{count})
   dashboards:
     contact:
       km away: '%{count} کلومیٹر دور'
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index b620b0168..9a675aeef 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -359,15 +359,10 @@ sl:
     destroy:
       success: Račun izbrisan.
   browse:
-    created: Ustvarjeno
-    closed: Zaprto
-    created_ago_html: Ustvaril_a %{time_ago}
-    closed_ago_html: Zaprto %{time_ago}
-    created_ago_by_html: Ustvaril %{user} %{time_ago}
-    closed_ago_by_html: Zaprl_a %{time_ago} %{user}
     deleted_ago_by_html: Izbrisal %{user} %{time_ago}
     edited_ago_by_html: Uredil_a %{user} %{time_ago}
     version: Različica
+    redacted_version: Skrita različica
     in_changeset: Nabor sprememb
     anonymous: anonimni
     no_comment: (brez komentarja)
@@ -384,25 +379,11 @@ sl:
       other: '%{count} poti'
     download_xml: Prenesi XML
     view_history: Ogled zgodovine
+    view_unredacted_history: Ogled neskrite zgodovine
     view_details: Prikaz podrobnosti
+    view_redacted_data: Ogled skritih podatkov
+    view_redaction_message: Ogled sporočila o redigiranju
     location: 'Lokacija:'
-    changeset:
-      title: 'Nabor sprememb: %{id}'
-      belongs_to: Avtor
-      node: Vozlišč (%{count})
-      node_paginated: Vozlišča (%{x}-%{y} od %{count})
-      way: Poti (%{count})
-      way_paginated: Poti (%{x}-%{y} od %{count})
-      relation: Relacije (%{count})
-      relation_paginated: Zveze (%{x}-%{y} od %{count})
-      hidden_comment_by_html: Skrit komentar %{user} %{time_ago}
-      comment_by_html: Komentar %{user} %{time_ago}
-      changesetxml: Nabor sprememb XML
-      osmchangexml: osmChange XML
-      join_discussion: Prijavite se za pridružitev pogovoru
-      discussion: Pogovor
-      still_open: Nabor sprememb je še vedno odprt – pogovor se bo začel, ko bo nabor
-        sprememb zaprt.
     node:
       title_html: 'Vozlišče: %{name}'
       history_title_html: 'Zgodovina vozlišča: %{name}'
@@ -523,6 +504,9 @@ sl:
       feed:
         title: Nabor sprememb %{id}
         title_comment: Nabor sprememb %{id} – %{comment}
+        created: Ustvarjeno
+        closed: Zaprto
+        belongs_to: Avtor
     subscribe:
       heading: Se želite prijaviti na naslednjo razprave o naboru sprememb?
       button: Prijava na razpravo
@@ -537,6 +521,27 @@ sl:
       heading: Zapisa z id-jem %{id} ni
       body: Oprostite, nabora sprememb z oznako %{id} ni. Prosimo, preverite črkovanje
         in povezavo, ki ste jo kliknili.
+    show:
+      title: 'Nabor sprememb: %{id}'
+      created_ago_html: Ustvaril_a %{time_ago}
+      closed_ago_html: Zaprto %{time_ago}
+      created_ago_by_html: Ustvaril %{user} %{time_ago}
+      closed_ago_by_html: Zaprl_a %{time_ago} %{user}
+      discussion: Pogovor
+      join_discussion: Prijavite se za pridružitev pogovoru
+      still_open: Nabor sprememb je še vedno odprt – pogovor se bo začel, ko bo nabor
+        sprememb zaprt.
+      comment_by_html: Komentar %{user} %{time_ago}
+      hidden_comment_by_html: Skrit komentar %{user} %{time_ago}
+      changesetxml: Nabor sprememb XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Vozlišč (%{count})
+      nodes_paginated: Vozlišča (%{x}-%{y} od %{count})
+      ways: Poti (%{count})
+      ways_paginated: Poti (%{x}-%{y} od %{count})
+      relations: Relacije (%{count})
+      relations_paginated: Zveze (%{x}-%{y} od %{count})
     timeout:
       sorry: Žal je trajalo pridobivanje zahtevanega nabora sprememb predolgo.
   changeset_comments:
@@ -682,7 +687,7 @@ sl:
     scopes:
       address: Ogled vašega fizičnega naslova
       email: Ogled vašega e-poštnega naslova
-      openid: Preverite pristnost svojega računa
+      openid: Avtenticirajte svoj račun
       phone: Ogled vaše telefonske številke
       profile: Ogled vaših profilnih podatkov
   errors:
@@ -1923,11 +1928,6 @@ sl:
       new password button: Pošlji mi novo geslo
       help_text: Vpišite e-poštni naslov, s katerim ste se registrirali. Poslali vam
         bomo povezavo za ponastavitev gesla.
-    create:
-      notice email on way: E-pismo z vsemi potrebnimi podatki za nastavitev novega
-        gesla je že na poti.
-      notice email cannot find: Oprostite, toda vnesenega e-poštnega naslova ni bilo
-        mogoče najti.
     edit:
       title: Ponastavitev gesla
       heading: Ponastavi geslo za %{user}
@@ -2715,7 +2715,7 @@ sl:
     permissions:
       missing: Aplikaciji niste dovolili dostopa do te funkcije
     scopes:
-      openid: Vstop z uporabo OpenStreetMap
+      openid: Prijava z uporabo OpenStreetMap
       read_prefs: Branje uporabniških prilagoditev
       write_prefs: Spreminjanje uporabniških nastavitev
       write_diary: Ustvarjajte dnevniške zapise, komentarje in sklepajte prijateljstva
@@ -2959,8 +2959,7 @@ sl:
       title: Račun zaklenjen
       heading: Račun zaklenjen
       support: podpora
-      automatically_suspended: Oprostite, vaš račun je bil blokiran zaradi sumljive
-        dejavnosti.
+      automatically_suspended: Vaš račun je bil žal blokiran zaradi sumljive dejavnosti.
       contact_support_html: To odločitev bo kmalu pregledal administrator, lahko pa
         se obrnete na %{support_link}, če se želite o tem pogovoriti.
     auth_failure:
@@ -2971,7 +2970,7 @@ sl:
       invalid_scope: Neveljaven obseg
       unknown_error: Avtentikacija ni uspela
     auth_association:
-      heading: Vaš ID še ni povezan z računom OpenStreetMap.
+      heading: Vaš ID še ni povezan z OpenStreetMap računom.
       option_1: Če ste novi v OpenStreetMapu, prosimo, ustvarite nov račun z uporabo
         spodnjega obrazca.
       option_2: Če že imate račun, se lahko prijavite s svojim uporabniškim imenom
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 604314a0d..bb3a57ab6 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -156,8 +156,6 @@ sq:
         emailin tuaj për një shënim për të konfirmuar adresën e re të emailit tuaj.
       success: Informacioni i përdoruesit u përditësua me sukses.
   browse:
-    created: Krijuar
-    closed: Mbyllur
     version: Versioni
     in_changeset: Grupi i Ndryshimeve
     anonymous: Anonim
@@ -167,19 +165,6 @@ sq:
     view_history: Shiko Historikun
     view_details: Shiko Detajet
     location: 'Vendndodhja:'
-    changeset:
-      title: 'Grupi i Ndryshimeve: %{id}'
-      belongs_to: Autori
-      node: Nyjet (%{count})
-      node_paginated: Nyjet (%{x}-%{y} nga %{count})
-      way: Mënyrat (%{count})
-      way_paginated: Mënyrat (%{x}-%{y} nga %{count})
-      relation: Marrëdhëniet (%{count})
-      relation_paginated: Marrëdhëniet (%{x}-%{y} nga %{count})
-      changesetxml: Grupi i ndryshimeve në XML
-      osmchangexml: osmNdrsyhimi XML
-      join_discussion: Identifikohuni për t'iu bashkuar diskutimit
-      discussion: Diskutim
     node:
       title_html: 'Nyja: %{name}'
       history_title_html: 'Historiku i nyjës: %{name}'
@@ -277,6 +262,22 @@ sq:
       feed:
         title: 'Grupi i ndryshimeve: %{id}'
         title_comment: Grupi i ndryshimeve %{id} - %{comment}
+        created: Krijuar
+        closed: Mbyllur
+        belongs_to: Autori
+    show:
+      title: 'Grupi i Ndryshimeve: %{id}'
+      discussion: Diskutim
+      join_discussion: Identifikohuni për t'iu bashkuar diskutimit
+      changesetxml: Grupi i ndryshimeve në XML
+      osmchangexml: osmNdrsyhimi XML
+    paging_nav:
+      nodes: Nyjet (%{count})
+      nodes_paginated: Nyjet (%{x}-%{y} nga %{count})
+      ways: Mënyrat (%{count})
+      ways_paginated: Mënyrat (%{x}-%{y} nga %{count})
+      relations: Marrëdhëniet (%{count})
+      relations_paginated: Marrëdhëniet (%{x}-%{y} nga %{count})
     timeout:
       sorry: Na vjen keq, lista e ndryshimeve që ju kërkuat zgjati shumë për t'u rikuperuar.
   changeset_comments:
@@ -1010,11 +1011,6 @@ sq:
       help_text: Shkruani adresën e emailit që keni përdorur për tu regjistruar, ne
         do të dërgojmë një lidhje të cilën mund të përdorni për të rivendosur fjalëkalimin
         tuaj.
-    create:
-      notice email on way: Na vjen keq e keni humbur atë :-( por një email është në
-        rrugëtim kështu që ju mund të rivendosni atë së shpejti.
-      notice email cannot find: Na vjen keq, ne nuk arritë ta gjejmë adresën e emailit
-        të dhënë.
     edit:
       title: Rivendos fjalëkalimin
       heading: Rivendos fjalëkalimin për %{user}
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 5ec3fd879..4e3932237 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -151,10 +151,6 @@ sr-Latn:
         da biste potvrdili svoju novu e-adresu.
       success: Podaci o korisniku su uspešno ažurirani.
   browse:
-    changeset:
-      title: Skup izmena
-      changesetxml: XML skup izmena
-      osmchangexml: osmChange XML
     relation_member:
       entry_role_html: '%{type} %{name} kao %{role}'
       type:
@@ -218,6 +214,10 @@ sr-Latn:
       feed:
         title: Skup izmena %{id}
         title_comment: Skup izmena %{id} – %{comment}
+    show:
+      title: Skup izmena
+      changesetxml: XML skup izmena
+      osmchangexml: osmChange XML
     timeout:
       sorry: Žao nam je, ali spisak izmena koji ste zahtevali je predugačak.
   dashboards:
@@ -894,9 +894,6 @@ sr-Latn:
       new password button: Poništi lozinku
       help_text: Unesite e-adresu koju ste uneli pri upisu, a mi ćemo vam poslati
         vezu pomoću koje možete da poništite lozinku.
-    create:
-      notice email on way: Poruka za poništavanje lozinke je poslata.
-      notice email cannot find: E-adresa nije pronađena.
     edit:
       title: Poništi lozinku
       heading: Poništavanje lozinke za %{user}
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 6d236f9d7..d76c8f927 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -310,11 +310,6 @@ sr:
     destroy:
       success: Налог је обрисан.
   browse:
-    created: Направљено
-    closed: Затворено
-    created_ago_html: Направљено %{time_ago}
-    closed_ago_html: Затворено %{time_ago}
-    created_ago_by_html: Направљено %{time_ago} од %{user}
     edited_ago_by_html: Уређено %{time_ago} од %{user}
     version: Верзија
     in_changeset: Скуп промена
@@ -325,21 +320,6 @@ sr:
     view_history: Погледај историју
     view_details: Детаљније
     location: 'Локација:'
-    changeset:
-      title: 'Скуп промена: %{id}'
-      belongs_to: Аутор
-      node: Тачке (%{count})
-      node_paginated: Тачке (%{x}-%{y} од %{count})
-      way: Линије (%{count})
-      way_paginated: Линије (%{x}-%{y} од %{count})
-      relation: Односи (%{count})
-      relation_paginated: Односи (%{x}-%{y} од %{count})
-      hidden_comment_by_html: Сакривени коментар корисника %{user} %{time_ago}
-      comment_by_html: '%{user} коментарисао(ла) пре %{time_ago}'
-      changesetxml: XML скуп промена
-      osmchangexml: osmChange XML
-      join_discussion: Пријавите се да бисте се придружили дискусији
-      discussion: Дискусија
     node:
       title_html: 'Тачка: %{name}'
       history_title_html: 'Историја тачака: %{name}'
@@ -437,6 +417,27 @@ sr:
       feed:
         title: Скуп промена %{id}
         title_comment: Скуп промена %{id} – %{comment}
+        created: Направљено
+        closed: Затворено
+        belongs_to: Аутор
+    show:
+      title: 'Скуп промена: %{id}'
+      created_ago_html: Направљено %{time_ago}
+      closed_ago_html: Затворено %{time_ago}
+      created_ago_by_html: Направљено %{time_ago} од %{user}
+      discussion: Дискусија
+      join_discussion: Пријавите се да бисте се придружили дискусији
+      comment_by_html: '%{user} коментарисао(ла) пре %{time_ago}'
+      hidden_comment_by_html: Сакривени коментар корисника %{user} %{time_ago}
+      changesetxml: XML скуп промена
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Тачке (%{count})
+      nodes_paginated: Тачке (%{x}-%{y} од %{count})
+      ways: Линије (%{count})
+      ways_paginated: Линије (%{x}-%{y} од %{count})
+      relations: Односи (%{count})
+      relations_paginated: Односи (%{x}-%{y} од %{count})
     timeout:
       sorry: Преузимање захтеваних скупова промена је трајало предуго.
   changeset_comments:
@@ -1547,9 +1548,6 @@ sr:
       new password button: Поништи лозинку
       help_text: Унесите е-адресу коју сте унели при упису, а ми ћемо вам послати
         везу помоћу које можете да поништите лозинку.
-    create:
-      notice email on way: Порука за поништавање лозинке је послата.
-      notice email cannot find: Имејл адреса није пронађена, жао нам је.
     edit:
       title: Поништи лозинку
       heading: Поништавање лозинке за %{user}
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 2f18d5892..734a6f454 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -367,12 +367,6 @@ sv:
     destroy:
       success: Kontot har raderats.
   browse:
-    created: Skapad
-    closed: Stängd
-    created_ago_html: Skapades %{time_ago}
-    closed_ago_html: Stängdes %{time_ago}
-    created_ago_by_html: Skapades %{time_ago} av %{user}
-    closed_ago_by_html: Stängdes %{time_ago} av %{user}
     deleted_ago_by_html: Raderades %{time_ago} av %{user}
     edited_ago_by_html: Redigerades %{time_ago} av %{user}
     version: Version
@@ -390,23 +384,6 @@ sv:
     view_history: Visa historik
     view_details: Visa detaljer
     location: 'Plats:'
-    changeset:
-      title: 'Ändringsuppsättning: %{id}'
-      belongs_to: Författare
-      node: Noder (%{count})
-      node_paginated: Noder (%{x}-%{y} av %{count})
-      way: Sträckor (%{count})
-      way_paginated: Sträckor (%{x}-%{y} av %{count})
-      relation: Förbindelser (%{count})
-      relation_paginated: Förbindelser (%{x}-%{y} av %{count})
-      hidden_comment_by_html: Dold kommentar från %{user} %{time_ago}
-      comment_by_html: Kommenterades från %{user} %{time_ago}
-      changesetxml: XML för ändringsuppsättning
-      osmchangexml: osmChange XML
-      join_discussion: Logga in för att delta i diskussionen
-      discussion: Diskussion
-      still_open: Ändringsuppsättningen är fortfarande öppen - diskussionen kommer
-        att öppnas när ändringsuppsättning har stängts.
     node:
       title_html: 'Nod: %{name}'
       history_title_html: 'Nodhistorik: %{name}'
@@ -524,6 +501,30 @@ sv:
       feed:
         title: Ändringsuppsättning %{id}
         title_comment: Ändringsset %{id} - %{comment}
+        created: Skapad
+        closed: Stängd
+        belongs_to: Författare
+    show:
+      title: 'Ändringsuppsättning: %{id}'
+      created_ago_html: Skapades %{time_ago}
+      closed_ago_html: Stängdes %{time_ago}
+      created_ago_by_html: Skapades %{time_ago} av %{user}
+      closed_ago_by_html: Stängdes %{time_ago} av %{user}
+      discussion: Diskussion
+      join_discussion: Logga in för att delta i diskussionen
+      still_open: Ändringsuppsättningen är fortfarande öppen - diskussionen kommer
+        att öppnas när ändringsuppsättning har stängts.
+      comment_by_html: Kommenterades från %{user} %{time_ago}
+      hidden_comment_by_html: Dold kommentar från %{user} %{time_ago}
+      changesetxml: XML för ändringsuppsättning
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Noder (%{count})
+      nodes_paginated: Noder (%{x}-%{y} av %{count})
+      ways: Sträckor (%{count})
+      ways_paginated: Sträckor (%{x}-%{y} av %{count})
+      relations: Förbindelser (%{count})
+      relations_paginated: Förbindelser (%{x}-%{y} av %{count})
     timeout:
       sorry: Kunde tyvärr inte lista begärda ändringsuppsättningar. Begäran tog för
         lång tid att hämta.
@@ -1880,10 +1881,6 @@ sv:
       new password button: Återställ lösenord
       help_text: Ange e-postadressen du använde för att registrera dig så skickar
         vi en länk till den som du kan använda för att återställa ditt lösenord.
-    create:
-      notice email on way: Ledsen att du tappade bort det :-( men ett mejl är på väg
-        så du kan återställa det snart.
-      notice email cannot find: Kunde inte hitta den e-postadressen, tyvärr.
     edit:
       title: Återställ lösenord
       heading: Återställ lösenord för %{user}
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index e34397786..c9b510dc0 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -12,6 +12,7 @@
 # Author: Rakeshonwiki
 # Author: Sank
 # Author: Shanmugamp7
+# Author: Sriveenkat
 # Author: Surya Prakash.S.A.
 # Author: TRYPPN
 # Author: தமிழ்க்குரிசில்
@@ -168,6 +169,26 @@ ta:
     remote:
       name: தொலைவுக் கட்டுப்பாடு
       description: தொலைவு கட்டுப்பாடு (JOSM அல்லது Merkaartor)
+  auth:
+    providers:
+      google: கூகுள்
+      facebook: முகநூல்
+      github: கிட்ஹப்
+      wikipedia: விக்கிப்பீடியா
+  api:
+    notes:
+      comment:
+        opened_at_html: '%{when} உருவாக்கப்பட்டது'
+        opened_at_by_html: '%{when} %{user} பயனரால் உருவாக்கப்பட்டது'
+  account:
+    deletions:
+      show:
+        title: எமது கணக்கை நீக்கு
+        warning: எச்சரிக்கை! கணக்கு நீக்குதல் செயல்முறை இறுதியானது, அதை மாற்ற முடியாது.
+        delete_account: கணக்கை நீக்குக
+        delete_introduction: 'கீழே உள்ள பொத்தானைப் பயன்படுத்தி உங்கள் ஓபன்ஸ்ட்ரீட்மேப்
+          கணக்கை நீக்கலாம். பின்வரும் விவரங்களைக் கவனியுங்கள்:'
+        cancel: கைவிடுக
   accounts:
     edit:
       title: கணக்கை திருத்து
@@ -175,23 +196,28 @@ ta:
       current email address: 'தற்பொழுதுள்ள மின்னஞ்சல் முகவரி:'
       openid:
         link text: இது என்ன?
+      public editing:
+        enabled link text: இது என்ன?
       contributor terms:
         link text: இது என்ன?
       save changes button: மாற்றங்களைச் சேமி
+    go_public:
+      email_not_revealed: உங்கள் மின்னஞ்சல் முகவரி பொதுவில் வெளியிடப்படாது.
+      not_reversible: இந்தச் செயலை மாற்றியமைக்க முடியாது, அனைத்து புதிய பயனர்களும்
+        இயல்பாகவே பொதுவில் உள்ளனர்.
+    update:
+      success: பயனர் தகவல் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.
+    destroy:
+      success: பயனர் கணக்கு நீக்கப்பட்டது.
   browse:
-    created: உருவாக்கப்பட்டது
-    closed: மூடப்பட்டது
+    deleted_ago_by_html: '%{user} பயனரால் %{time_ago} நீக்கப்பட்டது'
+    edited_ago_by_html: '%{user} ஆல் %{time_ago} திருத்தப்பட்டது'
     version: பதிப்பு
     in_changeset: மாற்றங்கள்
     anonymous: அடையாளமற்றவர்
+    view_history: வரலாற்றைக் காண்க
     view_details: விவரங்களைக் காட்டு
     location: 'இடம்:'
-    changeset:
-      title: 'மாற்றங்கள்: %{id}'
-      belongs_to: ஆசிரியர்
-      changesetxml: மாற்றத்தொடுப்பு XML
-      osmchangexml: osmChange XML
-      discussion: உரையாடல்
     relation:
       members: உறுப்பினர்கள்
     relation_member:
@@ -204,6 +230,7 @@ ta:
       entry_html: தொடர்பு %{relation_name}
       entry_role_html: தொடர்பு %{relation_name} (%{relation_role} ஆக)
     not_found:
+      title: காணப்படவில்லை
       sorry: மன்னிக்கவும், %{id} என்ற அடையாளம் கொண்ட %{type} கிடைக்கவில்லை.
       type:
         node: முனையம்
@@ -251,6 +278,14 @@ ta:
       feed:
         title: 'மாற்றங்கள்: %{id}'
         title_comment: மாற்றங்கள் %{id}-%{comment}
+        created: உருவாக்கப்பட்டது
+        closed: மூடப்பட்டது
+        belongs_to: ஆசிரியர்
+    show:
+      title: 'மாற்றங்கள்: %{id}'
+      discussion: உரையாடல்
+      changesetxml: மாற்றத்தொடுப்பு XML
+      osmchangexml: osmChange XML
   dashboards:
     contact:
       km away: '%{count}கிமீ தாண்டி'
diff --git a/config/locales/te.yml b/config/locales/te.yml
index e440515d6..57aceabab 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -305,8 +305,6 @@ te:
     destroy:
       success: ఖాతాను తొలగించాం.
   browse:
-    created: 'సృష్టించబడినది:'
-    closed: ముగించబడింది
     version: సంచిక
     in_changeset: మార్పులసమితి
     anonymous: అజ్ఞాత
@@ -322,20 +320,6 @@ te:
     view_history: చరిత్రను చూడండి
     view_details: వివరాలను చూడండి
     location: 'ప్రాంతం:'
-    changeset:
-      title: 'మార్పులసమితి: %{id}'
-      belongs_to: రచయిత
-      node: బుడిపెలు (%{count})
-      node_paginated: బుడిపెలు (%{count} లో %{x}-%{y})
-      way: మార్గాలు (%{count})
-      way_paginated: దారులు (%{count} లో %{x}-%{y})
-      relation: సంబంధాలు (%{count})
-      relation_paginated: '%{count} లో %{x}-%{y} యొక్క సంబంధాలు'
-      changesetxml: మార్పులసమితి XML
-      osmchangexml: osmChange XML
-      join_discussion: చర్చలో పాల్గొనేందుకు లాగినవండి
-      discussion: చర్చ
-      still_open: మార్పులసమితి ఇంకా తెరిచే ఉంది - దాన్ని మూసివేయగానే చర్చ తెరుచుకుంటుంది.
     node:
       title_html: 'బిందువు: %{name}'
       history_title_html: 'బుడిపె చరిత్ర: %{name}'
@@ -438,6 +422,23 @@ te:
       feed:
         title: మార్పులసమితి %{id}
         title_comment: మార్పులసమితి %{id} - %{comment}
+        created: 'సృష్టించబడినది:'
+        closed: ముగించబడింది
+        belongs_to: రచయిత
+    show:
+      title: 'మార్పులసమితి: %{id}'
+      discussion: చర్చ
+      join_discussion: చర్చలో పాల్గొనేందుకు లాగినవండి
+      still_open: మార్పులసమితి ఇంకా తెరిచే ఉంది - దాన్ని మూసివేయగానే చర్చ తెరుచుకుంటుంది.
+      changesetxml: మార్పులసమితి XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: బుడిపెలు (%{count})
+      nodes_paginated: బుడిపెలు (%{count} లో %{x}-%{y})
+      ways: మార్గాలు (%{count})
+      ways_paginated: దారులు (%{count} లో %{x}-%{y})
+      relations: సంబంధాలు (%{count})
+      relations_paginated: '%{count} లో %{x}-%{y} యొక్క సంబంధాలు'
     timeout:
       sorry: సారీ, మీరడిగిన మార్పులసమితుల జాబితాను తేవడంలో చాలా సమయం పట్టింది.
   changeset_comments:
@@ -1709,10 +1710,6 @@ te:
       new password button: సంకేతపదాన్ని మార్చు
       help_text: నమోదైనపుడు మీరిచ్చిన ఈమెయిలు చిరునామాను ఇవ్వండి. సంకేతపదాన్ని మార్చుకునే
         లింకును ఆ చిరునామాకు పంపిస్తాం.
-    create:
-      notice email on way: అయ్యో.. పోయిందా :-( పోన్లెండి, దాన్ని మార్చుకునేందుకు ఒక
-        ఈమెయిలు వచ్చేస్తోంది.
-      notice email cannot find: క్షమించండి, ఆ ఈమెయిలు చిరునామా దొరకలేదు.
     edit:
       title: సంకేతపదం మార్పు
       heading: '%{user} సంకేతపదాన్ని మార్చు'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index e2e19e3a6..4cb4befd4 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -274,12 +274,6 @@ th:
     destroy:
       success: ลบบัญชีแล้ว
   browse:
-    created: สร้างเมื่อ
-    closed: ปิดเมื่อ
-    created_ago_html: สร้างเมื่อ %{time_ago}
-    closed_ago_html: ปิดเมื่อ %{time_ago}
-    created_ago_by_html: สร้างเมื่อ %{time_ago} โดย %{user}
-    closed_ago_by_html: ปิดเมื่อ %{time_ago} โดย %{user}
     deleted_ago_by_html: ลบเมื่อ %{time_ago} โดย %{user}
     edited_ago_by_html: แก้ไขเมื่อ %{time_ago} โดย %{user}
     version: รุ่นที่
@@ -295,22 +289,6 @@ th:
     view_history: ดูประวัติ
     view_details: ดูรายละเอียด
     location: 'ที่ตั้ง:'
-    changeset:
-      title: 'ชุดการเปลี่ยนแปลง: %{id}'
-      belongs_to: ผู้สร้างสรรค์
-      node: หมุด (%{count})
-      node_paginated: หมุดที่ (%{x}-%{y} จากทั้งหมด %{count})
-      way: เส้นทาง (%{count})
-      way_paginated: เส้นทางที่ (%{x}-%{y} จาก %{count})
-      relation: ความสัมพันธ์ (%{count})
-      relation_paginated: ความสัมพันธ์ (%{x}-%{y} จาก %{count})
-      hidden_comment_by_html: ความคิดเห็นที่ซ่อนอยู่จาก %{user} %{time_ago}
-      comment_by_html: ความคิดเห็นจาก %{user} %{time_ago}
-      changesetxml: ชุดการเปลี่ยนแปลง XML
-      osmchangexml: เอ็กซ์เอ็มแอลของ osmChange
-      join_discussion: เข้าสู่ระบบเพื่อเข้าร่วมการอภิปราย
-      discussion: การอภิปราย
-      still_open: ชุดการเปลี่ยนแปลงกำลังเปิดอยู่ การอภิปรายจะเริ่มได้หลังจากปิดชุดการเปลี่ยนแปลงแล้ว
     node:
       title_html: 'หมุด: %{name}'
       history_title_html: 'ประวัติหมุด: %{name}'
@@ -412,6 +390,29 @@ th:
       feed:
         title: ชุดการเปลี่ยนแปลง %{id}
         title_comment: ชุดการเปลี่ยนแปลง %{id} - %{comment}
+        created: สร้างเมื่อ
+        closed: ปิดเมื่อ
+        belongs_to: ผู้สร้างสรรค์
+    show:
+      title: 'ชุดการเปลี่ยนแปลง: %{id}'
+      created_ago_html: สร้างเมื่อ %{time_ago}
+      closed_ago_html: ปิดเมื่อ %{time_ago}
+      created_ago_by_html: สร้างเมื่อ %{time_ago} โดย %{user}
+      closed_ago_by_html: ปิดเมื่อ %{time_ago} โดย %{user}
+      discussion: การอภิปราย
+      join_discussion: เข้าสู่ระบบเพื่อเข้าร่วมการอภิปราย
+      still_open: ชุดการเปลี่ยนแปลงกำลังเปิดอยู่ การอภิปรายจะเริ่มได้หลังจากปิดชุดการเปลี่ยนแปลงแล้ว
+      comment_by_html: ความคิดเห็นจาก %{user} %{time_ago}
+      hidden_comment_by_html: ความคิดเห็นที่ซ่อนอยู่จาก %{user} %{time_ago}
+      changesetxml: ชุดการเปลี่ยนแปลง XML
+      osmchangexml: เอ็กซ์เอ็มแอลของ osmChange
+    paging_nav:
+      nodes: หมุด (%{count})
+      nodes_paginated: หมุดที่ (%{x}-%{y} จากทั้งหมด %{count})
+      ways: เส้นทาง (%{count})
+      ways_paginated: เส้นทางที่ (%{x}-%{y} จาก %{count})
+      relations: ความสัมพันธ์ (%{count})
+      relations_paginated: ความสัมพันธ์ (%{x}-%{y} จาก %{count})
     timeout:
       sorry: ขออภัย รายการชุดการเปลี่ยนแปลงที่ท่านร้องขอใช้เวลานานเกินสมควรในการสืบค้น
   changeset_comments:
@@ -1420,8 +1421,6 @@ th:
       heading: ลืมรหัสผ่านหรือ?
       email address: 'ที่อยู่อีเมล:'
       new password button: ตั้งรหัสผ่านใหม่
-    create:
-      notice email cannot find: ขออภัย, ไม่พบที่อยู่อีเมลที่ระบุ
     edit:
       title: ตั้งรหัสผ่านใหม่
       heading: 'ตั้วรหัสผ่านใหม่สำหรับ: %{user}'
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index c1d1f810d..5298b5e36 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -268,8 +268,6 @@ tl:
         ng e-liham.
       success: Matagumpay na naisapanahon ang kabatiran sa tagagamit.
   browse:
-    created: Nilikha
-    closed: Isinara
     version: Bersyon
     in_changeset: Pangkat ng pagbabago
     anonymous: Hindi nagpapakilala (anonimo)
@@ -285,21 +283,6 @@ tl:
     view_history: Tingnan ang kasaysayan
     view_details: Tingnan ang mga detalye
     location: Pook (lokasyon)
-    changeset:
-      title: 'Pangkat ng pagbabago: %{id}'
-      belongs_to: May-akda
-      node: Mga buko (%{count})
-      node_paginated: Mga buko (%{x}-%{y} ng %{count})
-      way: Mga daan (%{count})
-      way_paginated: Mga daan (%{x}-%{y} ng %{count})
-      relation: Mga kaugnayan (%{count})
-      relation_paginated: Mga kaugnayan (%{x}-%{y} ng %{count})
-      changesetxml: XML ng pangkat ng pagbabago
-      osmchangexml: XML ng osmChange
-      join_discussion: Lumagda para sumali sa talakayan
-      discussion: Talakayan
-      still_open: Bukas pa rin ang pangkat ng pagbabago - magbubukas ang talakayan
-        pag naisara na ang pangkat ng pagbabago.
     node:
       title_html: 'Buko: %{name}'
       history_title_html: 'Kasaysayan ng Buko: %{name}'
@@ -403,6 +386,24 @@ tl:
       feed:
         title: '%{id} ng pangkat ng pagbabago'
         title_comment: '%{id} ng angkat ng pagbabago - %{comment}'
+        created: Nilikha
+        closed: Isinara
+        belongs_to: May-akda
+    show:
+      title: 'Pangkat ng pagbabago: %{id}'
+      discussion: Talakayan
+      join_discussion: Lumagda para sumali sa talakayan
+      still_open: Bukas pa rin ang pangkat ng pagbabago - magbubukas ang talakayan
+        pag naisara na ang pangkat ng pagbabago.
+      changesetxml: XML ng pangkat ng pagbabago
+      osmchangexml: XML ng osmChange
+    paging_nav:
+      nodes: Mga buko (%{count})
+      nodes_paginated: Mga buko (%{x}-%{y} ng %{count})
+      ways: Mga daan (%{count})
+      ways_paginated: Mga daan (%{x}-%{y} ng %{count})
+      relations: Mga kaugnayan (%{count})
+      relations_paginated: Mga kaugnayan (%{x}-%{y} ng %{count})
     timeout:
       sorry: Paumanhin, ang talaan ng mga pangkat ng pagbabagong hiniling mo ay naging
         napakatagal bago nakuhang muli.
@@ -1432,10 +1433,6 @@ tl:
       help_text: Ipasok ang tirahan ng e-liham na ginamit mo upang magpatala, ipapadala
         namin ang isang kawing papunta rito na magagamit mo upang muling maitakda
         mo ang iyong password.
-    create:
-      notice email on way: Ikinalulungkot na naiwala mo iyan :-( ngunit darating na
-        ang isang e-liham upang maitakda mong muli iyan kaagad.
-      notice email cannot find: Hindi matagpuan ang ganyang tirahan ng e-liham, paumanhin.
     edit:
       title: Muling itakda ang password
       heading: Muling itakda ang Hudyat para kay %{user}
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index a127c5322..1096e8619 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -367,15 +367,10 @@ tr:
     destroy:
       success: Hesap Silindi.
   browse:
-    created: Oluşturulma
-    closed: Kapandı
-    created_ago_html: '%{time_ago} oluşturuldu'
-    closed_ago_html: '%{time_ago} kapatıldı'
-    created_ago_by_html: '%{user} tarafından %{time_ago} oluşturuldu'
-    closed_ago_by_html: '%{user} tarafından %{time_ago} kapatıldı'
     deleted_ago_by_html: '%{user} tarafından %{time_ago} silindi'
     edited_ago_by_html: '%{user} tarafından %{time_ago} düzenlendi'
     version: Sürüm
+    redacted_version: Düzenlenmiş Sürüm
     in_changeset: Değişiklik Kaydı
     anonymous: anonim
     no_comment: (yorum yok)
@@ -388,25 +383,11 @@ tr:
       other: '%{count} yol'
     download_xml: XML Ä°ndir
     view_history: Geçmişi Görüntüle
+    view_unredacted_history: Düzenlenmemiş Geçmişi Görüntüle
     view_details: Ayrıntıları Görüntüle
+    view_redacted_data: Düzenlenmiş Veriyi Görüntüle
+    view_redaction_message: Düzenlenmiş Mesajı Görüntüle
     location: 'Konum:'
-    changeset:
-      title: 'Değişiklik kaydı: %{id}'
-      belongs_to: Yazar
-      node: Noktalar (%{count})
-      node_paginated: Nokta (%{x}-%{y} - toplam %{count})
-      way: Yollar (%{count})
-      way_paginated: Yol (%{x}-%{y} - toplam %{count})
-      relation: İlişkiler (%{count})
-      relation_paginated: İlişkiler (%{x}-%{y} - toplam %{count})
-      hidden_comment_by_html: '%{user} tarafından %{time_ago} yapılan gizli yorum'
-      comment_by_html: '%{user} tarafından %{time_ago} yapılan yorum'
-      changesetxml: ' XML değişiklik kaydı'
-      osmchangexml: osmChange XML
-      join_discussion: Tartışmaya katılmak için lütfen giriş yapın
-      discussion: Tartışma
-      still_open: Değişiklik kaydı hâlâ açık - tartışma, değişiklik serisi kapatıldığında
-        açılacaktır.
     node:
       title_html: 'Nokta: %{name}'
       history_title_html: 'Nokta Geçmişi: %{name}'
@@ -524,6 +505,9 @@ tr:
       feed:
         title: Değişiklik kaydı %{id}
         title_comment: Değişiklik takımı %{id} - %{comment}
+        created: Oluşturulma
+        closed: Kapandı
+        belongs_to: Yazar
     subscribe:
       heading: Aşağıdaki değişiklik kaydı tartışmasına abone olmak ister misiniz?
       button: Tartışmaya abone ol
@@ -538,6 +522,29 @@ tr:
       heading: 'Şu kimliğe sahip girdi yok: %{id}'
       body: Üzgünüz, %{id} kimliğine sahip herhangi bir değişiklik kaydı yok. Lütfen
         yazımınızı kontrol edin ya da tıkladığınız bağlantı yanlış olabilir.
+    show:
+      title: 'Değişiklik kaydı: %{id}'
+      created: 'Oluşturma: %{when}'
+      closed: 'Kapanma: %{when}'
+      created_ago_html: '%{time_ago} oluşturuldu'
+      closed_ago_html: '%{time_ago} kapatıldı'
+      created_ago_by_html: '%{user} tarafından %{time_ago} oluşturuldu'
+      closed_ago_by_html: '%{user} tarafından %{time_ago} kapatıldı'
+      discussion: Tartışma
+      join_discussion: Tartışmaya katılmak için lütfen giriş yapın
+      still_open: Değişiklik kaydı hâlâ açık - tartışma, değişiklik serisi kapatıldığında
+        açılacaktır.
+      comment_by_html: '%{user} tarafından %{time_ago} yapılan yorum'
+      hidden_comment_by_html: '%{user} tarafından %{time_ago} yapılan gizli yorum'
+      changesetxml: ' XML değişiklik kaydı'
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Noktalar (%{count})
+      nodes_paginated: Nokta (%{x}-%{y} - toplam %{count})
+      ways: Yollar (%{count})
+      ways_paginated: Yol (%{x}-%{y} - toplam %{count})
+      relations: İlişkiler (%{count})
+      relations_paginated: İlişkiler (%{x}-%{y} - toplam %{count})
     timeout:
       sorry: Üzgünüz, değişiklik kayıtlarının listelenmesi fazla sürdü.
   changeset_comments:
@@ -1923,9 +1930,8 @@ tr:
       help_text: Kaydolmak için kullandığınız e-posta adresini girin, şifrenizi sıfırlamak
         için kullanabileceğiniz bir bağlantı yollayacağız.
     create:
-      notice email on way: Maalesef şifrenizi kaybettiniz :-( Ancak yeni bir e-posta
-        yolda böylece şifreniziyakında sıfırlayabilirsiniz.
-      notice email cannot find: 'Üzgünüz: bu e-posta adresi bulunamadı.'
+      send_paranoid_instructions: E-posta adresiniz veritabanımızda mevcutsa birkaç
+        dakika içinde e-posta adresinize bir şifre kurtarma bağlantısı gönderilecektir.
     edit:
       title: Parolayı sıfırla
       heading: '%{user} İçin Parolayı Sıfırlayın'
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 074631aa5..1830a614a 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -313,12 +313,6 @@ tt:
     destroy:
       success: Хисапъязма бетерелде.
   browse:
-    created: Төзелгән
-    closed: Ябык
-    created_ago_html: 'Күпме вакыт элек ясалды: %{time_ago}'
-    closed_ago_html: 'Күпме вакыт элек ябылды: %{time_ago}'
-    created_ago_by_html: 'Күпме вакыт элек ясалды: %{time_ago}, кем тарафыннан: %{user}'
-    closed_ago_by_html: 'Күпме вакыт элек ябылды: %{time_ago}, кем тарафыннан: %{user}'
     deleted_ago_by_html: 'Күпме вакыт элек бетерелде: %{time_ago}, кем тарафыннан:
       %{user}'
     edited_ago_by_html: 'Күпме вакыт элек үзгәртелде: %{time_ago}, кем тарафыннан:
@@ -338,23 +332,6 @@ tt:
     view_history: Тарихын карау
     view_details: Тулырак мәгълүмат
     location: 'Урын:'
-    changeset:
-      title: 'Үзгәртүләр өеме: %{id}'
-      belongs_to: Автор
-      node: Нокталар (%{count})
-      node_paginated: Нокталар (%{count} ноктадан %{x}-%{y})
-      way: Сызыклар (%{count})
-      way_paginated: Сызыклар (%{count} сызыктан %{x}-%{y})
-      relation: Мөнәсәбәтләр (%{count})
-      relation_paginated: Мөнәсәбәтләр (%{count} мөнәсәбәттән %{x}-%{y})
-      hidden_comment_by_html: '%{user} исемле кулланучыдан яшерен шәрех %{time_ago}'
-      comment_by_html: '%{user} исемле кулланучыдан шәрех %{time_ago}'
-      changesetxml: Үзгәртүләр өеменең XMLы
-      osmchangexml: osmChange XML
-      join_discussion: Бәхәстә катнашу өчен хисапъязмагызга керегез
-      discussion: Фикер алышу
-      still_open: Үзгәртүләр өеме әлегә ачык. Ул ябылгач бәхәскә шунда ук керергә
-        мөмкин булыр.
     node:
       title_html: 'Нокта: %{name}'
       history_title_html: 'Нокта тарихы: %{name}'
@@ -427,6 +404,31 @@ tt:
       feed:
         title: '%{id} үзгәртүләр өеме'
         title_comment: '%{id} үзгәртүләр өеме  -  %{comment}'
+        created: Төзелгән
+        closed: Ябык
+        belongs_to: Автор
+    show:
+      title: 'Үзгәртүләр өеме: %{id}'
+      created_ago_html: 'Күпме вакыт элек ясалды: %{time_ago}'
+      closed_ago_html: 'Күпме вакыт элек ябылды: %{time_ago}'
+      created_ago_by_html: 'Күпме вакыт элек ясалды: %{time_ago}, кем тарафыннан:
+        %{user}'
+      closed_ago_by_html: 'Күпме вакыт элек ябылды: %{time_ago}, кем тарафыннан: %{user}'
+      discussion: Фикер алышу
+      join_discussion: Бәхәстә катнашу өчен хисапъязмагызга керегез
+      still_open: Үзгәртүләр өеме әлегә ачык. Ул ябылгач бәхәскә шунда ук керергә
+        мөмкин булыр.
+      comment_by_html: '%{user} исемле кулланучыдан шәрех %{time_ago}'
+      hidden_comment_by_html: '%{user} исемле кулланучыдан яшерен шәрех %{time_ago}'
+      changesetxml: Үзгәртүләр өеменең XMLы
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Нокталар (%{count})
+      nodes_paginated: Нокталар (%{count} ноктадан %{x}-%{y})
+      ways: Сызыклар (%{count})
+      ways_paginated: Сызыклар (%{count} сызыктан %{x}-%{y})
+      relations: Мөнәсәбәтләр (%{count})
+      relations_paginated: Мөнәсәбәтләр (%{count} мөнәсәбәттән %{x}-%{y})
   dashboards:
     contact:
       latest_edit_html: 'Соңгы төзәтмә (%{ago}):'
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 4fe97ebea..2fef0aeb3 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -392,12 +392,6 @@ uk:
     destroy:
       success: Обліковий запис видалено.
   browse:
-    created: Створено
-    closed: Закрито
-    created_ago_html: Створено %{time_ago}
-    closed_ago_html: Закрито %{time_ago}
-    created_ago_by_html: Створив(ла) %{user} %{time_ago}
-    closed_ago_by_html: Закрив(ла) %{time_ago} %{user}
     deleted_ago_by_html: Вилучив(ла) %{time_ago} %{user}
     edited_ago_by_html: Змінено %{user} %{time_ago}
     version: Версія
@@ -419,23 +413,6 @@ uk:
     view_history: Перегляд історії
     view_details: Поточна інформація
     location: 'Координати:'
-    changeset:
-      title: 'Набір змін: %{id}'
-      belongs_to: Автор
-      node: Точки (%{count})
-      node_paginated: Точки (%{x}-%{y} із %{count})
-      way: Лінії (%{count})
-      way_paginated: Лінії (%{x}-%{y} із %{count})
-      relation: Зв’язки (%{count})
-      relation_paginated: Зв’язки (%{x}-%{y} із %{count})
-      hidden_comment_by_html: Прихований коментар від %{user} %{time_ago}
-      comment_by_html: Коментар від %{user} %{time_ago}
-      changesetxml: XML опис набору змін
-      osmchangexml: osmChange XML
-      join_discussion: Увійдіть в систему, щоб приєднатися до обговорення
-      discussion: Обговорення
-      still_open: Набір змін досі відкритий — обговорення буде відкрито, як тільки
-        він стане закритим.
     node:
       title_html: 'Точка: %{name}'
       history_title_html: 'Історія точки: %{name}'
@@ -550,6 +527,30 @@ uk:
       feed:
         title: Набір змін %{id}
         title_comment: Набір змін %{id} — %{comment}
+        created: Створено
+        closed: Закрито
+        belongs_to: Автор
+    show:
+      title: 'Набір змін: %{id}'
+      created_ago_html: Створено %{time_ago}
+      closed_ago_html: Закрито %{time_ago}
+      created_ago_by_html: Створив(ла) %{user} %{time_ago}
+      closed_ago_by_html: Закрив(ла) %{time_ago} %{user}
+      discussion: Обговорення
+      join_discussion: Увійдіть в систему, щоб приєднатися до обговорення
+      still_open: Набір змін досі відкритий — обговорення буде відкрито, як тільки
+        він стане закритим.
+      comment_by_html: Коментар від %{user} %{time_ago}
+      hidden_comment_by_html: Прихований коментар від %{user} %{time_ago}
+      changesetxml: XML опис набору змін
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Точки (%{count})
+      nodes_paginated: Точки (%{x}-%{y} із %{count})
+      ways: Лінії (%{count})
+      ways_paginated: Лінії (%{x}-%{y} із %{count})
+      relations: Зв’язки (%{count})
+      relations_paginated: Зв’язки (%{x}-%{y} із %{count})
     timeout:
       sorry: На жаль, перелік наборів змін, який ви запросили, потребує забагато часу
         для завантаження.
@@ -1925,10 +1926,6 @@ uk:
       new password button: Вишліть мені новий пароль
       help_text: Введіть адресу вашої електронної пошти, яку ви використовували для
         реєстрації, і ми надішлемо інструкції, як можна відновити ваш пароль.
-    create:
-      notice email on way: Шкода, що ви втратили пароль :-( але нічого, скоро прийде
-        лист і ви зможете перевстановити свій пароль.
-      notice email cannot find: На жаль, така адреса не зареєстрована.
     edit:
       title: Скидання пароля
       heading: Скидання пароля для %{user}
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 82df5b4fe..be8c2f827 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -312,12 +312,6 @@ vi:
     destroy:
       success: Đã Xóa Tài khoản
   browse:
-    created: Tạo
-    closed: Đóng
-    created_ago_html: Tạo %{time_ago}
-    closed_ago_html: Đóng %{time_ago}
-    created_ago_by_html: Tạo %{time_ago} bởi %{user}
-    closed_ago_by_html: Đóng %{time_ago} bởi %{user}
     deleted_ago_by_html: Xóa %{time_ago} bởi %{user}
     edited_ago_by_html: Sửa đổi %{time_ago} bởi %{user}
     version: Phiên bản
@@ -333,23 +327,6 @@ vi:
     view_history: Xem Lịch sử
     view_details: Xem Chi tiết
     location: 'Vị trí:'
-    changeset:
-      title: 'Bộ thay đổi: %{id}'
-      belongs_to: Tác giả
-      node: Các nốt (%{count})
-      node_paginated: Các nốt (%{x}–%{y} trên %{count})
-      way: Các lối (%{count})
-      way_paginated: Các lối (%{x}–%{y} trên %{count})
-      relation: Các quan hệ (%{count})
-      relation_paginated: Các quan hệ (%{x}–%{y} trên %{count})
-      hidden_comment_by_html: Nhận xét ẩn của %{user} từ %{time_ago}
-      comment_by_html: Nhận xét của %{user} từ %{time_ago}
-      changesetxml: Bộ thay đổi XML
-      osmchangexml: osmChange XML
-      join_discussion: Đăng nhập để tham gia thảo luận
-      discussion: Thảo luận
-      still_open: Bộ thay đổi đang mở – có thể thảo luận sau khi bộ thay đổi được
-        đóng.
     node:
       title_html: 'Nốt: %{name}'
       history_title_html: 'Lịch sử Nốt: %{name}'
@@ -456,6 +433,30 @@ vi:
       feed:
         title: Bộ thay đổi %{id}
         title_comment: Bộ thay đổi %{id} – %{comment}
+        created: Tạo
+        closed: Đóng
+        belongs_to: Tác giả
+    show:
+      title: 'Bộ thay đổi: %{id}'
+      created_ago_html: Tạo %{time_ago}
+      closed_ago_html: Đóng %{time_ago}
+      created_ago_by_html: Tạo %{time_ago} bởi %{user}
+      closed_ago_by_html: Đóng %{time_ago} bởi %{user}
+      discussion: Thảo luận
+      join_discussion: Đăng nhập để tham gia thảo luận
+      still_open: Bộ thay đổi đang mở – có thể thảo luận sau khi bộ thay đổi được
+        đóng.
+      comment_by_html: Nhận xét của %{user} từ %{time_ago}
+      hidden_comment_by_html: Nhận xét ẩn của %{user} từ %{time_ago}
+      changesetxml: Bộ thay đổi XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Các nốt (%{count})
+      nodes_paginated: Các nốt (%{x}–%{y} trên %{count})
+      ways: Các lối (%{count})
+      ways_paginated: Các lối (%{x}–%{y} trên %{count})
+      relations: Các quan hệ (%{count})
+      relations_paginated: Các quan hệ (%{x}–%{y} trên %{count})
     timeout:
       sorry: Rất tiếc, việc lấy danh sách bộ thay đổi tốn quá nhiều thì giờ.
   changeset_comments:
@@ -1667,10 +1668,6 @@ vi:
       new password button: Đặt lại mật khẩu
       help_text: Nhập địa chỉ thư điện tử mà bạn đã dùng để mở tài khoản, rồi chúng
         tôi sẽ gửi liên kết cho địa chỉ đó để cho bạn đặt lại mật khẩu.
-    create:
-      notice email on way: Đáng tiếc là bạn quên nó. :-( May là thư điện tử sắp tới
-        để bạn đặt nó lại.
-      notice email cannot find: Rất tiếc, không tìm thấy địa chỉ thư điện tử.
     edit:
       title: Đặt lại mật khẩu
       heading: Đặt lại Mật khẩu của %{user}
diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 47efe981f..5dfe084d5 100644
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -273,10 +273,6 @@ xmf:
     destroy:
       success: ანგარიშიქ დილასჷ.
   browse:
-    created: აკიქიმინუ
-    closed: კილერი
-    created_ago_html: გიჭყჷ %{time_ago}
-    closed_ago_html: გიჭყჷ %{time_ago}
     version: ვერსია
     in_changeset: თირაფეფიშ პაკეტი
     anonymous: ანონიმი
@@ -292,21 +288,6 @@ xmf:
     view_history: ისტორიაშ ძირაფა
     view_details: დეტალეფიშ ძირაფა
     location: ორენიː
-    changeset:
-      title: 'თირაფეფიშ პაკეტი: %{id}'
-      belongs_to: ავტორი
-      node: ჭურჭულეფი (%{count})
-      node_paginated: ჭურჭულეფი (%{x}-%{y} %{count}-შე)
-      way: ღოზეფი (%{count})
-      way_paginated: ღოზეფი (%{x}-%{y} %{count}-შე)
-      relation: ურთიართობეფი (%{count})
-      relation_paginated: ურთიართობეფი (%{x}-%{y} %{count}-შე)
-      changesetxml: თირუეფიშ პაკეტიშ XML
-      osmchangexml: osmChange XML
-      join_discussion: გემშართით სისტემაშა, თიშენ ნამჷ-და, სხუნუას ქაკათათინ
-      discussion: სხუნუა
-      still_open: თირუეფიშ პაკეტი დიო ღილე რე. სხუნუა ხემიოჭირინაფუ იჸი, მუჭო თირუეფიშ
-        პაკეტი დიკილუნ.
     node:
       title_html: 'ჭურჭული: %{name}'
       history_title_html: 'ჭურჭულიშ ისტორია: %{name}'
@@ -412,6 +393,26 @@ xmf:
       feed:
         title: თირუეფიშ პაკეტი %{id}
         title_comment: თირუეფიშ პაკეტი %{id} - %{comment}
+        created: აკიქიმინუ
+        closed: კილერი
+        belongs_to: ავტორი
+    show:
+      title: 'თირაფეფიშ პაკეტი: %{id}'
+      created_ago_html: გიჭყჷ %{time_ago}
+      closed_ago_html: გიჭყჷ %{time_ago}
+      discussion: სხუნუა
+      join_discussion: გემშართით სისტემაშა, თიშენ ნამჷ-და, სხუნუას ქაკათათინ
+      still_open: თირუეფიშ პაკეტი დიო ღილე რე. სხუნუა ხემიოჭირინაფუ იჸი, მუჭო თირუეფიშ
+        პაკეტი დიკილუნ.
+      changesetxml: თირუეფიშ პაკეტიშ XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: ჭურჭულეფი (%{count})
+      nodes_paginated: ჭურჭულეფი (%{x}-%{y} %{count}-შე)
+      ways: ღოზეფი (%{count})
+      ways_paginated: ღოზეფი (%{x}-%{y} %{count}-შე)
+      relations: ურთიართობეფი (%{count})
+      relations_paginated: ურთიართობეფი (%{x}-%{y} %{count}-შე)
     timeout:
       sorry: სანარღოთ, თირუეფიშ პაკეტეფიშ ერკებული, ნამუთ თქვა მითხითჷნ, ძალამ დიდი
         ბორჯი ოკო გიშაღალარო.
diff --git a/config/locales/yi.yml b/config/locales/yi.yml
index d93073817..7a548b85b 100644
--- a/config/locales/yi.yml
+++ b/config/locales/yi.yml
@@ -65,8 +65,6 @@ yi:
       show:
         cancel: אַנולירן
   browse:
-    created: געשאַפֿן
-    closed: געשלאסן
     version: ווערסיע
     anonymous: אַנאנים
     no_comment: (קיין הערות)
@@ -78,6 +76,10 @@ yi:
   changesets:
     changeset_paging_nav:
       showing_page: בלאַט %{page}
+    index:
+      feed:
+        created: געשאַפֿן
+        closed: געשלאסן
   geocoder:
     search_osm_nominatim:
       prefix:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 2fe9875a2..43ae11f07 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -378,12 +378,6 @@ zh-CN:
     destroy:
       success: 账户已删除。
   browse:
-    created: 创建于
-    closed: 关闭于
-    created_ago_html: 创建于 %{time_ago}
-    closed_ago_html: 关闭于 %{time_ago}
-    created_ago_by_html: 由 %{user} 创建于 %{time_ago}
-    closed_ago_by_html: 由 %{user} 关闭于 %{time_ago}
     deleted_ago_by_html: 由 %{user} 删除于 %{time_ago}
     edited_ago_by_html: 由%{user} 编辑于 %{time_ago}
     version: 版本
@@ -401,22 +395,6 @@ zh-CN:
     view_history: 查看历史
     view_details: 查看详情
     location: 位置：
-    changeset:
-      title: 变更集：%{id}
-      belongs_to: 作者
-      node: 节点 (%{count})
-      node_paginated: 节点 (%{x}-%{y}，共 %{count})
-      way: 路径 (%{count})
-      way_paginated: 路径 (%{x}-%{y}，共 %{count})
-      relation: 关系 (%{count})
-      relation_paginated: 关系 (%{x}-%{y}，共 %{count})
-      hidden_comment_by_html: '%{user} 于 %{time_ago} 的隐藏评论'
-      comment_by_html: '%{user} 于 %{time_ago} 的评论'
-      changesetxml: 变更集 XML
-      osmchangexml: osmChange XML
-      join_discussion: 登录以加入讨论
-      discussion: 讨论
-      still_open: 变更集依然开放——一旦变更集关闭讨论将开放。
     node:
       title_html: 节点：%{name}
       history_title_html: 节点历史：%{name}
@@ -529,6 +507,42 @@ zh-CN:
       feed:
         title: 变更集 %{id}
         title_comment: 变更集 %{id} - %{comment}
+        created: 创建于
+        closed: 关闭于
+        belongs_to: 作者
+    subscribe:
+      heading: 订阅以下变更集讨论吗？
+      button: 订阅讨论
+    unsubscribe:
+      heading: 退订以下变更集讨论吗？
+      button: 退订讨论
+    heading:
+      title: 变更集 %{id}
+      created_by_html: 由 %{link_user} 在 %{created} 创建。
+    no_such_entry:
+      title: 无此变更集
+      heading: 找不到ID为%{id}的文章
+      body: 对不起，没有ID为 %{id} 的变更集。请检查您的拼写，或者可能是点击了错误的链接。
+    show:
+      title: 变更集：%{id}
+      created_ago_html: 创建于 %{time_ago}
+      closed_ago_html: 关闭于 %{time_ago}
+      created_ago_by_html: 由 %{user} 创建于 %{time_ago}
+      closed_ago_by_html: 由 %{user} 关闭于 %{time_ago}
+      discussion: 讨论
+      join_discussion: 登录以加入讨论
+      still_open: 变更集依然开放——一旦变更集关闭讨论将开放。
+      comment_by_html: '%{user} 于 %{time_ago} 的评论'
+      hidden_comment_by_html: '%{user} 于 %{time_ago} 的隐藏评论'
+      changesetxml: 变更集 XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: 节点 (%{count})
+      nodes_paginated: 节点 (%{x}-%{y}，共 %{count})
+      ways: 路径 (%{count})
+      ways_paginated: 路径 (%{x}-%{y}，共 %{count})
+      relations: 关系 (%{count})
+      relations_paginated: 关系 (%{x}-%{y}，共 %{count})
     timeout:
       sorry: 抱歉，您所请求的变更集列表检索时间过长。
   changeset_comments:
@@ -640,6 +654,12 @@ zh-CN:
       comment: 评论
       newer_comments: 较新评论
       older_comments: 较旧评论
+    subscribe:
+      heading: 订阅以下日记讨论吗？
+      button: 订阅讨论
+    unsubscribe:
+      heading: 退订以下日记讨论吗？
+      button: 退订讨论
   doorkeeper:
     errors:
       messages:
@@ -1623,12 +1643,15 @@ zh-CN:
     more: 更多
   user_mailer:
     diary_comment_notification:
+      description: 'OpenStreetMap 日记 #%{id}'
       subject: '[OpenStreetMap] %{user} 在日记篇目留下了评论'
       hi: 您好，%{to_user}：
       header: '%{from_user} 评论了主题为 %{subject} 的 OpenStreetMap 日记文章：'
       header_html: '%{from_user} 评论了主题为 %{subject} 的 OpenStreetMap 日记文章：'
       footer: 您也可以通过%{readurl}来读取评论，并且在%{commenturl}来撰写评论或者通过%{replyurl}向作者发送消息
       footer_html: 您也可以通过%{readurl}查看评论，并在%{commenturl}撰写评论或通过%{replyurl}向作者发送消息
+      footer_unsubscribe: 您可访问%{unsubscribeurl}以从该讨论中退订。
+      footer_unsubscribe_html: 您可访问%{unsubscribeurl}以从该讨论中退订。
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'
       hi: 您好，%{to_user}：
@@ -1675,6 +1698,7 @@ zh-CN:
       hopefully_you: 某人(可能是您)已要求重置该电子邮件地址上的 openstreetmap.org 帐户密码。
       click_the_link: 如果这是您，请点击下面的链接重置您的密码。
     note_comment_notification:
+      description: 'OpenStreetMap 注记 #%{id}'
       anonymous: 匿名用户
       greeting: 您好，
       commented:
@@ -1701,6 +1725,7 @@ zh-CN:
       details: 更多关于笔记的详细信息可以在%{url}找到。
       details_html: 更多关于笔记的详细信息可以在%{url}找到。
     changeset_comment_notification:
+      description: 'OpenStreetMap 变更集 #%{id}'
       hi: 您好，%{to_user}：
       greeting: 您好，
       commented:
@@ -1715,8 +1740,8 @@ zh-CN:
         partial_changeset_without_comment: 没有评论
       details: 更多关于变更集的详细信息可以在 %{url} 找到。
       details_html: 更多有关变更集的详细信息，请参见 %{url}。
-      unsubscribe: 要从该变更集中退订，请访问%{url}，并点击“退订”。
-      unsubscribe_html: 要从该变更集中退订，请访问%{url}，并点击“退订”。
+      unsubscribe: 您可访问%{url}以从该变更集中退订。
+      unsubscribe_html: 您可访问%{url}以从该变更集中退订。
   confirmations:
     confirm:
       heading: 检查您的电子邮件！
@@ -1815,9 +1840,6 @@ zh-CN:
       email address: 电子邮件地址
       new password button: 重置密码
       help_text: 输入您的电子邮件地址来注册，我们会寄出链接给它，这样您就可以用它来重置密码。
-    create:
-      notice email on way: 很遗憾您遗失了密码:-(不过一封电子邮件已经发往您的邮箱，您很快就可以重置密码了。
-      notice email cannot find: 对不起，无法找到邮箱。
     edit:
       title: 重置密码
       heading: 重置%{user}的密码
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index e7bcfe949..0f5b241bf 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -285,11 +285,6 @@ zh-HK:
     view_history: 檢視歷史
     view_details: 檢視詳細資料
     location: 位置：
-    changeset:
-      title: 變更集：%{id}
-      belongs_to: 製作者
-      changesetxml: 變更集XML
-      osmchangexml: osmChange格式XML
     relation_member:
       type:
         node: 節點
@@ -341,6 +336,11 @@ zh-HK:
       load_more: 載入更多
       feed:
         title: 變更集 %{id}
+        belongs_to: 製作者
+    show:
+      title: 變更集：%{id}
+      changesetxml: 變更集XML
+      osmchangexml: osmChange格式XML
   dashboards:
     show:
       nearby users: 其他附近的用戶
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 32f48f421..4d69e96d9 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -342,15 +342,10 @@ zh-TW:
     destroy:
       success: 帳號已刪除。
   browse:
-    created: 建立於
-    closed: 關閉於
-    created_ago_html: '%{time_ago}建立'
-    closed_ago_html: '%{time_ago}關閉'
-    created_ago_by_html: 由%{user}%{time_ago}建立
-    closed_ago_by_html: 由%{user}%{time_ago}關閉
     deleted_ago_by_html: 由%{user}%{time_ago}刪除
     edited_ago_by_html: 由%{user}%{time_ago}編輯
     version: 版本
+    redacted_version: 編修版本
     in_changeset: 變更集
     anonymous: 匿名
     no_comment: (沒有評論)
@@ -363,24 +358,11 @@ zh-TW:
       other: '%{count} 條路徑'
     download_xml: 下載 XML
     view_history: 檢視歷史
+    view_unredacted_history: 查看未編修的歷史
     view_details: 檢視詳細資料
+    view_redacted_data: 查看編修資料
+    view_redaction_message: 查看編修訊息
     location: 位置：
-    changeset:
-      title: 變更集：%{id}
-      belongs_to: 作者
-      node: 節點 (共 %{count} 項)
-      node_paginated: 節點 (共 %{count} 項中的第 %{x}-%{y} 項)
-      way: 路徑 (共 %{count} 項)
-      way_paginated: 路線 (%{count} 的 %{x}-%{y})
-      relation: 關聯 (%{count})
-      relation_paginated: 關聯 (%{count} 的 %{x}-%{y})
-      hidden_comment_by_html: '%{user}%{time_ago}隱藏評論'
-      comment_by_html: 來自%{user}%{time_ago}的評論
-      changesetxml: 變更集 XML
-      osmchangexml: osmChange 格式 XML
-      join_discussion: 登入以參加討論
-      discussion: 討論
-      still_open: 變更集仍為開啟 - 討論要在變更集關閉後才會開啟。
     node:
       title_html: 節點：%{name}
       history_title_html: 節點歷史：%{name}
@@ -495,6 +477,9 @@ zh-TW:
       feed:
         title: 變更集 %{id}
         title_comment: 變更集 %{id} - %{comment}
+        created: 建立於
+        closed: 關閉於
+        belongs_to: 作者
     subscribe:
       heading: 訂閱以下變更集討論？
       button: 訂閱討論
@@ -508,6 +493,28 @@ zh-TW:
       title: 沒有這樣的變更集
       heading: 沒有 id 為 %{id} 的項目
       body: 抱歉，沒有 id 為 %{id} 的變更集。請檢查您的拼字，或者可能是您按到錯誤的連結。
+    show:
+      title: 變更集：%{id}
+      created: 建立於：%{when}
+      closed: 關閉於：%{when}
+      created_ago_html: '%{time_ago}建立'
+      closed_ago_html: '%{time_ago}關閉'
+      created_ago_by_html: 由%{user}%{time_ago}建立
+      closed_ago_by_html: 由%{user}%{time_ago}關閉
+      discussion: 討論
+      join_discussion: 登入以參加討論
+      still_open: 變更集仍為開啟 - 討論要在變更集關閉後才會開啟。
+      comment_by_html: 來自%{user}%{time_ago}的評論
+      hidden_comment_by_html: '%{user}%{time_ago}隱藏評論'
+      changesetxml: 變更集 XML
+      osmchangexml: osmChange 格式 XML
+    paging_nav:
+      nodes: 節點 (共 %{count} 項)
+      nodes_paginated: 節點 (共 %{count} 項中的第 %{x}-%{y} 項)
+      ways: 路徑 (共 %{count} 項)
+      ways_paginated: 路線 (%{count} 的 %{x}-%{y})
+      relations: 關聯 (%{count})
+      relations_paginated: 關聯 (%{count} 的 %{x}-%{y})
     timeout:
       sorry: 很抱歉，您請求的變更集清單過長無法讀取。
   changeset_comments:
@@ -1814,8 +1821,7 @@ zh-TW:
       new password button: 重設密碼
       help_text: 輸入您的電子郵件地址來註冊，我們會將連結送至該地址，而您可以用它來重設密碼。
     create:
-      notice email on way: 很遺憾您忘了它 :-( 不過讓您可以重設它的電子郵件已經寄出，您待會便可重設。
-      notice email cannot find: 很抱歉，找不到該電子郵件地址。
+      send_paranoid_instructions: 如果您的電子郵件地址存於我們的資料庫裡，您將在幾分鐘內收到密碼恢復連結的電郵。
     edit:
       title: 重設密碼
       heading: 重設 %{user} 的密碼
diff --git a/db/migrate/20240228205723_drop_user_tokens.rb b/db/migrate/20240228205723_drop_user_tokens.rb
new file mode 100644
index 000000000..a6c885a1a
--- /dev/null
+++ b/db/migrate/20240228205723_drop_user_tokens.rb
@@ -0,0 +1,5 @@
+class DropUserTokens < ActiveRecord::Migration[7.1]
+  def up
+    drop_table :user_tokens
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 4998bc694..a41cb6991 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1532,38 +1532,6 @@ CREATE SEQUENCE public.user_roles_id_seq
 ALTER SEQUENCE public.user_roles_id_seq OWNED BY public.user_roles.id;
 
 
---
--- Name: user_tokens; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.user_tokens (
-    id bigint NOT NULL,
-    user_id bigint NOT NULL,
-    token character varying NOT NULL,
-    expiry timestamp without time zone NOT NULL,
-    referer text
-);
-
-
---
--- Name: user_tokens_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.user_tokens_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: user_tokens_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.user_tokens_id_seq OWNED BY public.user_tokens.id;
-
-
 --
 -- Name: users; Type: TABLE; Schema: public; Owner: -
 --
@@ -1882,13 +1850,6 @@ ALTER TABLE ONLY public.user_mutes ALTER COLUMN id SET DEFAULT nextval('public.u
 ALTER TABLE ONLY public.user_roles ALTER COLUMN id SET DEFAULT nextval('public.user_roles_id_seq'::regclass);
 
 
---
--- Name: user_tokens id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.user_tokens ALTER COLUMN id SET DEFAULT nextval('public.user_tokens_id_seq'::regclass);
-
-
 --
 -- Name: users id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -2280,14 +2241,6 @@ ALTER TABLE ONLY public.user_roles
     ADD CONSTRAINT user_roles_pkey PRIMARY KEY (id);
 
 
---
--- Name: user_tokens user_tokens_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.user_tokens
-    ADD CONSTRAINT user_tokens_pkey PRIMARY KEY (id);
-
-
 --
 -- Name: users users_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -2901,20 +2854,6 @@ CREATE INDEX user_id_idx ON public.friends USING btree (friend_user_id);
 CREATE UNIQUE INDEX user_roles_id_role_unique ON public.user_roles USING btree (user_id, role);
 
 
---
--- Name: user_tokens_token_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE UNIQUE INDEX user_tokens_token_idx ON public.user_tokens USING btree (token);
-
-
---
--- Name: user_tokens_user_id_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX user_tokens_user_id_idx ON public.user_tokens USING btree (user_id);
-
-
 --
 -- Name: users_auth_idx; Type: INDEX; Schema: public; Owner: -
 --
@@ -3490,14 +3429,6 @@ ALTER TABLE ONLY public.user_roles
     ADD CONSTRAINT user_roles_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id);
 
 
---
--- Name: user_tokens user_tokens_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.user_tokens
-    ADD CONSTRAINT user_tokens_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id);
-
-
 --
 -- Name: way_nodes way_nodes_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3581,6 +3512,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('23'),
 ('22'),
 ('21'),
+('20240228205723'),
 ('20240117185445'),
 ('20231213182102'),
 ('20231206141457'),
diff --git a/script/cleanup b/script/cleanup
index 67cc0705e..7601d35cf 100755
--- a/script/cleanup
+++ b/script/cleanup
@@ -2,7 +2,6 @@
 
 require File.join(File.dirname(__FILE__), "..", "config", "environment")
 
-UserToken.where("expiry < NOW()").delete_all
 OauthNonce.where("timestamp < EXTRACT(EPOCH FROM NOW() - INTERVAL '1 day')").delete_all
 OauthToken.where("invalidated_at < NOW() - INTERVAL '28 days'").delete_all
 RequestToken.where("authorized_at IS NULL AND created_at < NOW() - INTERVAL '28 days'").delete_all
diff --git a/test/models/user_token_test.rb b/test/models/user_token_test.rb
deleted file mode 100644
index cf9f09ea4..000000000
--- a/test/models/user_token_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require "test_helper"
-
-class UserTokenTest < ActiveSupport::TestCase
-end
diff --git a/yarn.lock b/yarn.lock
index 8c21ee46a..410b50260 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -139,13 +139,16 @@ bs-custom-file-input@^1.3.4:
   resolved "https://registry.yarnpkg.com/bs-custom-file-input/-/bs-custom-file-input-1.3.4.tgz#c275cb8d4f1c02ba026324292509fa9a747dbda8"
   integrity sha512-NBsQzTnef3OW1MvdKBbMHAYHssCd613MSeJV7z2McXznWtVMnJCy7Ckyc+PwxV6Pk16cu6YBcYWh/ZE0XWNKCA==
 
-call-bind@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+call-bind@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
   dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -198,6 +201,15 @@ deep-is@^0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
+define-data-property@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
+
 diacritics@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/diacritics/-/diacritics-1.3.0.tgz#3efa87323ebb863e6696cebb0082d48ff3d6f7a1"
@@ -210,6 +222,18 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
@@ -360,19 +384,21 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-get-intrinsic@^1.0.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
-  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
   dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
     has-symbols "^1.0.3"
+    hasown "^2.0.0"
 
 glob-parent@^6.0.2:
   version "6.0.2"
@@ -400,6 +426,13 @@ globals@^13.19.0:
   dependencies:
     type-fest "^0.20.2"
 
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
 graphemer@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
@@ -410,17 +443,29 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-property-descriptors@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
+  dependencies:
+    es-define-property "^1.0.0"
+
+has-proto@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
+
 has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+hasown@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa"
+  integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==
   dependencies:
-    function-bind "^1.1.1"
+    function-bind "^1.1.2"
 
 ignore@^5.2.0:
   version "5.2.0"
@@ -549,10 +594,10 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-object-inspect@^1.9.0:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
-  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
+object-inspect@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
 
 once@^1.3.0:
   version "1.4.0"
@@ -627,11 +672,11 @@ punycode@^2.1.0:
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@^6.9.4:
-  version "6.11.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
-  integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.0.tgz#edd40c3b823995946a8a0b1f208669c7a200db77"
+  integrity sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==
   dependencies:
-    side-channel "^1.0.4"
+    side-channel "^1.0.6"
 
 queue-microtask@^1.2.2:
   version "1.2.3"
@@ -662,6 +707,18 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+set-function-length@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425"
+  integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==
+  dependencies:
+    define-data-property "^1.1.2"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.3"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.1"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -674,14 +731,15 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+side-channel@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
+  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
   dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    object-inspect "^1.13.1"
 
 strip-ansi@^6.0.1:
   version "6.0.1"