From: Tom Hughes <tom@compton.nu>
Date: Sun, 25 Feb 2024 09:28:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4463'
X-Git-Tag: live~1257
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/746bfd0a4838268eaf745e85e0e27b5acf9cf64a?hp=2d03d738dab3ffa1f73566fd85d6f4a8c92f6d56

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 32ac9e418..24beeb4d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,35 +3,35 @@ GEM
   specs:
     aasm (5.5.0)
       concurrent-ruby (~> 1.0)
-    actioncable (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
+    actioncable (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3)
-      actionpack (= 7.1.3)
-      activejob (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionmailbox (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3)
-      actionpack (= 7.1.3)
-      actionview (= 7.1.3)
-      activejob (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionmailer (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3)
-      actionview (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -41,39 +41,39 @@ GEM
       rails-html-sanitizer (~> 1.6)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
-    actiontext (7.1.3)
-      actionpack (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    actiontext (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3)
-      activesupport (= 7.1.3)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
-    activejob (7.1.3)
-      activesupport (= 7.1.3)
+    activejob (7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.3)
-      activesupport (= 7.1.3)
-    activerecord (7.1.3)
-      activemodel (= 7.1.3)
-      activesupport (= 7.1.3)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activerecord (7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       timeout (>= 0.4.0)
     activerecord-import (1.5.1)
       activerecord (>= 4.2)
-    activestorage (7.1.3)
-      actionpack (= 7.1.3)
-      activejob (= 7.1.3)
-      activerecord (= 7.1.3)
-      activesupport (= 7.1.3)
+    activestorage (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       marcel (~> 1.0)
-    activesupport (7.1.3)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -95,11 +95,12 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.887.0)
-    aws-sdk-core (3.191.0)
+    aws-partitions (1.894.0)
+    aws-sdk-core (3.191.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
+      base64
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.77.0)
       aws-sdk-core (~> 3, >= 3.191.0)
@@ -157,12 +158,11 @@ GEM
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     connection_pool (2.4.1)
-    crack (0.4.6)
+    crack (1.0.0)
       bigdecimal
       rexml
     crass (1.0.6)
-    dalli (3.2.7)
-      base64
+    dalli (3.2.8)
     dartsass-ruby (3.0.2)
       sass-embedded (~> 1.54, < 1.67)
     dartsass-sprockets (3.0.0)
@@ -180,7 +180,7 @@ GEM
       activerecord (>= 3.0, < 8.0)
       delayed_job (>= 3.0, < 5)
     docile (1.4.0)
-    doorkeeper (5.6.8)
+    doorkeeper (5.6.9)
       railties (>= 5)
     doorkeeper-i18n (5.2.7)
       doorkeeper (>= 5.2)
@@ -248,14 +248,14 @@ GEM
     ffi-libarchive (1.1.14)
       ffi (~> 1.0)
     file_exists (0.2.0)
-    frozen_record (0.27.0)
+    frozen_record (0.27.1)
       activemodel
     fspath (3.1.2)
     gd2-ffij (0.4.0)
       ffi (>= 1.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-protobuf (3.25.2)
+    google-protobuf (3.25.3)
     hashdiff (1.1.0)
     hashie (5.0.0)
     highline (3.0.1)
@@ -292,7 +292,7 @@ GEM
     image_size (3.4.0)
     in_threads (1.6.0)
     io-console (0.7.2)
-    irb (1.11.1)
+    irb (1.11.2)
       rdoc
       reline (>= 0.4.2)
     jbuilder (2.11.5)
@@ -304,7 +304,8 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.7.1)
-    jwt (2.7.1)
+    jwt (2.8.0)
+      base64
     kgio (2.11.4)
     kramdown (2.4.0)
       rexml
@@ -333,7 +334,7 @@ GEM
     mini_portile2 (2.8.5)
     mini_racer (0.8.0)
       libv8-node (~> 18.16.0.0)
-    minitest (5.22.0)
+    minitest (5.22.2)
     minitest-focus (1.4.0)
       minitest (>= 4, < 6)
     msgpack (1.7.2)
@@ -406,7 +407,7 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    pg (1.5.4)
+    pg (1.5.5)
     popper_js (2.11.8)
     progress (3.6.0)
     psych (5.1.2)
@@ -416,7 +417,7 @@ GEM
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.8.1)
     rack-cors (2.0.1)
       rack (>= 2.0.0)
     rack-openid (1.4.2)
@@ -433,20 +434,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.3)
-      actioncable (= 7.1.3)
-      actionmailbox (= 7.1.3)
-      actionmailer (= 7.1.3)
-      actionpack (= 7.1.3)
-      actiontext (= 7.1.3)
-      actionview (= 7.1.3)
-      activejob (= 7.1.3)
-      activemodel (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    rails (7.1.3.2)
+      actioncable (= 7.1.3.2)
+      actionmailbox (= 7.1.3.2)
+      actionmailer (= 7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actiontext (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.3)
+      railties (= 7.1.3.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -461,9 +462,9 @@ GEM
     rails-i18n (7.0.8)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
+    railties (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -479,7 +480,7 @@ GEM
     regexp_parser (2.9.0)
     reline (0.4.2)
       io-console (~> 0.5)
-    request_store (1.5.1)
+    request_store (1.6.0)
       rack (>= 1.4)
     rexml (3.2.6)
     rinku (2.0.6)
@@ -530,7 +531,7 @@ GEM
       google-protobuf (~> 3.23)
       rake (>= 13.0.0)
     secure_headers (6.5.0)
-    selenium-webdriver (4.17.0)
+    selenium-webdriver (4.18.1)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -574,7 +575,7 @@ GEM
       i18n
     vendorer (0.2.0)
     version_gem (1.1.3)
-    webmock (3.19.1)
+    webmock (3.21.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index 7c6f4b365..fe398bc5a 100644
--- a/app/assets/stylesheets/browse.scss
+++ b/app/assets/stylesheets/browse.scss
@@ -14,10 +14,6 @@
     margin-left: 25px;
   }
 
-  /* Deleted objects */
-
-  .deleted { text-decoration: line-through; }
-
   /* Nodes (and ways as areas) */
 
   .aeroway.aerodrome::before { content: image-url('browse/aerodrome.p.16.png'); }
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 18eab1316..1f7c45db5 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -822,14 +822,11 @@ tr.turn:hover {
     height: 400px;
     display: none;
   }
-  .comments {
-    max-width: 740px;
+  .diary-comment .col-auto {
+    width: 62px;
   }
-  .diary-comment {
-    border-top: 1px dashed $grey;
-    &:first-child {
-      border-top: 1px solid $grey;
-    }
+  .diary-comment .col {
+    max-width: 690px;
   }
 }
 
diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb
index b66aead38..956bcde6e 100644
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -35,7 +35,7 @@ module Api
         trace = do_create(params[:file], tags, description, visibility)
 
         if trace.id
-          TraceImporterJob.perform_later(trace)
+          trace.schedule_import
           render :plain => trace.id.to_s
         elsif trace.valid?
           head :internal_server_error
@@ -66,7 +66,7 @@ module Api
       if trace.user == current_user
         trace.visible = false
         trace.save!
-        TraceDestroyerJob.perform_later(trace)
+        trace.schedule_destruction
 
         head :ok
       else
diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index 1f9574b9c..1a3d648f4 100644
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -157,21 +157,25 @@ class DiaryEntriesController < ApplicationController
   end
 
   def subscribe
-    diary_entry = DiaryEntry.find(params[:id])
+    @diary_entry = DiaryEntry.find(params[:id])
 
-    diary_entry.subscriptions.create(:user => current_user) unless diary_entry.subscribers.exists?(current_user.id)
+    if request.post?
+      @diary_entry.subscriptions.create(:user => current_user) unless @diary_entry.subscribers.exists?(current_user.id)
 
-    redirect_to diary_entry_path(diary_entry.user, diary_entry)
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+    end
   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
 
   def unsubscribe
-    diary_entry = DiaryEntry.find(params[:id])
+    @diary_entry = DiaryEntry.find(params[:id])
 
-    diary_entry.subscriptions.where(:user => current_user).delete_all if diary_entry.subscribers.exists?(current_user.id)
+    if request.post?
+      @diary_entry.subscriptions.where(:user => current_user).delete_all if @diary_entry.subscribers.exists?(current_user.id)
 
-    redirect_to diary_entry_path(diary_entry.user, diary_entry)
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+    end
   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index ba2858ce4..3c2084a5b 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -20,7 +20,7 @@ class SessionsController < ApplicationController
   def create
     session[:remember_me] ||= params[:remember_me]
     session[:referer] = safe_referer(params[:referer]) if params[:referer]
-    password_authentication(params[:username], params[:password])
+    password_authentication(params[:username].strip, params[:password])
   end
 
   def destroy
diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index 242f8113c..df6337147 100644
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -126,7 +126,7 @@ class TracesController < ApplicationController
         flash[:notice] = t ".trace_uploaded"
         flash[:warning] = t ".traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4
 
-        TraceImporterJob.perform_later(@trace)
+        @trace.schedule_import
         redirect_to :action => :index, :display_name => current_user.display_name
       else
         flash[:error] = t(".upload_failed") if @trace.valid?
@@ -176,7 +176,7 @@ class TracesController < ApplicationController
       trace.visible = false
       trace.save
       flash[:notice] = t ".scheduled_for_deletion"
-      TraceDestroyerJob.perform_later(trace)
+      trace.schedule_destruction
       redirect_to :action => :index, :display_name => trace.user.display_name
     end
   rescue ActiveRecord::RecordNotFound
diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 0f533770b..7aa6e4754 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,12 +1,25 @@
 module BrowseHelper
-  def printable_name(object, version: false)
+  def element_single_current_link(type, object, url)
+    link_to url, { :class => element_class(type, object), :title => element_title(object), :rel => (link_follow(object) if type == "node") } do
+      element_strikethrough object do
+        printable_element_name object
+      end
+    end
+  end
+
+  def element_list_item(type, object, &block)
+    tag.li :class => element_class(type, object), :title => element_title(object) do
+      element_strikethrough object, &block
+    end
+  end
+
+  def printable_element_name(object)
     id = if object.id.is_a?(Array)
            object.id[0]
          else
            object.id
          end
-    name = t "printable_name.with_id", :id => id.to_s
-    name = t "printable_name.with_version", :id => name, :version => object.version.to_s if version
+    name = id.to_s
 
     # don't look at object tags if redacted, so as to avoid giving
     # away redacted version tag information.
@@ -27,20 +40,25 @@ module BrowseHelper
     name
   end
 
-  def link_class(type, object)
-    classes = [type]
+  def printable_element_version(object)
+    t "printable_name.version", :version => object.version
+  end
 
-    if object.redacted?
-      classes << "deleted"
+  def element_strikethrough(object, &block)
+    if object.redacted? || !object.visible?
+      tag.s(&block)
     else
-      classes += icon_tags(object).flatten.map { |t| h(t) }
-      classes << "deleted" unless object.visible?
+      yield
     end
+  end
 
+  def element_class(type, object)
+    classes = [type]
+    classes += icon_tags(object).flatten.map { |t| h(t) } unless object.redacted?
     classes.join(" ")
   end
 
-  def link_title(object)
+  def element_title(object)
     if object.redacted?
       ""
     else
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index d1ad60b2c..0894b972d 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -97,6 +97,7 @@ class UserMailer < ApplicationMailer
       @readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}")
       @commenturl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "newcomment")
       @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })
+      @unsubscribeurl = diary_entry_unsubscribe_url(comment.diary_entry.user, comment.diary_entry)
       @author = @from_user
 
       attach_user_avatar(comment.user)
diff --git a/app/models/trace.rb b/app/models/trace.rb
index 2411fb9b7..1e8f25a83 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -267,6 +267,14 @@ class Trace < ApplicationRecord
     end
   end
 
+  def schedule_import
+    TraceImporterJob.new(self).enqueue(:priority => user.traces.where(:inserted => false).count)
+  end
+
+  def schedule_destruction
+    TraceDestroyerJob.perform_later(self)
+  end
+
   private
 
   def content_type(file)
diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb
index 06220a97d..2547ff7aa 100644
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -1,4 +1,4 @@
-<li><%= linked_name = link_to printable_name(containing_relation.relation), :action => "relation", :id => containing_relation.relation.id.to_s
+<li><%= linked_name = link_to printable_element_name(containing_relation.relation), :action => "relation", :id => containing_relation.relation.id.to_s
         if containing_relation.member_role.blank?
           t ".entry_html", :relation_name => linked_name
         else
diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index cc8597292..6c6c1fdf3 100644
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -17,7 +17,7 @@
           <summary><%= t "browse.part_of_ways", :count => node.ways.uniq.count %></summary>
           <ul class="list-unstyled">
             <% node.ways.uniq.each do |way| %>
-              <li><%= link_to printable_name(way), way_path(way), { :class => link_class("way", way), :title => link_title(way) } %></li>
+              <li><%= element_single_current_link "way", way, way_path(way) %></li>
             <% end %>
           </ul>
         </details>
diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index 5e52c04e8..16842f569 100644
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,10 +1,9 @@
-<% member_class = link_class(relation_member.member_type.downcase, relation_member.member)
-   linked_name = link_to printable_name(relation_member.member), { :controller => :browse, :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) }
+<% linked_name = link_to printable_element_name(relation_member.member), { :controller => :browse, :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :rel => link_follow(relation_member.member) }
    type_str = t ".type.#{relation_member.member_type.downcase}" %>
-<li class="<%= member_class %>">
+<%= element_list_item relation_member.member_type.downcase, relation_member.member do %>
   <%= if relation_member.member_role.blank?
         t ".entry_html", :type => type_str, :name => linked_name
       else
         t ".entry_role_html", :type => type_str, :name => linked_name, :role => relation_member.member_role
       end %>
-</li>
+<% end %>
diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index 26403f3fd..7197298ac 100644
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -27,10 +27,12 @@
         <ul class="list-unstyled">
           <% way.way_nodes.each do |wn| %>
             <li>
-              <%= link_to printable_name(wn.node), node_path(wn.node), { :class => link_class("node", wn.node), :title => link_title(wn.node), :rel => link_follow(wn.node) } %>
+              <%= element_single_current_link "node", wn.node, node_path(wn.node) %>
               <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
               <% if related_ways.size > 0 then %>
-                (<%= t ".also_part_of_html", :count => related_ways.size, :related_ways => to_sentence(related_ways.map { |w| link_to(printable_name(w), way_path(w), { :class => link_class("way", w), :title => link_title(w) }) }) %>)
+                (<%= t ".also_part_of_html",
+                       :count => related_ways.size,
+                       :related_ways => to_sentence(related_ways.map { |w| element_single_current_link "way", w, way_path(w) }) %>)
               <% end %>
             </li>
           <% end %>
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 88d90d0f7..ac5382b14 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -80,7 +80,11 @@
     <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("way", @way_pages), :pages => @way_pages, :page_param => "way_page" } %>
     <ul class="list-unstyled">
       <% @ways.each do |way| %>
-        <li><%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>
+        <%= 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 %>
       <% end %>
     </ul>
   <% end %>
@@ -89,7 +93,11 @@
     <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("relation", @relation_pages), :pages => @relation_pages, :page_param => "relation_page" } %>
     <ul class="list-unstyled">
       <% @relations.each do |relation| %>
-        <li><%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %></li>
+        <%= 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 %>
       <% end %>
     </ul>
   <% end %>
@@ -98,12 +106,22 @@
     <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("node", @node_pages), :pages => @node_pages, :page_param => "node_page" } %>
     <ul class="list-unstyled">
       <% @nodes.each do |node| %>
-        <li><%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %></li>
+        <%= 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 %>
       <% end %>
     </ul>
   <% end %>
 </div>
 
+<div class='secondary-actions'>
+  <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %>
+  &middot;
+  <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>
+</div>
+
 <% if @next_by_user || @prev_by_user %>
   <div class='secondary-actions'>
     <% if @prev_by_user %>
@@ -124,9 +142,3 @@
     <% end %>
   </div>
 <% end %>
-
-<div class='secondary-actions'>
-  <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %>
-  &middot;
-  <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>
-</div>
diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb
index 37be312b1..cd333d3bf 100644
--- a/app/views/browse/feature.html.erb
+++ b/app/views/browse/feature.html.erb
@@ -1,6 +1,6 @@
-<% set_title(t("browse.#{@type}.title_html", :name => printable_name(@feature))) %>
+<% set_title(t("browse.#{@type}.title_html", :name => printable_element_name(@feature))) %>
 
-<%= render "sidebar_header", :title => t("browse.#{@type}.title_html", :name => printable_name(@feature)) %>
+<%= render "sidebar_header", :title => t("browse.#{@type}.title_html", :name => printable_element_name(@feature)) %>
 
 <%= render :partial => @type, :object => @feature %>
 
diff --git a/app/views/browse/history.html.erb b/app/views/browse/history.html.erb
index fd1f5ffc5..bf11e8f1e 100644
--- a/app/views/browse/history.html.erb
+++ b/app/views/browse/history.html.erb
@@ -1,6 +1,6 @@
-<% set_title(t("browse.#{@type}.history_title_html", :name => printable_name(@feature))) %>
+<% set_title(t("browse.#{@type}.history_title_html", :name => printable_element_name(@feature))) %>
 
-<%= render "sidebar_header", :title => t("browse.#{@type}.history_title_html", :name => printable_name(@feature)) %>
+<%= render "sidebar_header", :title => t("browse.#{@type}.history_title_html", :name => printable_element_name(@feature)) %>
 
 <%= render :partial => @type, :collection => @feature.send(:"old_#{@type}s").reverse %>
 
diff --git a/app/views/changesets/index.atom.builder b/app/views/changesets/index.atom.builder
index a1af72b91..521dffe5f 100644
--- a/app/views/changesets/index.atom.builder
+++ b/app/views/changesets/index.atom.builder
@@ -25,9 +25,9 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
                  :type => "application/osmChange+xml"
 
       if !changeset.tags.empty? && changeset.tags.key?("comment")
-        entry.title t("browse.changeset.feed.title_comment", :id => changeset.id, :comment => changeset.tags["comment"]), :type => "html"
+        entry.title t(".feed.title_comment", :id => changeset.id, :comment => changeset.tags["comment"])
       else
-        entry.title t("browse.changeset.feed.title", :id => changeset.id)
+        entry.title t(".feed.title", :id => changeset.id)
       end
 
       if changeset.user.data_public?
diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb
index 238f4d43c..04e011574 100644
--- a/app/views/diary_entries/_diary_comment.html.erb
+++ b/app/views/diary_entries/_diary_comment.html.erb
@@ -1,5 +1,5 @@
-<div class="row diary-comment py-3<%= " text-muted bg-danger bg-opacity-10" unless diary_comment.visible? %>">
-  <div class="col-auto">
+<div class="row diary-comment border-bottom py-3<%= " text-muted bg-danger bg-opacity-10" unless diary_comment.visible? %>">
+  <div class="col-auto pe-0 text-center">
     <%= user_thumbnail diary_comment.user %>
   </div>
   <div class="col">
diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index f69c7e552..8bd4dc57f 100644
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -1,26 +1,5 @@
 <article class='diary_post border-top border-grey py-3<%= " text-muted px-3 bg-danger bg-opacity-10" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
-  <div class='mb-3'>
-    <% if @user %>
-      <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
-    <% else %>
-      <div class="row">
-        <div class="col-auto">
-          <%= user_thumbnail diary_entry.user %>
-        </div>
-        <div class="col">
-          <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
-        </div>
-      </div>
-    <% end %>
-
-    <small class='text-muted'>
-      <%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %>
-      <% if (l(diary_entry.updated_at, :format => :blog) != l(diary_entry.created_at, :format => :blog)) %>
-        <%= t(".updated_at_html", :updated => l(diary_entry.updated_at, :format => :blog)) %>
-      <% end %>
-    </small>
-
-  </div>
+  <%= render :partial => "diary_entry_heading", :object => diary_entry, :as => "diary_entry" %>
 
   <div class="richtext text-break" xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
     <%= diary_entry.body.to_html %>
diff --git a/app/views/diary_entries/_diary_entry_heading.html.erb b/app/views/diary_entries/_diary_entry_heading.html.erb
new file mode 100644
index 000000000..ef924ffdd
--- /dev/null
+++ b/app/views/diary_entries/_diary_entry_heading.html.erb
@@ -0,0 +1,21 @@
+<div class='mb-3'>
+  <% if @user %>
+    <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
+  <% else %>
+    <div class="row">
+      <div class="col-auto">
+        <%= user_thumbnail diary_entry.user %>
+      </div>
+      <div class="col">
+        <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
+      </div>
+    </div>
+  <% end %>
+
+  <small class='text-muted'>
+    <%= t("diary_entries.diary_entry.posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %>
+    <% if (l(diary_entry.updated_at, :format => :blog) != l(diary_entry.created_at, :format => :blog)) %>
+      <%= t("diary_entries.diary_entry.updated_at_html", :updated => l(diary_entry.updated_at, :format => :blog)) %>
+    <% end %>
+  </small>
+</div>
diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 5bfdfa17b..63ab89b8f 100644
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -12,11 +12,23 @@
 
 <%= render @entry %>
 
-<div id="comments" class="comments">
-<%= render :partial => "diary_comment", :collection => @comments %>
-</div>
+<div id="comments" class="comments mb-3 overflow-hidden">
+  <div class="row border-bottom border-grey">
+    <h2 class="col"><%= t(".discussion") %></h2>
 
-<hr>
+    <% if current_user %>
+      <div class="col-auto">
+        <% if @entry.subscribers.exists?(current_user.id) %>
+          <%= link_to t("javascripts.changesets.show.unsubscribe"), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => "btn btn-sm btn-primary" %>
+        <% else %>
+          <%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => "btn btn-sm btn-primary" %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+
+  <%= render :partial => "diary_comment", :collection => @comments %>
+</div>
 
 <div>
   <% if current_user %>
@@ -25,11 +37,6 @@
     <%= bootstrap_form_for @entry.comments.new, :url => { :action => "comment" } do |f| %>
       <%= f.richtext_field :body, :cols => 80, :rows => 20, :hide_label => true %>
       <%= f.primary %>
-      <% if @entry.subscribers.exists?(current_user.id) %>
-        <%= link_to t("javascripts.changesets.show.unsubscribe"), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => "btn btn-light" %>
-      <% else %>
-        <%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => "btn btn-light" %>
-      <% end %>
     <% end %>
   <% else %>
     <h3 id="newcomment"><%= t(".login_to_leave_a_comment_html", :login_link => link_to(t(".login"), login_path(:referer => request.fullpath))) %></h3>
diff --git a/app/views/diary_entries/subscribe.html.erb b/app/views/diary_entries/subscribe.html.erb
new file mode 100644
index 000000000..e18be2b6d
--- /dev/null
+++ b/app/views/diary_entries/subscribe.html.erb
@@ -0,0 +1,12 @@
+<% content_for :heading do %>
+  <h1><%= t ".heading", :user => @diary_entry.user.display_name %></h1>
+<% end %>
+
+<%= render :partial => "diary_entry_heading", :object => @diary_entry, :as => "diary_entry" %>
+
+<%= bootstrap_form_tag do |f| %>
+  <% if params[:referer] -%>
+  <%= f.hidden_field :referer, :value => params[:referer] %>
+  <% end -%>
+  <%= f.primary t(".button") %>
+<% end %>
diff --git a/app/views/diary_entries/unsubscribe.html.erb b/app/views/diary_entries/unsubscribe.html.erb
new file mode 100644
index 000000000..e18be2b6d
--- /dev/null
+++ b/app/views/diary_entries/unsubscribe.html.erb
@@ -0,0 +1,12 @@
+<% content_for :heading do %>
+  <h1><%= t ".heading", :user => @diary_entry.user.display_name %></h1>
+<% end %>
+
+<%= render :partial => "diary_entry_heading", :object => @diary_entry, :as => "diary_entry" %>
+
+<%= bootstrap_form_tag do |f| %>
+  <% if params[:referer] -%>
+  <%= f.hidden_field :referer, :value => params[:referer] %>
+  <% end -%>
+  <%= f.primary t(".button") %>
+<% end %>
diff --git a/app/views/old_nodes/show.html.erb b/app/views/old_nodes/show.html.erb
index 9220b2cc2..90be6b7c9 100644
--- a/app/views/old_nodes/show.html.erb
+++ b/app/views/old_nodes/show.html.erb
@@ -1,6 +1,6 @@
-<% set_title t("browse.node.title_html", :name => printable_name(@feature)) %>
+<% set_title t("browse.node.title_html", :name => printable_element_name(@feature)) %>
 
-<%= render "sidebar_header", :title => t("browse.node.title_html", :name => printable_name(@feature)) %>
+<%= render "sidebar_header", :title => t("browse.node.title_html", :name => printable_element_name(@feature)) %>
 
 <%= render :partial => "browse/node", :object => @feature %>
 
diff --git a/app/views/old_relations/show.html.erb b/app/views/old_relations/show.html.erb
index b049a4cf0..42e80e651 100644
--- a/app/views/old_relations/show.html.erb
+++ b/app/views/old_relations/show.html.erb
@@ -1,6 +1,6 @@
-<% set_title t("browse.relation.title_html", :name => printable_name(@feature)) %>
+<% set_title t("browse.relation.title_html", :name => printable_element_name(@feature)) %>
 
-<%= render "sidebar_header", :title => t("browse.relation.title_html", :name => printable_name(@feature)) %>
+<%= render "sidebar_header", :title => t("browse.relation.title_html", :name => printable_element_name(@feature)) %>
 
 <%= render :partial => "browse/relation", :object => @feature %>
 
diff --git a/app/views/old_ways/show.html.erb b/app/views/old_ways/show.html.erb
index d128cd2ad..b16c6b291 100644
--- a/app/views/old_ways/show.html.erb
+++ b/app/views/old_ways/show.html.erb
@@ -1,6 +1,6 @@
-<% set_title t("browse.way.title_html", :name => printable_name(@feature)) %>
+<% set_title t("browse.way.title_html", :name => printable_element_name(@feature)) %>
 
-<%= render "sidebar_header", :title => t("browse.way.title_html", :name => printable_name(@feature)) %>
+<%= render "sidebar_header", :title => t("browse.way.title_html", :name => printable_element_name(@feature)) %>
 
 <%= render :partial => "browse/way", :object => @feature %>
 
diff --git a/app/views/user_mailer/diary_comment_notification.html.erb b/app/views/user_mailer/diary_comment_notification.html.erb
index 7f9368fe3..dab4510ed 100644
--- a/app/views/user_mailer/diary_comment_notification.html.erb
+++ b/app/views/user_mailer/diary_comment_notification.html.erb
@@ -15,4 +15,7 @@
            :commenturl => link_to(@commenturl, @commenturl) + tag.br,
            :replyurl => link_to(@replyurl, @replyurl) %>
   </p>
+  <p><%= t ".footer_unsubscribe_html",
+           :unsubscribeurl => link_to(@unsubscribeurl, @unsubscribeurl) %>
+  </p>
 <% end %>
diff --git a/app/views/user_mailer/diary_comment_notification.text.erb b/app/views/user_mailer/diary_comment_notification.text.erb
index cbf9ddaa0..13aa460f1 100644
--- a/app/views/user_mailer/diary_comment_notification.text.erb
+++ b/app/views/user_mailer/diary_comment_notification.text.erb
@@ -7,3 +7,5 @@
 ==
 
 <%= t '.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %>
+
+<%= t '.footer_unsubscribe', :unsubscribeurl => @unsubscribeurl %>
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 6a9d72adb..d02140f27 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -304,12 +304,8 @@ af:
       way_paginated: Weë (%{x}-%{y} van %{count})
       relation: Verwantskappe (%{count})
       relation_paginated: Verwantskappe (%{x}-%{y} of %{count})
-      comment: Kommentaar (%{count})
       changesetxml: Wysigingstel XML
       osmchangexml: osmWysiging XML
-      feed:
-        title: Wysigingstel %{id}
-        title_comment: Wysigingstel %{id} - %{comment}
       join_discussion: Meld aan en gesels saam
       discussion: Bespreking
       still_open: Wysigingstel is steeds oop - bespreking sal oopmaak sodra die wysigingstel
@@ -417,6 +413,9 @@ af:
       no_more_area: Geen wysigingstelle in hierdie gebied nie.
       no_more_user: Geen ander wysigingstelle deur hierdie gebruiker nie.
       load_more: Laai nog
+      feed:
+        title: Wysigingstel %{id}
+        title_comment: Wysigingstel %{id} - %{comment}
     timeout:
       sorry: Jammer, die lys wysigingstelle wat u versoek het, neem lank om uit te
         haal.
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index bab97d647..b3bd19cf7 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -148,9 +148,6 @@ aln:
       title: Ndryshim
       changesetxml: Ndryshim en XML
       osmchangexml: Ndryshim i OSM-s en XML
-      feed:
-        title: Ndryshim %{id}
-        title_comment: Ndryshimi %{id} - %{comment}
     relation_member:
       entry_role_html: '%{type} %{name} asht si %{role}'
       type:
@@ -202,6 +199,9 @@ aln:
     index:
       title: Changesets
       title_user: Changesets nga %{user}
+      feed:
+        title: Ndryshim %{id}
+        title_comment: Ndryshimi %{id} - %{comment}
   dashboards:
     contact:
       km away: '%{count}km larg'
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 6ec27d455..527d73710 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -295,8 +295,6 @@ ar:
         few: '%{count} سنة'
         many: '%{count} سنوات'
         other: '%{count} سنة'
-  printable_name:
-    with_version: '%{id}، v%{version}'
   editor:
     default: الافتراضي (حالياً %{name})
     id:
@@ -439,14 +437,10 @@ ar:
       way_paginated: الطرق (%{x}-%{y} من %{count})
       relation: الصلات (%{count})
       relation_paginated: الصلات (%{x}-%{y} من %{count})
-      comment: التعليقات (%{count})
       hidden_comment_by_html: تعليق مخفي من%{time_ago} %{user}
       comment_by_html: تعليق من %{user}%{time_ago}
       changesetxml: حزمة التغييرات XML
       osmchangexml: osmChange XML
-      feed:
-        title: حزمة التغييرات %{id}
-        title_comment: حزمة التغييرات %{id} - %{comment}
       join_discussion: ادخل للاشتراك في المناقشة
       discussion: مناقشة
       still_open: ما زالت مجموعة التغييرات مفتوحة - سيتم فتح المناقشة بمجرد إغلاق
@@ -549,6 +543,9 @@ ar:
       no_more_area: لم يُعثَر على مجموعات تغييرات أخرى في هذه المنطقة.
       no_more_user: لم يُعثَر على مجموعات تغييرات أخرى بواسطة هذا المستخدم.
       load_more: تحميل المزيد؟
+      feed:
+        title: حزمة التغييرات %{id}
+        title_comment: حزمة التغييرات %{id} - %{comment}
     timeout:
       sorry: عذرا، لقد استغرقت قائمة مجموعات التغييرات اللتي طلبتها وقتا طويلا لاستردادها.
   changeset_comments:
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 70fa3d63a..a7fafef89 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -128,9 +128,6 @@ arz:
       title: 'حزمه التغييرات: %{id}'
       changesetxml: حزمه التغييرات إكس إم إل
       osmchangexml: osmChange XML
-      feed:
-        title: حزمه التغييرات %{id}
-        title_comment: حزمه التغييرات %{id} - %{comment}
     relation_member:
       entry_role_html: '%{type} %{name} كــ %{role}'
       type:
@@ -170,6 +167,9 @@ arz:
     index:
       title: حزم التغييرات
       title_user: حزم التغييرات بواسطه %{user}
+      feed:
+        title: حزمه التغييرات %{id}
+        title_comment: حزمه التغييرات %{id} - %{comment}
   dashboards:
     contact:
       km away: على بعد %{count}كم
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index b0a6b8115..4c7c087ab 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -279,12 +279,8 @@ ast:
       way_paginated: Víes (%{x}-%{y} de %{count})
       relation: Rellaciones (%{count})
       relation_paginated: Rellaciones (%{x}-%{y} de %{count})
-      comment: Comentarios (%{count})
       changesetxml: Conxuntu de cambeos XML
       osmchangexml: osmChange XML
-      feed:
-        title: Conxuntu de cambeos %{id}
-        title_comment: Conxuntu de cambeos %{id} - %{comment}
       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
@@ -384,6 +380,9 @@ ast:
       no_more_area: Nun hai más conxuntos de cambeos nesta área.
       no_more_user: Nun hai más conxuntos de cambeos d'esti usuariu.
       load_more: Cargar más
+      feed:
+        title: Conxuntu de cambeos %{id}
+        title_comment: Conxuntu de cambeos %{id} - %{comment}
     timeout:
       sorry: Llevó demasiao tiempu baxar la llista de conxuntos de cambeos que pidisti.
   changeset_comments:
diff --git a/config/locales/az.yml b/config/locales/az.yml
index bbd43bcaf..32e8bc347 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -179,9 +179,6 @@ az:
       node: (%{count}) nöqtə
       changesetxml: XML dəyişikliklər dəsti
       osmchangexml: osmChange XML
-      feed:
-        title: Dəyişikliklər dəsti  %{id}
-        title_comment: Dəyişikliklər dəsti %{id} - %{comment}
     relation:
       members: İştirakçılar
     relation_member:
@@ -247,6 +244,9 @@ az:
       title_user: '%{user} tərəfindən edilmiş dəyişikliklər dəsti'
       title_friend: Dostlarınız tərəfindən edilmiş dəyişikliklər dəsti
       title_nearby: Yaxınlıqdakı istifadəçilər tərəfindən edilmiş dəyişikliklər dəsti
+      feed:
+        title: Dəyişikliklər dəsti  %{id}
+        title_comment: Dəyişikliklər dəsti %{id} - %{comment}
     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 bfe066976..ca53e54c5 100644
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: AiseluRB
 # Author: Amire80
+# Author: Bashkorttan
 # Author: Lizalizaufa
 # Author: MR973
 # Author: Roustammr
@@ -264,7 +265,7 @@ ba:
       one: 1 юл
       other: '%{count} юлдар'
     download_xml: ' XML-ды күсереү'
-    view_history: Тарихты ҡарау
+    view_history: Тарих
     view_details: Ентекләберәк
     location: 'Географик урын:'
     changeset:
@@ -276,12 +277,8 @@ ba:
       way_paginated: Юлдар (%{x}-%{y} %{count}һынан)
       relation: Мөнәсәбәттәр (%{count})
       relation_paginated: Мөнәсәбәттәр (%{x}-%{y} %{count}нан)
-      comment: Комментарийҙар (%{count})
       changesetxml: Төҙәтеүҙәр пакетының XML-ы
       osmchangexml: osmChange XML
-      feed:
-        title: 'Төҙәтеүҙәр пакеты: %{id}'
-        title_comment: Төҙәтеүҙәр пакеты %{id} — %{comment}
       join_discussion: Фекер алышыуға ҡушылыу өсөн системаға инегеҙ
       discussion: Фекер алышыу
       still_open: Төҙәтмәләр пакеты әле асыҡ. Фекер алышыу, төҙәтмәләр пакеты ябылғандан
@@ -387,6 +384,9 @@ ba:
       no_more_area: Был өлкәлә башҡа төҙәтмәләр пакеты юҡ.
       no_more_user: Был ҡулланыусынан башҡа төҙәтмәләр пакеты юҡ.
       load_more: Күберәк тейәү
+      feed:
+        title: 'Төҙәтеүҙәр пакеты: %{id}'
+        title_comment: Төҙәтеүҙәр пакеты %{id} — %{comment}
     timeout:
       sorry: Ҡыҙғанысҡа ҡаршы, һеҙ һораған төҙәтмә пакеттары исемлеген алыу өсөн күп
         ваҡыт талап итә.
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 6b19a5830..6825dd85c 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -311,12 +311,8 @@ be-Tarask:
       way_paginated: Лініі (%{x}-%{y} з %{count})
       relation: Сувязі (%{count})
       relation_paginated: Сувязі (%{x}-%{y} з %{count})
-      comment: Камэнтары (%{count})
       changesetxml: Набор зьменаў у фармаце XML
       osmchangexml: osmChange XML
-      feed:
-        title: Набор зьменаў %{id}
-        title_comment: Набор зьменаў %{id} - %{comment}
     way:
       nodes: Вузлы
       nodes_count:
@@ -397,6 +393,9 @@ be-Tarask:
       title_user: Набор зьменаў %{user}
       title_friend: Наборы зьменаў маіх сяброў
       title_nearby: Наборы зьменаў для суседніх удзельнікаў
+      feed:
+        title: Набор зьменаў %{id}
+        title_comment: Набор зьменаў %{id} - %{comment}
     timeout:
       sorry: Прабачце, сьпіс набораў зьменаў, які Вы запыталі, занадта вялікі для
         атрыманьня.
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 44dd6b835..0c3771d46 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -337,12 +337,8 @@ be:
       way_paginated: Лініі (%{x}-%{y} з %{count})
       relation: Дачыненні (%{count})
       relation_paginated: Дачыненні (%{x}-%{y} з %{count})
-      comment: Каментары (%{count})
       changesetxml: XML пакета правак
       osmchangexml: osmChange XML
-      feed:
-        title: Набор змен %{id}
-        title_comment: Набор змен %{id} - %{comment}
       join_discussion: Увайдзіце ў сістэму, каб далучыцца да абмеркавання
       discussion: Абмеркаванне
       still_open: Пакет правак яшчэ адкрыты. Абмеркаванне стане даступным, як толькі
@@ -442,6 +438,9 @@ be:
       no_more_area: Больш няма пакетаў правак у гэтай вобласці.
       no_more_user: Больш няма пакетаў правак ад гэтага карыстальніка.
       load_more: Загрузіць больш
+      feed:
+        title: Набор змен %{id}
+        title_comment: Набор змен %{id} - %{comment}
     timeout:
       sorry: Выбачайце, спіс набораў правак, што Вы запыталі, занадта вялікі для атрымання.
   changeset_comments:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 4dfd48435..ade60f0c3 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -317,12 +317,8 @@ bg:
       way_paginated: Пътища (%{x}-%{y} от общо %{count})
       relation: Релации (%{count})
       relation_paginated: Релации(%{x}-%{y} от %{count})
-      comment: Коментари (%{count})
       changesetxml: XML на списъка с промени
       osmchangexml: osmChange XML
-      feed:
-        title: Списък с промени %{id}
-        title_comment: Списък с промени %{id} - %{comment}
       join_discussion: Впишете се, за да се присъедините към обсъждането
       discussion: Обсъждане
       still_open: Списъкът с промени не е завършен - обсъждането ще започне след неговото
@@ -416,6 +412,9 @@ bg:
       no_more_area: Няма повече списъци с промени в този район.
       no_more_user: Няма повече списъци с промени от потребителя.
       load_more: Зареждане на още
+      feed:
+        title: Списък с промени %{id}
+        title_comment: Списък с промени %{id} - %{comment}
     timeout:
       sorry: Съжаляваме, но списъка с промени който заявихте се зарежда твърде дълго.
   changeset_comments:
@@ -440,11 +439,15 @@ bg:
       nearby mapper: Картографи в близост
       friend: Приятел
     show:
+      no_home_location_html: '%{edit_profile_link} и задайте домашното си местоположение,
+        за да видите потребителите наблизо.'
       edit_your_profile: Редактиране на профила
       my friends: Моите приятели
       no friends: Все още нямате добавени приятели.
       nearby users: Други потребители в близост
       no nearby users: Все още няма други потребители, които картографират в близост.
+      friends_changesets: набори с промени на приятели
+      friends_diaries: записи в дневника на приятели
   diary_entries:
     new:
       title: Нова публикация в дневника
@@ -485,6 +488,7 @@ bg:
       comment_count:
         one: 1 коментар
         other: '%{count} коментара'
+      no_comments: Без коментари
       edit_link: Променяне на публикацията
       hide_link: Скриване на публикацията
       unhide_link: Скриване на публикацията
@@ -504,6 +508,10 @@ bg:
       user:
         title: OpenStreetMap дневник записи за %{user}
         description: Последни OpenStreetMap записи в дневника от %{user}
+      language:
+        title: Записи в дневника на OpenStreetMap на %{language_name}
+        description: Скорошни записи в дневника от потребители на OpenStreetMap на
+          %{language_name}
       all:
         title: Записи в дневника на OpenStreetMap
     comments:
@@ -513,6 +521,9 @@ bg:
       comment: Коментар
       newer_comments: По-нови коментари
       older_comments: По-стари коментари
+  doorkeeper:
+    scopes:
+      address: Вижте вашия физически адрес
   errors:
     contact:
       contact: контакт
@@ -529,6 +540,10 @@ bg:
       success: '%{name} беше премахнат от списъка с приятелите.'
       not_a_friend: '%{name} не е между вашите приятели.'
   geocoder:
+    search:
+      title:
+        results_from_html: Резултати от %{results_link}
+        latlon: Вътрешни
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -544,6 +559,7 @@ bg:
           gate: Врата на летище
           hangar: Хангар
           helipad: Вертолетна площадка
+          parking_position: Позиция за паркиране
           runway: Писта
           taxilane: Таксилента
           taxiway: Път за рулиране
@@ -591,6 +607,7 @@ bg:
           fuel: Бензиностанция
           gambling: Хазартни игри
           grave_yard: Гробище
+          grit_bin: Кошче за пясък
           hospital: Болница
           hunting_stand: Ловна стоянка
           ice_cream: Сладолед
@@ -698,9 +715,13 @@ bg:
           electronics_repair: Ремонт Електроника
           gardener: Градинар
           handicraft: Ръчна изработка
+          hvac: Климатици
+          metal_construction: Метални конструкции
           painter: Художник
           photographer: Фотограф
           plumber: Водопроводчик
+          roofer: Покриви
+          sawmill: Дъскорезница
           shoemaker: Обущар
           tailor: Шивач
           window_construction: Изработка на прозорци
@@ -712,6 +733,7 @@ bg:
           defibrillator: Дефибрилатор
           fire_extinguisher: Пожарогасител
           landing_site: Място за аварийно приземяване
+          life_ring: Спасителен пояс
           phone: Телефон за спешни повиквания
           water_tank: Цистерна за спешни случаи
         highway:
@@ -720,6 +742,7 @@ bg:
           bus_stop: Автобусна спирка
           construction: Магистрала в строеж
           corridor: Коридор
+          crossing: Пресичане
           cycleway: Велосипедна пътека
           elevator: Асансьор
           emergency_access_point: Пункт за спешна помощ
@@ -758,6 +781,7 @@ bg:
           unclassified: Некласифициран път
           "yes": Път
         historic:
+          aircraft: Исторически самолет
           archaeological_site: Разкопки
           battlefield: Бойно поле
           boundary_stone: Граничен камък
@@ -775,6 +799,7 @@ bg:
           mine: Рудник
           mine_shaft: Шахта на мина
           monument: Паметник
+          railway: Историческа ж.п. линия
           roman_road: Римски път
           ruins: Развалини
           stone: Камък
@@ -838,6 +863,7 @@ bg:
           water_park: Аквапарк
         man_made:
           antenna: Антена
+          beacon: Маяк
           beehive: Кошер
           bridge: Мост
           bunker_silo: Бункер
@@ -859,6 +885,7 @@ bg:
           silo: Силоз
           snow_cannon: Снежно оръдие
           storage_tank: Резервоар
+          street_cabinet: Ел. табло на улицата
           surveillance: Наблюдение
           telescope: Телескоп
           tower: Кула
@@ -877,6 +904,7 @@ bg:
         mountain_pass:
           "yes": Планински проход
         natural:
+          atoll: Атол
           bay: Залив
           beach: Плаж
           cape: Нос
@@ -902,10 +930,12 @@ bg:
           rock: Скала
           saddle: Седловина
           sand: Пясък
+          scrub: Храсти
           spring: Ручей
           stone: Камък
           tree: Дърво
           tree_row: Редица дървета
+          tundra: Тундра
           valley: Долина
           volcano: Вулкан
           water: Вода
@@ -931,10 +961,12 @@ bg:
           ngo: Офис на НПО
           notary: Нотариус
           research: Изследователски офис
+          tax_advisor: Данъчен съветник
           travel_agent: Туристическа агенция
           "yes": Офис
         place:
           allotments: Градини
+          archipelago: Архипелаг
           city: Град
           country: Държава
           county: Област
@@ -1010,6 +1042,7 @@ bg:
           fishing: Рибарски магазин
           florist: Цветарски магазин
           food: Хранителни стоки
+          frame: Магазин за рамки
           funeral_directors: Погребална служба
           furniture: Мебели
           garden_centre: Градински център
@@ -1031,6 +1064,7 @@ bg:
           mall: Търговски център
           massage: Масаж
           mobile_phone: Магазин за мобилни телефони
+          money_lender: Лихвар
           motorcycle: Магазин за Мотори и Мотоциклети
           music: Музикален магазин
           musical_instrument: Музикални Инструменти
@@ -1041,6 +1075,7 @@ bg:
           paint: Бои и лакови
           perfumery: Парфюмерия
           pet: Магазин за домашни любимци
+          pet_grooming: Грижа за домашни любимци
           photo: Фотомагазин
           seafood: Морска храна
           second_hand: Магазин Втора-ръка
@@ -1049,6 +1084,7 @@ bg:
           stationery: Канцеларски материали
           supermarket: Супермаркет
           tailor: Шивач
+          tattoo: Татуировки
           ticket: Билетна каса
           toys: Магазин за играчки
           travel_agency: Туристическа агенция
@@ -1075,6 +1111,7 @@ bg:
           museum: Музей
           picnic_site: Място за пикник
           theme_park: Увеселителен парк
+          viewpoint: Място с добра гледка
           wilderness_hut: Горска хижа
           zoo: Зологическа градина
         tunnel:
@@ -1084,6 +1121,7 @@ bg:
           canal: Канал
           dam: Язовирна стена
           dock: Док
+          mooring: Пристан
           river: Река
           stream: Поток
           waterfall: Водопад
@@ -1238,6 +1276,7 @@ bg:
     diary_comment_notification:
       hi: Здравейте %{to_user},
     message_notification:
+      subject: '[OpenStreetMap] %{message_title}'
       hi: Здравейте %{to_user},
     friendship_notification:
       hi: Здравейте %{to_user},
@@ -1246,6 +1285,7 @@ bg:
       see_their_profile: Можете да видите профила му на %{userurl}.
       befriend_them: Можете да ги добавите като приятел на %{befriendurl}.
     gpx_failure:
+      hi: Здравейте %{to_user},
       failed_to_import: 'не е внесен. Това е грешката:'
       subject: '[OpenStreetMap] Грешка при внасяне на GPX'
     gpx_success:
@@ -1281,8 +1321,11 @@ bg:
           интересувате'
       closed:
         subject_own: '[OpenStreetMap] %{commenter} е решил една от бележките ви'
+        subject_other: '[OpenStreetMap] %{commenter} разреши бележка, която ви интересува'
         your_note: '%{commenter} е решил една от бележките ви към картата в близост
           до %{place}.'
+        your_note_html: '%{commenter} разреши една от вашите бележки на картата близо
+          до %{place}.'
       reopened:
         subject_own: '[OpenStreetMap] %{commenter} повторно е отворил една от бележките
           ви'
@@ -1307,6 +1350,7 @@ bg:
       success: Профилът е потвърден, благодарим за регистрацията!
       already active: Този профил вече е бил потвърден.
       unknown token: Този код за потвърждение е изтекъл или не съществува.
+      click_here: Кликнете тук
     confirm_resend:
       failure: Потребителят %{name} не е открит.
     confirm_email:
@@ -1374,6 +1418,7 @@ bg:
     heading:
       my_inbox: Входяща кутия
       my_outbox: Изходяща кутия
+      muted_messages: Заглушени съобщения
     mark:
       as_read: Съобщението е отбелязано като прочетено
       as_unread: Съобщението е отбелязано като непрочетено
@@ -1383,7 +1428,7 @@ bg:
     new:
       title: Възстановяване на парола
       heading: Забравена парола?
-      email address: 'Електронна поща:'
+      email address: Електронна поща
       new password button: Нова парола
       help_text: Въведете имейл адреса, който сте използвали при регистрацията, и
         ние ще Ви изпратим връзка, която можете да използвате, за да промените паролата
@@ -1405,6 +1450,8 @@ bg:
     edit:
       save: Запазване на предпочитанията
       cancel: Отказ
+    update_success_flash:
+      message: Настройките са обновени.
   profiles:
     edit:
       title: Редактиране на профила
@@ -1412,6 +1459,7 @@ bg:
       image: Изображение
       gravatar:
         gravatar: Използване на Gravatar
+        what_is_gravatar: Какво е Gravatar?
       new image: Добавяне на изображение
       keep image: Запазване на текущото изображение
       delete image: Премахване на текущото изображение
@@ -1421,6 +1469,7 @@ bg:
       no home location: Не сте избрали своето местоположение.
       update home location on click: Променяне на моето местоположение при избиране
         от картата
+      show: Показване
     update:
       success: Профилът е обновен.
       failure: Неуспешно обновление на профила.
@@ -1428,8 +1477,8 @@ bg:
     new:
       title: Влизане
       heading: Влизане
-      email or username: 'Електронна поща или потребителско име:'
-      password: 'Парола:'
+      email or username: Електронна поща или потребителско име
+      password: Парола
       remember: Запомняне
       lost password link: Забравена парола?
       login_button: Влизане
@@ -1478,12 +1527,15 @@ bg:
       text: Текст
       image: Изображение
       alt: Алтернативен текст
+      url: URL
+      codeblock: Блок с код
     richtext_field:
       edit: Редактиране
       preview: Предварителен преглед
   site:
     about:
       next: Напред
+      heading_html: '%{copyright}OpenStreetMap %{br} сътрудници'
       used_by_html: '%{name} осигурява картографски данни на хиляди страници, мобилни
         приложения и устройства'
       lede_text: OpenStreetMap е създадена от общност от картографи, които предоставят
@@ -1508,12 +1560,14 @@ bg:
         промените или надграждате данните по определен начин, можете да разпространявате
         резултата само под същия лиценз. За подробности вижте %{copyright_license_link}.'
       open_data_open_data: отворени данни
+      open_data_copyright_license: Авторски права и лиценз
       legal_title: Правни въпроси
       legal_1_1_html: |-
         Този сайт и много други свързани с него услуги се управляват официално от
         %{openstreetmap_foundation_link} (OSMF)
         от името на общността. Използването на всички услуги, управлявани от OSMF, е предмет на
         на нашите %{terms_of_use_link}, %{aup_link} и нашата %{privacy_policy_link}.
+      legal_1_1_privacy_policy: Политика за поверителност
       legal_2_1_html: Моля, %{contact_the_osmf_link} ако имате въпроси, свързани с
         лицензирането, авторските права или други правни въпроси.
       legal_2_1_contact_the_osmf: свържете се с OSMF
@@ -1591,7 +1645,7 @@ bg:
         description: Ръководство за начинаещи, поддържано от общността.
       community:
         title: Форум на общността
-        description: Споделено място за разговори за OpenStreetMap.
+        description: Споделено място за търсене на помощ и разговори за OpenStreetMap.
       mailing_lists:
         title: Пощенски списъци
         description: Задайте въпрос или дискутирайте интересни теми в широк спектър
@@ -1645,13 +1699,13 @@ bg:
           rail: Железен път
           subway: Метро
           cable_car: Кабинков лифт
-          chair_lift: седалков лифт
+          chair_lift: Седалков лифт
           runway: Летищна писта
-          taxiway: път за рулиране
+          taxiway: Път за рулиране
           apron: Летищен перон
           admin: Административна граница
           forest: Гора
-          wood: Дървета
+          wood: Гора
           golf: Игрище за голф
           park: Парк
           common: Обща
@@ -1661,7 +1715,7 @@ bg:
           commercial: Търговска зона
           heathland: Пустош
           lake: Езеро
-          reservoir: язовир
+          reservoir: Язовир
           farm: Ферма
           brownfield: Място за строеж
           cemetery: Гробище
@@ -1675,7 +1729,7 @@ bg:
           building: Значима сграда
           station: Железопътна гара
           summit: Било
-          peak: връх
+          peak: Връх
           tunnel: Тунел (пунктирана линия)
           bridge: Мост (плътна линия)
           private: Частен достъп
@@ -2135,6 +2189,8 @@ bg:
         offramp_right_with_exit_directions: Излезте от %{exit} изход вдясно към %{directions}
         offramp_right_with_exit_name_directions: Излезте от %{exit} изход вдясно на
           %{name}, към %{directions}
+        onramp_right_without_directions: Завийте надясно към рампата
+        onramp_right: Завийте надясно към рампата
         endofroad_right_without_exit: В края на пътя завийте надясно по %{name}
         merge_right_without_exit: Навлезте надясно на %{name}
         fork_right_without_exit: На разклона завийте надясно по %{name}
@@ -2143,11 +2199,14 @@ bg:
         uturn_without_exit: Обратен завой по %{name}
         sharp_left_without_exit: Остър завой наляво по %{name}
         turn_left_without_exit: Завийте наляво по %{name}
+        offramp_left: Вземете изхода наляво
         offramp_left_with_exit: Излезте от %{exit} изход вляво
         offramp_left_with_exit_name: Излезте от %{exit} изход вляво на %{name}
         offramp_left_with_exit_directions: Излезте от %{exit} изход вляво към %{directions}
         offramp_left_with_exit_name_directions: Излезте от %{exit} изход вляво на
           %{name}, към %{directions}
+        offramp_left_with_name: Вземете изхода наляво към %{name}
+        offramp_left_with_directions: Вземете изхода наляво в посока %{directions}
         endofroad_left_without_exit: В края на пътя завийте наляво по %{name}
         merge_left_without_exit: Навлезте наляво на %{name}
         fork_left_without_exit: На разклона завийте наляво по %{name}
@@ -2162,7 +2221,7 @@ bg:
         roundabout_with_exit: На кръговото движение излезте от %{exit} изход към %{name}
         roundabout_with_exit_ordinal: На кръговото движение вземете %{exit} изход
           към %{name}
-        exit_roundabout: Излезете от кръговото движение от %{name}
+        exit_roundabout: Излезте от кръговото движение от %{name}
         unnamed: неименуван път
         courtesy: Упътване благодарение на %{link}
         exit_counts:
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 28d51f5d8..6c90192f7 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -369,13 +369,9 @@ bn:
       way_paginated: পথসমূহ (%{count}টির %{x}-%{y})
       relation: সম্পর্ক (%{count}টি)
       relation_paginated: সম্পর্ক (%{count}টির %{x}-%{y})
-      comment: মন্তব্য (%{count}টি)
       hidden_comment_by_html: '%{user} %{time_ago} মন্তব্যটি লুকিয়েছেন'
       changesetxml: পরিবর্তনধার্য এক্সএমএল
       osmchangexml: osmChange এক্সএমএল
-      feed:
-        title: পরিবর্তনধার্য %{id}
-        title_comment: পরিবর্তনধার্য %{id} - %{comment}
       join_discussion: আলোচনায় যোগ দিতে প্রবেশ করুন
       discussion: আলোচনা
       still_open: চেঞ্জসেট এখনও খোলা - চেঞ্জসেট বন্ধ হয়ে গেলে আলোচনা খোলা হবে।
@@ -483,6 +479,9 @@ bn:
       no_more_area: এই এলাকায় কোনো পরিবর্তনসেট নেই।
       no_more_user: এই ব্যবহারকারীর দ্বারা আর কোনো পরিবর্তনসেট নেই।
       load_more: আরও লোড করুন
+      feed:
+        title: পরিবর্তনধার্য %{id}
+        title_comment: পরিবর্তনধার্য %{id} - %{comment}
     timeout:
       sorry: দুঃখিত, আপনি যেই পরিবর্তনসেটটির জন্য আবেদন করছেন সেটি ফিরিয়ে আনতে আরও
         সময় লাগবে।
@@ -546,6 +545,7 @@ bn:
     show:
       title: '%{user}-এর দিনলিপি | %{title}'
       user_title: '%{user}-এর দিনলিপি'
+      discussion: আলোচনা
       leave_a_comment: একটি মন্তব্য করুন
       login_to_leave_a_comment_html: মন্তব্য করতে %{login_link} করুন
       login: প্রবেশ
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 212812164..59a3127f5 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -388,14 +388,10 @@ br:
       way_paginated: Hentoù (%{x}-%{y} diwar %{count})
       relation: Darempredoù (%{count})
       relation_paginated: Darempredoù (%{x}-%{y} diwar %{count})
-      comment: Evezhiadennoù (%{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
-      feed:
-        title: Hollad cheñchamantoù %{id}
-        title_comment: Hollad cheñchamantoù %{id} - %{comment}
       join_discussion: Kevreit evit mont er gaozeadenn
       discussion: Kaozeadenn
       still_open: Hollad cheñchamantoù digor - an diviz a zigoro ur wech ma vo serret
@@ -524,6 +520,9 @@ br:
       no_more_area: Hollad cheñchamant ouzhpenn ebet ken en takad-mañ.
       no_more_user: Hollad cheñchamant ouzhpenn ebet ken gant an implijer-mañ.
       load_more: Kargañ muioc'h
+      feed:
+        title: Hollad cheñchamantoù %{id}
+        title_comment: Hollad cheñchamantoù %{id} - %{comment}
     timeout:
       sorry: Ho tigarez, re hir eo adtapout ar roll cheñchamantoù hoc'h eus goulennet.
   changeset_comments:
@@ -586,6 +585,7 @@ br:
     show:
       title: Deizlevr %{user} | %{title}
       user_title: Deizlevr %{user}
+      discussion: Kaozeadenn
       leave_a_comment: Skrivañ un evezhiadenn
       login_to_leave_a_comment_html: '%{login_link} evit skrivañ un evezhiadenn'
       login: Kevreañ
@@ -1965,6 +1965,7 @@ br:
       image: Skeudenn
       alt: Testenn all
       url: URL
+      codeblock: Bloc'had kod
     richtext_field:
       edit: Aozañ
       preview: Rakwelet
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 11d95da6d..e661a4614 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -204,12 +204,8 @@ bs:
       way_paginated: Putevi (%{x}-%{y} of %{count})
       relation: Relacije (%{count})
       relation_paginated: Relacije (%{x}-%{y} of %{count})
-      comment: Komentari (%{count})
       changesetxml: XML seta promjena
       osmchangexml: osmChange XML
-      feed:
-        title: Set promjena %{id}
-        title_comment: Set promjena %{id} - %{comment}
       discussion: Diskusija
     node:
       title_html: 'Čvor: %{name}'
@@ -283,6 +279,9 @@ bs:
       title_friend: Setovi promjena vaših prijatelja
       title_nearby: Setovi promjena obližnjih korisnika
       load_more: Učitaj više
+      feed:
+        title: Set promjena %{id}
+        title_comment: Set promjena %{id} - %{comment}
     timeout:
       sorry: Žao nam je, listi seta promjena koju ste tražili je predugo trajalo za
         preuzimanje.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 7f76ca149..54bbfeb27 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -388,14 +388,10 @@ ca:
       way_paginated: Vies (%{x}-%{y} de %{count})
       relation: Relacions (%{count})
       relation_paginated: Relacions (%{x}-%{y} de %{count})
-      comment: Comentaris(%{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
-      feed:
-        title: Conjunt de canvis %{id}
-        title_comment: Conjunt de canvis %{id} - %{comment}
       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
@@ -506,6 +502,9 @@ ca:
       no_more_area: No hi ha cap altre conjunt de canvis en aquesta àrea.
       no_more_user: No hi ha cap altre conjunt de canvis d'aquest usuari.
       load_more: Carrega'n més
+      feed:
+        title: Conjunt de canvis %{id}
+        title_comment: Conjunt de canvis %{id} - %{comment}
     timeout:
       sorry: La llista de conjunt de canvis que heu sol·licitat ha trigat massa a
         carregar-se.
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index d65e3fc34..8029aa442 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -203,12 +203,8 @@ ce:
       way_paginated: Сиз (%{x}-%{y} чуьра %{count})
       relation: Хилар (%{count})
       relation_paginated: Хилар (%{x}-%{y} чуьра %{count})
-      comment: Комменташ (%{count})
       changesetxml: Нисдарийн XML
       osmchangexml: osmChange XML
-      feed:
-        title: 'Нисдарш: %{id}'
-        title_comment: Нисдарш %{id} — %{comment}
       join_discussion: Дийцарехь дакъалаца системин чугӀо
       discussion: Дийцар
     node:
@@ -303,6 +299,9 @@ ce:
       no_more_area: Кхузахь нисдарш дина дац.
       no_more_user: Кхузахь хӀокху декъашхочо нисдарш дина дац.
       load_more: Чуйаха кхин а
+      feed:
+        title: 'Нисдарш: %{id}'
+        title_comment: Нисдарш %{id} — %{comment}
     timeout:
       sorry: Ахьа бихина нисдарийн могӀа, арабаккха тӀехь беха бу.
   changeset_comments:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index e4b22fd6e..2649ed220 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -422,14 +422,10 @@ cs:
       way_paginated: Cesty (%{x}-%{y} z %{count})
       relation: Relace (%{count})
       relation_paginated: Relace (%{x}–%{y} z %{count})
-      comment: Komentáře (%{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
-      feed:
-        title: Sada změn %{id}
-        title_comment: Sada změn %{id} - %{comment}
       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
@@ -542,6 +538,9 @@ cs:
       no_more_area: Pro tuto oblast nebyly nalezeny žádné další sady změn.
       no_more_user: Nebyly nalezeny žádné další sady změn tohoto uživatele.
       load_more: Načíst další
+      feed:
+        title: Sada změn %{id}
+        title_comment: Sada změn %{id} - %{comment}
     timeout:
       sorry: Omlouváme se, ale vámi požadovaný seznam sad změn se načítal příliš dlouho.
   changeset_comments:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index c3c263bc4..ac1d354ff 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -156,6 +156,9 @@ cy:
         redirect_uri: Defnyddiwch un llinell fesul URI
       trace:
         tagstring: defnyddiwch goma i wahaniaethu
+      user_block:
+        needs_view: Oes angen i'r defnyddiwr fewngofnodi cyn y bydd y bloc hwn yn
+          cael ei glirio?
       user:
         new_email: (byth ei ddangos yn gyhoeddus)
   datetime:
@@ -379,18 +382,14 @@ cy:
       way_paginated: Llwybrau (%{x}-%{y} o %{count})
       relation: Perthnasoedd (%{count})
       relation_paginated: Perthnasoedd (%{x}-%{y} o %{count})
-      comment: Sylwadau (%{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
-      feed:
-        title: Grŵp newid %{id}
-        title_comment: Grŵp newid %{id} - %{comment}
       join_discussion: Mewngofnodwch i ymuno â'r sgwrs
       discussion: Sgwrs
-      still_open: Mae'r grŵp newid dal ar agor - bydd trafodaeth yn cychwyn unwaith
-        y bydd y grŵp newid wedi cau.
+      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}'
@@ -507,6 +506,9 @@ cy:
       no_more_area: Heb ganfod mwy o grwpiau newid yn yr ardal hon.
       no_more_user: Heb ganfod mwy o grwpiau newid gan y defnyddiwr hwn.
       load_more: Llwytho mwy
+      feed:
+        title: Grŵp newid %{id}
+        title_comment: Grŵp newid %{id} - %{comment}
     timeout:
       sorry: Mae'n ddrwg gennym, cymerodd y rhestr o grwpiau newid y gofynnoch amdanynt
         rhy hir i'w hadalw.
@@ -566,6 +568,7 @@ cy:
     show:
       title: Dyddiadur %{user} | %{title}
       user_title: Dyddiadur %{user}
+      discussion: Sgwrs
       leave_a_comment: Sylw
       login_to_leave_a_comment_html: '%{login_link} i adael sylw'
       login: Mewngofnodi
@@ -865,6 +868,7 @@ cy:
           roof: To
           ruins: Adeilad Adfeiliedig
           school: Adeilad Ysgol
+          service: Adeilad Gwasanaeth
           shed: Sied
           stable: Stabl
           static_caravan: Carafan
@@ -910,7 +914,7 @@ cy:
           phone: Ffôn Argyfwng
           water_tank: Tanc Dŵr Argyfwng
         highway:
-          abandoned: Hen Briffordd
+          abandoned: Priffordd Gadawedig
           bridleway: Llwybr Ceffyl
           bus_guideway: Lon Bysiau
           bus_stop: Safle Bws
@@ -1016,6 +1020,7 @@ cy:
           quarry: Chwarel
           railway: Rheilffordd
           recreation_ground: Ardal Chwarae
+          religious: Ardal Grefyddol
           reservoir: Cronfa Ddŵr
           reservoir_watershed: Gwahanfa Ddŵr
           residential: Ardal Breswyl
@@ -1024,9 +1029,11 @@ cy:
           vineyard: Gwinllan
           "yes": Defnydd Tir
         leisure:
+          adult_gaming_centre: Canolfan Hapchwarae Oedolion
           beach_resort: Cyrchfan Traeth
           bird_hide: Cuddfan Adar
           common: Tir Comin
+          dance: Neuadd Ddawns
           dog_park: Parc Cwn
           firepit: Ardal Dân
           fishing: Man Pysgota
@@ -1039,7 +1046,9 @@ cy:
           marina: Marina
           miniature_golf: Golff Pitw
           nature_reserve: Gwarchodfa Natur
+          outdoor_seating: Seddau Awyr Agored
           park: Parc
+          picnic_table: Bwrdd Picnic
           pitch: Cae Chwaraeon
           playground: Ardal Chwarae
           recreation_ground: Ardal Hamdden
@@ -1197,7 +1206,7 @@ cy:
           village: Pentref
           "yes": Lle
         railway:
-          abandoned: Hen Reilffordd
+          abandoned: Rheilffordd Adawedig
           construction: Rheilffordd yn cael ei hadeiladu
           disused: Rheilffordd Segur
           funicular: Rheilffordd fynydd
@@ -1299,6 +1308,7 @@ cy:
           organic: Siop Fwyd Organig
           outdoor: Siop Awyr Agored
           paint: Siop Baent
+          pawnbroker: Siop Wystlo
           pet: Siop Anifeiliaid Anwes
           photo: Siop Luniau
           seafood: Bwyd Môr
@@ -1370,7 +1380,7 @@ cy:
         level2: Ffin Gwledydd
         level4: Ffin Taleithiau
         level5: Ffin Rhanbarth
-        level6: Ffin Sir
+        level6: Ffin Sir / Swydd
         level8: Ffin Dinas
         level9: Ffin Pentref
         level10: Ffin Maesdref
@@ -1428,6 +1438,7 @@ cy:
       reports_of_this_issue: Adroddiadau o'r Mater hwn
       read_reports: Darllen Adroddiadau
       new_reports: Adroddiadau Newydd
+      comments_on_this_issue: Sylwadau ar y mater hwn
     comments:
       comment_from_html: Sylw gan %{user_link} ar %{comment_created_at}
       reassign_param: Ailbennu'r Mater?
@@ -1437,10 +1448,20 @@ cy:
       reportable_title:
         diary_comment: '%{entry_title}, sylw #%{comment_id}'
         note: 'Nodyn #%{note_id}'
+  issue_comments:
+    create:
+      comment_created: Postiwyd eich sylw yn llwyddiannus
   reports:
     new:
       title_html: Adrodd %{link}
       missing_params: Ni ellir creu adroddiad newydd
+      disclaimer:
+        intro: 'Cyn anfon eich adroddiad at gymedrolwyr y safle, sicrhewch:'
+        not_just_mistake: Eich bod chi'n siŵr nad yw'r broblem yn gamgymeriad
+        unable_to_fix: Nid ydych chi'n gallu datrys y broblem eich hun neu gyda chymorth
+          y gymuned
+        resolve_with_user: Eich bod chi eisoes wedi ceisio datrys y broblem gyda'r
+          defnyddiwr dan sylw
       categories:
         diary_entry:
           spam_label: Mae'r cofnod dyddiadur hwn yn / yn cynnwys sbam
@@ -1527,6 +1548,8 @@ cy:
       had_added_you: Mae %{user} wedi eich ychwanegu fel ffrind ar OpenStreetMap.
       see_their_profile: 'Gallwch weld eu proffil yma: %{userurl}.'
       see_their_profile_html: 'Gallwch weld eu proffil yma: %{userurl}.'
+      befriend_them: Gallwch hefyd eu hychwanegu fel ffrind ar %{befriendurl}.
+      befriend_them_html: Gallwch hefyd eu hychwanegu fel ffrind ar %{befriendurl}.
     gpx_failure:
       hi: Helo %{to_user},
       failed_to_import: 'methwyd â mewnforio. Dyma''r gwall:'
@@ -1547,6 +1570,8 @@ cy:
     lost_password:
       subject: '[OpenStreetMap] Cais ailosod cyfrinair'
       greeting: Helo,
+      click_the_link: Os mai chi yw hwn, cliciwch ar y ddolen isod i ailosod eich
+        cyfrinair.
     note_comment_notification:
       anonymous: Defnyddiwr dienw
       greeting: Helo,
@@ -1554,14 +1579,23 @@ cy:
         subject_own: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar un o''ch nodiadau'
         subject_other: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar nodyn y mae gennych
           ddiddordeb ynddo'
+        your_note: Ysgrifennodd %{commenter} sylw ar un o'ch nodiadau map ger %{place}.
+        your_note_html: Ysgrifennodd %{commenter} sylw ar un o'ch nodiadau map ger
+          %{place}.
       closed:
         subject_own: '[OpenStreetMap] Datrysodd %{commenter} un o''ch nodiadau'
         subject_other: '[OpenStreetMap] Datrysodd %{commenter} nodyn y mae gennych
-          ddiddordeb yndo'
+          chi ddiddordeb ynddo'
+        your_note: Datrysodd %{commenter} un o'ch nodiadau map ger %{place}.
+        your_note_html: Datrysodd %{commenter} un o'ch nodiadau map ger %{place}.
       reopened:
         subject_own: '[OpenStreetMap] Ailysgogodd %{commenter} un o''ch nodiadau'
         subject_other: '[OpenStreetMap] Ailysgogodd %{commenter} nodyn y mae gennych
           ddiddordeb ynddo'
+        your_note: Ailysgogodd %{commenter} un o'ch nodiadau map ger %{place}.
+        your_note_html: Ailysgogodd %{commenter} un o'ch nodiadau map ger %{place}.
+      details: Ceir rhagor o fanylion am y nodyn ar %{url}.
+      details_html: Ceir rhagor o fanylion am y nodyn ar %{url}.
     changeset_comment_notification:
       hi: Helo %{to_user},
       greeting: Helo,
@@ -1570,19 +1604,29 @@ cy:
           newid'
         subject_other: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar grŵp newydd y
           mae gennych ddiddordeb ynddo'
+        your_changeset: Gwnaeth %{commenter} sylw am %{time} ar un o'ch grwpiau newid
+        your_changeset_html: Gwnaeth %{commenter} sylw am %{time} ar un o'ch grwpiau
+          newid
         partial_changeset_with_comment: gyda sylw '%{changeset_comment}'
         partial_changeset_with_comment_html: gyda sylw '%{changeset_comment}'
         partial_changeset_without_comment: dim sylw
+      details: Ceir rhagor o fanylion am y grŵp newid ar %{url}.
+      details_html: Ceir rhagor o fanylion am y grŵp newid ar %{url}.
   confirmations:
     confirm:
       heading: Gwiriwch eich e-byst!
       introduction_1: Rydym wedi anfon e-bost cadarnhau atoch.
       button: Cadarnhau
+      success: Wedi cadarnhau eich cyfrif, diolch am gofrestru!
+      already active: Mae'r cyfrif hwn eisoes wedi'i gadarnhau.
+      resend_html: Os oes angen inni ailanfon yr e-bost cadarnhau, %{reconfirm_link}.
       click_here: cliciwch yma
     confirm_resend:
       failure: Heb ganfod y defnyddiwr %{name}.
     confirm_email:
       heading: Cadarnhau newid cyfeiriad e-bost
+      press confirm button: Cliciwch ar y botwm cadarnhau isod i gadarnhau eich cyfeiriad
+        e-bost newydd.
       button: Cadarnhau
       success: Wedi cadarnhau eich newid cyfeiriad e-bost!
       failure: Mae cyfeiriad e-bost eisoes wedi'i gadarnhau gyda'r tocyn hwn.
@@ -1657,6 +1701,8 @@ cy:
     mark:
       as_read: Nodwyd fod y neges wedi ei ddarllen
       as_unread: Nodwyd nad yw'r neges wedi ei ddarllen
+    unmute:
+      notice: Symudwyd y neges i'r Mewnflwch
     destroy:
       destroyed: Neges wedi'i dileu
   passwords:
@@ -1724,6 +1770,7 @@ cy:
       register now: Cofrestru nawr
       with external: 'Fel arall, defnyddiwch drydydd parti i fewngofnodi:'
       no account: Dim cyfrif gennych?
+      auth failure: Mae'n ddrwg gennym, ni ellir mewngofnodi gyda'r manylion hynny.
       openid_logo_alt: Mewngofnodi gydag OpenID
       auth_providers:
         openid:
@@ -1755,7 +1802,10 @@ cy:
       heading: Allgofnodi o OpenStreetMap
       logout_button: Allgofnodi
     suspended_flash:
-      support: cymorth
+      suspended: Mae'n ddrwg gennym, mae eich cyfrif wedi'i atal yn awtomatig oherwydd
+        gweithgarwch amheus.
+      contact_support_html: Cysylltwch â %{support_link} os hoffech chi drafod hyn.
+      support: chymorth
   shared:
     markdown_help:
       heading_html: Wedi'i ddosrannu gyda %{kramdown_link}
@@ -1779,7 +1829,12 @@ cy:
     about:
       next: Nesaf
       heading_html: '%{copyright}Cyfranwyr %{br} OpenStreetMap'
+      used_by_html: Mae %{name} yn darparu data map ar gyfer miloedd o wefannau, apiau
+        symudol a dyfeisiau caledwedd
       local_knowledge_title: Gwybodaeth Leol
+      local_knowledge_html: Mae OpenStreetMap yn rhoi pwyslais ar wybodaeth leol.
+        Mae cyfranwyr yn defnyddio delweddaeth o'r awyr, dyfeisiau GPS, a mapiau maes
+        technoleg isel i wirio bod OSM yn gywir ac yn gyfredol.
       community_driven_title: Gwaith y Gymuned
       community_driven_osm_blog: Blog OpenStreetMap
       community_driven_user_diaries: dyddiaduron defnyddwyr
@@ -1800,6 +1855,8 @@ cy:
       legal_1_1_terms_of_use: Telerau Gwasanaeth
       legal_1_1_aup: Polisïau Defnydd Derbyniol
       legal_1_1_privacy_policy: Polisi Preifatrwydd
+      legal_2_1_html: Cysylltwch â'r %{contact_the_osmf_link} os oes gennych chi gwestiynau
+        am drwydded, hawlfraint neu gwestiynau cyfreithiol eraill.
       legal_2_1_contact_the_osmf: cysylltwch â'r OSMF
       legal_2_2_registered_trademarks: nodau masnach cofrestredig yr OSMF
       partners_title: Partneriaid
@@ -1853,18 +1910,25 @@ cy:
         contributors_at_cc_by_at_with_amendments: CC BY AT gyda diwygiadau
         contributors_au_australia: Awstralia
         contributors_au_geoscape_australia: Geoscape Australia
+        contributors_au_cc_licence: Trwydded Creative Commons Attribution 4.0 International
+          (CC BY 4.0)
         contributors_ca_canada: Canada
         contributors_cz_czechia: Gweriniaeth Tsiec
         contributors_cz_cc_licence: Creative Commons Attribution 4.0 International
           licence (CC BY 4.0)
         contributors_fi_finland: Y Ffindir
         contributors_fi_nlsfi_license: Trwydded NLSFI
+        contributors_fr_credit_html: '%{france}: Cynhwysir data gan Direction Générale
+          des Impôts.'
         contributors_fr_france: Ffrainc
+        contributors_nl_credit_html: '%{netherlands}: Cynhwysir data &copy; AND, 2007
+          (%{and_link})'
         contributors_nl_netherlands: Iseldiroedd
         contributors_nz_new_zealand: Seland Newydd
         contributors_nz_linz_data_service: Gwasanaeth Data LINZ
         contributors_nz_cc_by: CC BY 4.0
         contributors_rs_serbia: Serbia
+        contributors_rs_open_data_portal: National Open Data Portal
         contributors_si_slovenia: Slofenia
         contributors_si_mkgp: Gweinyddiaeth Amaethyddiaeth, Coedwigaeth a Bwyd
         contributors_es_spain: Sbaen
@@ -1876,6 +1940,8 @@ cy:
         contributors_gb_united_kingdom: Y Deyrnas Unedig
         contributors_2_contributors_page: Tudalen gyfranwyr
         infringement_title_html: Torri hawlfraint
+        infringement_2_1_takedown_procedure: gweithdrefn tynnu i lawr
+        infringement_2_1_online_filing_page: tudalen ffeilio ar-lein
         trademarks_title: Nodau Masnach
         trademarks_1_1_trademark_policy: Polisi Nod Masnach
     index:
@@ -1927,7 +1993,8 @@ cy:
         title: Llawlyfr Dechreuwyr
         description: Canllaw'r gymuned i ddechreuwyr
       community:
-        title: Fforwm Cymunedol
+        title: Fforwm Cymorth a Chymuned
+        description: Dyma'r lle i chwilio am gymorth a sgwrsio am OpenStreetMap.
       mailing_lists:
         title: Rhestrau Post
       irc:
@@ -2032,7 +2099,7 @@ cy:
           hospital: Ysbyty
           building: Adeilad arwyddocâol
           station: Gorsaf drên
-          summit: Copa
+          summit: Pen Mynydd
           peak: Copa
           tunnel: Border toredig = twnnel
           bridge: Border du = pont
@@ -2076,15 +2143,30 @@ cy:
         tag: tag
       rules:
         title: Rheolau!
-        imports: Mewnforion
+        para_1_html: Nid oes llawer o reolau safonol ar OpenStreetMap ond rydym yn
+          disgwyl i bawb gydweithio a chyfathrebu â'r gymuned. Os ydych chi'n bwriadu
+          gwneud unrhyw weithgareddau yn wahanol i olygu â llaw, darllenwch a dilynwch
+          y canllawiau ar %{imports_link} a %{automated_edits_link}.
+        imports: Fewnforio
         automated_edits: Golygiadau Awtomatig
       start_mapping: Dechrau Mapio
       continue_authorization: Parhau Awdurdodi
       add_a_note:
         title: Dim amser i olygu? Ychwanegwch nodyn!
+        para_1: Os ydych chi eisiau trwsio rhywbeth bach ond nad oes amser i gofrestru
+          a dysgu sut i olygu, mae'n mor hawdd ychwanegu nodyn.
+        para_2_html: |-
+          Ewch i'r %{map_link} a chliciwch ar yr eicon nodyn: %{note_icon}.
+          Bydd hyn yn dangos marciwr ar y map, a gallwch ei symud drwy lusgo.
+          Ysgrifennwch eich neges a chliciwch gadw, a bydd mapwyr eraill yn gweithio arni.
         the_map: map
     communities:
       title: Cymunedau
+      lede_text: |-
+        Mae pobl ym mhob cwr o'r byd yn cyfrannu at neu'n ddefnyddio OpenStreetMap.
+        Er bod llawer yn cymryd rhan fel unigolion, mae rhai eraill wedi creu cymunedau.
+        Ceir grwpiau gwahanol sy'n cynrychioli trefi bach neu ardaloedd aml-wlad mawr.
+        Gall grwpiau fod yn ffurfiol neu'n anffurfiol.
       local_chapters:
         title: Siapteri Lleol
         about_text: Mae Siapteri Lleol yn grwpiau ar lefel gwlad neu ranbarth sydd
@@ -2097,7 +2179,10 @@ cy:
           Lleol:'
       other_groups:
         title: Grwpiau Eraill
-        communities_wiki: Tudalen wici cymunedau
+        other_groups_html: |-
+          Nid oes rhaid sefydlu grŵp ffurfiol yn yr un modd â'r Siapteri Lleol.
+          Mae llawer o grwpiau llwyddiannus yn bodoli fel grwpiau anffurfiol neu fel grŵp cymunedol. Gall unrhyw un ddechrau neu ymuno â grwp. Darllenwch fwy ar y %{communities_wiki_link}.
+        communities_wiki: dudalen wici Cymunedau
   traces:
     new:
       upload_trace: Uwchlwytho Arllwybr GPS
@@ -2171,6 +2256,8 @@ cy:
       my_traces: Fy Arllwybrau
       traces_from: Arllwybrau Cyhoeddus gan %{user}
       remove_tag_filter: Dileu Hidlydd Tagiau
+    offline:
+      heading: Storio GPX All-lein
     georss:
       title: Arllwybrau GPS OpenStreetMap
     description:
@@ -2220,6 +2307,7 @@ cy:
   oauth_clients:
     new:
       title: Cofrestru ap newydd
+      disabled: Ni ellir cofrestru apiau OAuth 1 bellach
     edit:
       title: Golygu eich ap
     show:
@@ -2267,6 +2355,8 @@ cy:
     new:
       authorize: Awdurdodi
       deny: Gwrthod
+    error:
+      title: Digwyddodd gwall
     show:
       title: Cod awdurdodi
   oauth2_authorized_applications:
@@ -2379,6 +2469,7 @@ cy:
         few: Tudalen %{page} (%{first_item}-%{last_item} o %{items})
         many: Tudalen %{page} (%{first_item}-%{last_item} o %{items})
         other: Tudalen %{page} (%{first_item}-%{last_item} o %{items})
+      summary_html: Crëwyd %{name} o %{ip_address} ar %{date}
       summary_no_ip_html: '%{name} wedi''i greu ar %{date}'
       confirm: Cadarnhau Defnyddwyr Dewisiedig
       hide: Cuddio Defnyddwyr Dewisiedig
@@ -2499,10 +2590,13 @@ cy:
           send_message: Anfon neges
     create:
       notice: Rydych chi wedi anwybyddu %{name}.
+    destroy:
+      notice: Rydych chi wedi dad-anwybyddu %{name}.
   notes:
     index:
       title: Nodiadau ag agorwyd neu y gwnaed sylw arnynt gan %{user}
       heading: Nodiadau %{user}
+      subheading_html: Nodiadau ag %{submitted} neu y %{commented} arnynt gan %{user}
       subheading_submitted: cyflwynwyd
       subheading_commented: rhoddwyd sylw
       no_notes: Dim nodiadau
@@ -2534,6 +2628,7 @@ cy:
       reactivate: Ailysgogi
       comment_and_resolve: Sylw a Datrys
       comment: Sylw
+      log_in_to_comment: Mewngofnodwch i ysgrifennu sylw ar y nodyn hwn
       report_link_html: Os yw'r nodyn hwn yn cynnwys gwybodaeth sensitif sydd angen
         ei dileu, gallwch chi %{link}.
       other_problems_resolve: Ar gyfer pob problem arall gyda'r nodyn, dylech chi
@@ -2619,6 +2714,7 @@ cy:
         hide_comment: cuddio
         unhide_comment: datguddio
     directions:
+      ascend: Esgyn
       engines:
         fossgis_osrm_bike: Beic (OSRM)
         fossgis_osrm_car: Car (OSRM)
@@ -2629,6 +2725,7 @@ cy:
         fossgis_valhalla_bicycle: Beic (Valhalla)
         fossgis_valhalla_car: Car (Valhalla)
         fossgis_valhalla_foot: Troed (Valhalla)
+      descend: Disgyn
       directions: Cyfeiriadau
       distance: Pellter
       distance_m: '%{distance}m'
@@ -2641,6 +2738,13 @@ cy:
         offramp_right: Cymerwch y ramp ar y dde
         offramp_right_with_exit: Cymerwch allanfa %{exit} ar y dde
         offramp_right_with_exit_name: Cymerwch allanfa %{exit} ar y dde i %{name}
+        turn_right_without_exit: Trowch i'r dde ar %{name}
+        sharp_right_without_exit: Siarp i'r dde ar %{name}
+        uturn_without_exit: Tro pedol ar hyd %{name}
+        sharp_left_without_exit: Siarp i'r chwith ar %{name}
+        turn_left_without_exit: Trowch i'r chwith ar %{name}
+        offramp_left: Cymerwch y ramp ar y chwith
+        merge_left_without_exit: Cyfuno i'r chwith ar %{name}
         via_point_without_exit: (trwy bwynt)
         follow_without_exit: Dilynwch %{name}
         leave_roundabout_without_exit: Gadael cylchfan - %{name}
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 0489206f0..82d1f61b2 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -383,14 +383,10 @@ da:
       way_paginated: Veje (%{x}-%{y} af %{count})
       relation: Relationer (%{count})
       relation_paginated: Relationer (%{x}-%{y} af %{count})
-      comment: Kommentarer (%{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
-      feed:
-        title: Ændringssæt %{id}
-        title_comment: Ændringssæt %{id} - %{comment}
       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
@@ -509,6 +505,9 @@ da:
       no_more_area: Ikke flere ændringssæt i dette område.
       no_more_user: Ikke flere ændringssæt af denne bruger.
       load_more: Indlæs mere
+      feed:
+        title: Ændringssæt %{id}
+        title_comment: Ændringssæt %{id} - %{comment}
     timeout:
       sorry: Desværre tog det for lang tid at indlæse den liste af ændringssæt du
         har bedt om.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7d10526f8..d105238ad 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -462,14 +462,10 @@ de:
       way_paginated: Wege (%{x}–%{y} von %{count})
       relation: Relationen (%{count})
       relation_paginated: Relationen (%{x}–%{y} von %{count})
-      comment: Kommentare (%{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
-      feed:
-        title: 'Änderungssatz: %{id}'
-        title_comment: Änderungssatz %{id} - %{comment}
       join_discussion: Anmelden, um mitzudiskutieren
       discussion: Diskussion
       still_open: Der Änderungssatz ist noch offen. Die Diskussion wird eröffnet,
@@ -578,6 +574,9 @@ de:
       no_more_area: Keine weiteren Änderungssätze in diesem Bereich.
       no_more_user: Keine weiteren Änderungssätze von diesem Benutzer.
       load_more: Mehr laden
+      feed:
+        title: 'Änderungssatz: %{id}'
+        title_comment: Änderungssatz %{id} - %{comment}
     timeout:
       sorry: Es hat leider zu lange gedauert, die angeforderten Änderungssätze abzurufen.
   changeset_comments:
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 5b8d496ea..15aa85683 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -204,12 +204,8 @@ diq:
       way_paginated: Ray (%{x}-%{y} - pêro piya  %{count})
       relation: Elaqeyi %{count}
       relation_paginated: Elaqeyi %{x}-%{y} pêro piya %{count}
-      comment: Mışewreyi (%{count})
       changesetxml: Vurnayışê peyênê XML
       osmchangexml: OsmVurnayışê XML
-      feed:
-        title: 'Koma vurnayışi: %{id}'
-        title_comment: '%{id} - %{comment} vurniyayışi'
       join_discussion: Dekewtena vatenayışi rê qeyd bê
       discussion: Werênayış
     node:
@@ -289,6 +285,9 @@ diq:
       title_friend: Qeydê vurnayışê embazan
       title_nearby: Nezdıra vurriyayışê setê karberi
       load_more: Tayêna bar ke
+      feed:
+        title: 'Koma vurnayışi: %{id}'
+        title_comment: '%{id} - %{comment} vurniyayışi'
   dashboards:
     contact:
       km away: '%{count} km duriyo'
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index ebe903069..e418bc832 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -199,9 +199,6 @@ dsb:
       relation_paginated: Relacije (%{x}-%{y} z %{count})
       changesetxml: Sajźbu změnow XML
       osmchangexml: osmChange XML
-      feed:
-        title: Sajźba změnow %{id}
-        title_comment: Sajźba změnow %{id} - %{comment}
     node:
       title_html: 'Suk: %{name}'
       history_title_html: 'Sukowa historija: %{name}'
@@ -290,6 +287,9 @@ dsb:
       no_more_area: Žedne dalšne sajźby změnow w toś tom wobcerku.
       no_more_user: Žedne dalšne sajźby změnow wót toś togo wužywarja.
       load_more: Wěcej zacytaś
+      feed:
+        title: Sajźba změnow %{id}
+        title_comment: Sajźba změnow %{id} - %{comment}
     timeout:
       sorry: Bóžko jo pśedłujko trało, kupki změnow, kótarež  sy póžedał, wótwołaś.
   dashboards:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 257c3d123..0affff2bf 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -396,14 +396,10 @@ el:
       way_paginated: Διαδρομές (%{x}-%{y} από %{count})
       relation: Σχέσεις (%{count})
       relation_paginated: Σχέσεις (%{x}-%{y} από %{count})
-      comment: Σχόλια (%{count})
       hidden_comment_by_html: Κρυφό σχόλιο από %{user} %{time_ago}
       comment_by_html: Σχόλιο από %{user} %{time_ago}
       changesetxml: Ομάδας αλλαγών XML
       osmchangexml: osmChange XML
-      feed:
-        title: Ομάδα αλλαγών %{id}
-        title_comment: Ομάδα αλλαγών %{id} - %{comment}
       join_discussion: Συνδεθείτε για συμμετοχή στη συζήτηση
       discussion: Συζήτηση
       still_open: Η ομάδα αλλαγών παραμένει σε εκκρεμότητα - η συζήτηση θα ανοίξει
@@ -523,6 +519,9 @@ el:
       no_more_area: Δεν υπάρχουν άλλες αλλαγές για αυτήν την περιοχή.
       no_more_user: Δεν υπάρχουν άλλες αλλαγές από αυτόν τον χρήστη.
       load_more: Φόρτωση περισσότερων
+      feed:
+        title: Ομάδα αλλαγών %{id}
+        title_comment: Ομάδα αλλαγών %{id} - %{comment}
     timeout:
       sorry: Λυπάμαι, ο κατάλογος των αλλαγών που ζητήσατε χρειάστηκε πολύ χρόνο για
         να ανακτηθεί.
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 39f49ce27..6d3be7da8 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -171,41 +171,41 @@ en-GB:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: about 1 hour ago
+        one: about %{count} hour ago
         other: about %{count} hours ago
       about_x_months:
-        one: about 1 month ago
+        one: about %{count} month ago
         other: about %{count} months ago
       about_x_years:
-        one: about 1 year ago
+        one: about %{count} year ago
         other: about %{count} years ago
       almost_x_years:
-        one: almost 1 year ago
+        one: almost %{count} year ago
         other: almost %{count} years ago
       half_a_minute: half a minute ago
       less_than_x_seconds:
-        one: less than 1 second ago
+        one: less than %{count} second ago
         other: less than %{count} seconds ago
       less_than_x_minutes:
-        one: less than a minute ago
+        one: less than %{count} minute ago
         other: less than %{count} minutes ago
       over_x_years:
-        one: over 1 year ago
+        one: over %{count} year ago
         other: over %{count} years ago
       x_seconds:
-        one: 1 second ago
+        one: '%{count} second ago'
         other: '%{count} seconds ago'
       x_minutes:
-        one: 1 minute ago
+        one: '%{count} minute ago'
         other: '%{count} minutes ago'
       x_days:
-        one: 1 day ago
+        one: '%{count} day ago'
         other: '%{count} days ago'
       x_months:
-        one: 1 month ago
+        one: '%{count} month ago'
         other: '%{count} months ago'
       x_years:
-        one: 1 year ago
+        one: '%{count} year ago'
         other: '%{count} years ago'
   editor:
     default: Default (currently %{name})
@@ -297,12 +297,8 @@ en-GB:
       way_paginated: Ways (%{x}-%{y} of %{count})
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
-      comment: Comments (%{count})
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
-      feed:
-        title: Changeset %{id}
-        title_comment: Changeset %{id} - %{comment}
       join_discussion: Log in to join the discussion
       discussion: Discussion
       still_open: Changeset still open - discussion will open once the changeset is
@@ -403,6 +399,9 @@ en-GB:
       no_more_area: No more changesets in this area.
       no_more_user: No more changesets by this user.
       load_more: Load more
+      feed:
+        title: Changeset %{id}
+        title_comment: Changeset %{id} - %{comment}
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.
   changeset_comments:
@@ -473,7 +472,6 @@ en-GB:
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:
-        zero: No comments
         one: '%{count} comment'
         other: '%{count} comments'
       edit_link: Edit this entry
@@ -1339,7 +1337,7 @@ en-GB:
     new:
       title: Lost password
       heading: Forgotten Password?
-      email address: E-mail address
+      email address: E-mail Address
       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.
@@ -1373,8 +1371,8 @@ en-GB:
     new:
       title: Login
       heading: Login
-      email or username: 'E-mail Address or Username:'
-      password: 'Password:'
+      email or username: E-mail Address or Username
+      password: Password
       remember: Remember me
       lost password link: Lost your password?
       login_button: Login
@@ -1394,8 +1392,8 @@ en-GB:
           title: Login with Facebook
           alt: Login with a Facebook Account
         microsoft:
-          title: Login with Windows Live
-          alt: Login with a Windows Live Account
+          title: Login with Microsoft
+          alt: Login with a Microsoft Account
         github:
           title: Login with GitHub
           alt: Login with a GitHub Account
@@ -1574,9 +1572,9 @@ en-GB:
           rail: Railway
           subway: Subway
           cable_car: Cable car
-          chair_lift: chairlift
+          chair_lift: Chair lift
           runway: Airport Runway
-          taxiway: taxiway
+          taxiway: Taxiway
           apron: Airport apron
           admin: Administrative boundary
           forest: Forest
@@ -1590,7 +1588,7 @@ en-GB:
           commercial: Commercial area
           heathland: Heathland
           lake: Lake
-          reservoir: reservoir
+          reservoir: Reservoir
           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery
@@ -1600,11 +1598,11 @@ en-GB:
           reserve: Nature reserve
           military: Military area
           school: School
-          university: university
+          university: University
           building: Significant building
           station: Railway station
           summit: Summit
-          peak: peak
+          peak: Peak
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
@@ -1685,7 +1683,7 @@ en-GB:
     trace:
       pending: PENDING
       count_points:
-        one: 1 point
+        one: '%{count} point'
         other: '%{count} points'
       more: more
       trace_details: View Trace Details
@@ -1983,7 +1981,7 @@ en-GB:
       time_past_html: Ended %{time}.
       block_duration:
         hours:
-          one: 1 hour
+          one: '%{count} hour'
           other: '%{count} hours'
     blocks_on:
       title: Blocks on %{name}
@@ -2024,7 +2022,7 @@ en-GB:
     index:
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'
-      subheading_html: Notes submitted or commented on by %{user}
+      subheading_html: Notes %{submitted} or %{commented} by %{user}
       id: Id
       creator: Creator
       description: Description
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6a3c880c4..775030638 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -204,9 +204,9 @@ en:
         one: "%{count} year ago"
         other: "%{count} years ago"
   printable_name:
-    with_id: "%{id}"
-    with_version: "%{id}, v%{version}"
+    version: "v%{version}"
     with_name_html: "%{name} (%{id})"
+    current_and_old_links_html: "%{current_link}, %{old_link}"
   editor:
     default: "Default (currently %{name})"
     id:
@@ -342,14 +342,10 @@ en:
       way_paginated: "Ways (%{x}-%{y} of %{count})"
       relation: "Relations (%{count})"
       relation_paginated: "Relations (%{x}-%{y} of %{count})"
-      comment: "Comments (%{count})"
       hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
       comment_by_html: "Comment from %{user} %{time_ago}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
-      feed:
-        title: "Changeset %{id}"
-        title_comment: "Changeset %{id} - %{comment}"
       join_discussion: "Log in to join the discussion"
       discussion: Discussion
       still_open: "Changeset still open - discussion will open once the changeset is closed."
@@ -465,6 +461,9 @@ en:
       no_more_area: "No more changesets in this area."
       no_more_user: "No more changesets by this user."
       load_more: "Load more"
+      feed:
+        title: "Changeset %{id}"
+        title_comment: "Changeset %{id} - %{comment}"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   changeset_comments:
@@ -524,6 +523,7 @@ en:
     show:
       title: "%{user}'s Diary | %{title}"
       user_title: "%{user}'s Diary"
+      discussion: "Discussion"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Login"
@@ -576,6 +576,12 @@ en:
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
+    subscribe:
+      heading: Subscribe to the following diary entry discussion?
+      button: Subscribe to discussion
+    unsubscribe:
+      heading: Unsubscribe from the following diary entry discussion?
+      button: Unsubscribe from discussion
   doorkeeper:
     errors:
       messages:
@@ -1571,6 +1577,8 @@ en:
       header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
       footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
+      footer_unsubscribe: "You can unsubscribe from the discussion at %{unsubscribeurl}"
+      footer_unsubscribe_html: "You can unsubscribe from the discussion at %{unsubscribeurl}"
     message_notification:
       subject: "[OpenStreetMap] %{message_title}"
       hi: "Hi %{to_user},"
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 7397d3365..f2e141e8f 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -34,10 +34,10 @@ eo:
       friendly: '%e %B %Y je %H:%M'
   helpers:
     file:
-      prompt: Elektu dosieron
+      prompt: Elekti dosieron
     submit:
       diary_comment:
-        create: Publikigi
+        create: Prikomenti
       diary_entry:
         create: Publikigi
         update: Ĝisdatigi
@@ -47,7 +47,7 @@ eo:
         create: Sendi
       client_application:
         create: Registri
-        update: Aktualigi
+        update: Ĝisdatigi
       oauth2_application:
         create: Registri
         update: Ĝisdatigi
@@ -63,8 +63,9 @@ eo:
   activerecord:
     errors:
       messages:
-        invalid_email_address: ŝajnas ne estas ĝusta retpoŝta adreso
+        invalid_email_address: ŝajne ne estas ĝusta retpoŝta adreso
         email_address_not_routable: ne estas enkursigebla
+        display_name_is_user_n: ne povas esti user_n, escepte se n estas via uzant-identigilo
       models:
         user_mute:
           is_already_muted: jam estas silentigita
@@ -371,14 +372,10 @@ eo:
       way_paginated: Linioj (%{x}-%{y} el %{count})
       relation: Rilatoj (%{count})
       relation_paginated: Rilatoj (%{x}-%{y} el %{count})
-      comment: Komentoj (%{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
-      feed:
-        title: Ŝanĝaro %{id}
-        title_comment: Ŝanĝaro %{id} - %{comment}
       join_discussion: Ensalutu por aliĝi al la diskuto
       discussion: Diskuto
       still_open: Ŝanĝaro plue malfermita - diskuto estos malfermita ekde kiam la
@@ -497,6 +494,9 @@ eo:
       no_more_area: Neniu plia ŝanĝaro en tiu ĉi areo.
       no_more_user: Neniaj pliaj ŝanĝaroj de tiu ĉi uzanto.
       load_more: Pli
+      feed:
+        title: Ŝanĝaro %{id}
+        title_comment: Ŝanĝaro %{id} - %{comment}
     timeout:
       sorry: Bedaŭrinde daŭris tro longe kompili la petitan liston de ŝanĝaroj.
   changeset_comments:
@@ -558,6 +558,7 @@ eo:
     show:
       title: Taglibro de %{user} | %{title}
       user_title: Taglibro de %{user}
+      discussion: Diskuto
       leave_a_comment: Komenti
       login_to_leave_a_comment_html: '%{login_link} por aldoni komenton'
       login: Ensaluti
@@ -2240,8 +2241,8 @@ eo:
         title: Manlibro por komencantoj
         description: Manlibro por komencantoj kreata de la komunumo (en la angla).
       community:
-        title: Forumoj de komunumo
-        description: Loko por diskuti pri OpenStreetMap.
+        title: Helpo kaj forumoj
+        description: Komuna loko por serĉi helpon kaj diskuti pri OpenStreetMap.
       mailing_lists:
         title: Dissendolistoj
         description: Demandu aÅ­ diskutu pri interesaj temoj en multaj pritemaj aÅ­
@@ -2618,6 +2619,7 @@ eo:
   oauth_clients:
     new:
       title: Registri novan aplikaĵon
+      disabled: Registrado de aplikaĵoj OAuth 1 estas malŝaltita
     edit:
       title: Modifi vian aplikaĵon
     show:
@@ -2701,6 +2703,7 @@ eo:
       title: Miaj rajtigitaj aplikaĵoj
       application: Aplikaĵo
       permissions: Permesoj
+      last_authorized: AntaÅ­a aÅ­tentigo
       no_applications_html: Vi ankoraŭ rajtigis neniun aplikaĵon %{oauth2}.
     application:
       revoke: Senrajtigi aliron
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 8e8f2e5fc..42fe29783 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -450,14 +450,10 @@ es:
       way_paginated: Vías (%{x}-%{y} de %{count})
       relation: Relaciones (%{count})
       relation_paginated: Relaciones (%{x}-%{y} de %{count})
-      comment: Comentarios (%{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
-      feed:
-        title: Conjunto de cambios %{id}
-        title_comment: Conjunto de cambios %{id} - %{comment}
       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
@@ -540,6 +536,15 @@ es:
       introduction: Haz clic en el mapa para encontrar elementos cercanos.
       nearby: Elementos cercanos
       enclosing: Elementos delimitantes
+  old_nodes:
+    not_found:
+      sorry: 'Lo sentimos, no se pudo encontrar el nodo #%{id} versión %{version}.'
+  old_ways:
+    not_found:
+      sorry: 'Lo sentimos, no se pudo encontrar la vía #%{id} versión %{version}.'
+  old_relations:
+    not_found:
+      sorry: 'Lo sentimos, no se pudo encontrar la relación #%{id} versión %{version}.'
   changesets:
     changeset_paging_nav:
       showing_page: Página %{page}
@@ -568,6 +573,9 @@ es:
       no_more_area: No hay más conjuntos de cambios en este área.
       no_more_user: No hay más conjuntos de cambios por este usuario.
       load_more: Cargar más
+      feed:
+        title: Conjunto de cambios %{id}
+        title_comment: Conjunto de cambios %{id} - %{comment}
     timeout:
       sorry: Lo sentimos, la lista de conjuntos de cambios que solicitó tardó demasiado
         en obtenerse.
@@ -632,6 +640,7 @@ es:
     show:
       title: Diario de %{user} | %{title}
       user_title: Diario de %{user}
+      discussion: Discusión
       leave_a_comment: Dejar un comentario
       login_to_leave_a_comment_html: '%{login_link} para dejar un comentario'
       login: Iniciar sesión
@@ -2363,8 +2372,9 @@ es:
         title: Guía para principiantes
         description: Guía para principiantes, mantenida por la comunidad.
       community:
-        title: Foro de la Comunidad
-        description: Un lugar compartido para conversaciones sobre OpenStreetMap.
+        title: Ayuda y foro comunitario
+        description: Un lugar compartido para buscar ayuda y tener conversaciones
+          sobre OpenStreetMap.
       mailing_lists:
         title: Listas de correo
         description: Haz una pregunta o discute asuntos interesantes en una amplia
@@ -2754,6 +2764,7 @@ es:
   oauth_clients:
     new:
       title: Registrar una nueva aplicación
+      disabled: Se ha deshabilitado el registro de aplicaciones OAuth 1
     edit:
       title: Editar tu aplicación
     show:
@@ -2837,6 +2848,7 @@ es:
       title: Mis aplicaciones autorizadas
       application: Solicitudes
       permissions: Permisos
+      last_authorized: Último autorizado
       no_applications_html: Aún no has autorizado aplicaciones a %{oauth2}.
     application:
       revoke: Revocar el acceso
@@ -2863,7 +2875,7 @@ es:
         aunque habrá algunas herramientas y servidores que aún la soliciten.
       continue: Registrarse
       terms accepted: ¡Gracias por aceptar los nuevos Términos de Colaborador!
-      email_confirmation_help_html: Tu dirección no se muestra públicamente, consulta
+      email_confirmation_help_html: Tu dirección no se mostrará públicamente, consulta
         nuestra %{privacy_policy_link} para obtener más información.
       privacy_policy: normativa de privacidad
       privacy_policy_title: Política de privacidad de la OSMF, incluida la sección
@@ -2872,8 +2884,8 @@ es:
       title: Términos
       heading: Términos
       heading_ct: Términos de Colaborador
-      read and accept with tou: Lea el acuerdo de colaborador y los Términos de Uso,
-        marque ambas casillas de verificación cuando haya terminado y luego presione
+      read and accept with tou: Lee el acuerdo de colaborador y los Términos de Uso,
+        marca ambas casillas de verificación cuando hayas terminado y luego presiona
         el botón Continuar.
       contributor_terms_explain: Este acuerdo gobierna los términos de tus contribuciones
         actuales y futuras.
diff --git a/config/locales/et.yml b/config/locales/et.yml
index bc6e1df96..d715d5a0e 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -329,14 +329,10 @@ et:
       way_paginated: Jooned (%{x}–%{y} %{count}-st)
       relation: Relatsioonid (%{count})
       relation_paginated: Relatsioonid (%{x}–%{y} %{count}-st)
-      comment: Kommentaare (%{count})
       hidden_comment_by_html: Peidetud kommentaar kasutajalt %{user} %{time_ago}
       comment_by_html: Kommentaar kasutajalt %{user} %{time_ago}
       changesetxml: Muudatuskogumi XML
       osmchangexml: osmChange XML
-      feed:
-        title: Muudatuskogum %{id}
-        title_comment: Muudatuskogum %{id} – %{comment}
       join_discussion: Logi sisse, kui soovid arutelus osaleda
       discussion: Arutelu
       still_open: Muudatuskogum on veel avatud. Arutelu avaneb siis, kui muudatuskogum
@@ -443,6 +439,9 @@ et:
       no_more_area: Sellest alast ei leitud rohkem muudatuskogumeid.
       no_more_user: Sellelt kasutajalt ei leitud rohkem muudatuskogumeid.
       load_more: Laadi veel
+      feed:
+        title: Muudatuskogum %{id}
+        title_comment: Muudatuskogum %{id} – %{comment}
     timeout:
       sorry: Kahjuks võttis taotletud muudatuskogumite laadimine liiga kaua aega.
   changeset_comments:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 466666b3b..417185c1e 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -60,27 +60,32 @@ eu:
       messages:
         invalid_email_address: badirudi ez dela e-posta helbide egoki bat
         email_address_not_routable: ezin da biderik kalkulatu
+        display_name_is_user_n: ezin da user_n izan, salbu eta n zure erabiltzaile
+          ID-a bada
+      models:
+        user_mute:
+          is_already_muted: dagoeneko isilduta dago
     models:
       acl: Kontrol zerrendara sartu
-      changeset: Aldaketak
-      changeset_tag: Aldaketa Etiketa
+      changeset: Aldaketa multzoa
+      changeset_tag: Aldaketa multzoaren etiketa
       country: Herrialdea
-      diary_comment: Eguneroko iruzkina
-      diary_entry: Eguneroko sarrera
+      diary_comment: Egunerokoaren iruzkina
+      diary_entry: Egunerokoaren sarrera
       friend: Laguna
       issue: Arazoa
       language: Hizkuntza
       message: Mezua
-      node: Nodo
+      node: Nodoa
       node_tag: Nodoaren etiketa
       old_node: Nodo zaharra
       old_node_tag: Nodo etiketa zaharra
       old_relation: Erlazio zaharra
-      old_relation_member: Erlazio zaharreko kidea
-      old_relation_tag: Erlazio zaharreko etiketa
+      old_relation_member: Erlazioko kidea izandakoa
+      old_relation_tag: Erlazioko etiketa zaharra
       old_way: Bide zaharra
-      old_way_node: Nodo bide zaharra
-      old_way_tag: Bide zahar etiketa
+      old_way_node: Bideko nodo zaharra
+      old_way_tag: Bidearen etiketa zaharra
       relation: Erlazioa
       relation_member: Erlazio kidea
       relation_tag: Erlazio etiketa
@@ -136,7 +141,7 @@ eu:
         description: Deskribapena
         gpx_file: 'GPX fitxategia igo:'
         visibility: Ikusgarritasuna
-        tagstring: 'Etiketak:'
+        tagstring: Etiketak
       message:
         sender: Igorlea
         title: Gaia
@@ -156,13 +161,13 @@ eu:
         new_email: 'E-posta helbide berria:'
         active: Aktiboa
         display_name: Erakusteko izena
-        description: 'Profilaren deskribapena:'
+        description: Profilaren deskribapena
         home_lat: Latitudea
         home_lon: Longitudea
-        languages: Hizkuntza lehenetsiak
-        preferred_editor: 'Lehenetsitako editorea:'
+        languages: Hobetsitako hizkuntzak
+        preferred_editor: Editore hobetsia
         pass_crypt: Pasahitza
-        pass_crypt_confirmation: Pasahitza berretsi
+        pass_crypt_confirmation: 'Berretsi pasahitza:'
     help:
       doorkeeper/application:
         confidential: Bezeroaren sekretua isilpean gorde daitekeenean erabiliko da
@@ -170,12 +175,12 @@ eu:
           ez dira konfidentzialak)
         redirect_uri: Erabili lerro bat URI bakoitzeko
       trace:
-        tagstring: koma mugatua
+        tagstring: komak mugatua
       user_block:
         reason: Erabiltzailea blokaturik egoteko arrazoia. Egon ahal bezain lasai
           eta zentzudun, egoeraren inguruko xehetasun guztiak emanez, mezu hori publikoki
           ikusgai egongo dela gogoratuz. Gogoan izan erabiltzaile guztiek ez dutela
-          komunitatearen hizkera ulertzen; beraz, saiatu hitz arruntak erabiltzen.
+          komunitatearen hizkera ulertzen; beraz saiatu hitz arruntak erabiltzen.
         needs_view: Erabiltzaileak saioa hasi behar al du bloke hau garbitu aurretik?
       user:
         new_email: (inoiz ez da publikoki bistaratuko)
@@ -283,6 +288,8 @@ eu:
         retain_changeset_discussions: Zure aldaketa-multzoko eztabaidak, halakorik
           izanez gero, mantendu egingo dira.
         retain_email: Zure posta elektronikoko helbidea gordeko da.
+        recent_editing_html: Orain dela gutxi editatu duzunez zure kontua ezin da
+          ezabatu. %{time} barru ezabatzea posible izango da.
         confirm_delete: Ziur zaude?
         cancel: Utzi
   accounts:
@@ -362,14 +369,10 @@ eu:
       way_paginated: Bideak (%{x}-%{y} %{count}-tik)
       relation: Erlazioak (%{count})
       relation_paginated: Erlazioak (%{x}-%{y} %{count}-tik)
-      comment: Iruzkinak (%{count})
       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
-      feed:
-        title: '%{id} aldaketak'
-        title_comment: '%{id} aldaketa - %{comment}'
       join_discussion: Hasi saioa eztabaidan parte hartzeko
       discussion: Eztabaida
       still_open: Aldaketak oraindik zabalik - eztabaida aldaketak itxi ondoren irekiko
@@ -451,6 +454,15 @@ eu:
       introduction: Egin klik mapan hurbileko ezaugarriak aurkitzeko.
       nearby: Hurbileko ezaugarriak
       enclosing: Bildutako ezaugarriak
+  old_nodes:
+    not_found:
+      sorry: Barkatu, ezin izan da %{id} nodoaren %{version} bertsioa aurkitu.
+  old_ways:
+    not_found:
+      sorry: Barkatu, ezin izan da %{id} bidearen %{version} bertsioa aurkitu.
+  old_relations:
+    not_found:
+      sorry: Barkatu, ezin izan da %{id} erlazioaren %{version} bertsioa aurkitu.
   changesets:
     changeset_paging_nav:
       showing_page: '%{page} orrialdea'
@@ -479,6 +491,9 @@ eu:
       no_more_area: Inguru honetan ez dago aldaketa gehiagorik.
       no_more_user: Erabiltzaile honek ez du aldaketa gehiagorik egin.
       load_more: Gehiago kargatu
+      feed:
+        title: '%{id} aldaketak'
+        title_comment: '%{id} aldaketa - %{comment}'
     timeout:
       sorry: Barkatu, zuk eskatutako aldaketen zerrenda berreskuratzeko denbora gehiegi
         behar izan da.
@@ -542,6 +557,7 @@ eu:
     show:
       title: '%{user}(r)en egunerokoa | %{title}'
       user_title: '%{user}(r)en egunerokoa'
+      discussion: Eztabaida
       leave_a_comment: Iruzkin bat utzi
       login_to_leave_a_comment_html: '%{login_link} iruzkin bat uzteko'
       login: Hasi saioa
@@ -597,10 +613,25 @@ eu:
       newer_comments: Iruzkin berriagoak
       older_comments: Iruzkin zaharragoak
   doorkeeper:
+    errors:
+      messages:
+        account_selection_required: Baimen zerbitzariak azken erabiltzailearen kontua
+          hautatzea eskatzen du
+        consent_required: Baimen zerbitzariak erabiltzailearen baimena behar du
+        interaction_required: Baimen zerbitzariak erabiltzailearen interakzioa eskatzen
+          du
+        login_required: Baimen zerbitzariak erabiltzailearen autentifikazioa behar
+          du
     flash:
       applications:
         create:
           notice: Aplikazioa erregistratu da.
+    scopes:
+      address: Zure helbide fisikoa ikusi
+      email: Ikusi zure helbide elektronikoa
+      openid: Egiaztatu zure kontua
+      phone: Zure telefono zenbakia ikusi
+      profile: Zure profileko informazioa ikusi
   errors:
     contact:
       contact_url_title: Harremanetarako hainbat kanal azalduak
@@ -638,6 +669,7 @@ eu:
     search:
       title:
         results_from_html: '%{results_link} ren emaitzak'
+        latlon: Barnekoa
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -1132,7 +1164,7 @@ eu:
           reef: Arrezifea
           ridge: Gailurra
           rock: Arroka
-          saddle: Jarlekua
+          saddle: Mendi-lepoa
           sand: Harea
           scree: Pilaketa
           scrub: Sasiak
@@ -1430,6 +1462,7 @@ eu:
       status: Egoera
       reports: Reporteak
       last_updated: Azken eguneratzea
+      last_updated_time_ago_user_html: Duela %{time_ago} %{user} erabiltzaileak
       link_to_reports: Reporteak ikusi
       reports_count:
         one: txosten %{count}
@@ -1606,6 +1639,11 @@ eu:
       subject: '[OpenStreetMap] GPX Inportazioan porrota'
     gpx_success:
       hi: Kaixo %{to_user},
+      loaded:
+        one: behar bezala kargatu dira %{trace_points} %{count} puntu posibletatik.
+        other: '%{trace_points} %{count} puntu posibletatik arrakastaz kargatu da.'
+      all_your_traces_html: Arrakastaz kargatutako zure GPX arrasto guztiak %{url}
+        helbidean aurki daitezke.
       subject: '[OpenStreetMap] GPX Inportazioan arrakasta'
     signup_confirm:
       subject: '[OpenStreetMap] Ongi etorri OpenStreetMap-era'
@@ -1742,11 +1780,13 @@ eu:
       to: Hartzailea
       subject: Gaia
       date: Data
+      actions: Ekintzak
     message_summary:
       unread_button: Markatu irakurri gabekotzat
       read_button: Markatu irakurritzat
       reply_button: Erantzun
       destroy_button: Ezabatu
+      unmute_button: Mugitu Sarrera-ontzira
     new:
       title: Bidali mezua
       send_message_to_html: '%{name}ri mezu berri bat bidali'
@@ -1761,12 +1801,18 @@ eu:
       body: Barkatu baina id horrekin ez dago mezurik.
     outbox:
       title: Irteerako ontzia
+      actions: Ekintzak
       messages:
         one: '%{count} Mezua bidali duzu'
         other: ' %{count} Mezuak bidali dituzu'
       no_sent_messages_html: Ez duzu mezurik bidali oraindik. Zergatik ez konektatuan
         jarri %{people_mapping_nearby_link} batzuekin?
       people_mapping_nearby: kartografiatzen ari diren hurbileko pertsonak
+    muted:
+      title: Isildutako mezuak
+      messages:
+        one: "Isildutako mezu \n%{count}"
+        other: Isildutako %{count} mezu berri
     reply:
       wrong_user: '''%{user}'' bezala saioa hasi duzu baina erantzuteko eskatu duzun
         mezua ez da erabiltzaile horri bidali. Hasi saioa erabiltzaile zuzenarekin
@@ -1785,16 +1831,20 @@ eu:
     heading:
       my_inbox: Nire sarrera-ontzia
       my_outbox: Nire Irteera-Ontzia
+      muted_messages: Isildutako mezuak
     mark:
       as_read: Mezua irakurrita gisa markatu da
       as_unread: Mezua irakurri gabe gisa markatu da
+    unmute:
+      notice: Mezua Sarrera-ontzira eraman dugu
+      error: Mezua ezin izan da postontzira eraman.
     destroy:
       destroyed: Mezua ezabatuta
   passwords:
     new:
       title: Ahaztutako pasahitza
       heading: Pasahitza ahaztuta?
-      email address: 'Eposta helbidea:'
+      email address: Eposta helbidea
       new password button: Pasahitza berrezarri
       help_text: Sartu saioa hastean erabiltzen zenuen helbide elektronikoa, zure
         pasahitza berrezarri ahal izateko erabil dezakezu bidaliko dizugun esteka.
@@ -1809,6 +1859,7 @@ eu:
       flash token bad: Token hori ez da aurkitu, URL egiaztatu beharbada?
     update:
       flash changed: Zure pasahitza aldatu da.
+      flash token bad: Ez dut token hori aurkitu, egiaztatu dezakezu URLa agian?
   preferences:
     show:
       title: Nire hobespenak
@@ -1853,8 +1904,8 @@ eu:
     new:
       title: Saio-hasiera
       heading: Saio-hasiera
-      email or username: 'Eposta helbidea edo Erabiltzaile izena:'
-      password: 'Pasahitza:'
+      email or username: 'Eposta helbide edo erabiltzaile izena:'
+      password: Pasahitza
       remember: Gogora nazazu
       lost password link: Pasahitza ahaztu duzu?
       login_button: Saioa hasi
@@ -1912,6 +1963,7 @@ eu:
       image: Irudia
       alt: Ordezko testua
       url: URL
+      codeblock: Kode blokea
     richtext_field:
       edit: Aldatu
       preview: Aurreikuspena
@@ -1929,11 +1981,24 @@ eu:
         aireko irudiak erabiltzen dituzte, GPS gailuak eta teknologia baxuko eremuko
         mapak OSMrako egiaztapen zehatza eta eguneratua egiteko.
       community_driven_title: Komunitatearen Ahotsa
+      community_driven_1_html: |-
+        OpenStreetMap-en komunitatea anitza eta sutsua da eta egunero hazten ari da.
+        Gure kolaboratzaileen artean mapatzaile amorratuak, GIS profesionalak, ingeniariak
+        OSM zerbitzariak zuzentzen dituztenak, hondamendiak eragindako eremuak mapatzen dituzten laguntzaileak
+        eta askoz gehiago gaude.
+         Komunitateari buruz gehiago jakiteko, ikusi %{osm_blog_link},
+        %{user_diaries_link},%{community_blogs_link} eta
+        %{osm_foundation_link} webgunea.
       community_driven_osm_blog: OpenStreetMap bloga
       community_driven_user_diaries: Erabiltzaileen egunerokoak
       community_driven_community_blogs: Komunitateko blogak
       community_driven_osm_foundation: OSM Fundazioa
       open_data_title: Datu Irekiak
+      open_data_1_html: 'OpenStreetMap %{open_data} da: edozein gauzarako erabil dezakezu
+        betiere OpenStreetMap eta bere kolaboratzaileek aipatzen badituzu. Moduren
+        batean datuen gainean edukia eraiki edo eraldatzen baduzu, lizentzia beraren
+        azpian bakarrik partekatu ahal izango duzu emaitza. Ikus %{copyright_license_link}
+        xehetasun gehiago lortzeko.'
       open_data_open_data: Datu Irekiak
       open_data_copyright_license: Copyright eta lizentzia orria
       legal_title: Legala
@@ -2117,8 +2182,9 @@ eu:
         title: Hasiberrientzako gida
         description: Hasiberrientzako mantentze-gida komunitarioa.
       community:
-        title: Komunitatearen ataria
-        description: OpenStreetMapi buruzko elkarrizketetarako leku partekatua.
+        title: Laguntza eta Komunitatearen foroa
+        description: OpenStreetMapi buruz laguntza bilatu eta elkarrizketarako leku
+          partekatua.
       mailing_lists:
         title: Posta Bidaltze Zerrendak
         description: Galdera bat egin edo eztabaidatu gai interesgarriak gaikako edo
@@ -2154,6 +2220,7 @@ eu:
         galderak egiteko eta erantzuteko, eta elkarrekin eztabaidatzeko eta mapa-gaiak dokumentatzeko.
         %{help_link}. Erakunderen batekin OpenStreetMap-erako planak egiten? %{welcome_mat_link}.
       get_help_here: Lortu laguntza hemen
+      welcome_mat: Begiratu ongi etorria emateko txartelak.
     sidebar:
       search_results: Bilaketaren emaitzak
       close: Itxi
@@ -2176,23 +2243,40 @@ eu:
           primary: Lehen mailako errepidea
           secondary: Bigarren mailako errepidea
           unclassified: Sailkatu gabeko errepidea
+          pedestrian: Oinezkoen bidea
           track: Pista
           bridleway: Oinezkoen gunea
           cycleway: Bidegorria
           cycleway_national: Bizikleta bide nazionala
           cycleway_regional: Eskualde bizikleta bidea
           cycleway_local: Bizikleta bide lokala
+          cycleway_mtb: Mendiko bizikletarako ibilbidea
           footway: Oinezkoen bidea
           rail: Trenbidea
+          train: Trena
           subway: Metroa
+          ferry: Ferrya
+          light_rail: Trenbide arina
+          tram: Tranbia
+          trolleybus: Trolebusa
+          bus: Autobusa
           cable_car: Funikularra
-          chair_lift: teleaulkia
+          chair_lift: Teleaulkia
           runway: Aireportuko Pista
-          taxiway: taxi bidea
+          taxiway: Taxi-bidea
           apron: Aireportu plataforma
           admin: Muga administratiboa
+          capital: Hiriburua
+          city: Hiria
+          orchard: Baratzea
+          vineyard: Mahastia
           forest: Baso
           wood: Basoa
+          farmland: Nekazaritza-lurrak
+          grass: Belardia
+          meadow: Larrea
+          bare_rock: Harkaitz biluzia
+          sand: Harea
           golf: Golf-zelai
           park: Parke
           common: Arrunta
@@ -2201,29 +2285,39 @@ eu:
           industrial: Industrialdea
           commercial: Merkataritza eremua
           heathland: Txilardia
+          scrubland: Sastrakadiak
           lake: Aintzira
-          reservoir: urtegia
+          reservoir: Urtegia
+          glacier: Glaziarra
+          reef: Arrezifea
+          wetland: Hezegunea
           farm: Baserria
           brownfield: Landarik gabeko gunea
           cemetery: Hilerri
           allotments: Alokatutako Baratzeak
           pitch: Kirolgunea
           centre: Kiroldegi
+          beach: Hondartza
           reserve: Natura-erreserba
           military: Eremu militarra
           school: Eskola
-          university: unibertsitate
+          university: Unibertsitatea
+          hospital: Ospitalea
           building: Eraikin garrantzitsua
           station: Tren geltokia
           summit: Tontorra
-          peak: gailurra
+          peak: Gailurra
           tunnel: Marratxodun estalkia = tunela
           bridge: Estalki beltza = zubia
           private: Sarbide pribatua
           destination: Helmuga sarbidea
           construction: Eraikitzen ari diren errepideak
+          bus_stop: Autobus geltokia
+          stop: Geltokia
           bicycle_shop: Bizikleta-denda
+          bicycle_rental: Bizikleta alokairua
           bicycle_parking: Bizikleta-aparkalekua
+          bicycle_parking_small: Bizikleten aparkaleku txikia
           toilets: Komunak
     welcome:
       title: Ongi etorri!
@@ -2239,6 +2333,7 @@ eu:
           diren zenbait hitz gako.
         editor: editorea
         node: nodoa
+        way: bidea
         tag: etiketa
       rules:
         title: Arauak!
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index e1237dbfb..6073e505d 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -385,14 +385,10 @@ fa:
       way_paginated: راه‌ها (%{x}-%{y} از %{count})
       relation: رابطه‌ها (%{count})
       relation_paginated: رابطه‌ها (%{x}-%{y} از %{count})
-      comment: نظرها (%{count})
       hidden_comment_by_html: نظر پنهان؛ نوشتهٔ %{user}‏ %{time_ago}
       comment_by_html: نظر از %{user}‏ %{time_ago}
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
-      feed:
-        title: بستهٔ تغییر %{id}
-        title_comment: بستهٔ تغییر %{id} - %{comment}
       join_discussion: وارد شوید تا به بحث بپیوندید
       discussion: بحث
       still_open: بستهٔ تغییر هنوز باز است - امکان بحث پس از بستن آن باز می‌شود.
@@ -501,6 +497,9 @@ fa:
       no_more_area: بستهٔ تغییر دیگری در این ناحیه یافت نشد.
       no_more_user: بستهٔ تغییر دیگری از این کاربر یافت نشد.
       load_more: بیشتر بار کن
+      feed:
+        title: بستهٔ تغییر %{id}
+        title_comment: بستهٔ تغییر %{id} - %{comment}
     timeout:
       sorry: شوربختانه بازیابی بسته‌های تغییر که درخواست نموده‌اید، خیلی طولانی شد.
   changeset_comments:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 7c5a55ec8..6f9ad5235 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -382,14 +382,10 @@ fi:
       way_paginated: Reitit (%{x}-%{y} of %{count})
       relation: Relaatiot (%{count})
       relation_paginated: Relaatiot (%{x}-%{y} / %{count})
-      comment: Kommentit (%{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
-      feed:
-        title: Muutoskokoelma %{id}
-        title_comment: Muutoskokoelma %{id} - %{comment}
       join_discussion: Kirjaudu sisään osallistuaksesi keskusteluun
       discussion: Keskustelu
       still_open: Muutoskokoelma on edelleen avoimena - keskustelu avataan heti kun
@@ -498,6 +494,9 @@ fi:
       no_more_area: Ei muita muutosryhmiä tällä alueella.
       no_more_user: Ei muita muutosryhmiä tällä käyttäjällä.
       load_more: Lataa lisää
+      feed:
+        title: Muutoskokoelma %{id}
+        title_comment: Muutoskokoelma %{id} - %{comment}
     timeout:
       sorry: Valitettavasti pyytämäsi muutoskokoelmien listan hakeminen kesti liian
         kauan.
@@ -560,6 +559,7 @@ fi:
     show:
       title: Käyttäjän %{user} päiväkirja | %{title}
       user_title: Käyttäjän %{user} päiväkirja
+      discussion: Keskustelu
       leave_a_comment: Kommentoi tätä kirjoitusta
       login_to_leave_a_comment_html: '%{login_link} kommentoidaksesi'
       login: Kirjaudu sisään
@@ -2202,6 +2202,11 @@ fi:
           vineyard: Viinitarha
           forest: Talousmetsä
           wood: Metsä
+          farmland: Viljelysmaa
+          grass: Nurmikko
+          meadow: Niitty
+          bare_rock: Avokallio
+          sand: Hiekka
           golf: Golfkenttä
           park: Puisto
           common: Niitty
@@ -2212,12 +2217,16 @@ fi:
           heathland: Kanervikko
           lake: Järvi
           reservoir: Tekojärvi
+          glacier: Jäätikkö
+          reef: Riutta
+          wetland: Kosteikko
           farm: Maatila
           brownfield: Purettujen rakennusten alue
           cemetery: Hautausmaa
           allotments: Siirtolapuutarha
           pitch: Urheilukenttä
           centre: Urheilukeskus
+          beach: Hiekkaranta
           reserve: Luonnonsuojelualue
           military: Sotilasalue
           school: Koulu
@@ -2895,6 +2904,7 @@ fi:
       cyclosm_credit: 'Laattojen tyyli: %{osm_france_link} ylläpitämä %{cyclosm_link}'
       osm_france: OpenStreetMap Francen
       thunderforest_credit: Laattojen tekijä %{thunderforest_link}
+      tracestrack_credit: 'Laatat: %{tracestrack_link}'
       hotosm_credit: 'Laattojen tyyli: %{osm_france_link} ylläpitämä %{hotosm_link}'
     site:
       edit_tooltip: Muokkaa karttaa
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index bdf5c7c98..bc653f3a7 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -220,12 +220,8 @@ fit:
       way_paginated: Reitit (%{x}-%{y} of %{count})
       relation: Relaatiot (%{count})
       relation_paginated: Relaatiot (%{x}-%{y} / %{count})
-      comment: Kommentit (%{count})
       changesetxml: Muutoskokoelman XML
       osmchangexml: osmChange XML
-      feed:
-        title: Muutoskokoelma %{id}
-        title_comment: Muutoskokoelma %{id} - %{comment}
       join_discussion: Lokkaa sisäle, jos halvaat osallistua keskusteluun
       discussion: Keskustelu
       still_open: Muutoskokoelma on edelleen avoimena - keskustelu avathaan heti kun
@@ -324,6 +320,9 @@ fit:
       no_more_area: Ei muita muutosryhmiä tällä alueella.
       no_more_user: Ei muita muutosryhmiä tällä käyttäjällä.
       load_more: Lattaa lissää
+      feed:
+        title: Muutoskokoelma %{id}
+        title_comment: Muutoskokoelma %{id} - %{comment}
     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 0dfd24e6c..fa09fc52d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -29,6 +29,7 @@
 # Author: Florian COLLIN
 # Author: Florimondable
 # Author: Framafan
+# Author: Framawiki
 # Author: Freak2fast4u
 # Author: Fred73000
 # Author: Frigory
@@ -135,7 +136,7 @@ fr:
         create: Téléverser
         update: Enregistrer les modifications
       user_block:
-        create: Créer un bloc
+        create: Créer un blocage
         update: Mettre à jour le blocage
   activerecord:
     errors:
@@ -143,7 +144,7 @@ fr:
         invalid_email_address: ne semble pas être une adresse de courriel valide
         email_address_not_routable: n’est pas routable
         display_name_is_user_n: ne peut pas être user_n à moins que n soit votre identifiant
-          d'utilisateur
+          d’utilisateur
       models:
         user_mute:
           is_already_muted: est déjà en sourdine
@@ -309,7 +310,6 @@ fr:
         one: il y a %{count} an
         other: il y a %{count} ans
   printable_name:
-    with_version: '%{id}, v%{version}'
     with_name_html: '%{name} (%{id})'
   editor:
     default: Par défaut (actuellement %{name})
@@ -469,14 +469,10 @@ fr:
       way_paginated: Chemins (%{x} à %{y} sur %{count})
       relation: Relations (%{count})
       relation_paginated: Relations (%{x} à %{y} sur %{count})
-      comment: Commentaires (%{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
-      feed:
-        title: Groupe de modifications %{id}
-        title_comment: 'Groupe de modifications %{id} : %{comment}'
       join_discussion: Se connecter pour rejoindre la discussion
       discussion: Discussion
       still_open: Ensemble de modifications toujours ouvert – la discussion s’ouvrira
@@ -565,7 +561,7 @@ fr:
       sorry: 'Désolé, le nœud #%{id} version %{version} est introuvable.'
   old_ways:
     not_found:
-      sorry: 'Désolé, la façon #%{id} version %{version} ne pouvait pas être trouvée.'
+      sorry: 'Désolé, la façon #%{id} version %{version} est introuvable.'
   old_relations:
     not_found:
       sorry: 'Désolé, la relation #%{id} version %{version} est introuvable.'
@@ -597,6 +593,9 @@ fr:
       no_more_area: Aucun autre groupe de modifications dans cette zone.
       no_more_user: Aucun autre groupe de modifications par cet utilisateur.
       load_more: Charger davantage
+      feed:
+        title: Groupe de modifications %{id}
+        title_comment: 'Groupe de modifications %{id} : %{comment}'
     timeout:
       sorry: Désolé, la liste des groupes de modifications que vous avez demandée
         a mis trop de temps à récupérer.
@@ -662,6 +661,7 @@ fr:
     show:
       title: Carnet de %{user} | %{title}
       user_title: Carnet de %{user}
+      discussion: Discussion
       leave_a_comment: Laisser un commentaire
       login_to_leave_a_comment_html: '%{login_link} pour laisser un commentaire'
       login: Se connecter
@@ -1770,7 +1770,7 @@ fr:
         one: s’est chargé correctement avec %{trace_points} dd %{count} point possible.
         other: s’est chargé correctement avec %{trace_points} des %{count} points
           possibles.
-      all_your_traces_html: Toutes vos traces de GPX téléchargées avec succès peuvent
+      all_your_traces_html: Toutes vos traces de GPX téléversées avec succès peuvent
         être trouvées à %{url}.
       subject: '[OpenStreetMap] Import GPX réussi'
     signup_confirm:
@@ -2418,8 +2418,8 @@ fr:
         title: Guide du débutant
         description: Guide maintenu par la communauté pour les débutants.
       community:
-        title: Forum de la communauté
-        description: Un lieu partagé pour les conversations sur OpenStreetMap.
+        title: Aide & forum de la communauté
+        description: Un lieu partagé pour demander de l'aide et discuter d'OpenStreetMap.
       mailing_lists:
         title: Listes de diffusion
         description: Poser une question ou discuter de questions intéressantes sur
@@ -2812,12 +2812,13 @@ fr:
       read_gpx: Lire les traces GPC privées
       write_gpx: Mettre à jour les traces GPC
       write_notes: Modifier les notes
-      write_redactions: Rédiger les données cartographiques
+      write_redactions: Caviarder les données cartographiques
       read_email: Lire l’adresse courriel de l’utilisateur
       skip_authorization: Demande d’approbation automatique
   oauth_clients:
     new:
       title: Inscrire une nouvelle application
+      disabled: L'enregistrement d'applications OAuth 1 a été désactivé
     edit:
       title: Modifier votre application
     show:
@@ -2902,6 +2903,7 @@ fr:
       title: Mes applications autorisées
       application: Application
       permissions: Droits
+      last_authorized: Dernière autorisation
       no_applications_html: Vous n’avez encore autorisé aucune application %{oauth2}.
     application:
       revoke: Révoquer l’accès
@@ -2994,7 +2996,7 @@ fr:
       my_dashboard: Mon tableau de bord
       blocks on me: Blocages me concernant
       blocks by me: Blocages de ma part
-      create_mute: Désactiver cet utilisateur
+      create_mute: Mettre cet utilisateur en sourdine
       destroy_mute: Réactiver le son de cet utilisateur
       edit_profile: Modifier le profil
       send message: Envoyer un message
@@ -3027,7 +3029,7 @@ fr:
           importer: Supprimer le droit d’importation
       block_history: Blocages actifs
       moderator_history: Blocages donnés
-      revoke_all_blocks: Révoquer tous les blocs
+      revoke_all_blocks: Révoquer tous les blocages
       comments: Commentaires
       create_block: Bloquer cet utilisateur ou cette utilisatrice
       activate_user: Activer cet utilisateur ou cette utilisatrice
@@ -3143,14 +3145,15 @@ fr:
     revoke_all:
       title: Révoquer tous les blocages sur %{block_on}
       heading_html: Révoquer tous les blocages sur %{block_on}
-      empty: '%{name} n''a pas de blocs actifs.'
+      empty: '%{name} n’a pas de blocages actifs.'
+      confirm: Êtes-vous sûr de vouloir révoquer %{active_blocks} ?
       active_blocks:
-        one: '%{count} active block'
-        other: '%{count} active blocks'
+        one: '%{count} blocage actif'
+        other: '%{count} blocages actifs'
       revoke: Révoquer
       flash: Tous les blocages actifs ont été révoqués.
     helper:
-      time_future_html: Prends fin dans %{time}.
+      time_future_html: Prend fin dans %{time}.
       until_login: Actif jusqu’à ce que l’utilisateur se connecte.
       time_future_and_until_login_html: Finit dans %{time} et une fois que l’utilisateur
         s’est connecté.
@@ -3210,27 +3213,29 @@ fr:
       previous: ◂ Précédent
   user_mutes:
     index:
-      title: Utilisateurs muets
-      my_muted_users: Mes utilisateurs désactivés
+      title: Utilisateurs en sourdine
+      my_muted_users: Mes utilisateurs en sourdine
       you_have_muted_n_users:
-        one: Vous avez désactivé %{count} utilisateurs
-        other: Vous avez désactivé %{count} utilisateurs
+        one: Vous avez mis en sourdine %{count} utilisateur
+        other: Vous avez mis en sourdine %{count} utilisateurs
       user_mute_explainer: Les messages des utilisateurs mis en sourdine sont déplacés
         vers une boîte de réception distincte et vous ne recevrez pas de notifications
-        par e-mail.
+        par courriel.
       user_mute_admins_and_moderators: Vous pouvez désactiver le son des administrateurs
         et des modérateurs, mais leurs messages ne seront pas mis en sourdine.
       table:
         thead:
+          muted_user: Utilisateur en sourdine
           actions: Actions
         tbody:
-          unmute: Activer le son
+          unmute: Réactiver le son
           send_message: Envoyer un message
     create:
-      notice: Vous avez désactivé %{name}.
+      notice: Vous avez mis %{name} en sourdine.
       error: '%{name} n''a pas pu être mis en sourdine. %{full_message}.'
     destroy:
       notice: Vous avez rétabli le son de %{name}.
+      error: Le son de l’utilisateur n’a pas pu être rétabli. Veuillez réessayer.
   notes:
     index:
       title: Notes soumises ou commentées par « %{user} »
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 431f44cbd..9615be1f6 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -296,14 +296,10 @@ fur:
       way_paginated: Viis (%{x}-%{y} su %{count})
       relation: Relazions (%{count})
       relation_paginated: Relazions (%{x}-%{y} su %{count})
-      comment: Coments (%{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
-      feed:
-        title: Grup di cambiaments %{id}
-        title_comment: Grup di cambiaments %{id} - %{comment}
       join_discussion: Jentre par partecipâ ae discussion
       discussion: Discussion
     node:
@@ -402,6 +398,9 @@ fur:
       no_more_area: Nissun altri grup di cambiaments in cheste zone cjatât.
       no_more_user: Nissun altri grup di cambiaments par chest utent.
       load_more: Cjame di plui
+      feed:
+        title: Grup di cambiaments %{id}
+        title_comment: Grup di cambiaments %{id} - %{comment}
     timeout:
       sorry: Nus displâs, la liste dai grups di cambiaments che tu âs domandât e je
         stade masse timp a cjamâsi.
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 2f6ab86c7..d50bb21d9 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -326,12 +326,8 @@ fy:
       way_paginated: Linen (%{x}-%{y} fan %{count})
       relation: Relaasjes (%{count})
       relation_paginated: Relaasjes (%{x}-%{y} fan %{count})
-      comment: Reäksjes (%{count})
       changesetxml: Wizigingsset-XML
       osmchangexml: osmWizigings-XML
-      feed:
-        title: Wizigingsset %{id}
-        title_comment: Wizigingsset %{id} - %{comment}
       join_discussion: Meld jo oan en oerlis mei
       discussion: Oerlis
       still_open: Wizigingsset net ree - it oerlis iepenet sa gau't de wizigingsset
@@ -438,6 +434,9 @@ fy:
       no_more_area: Gjin wizigingssets mear yn dizze krite.
       no_more_user: Gjin wizigingssets mear fan dizze meidogger.
       load_more: Mear lade
+      feed:
+        title: Wizigingsset %{id}
+        title_comment: Wizigingsset %{id} - %{comment}
     timeout:
       sorry: Spitich, it opheljen fan 'e list wizigingssets dy't jo fregen duorre
         te lang.
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 9380e7fed..b64dc4fff 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -227,12 +227,8 @@ ga:
       way_paginated: Bealaí (%{x}-%{y} de %{count})
       relation: Gaolta (%{count})
       relation_paginated: Gaolta (%{x}-%{y} de %{count})
-      comment: Nótaí tráchta (%{count})
       changesetxml: XML an Tacair athruithe
       osmchangexml: XML osmChange
-      feed:
-        title: Tacar athruithe %{id}
-        title_comment: Tacar athruithe %{id} - %{comment}
       join_discussion: Logáil isteach chun páirt a ghlacadh sa phlé
       discussion: Plé
     node:
@@ -328,6 +324,9 @@ ga:
       no_more_area: Níl aon tacar athruithe eile sa limistéar seo.
       no_more_user: Níl aon tacar athruithe eile ón úsáideoir seo.
       load_more: Lódáil tuilleadh
+      feed:
+        title: Tacar athruithe %{id}
+        title_comment: Tacar athruithe %{id} - %{comment}
     timeout:
       sorry: Ár leithscéil, thóg sé rófhada an liosta de na tacair athruithe a d'iarr
         tú a aisghabháil.
diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 5f9d14cf5..05513dbe4 100644
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -105,7 +105,6 @@ gcf:
     download_xml: Chantyé XML
     location: 'Ki koté:'
     changeset:
-      comment: Komantasyon (%{count})
       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
@@ -235,6 +234,7 @@ gcf:
           police: Manblo
           prison: Lajòl
           school: Lékòl
+          toilets: Kakatwa
           townhall: Lanméri
           waste_basket: Bwètazòdi
         bridge:
@@ -309,6 +309,7 @@ gcf:
           island: Lilèt
           mud: Labou
           peninsula: Pwent
+          reef: Kay
           rock: Wòch
           sand: Sab
           scrub: Zèb-razyé
@@ -318,6 +319,7 @@ gcf:
           valley: Koulé
           volcano: Vòlkan
           water: Glo
+          wood: Granbwa
         office:
           lawyer: Avoka
         place:
@@ -325,10 +327,12 @@ gcf:
           city: Vil prensipal
           country: Péyi
           house: Kaz
+          houses: Kaz
           island: Lilèt
           islet: Tililèt
           locality: Koté
           sea: Lanmè
+          suburb: Fobou
           town: Vil
           village: Vilaj
           "yes": Koté
@@ -473,7 +477,7 @@ gcf:
       title: Konèkté-w
       heading: Konekté
       email or username: 'Adres imél ouben nom itilizaté aw :'
-      password: 'Kòd aw:'
+      password: 'Kòd a''w:'
       lost password link: Ou pèd kòd a-w?
       login_button: Konektéw
       auth_providers:
@@ -511,12 +515,13 @@ gcf:
       close: Fèmé
     search:
       search: Chèché
-      where_am_i: Ki moun an yé?
+      where_am_i: Ola sa yé?
       submit_text: Voyé
     key:
       table:
         entry:
           motorway: Lotowout
+          main_road: Chimen a gouvèlman
           trunk: Wokad
           primary: Chimen a gouvèlman
           train: Tren
@@ -526,11 +531,14 @@ gcf:
           grass: Zèb
           sand: Sab
           reservoir: Rézèvwa
+          reef: Kay
           cemetery: Simityè
           beach: Bòdlanmè
           school: Lékòl
           hospital: Lopital
+          toilets: Kakatwa
     welcome:
+      title: Kontan vwè-w!
       rules:
         title: Larèl-la!
       add_a_note:
@@ -538,6 +546,11 @@ gcf:
   traces:
     new:
       help: Anmwé
+  oauth:
+    authorize:
+      allow_write_api: modifyé kat-la.
+    scopes:
+      write_api: Modifyé kat-la
   oauth_clients:
     show:
       confirm: Ès ou sèkten?
@@ -566,8 +579,11 @@ gcf:
       remove as friend: Woté on zanmi
       add as friend: Ajouté on zanmi
       mapper since: 'Arpantè dèpi:'
+      comments: Komantasyon
     go_public:
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.
+    suspended:
+      support: janmdifòs
   user_blocks:
     show:
       confirm: Ès ou sèkten?
@@ -577,6 +593,7 @@ gcf:
   javascripts:
     share:
       title: Simé
+      download: Chantyé
     map:
       locate:
         title: Montré la ou yé
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 28a88347b..8082f2ae2 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -202,12 +202,8 @@ gd:
       way_paginated: Slighean (%{x}-%{y} à %{count})
       relation: Dàimhean (%{count})
       relation_paginated: Dàimhean (%{x}-%{y} à %{count})
-      comment: Beachdan (%{count})
       changesetxml: XML le seata atharraichean
       osmchangexml: XML osmChange
-      feed:
-        title: Seata atharraichean %{id}
-        title_comment: Seata atharraichean %{id} - %{comment}
       join_discussion: Clàraich a-steach gus pàirt a ghabhail san deasbaireachd
       discussion: Deasbaireachd
     node:
@@ -305,6 +301,9 @@ gd:
       no_more_user: Cha do chruthaich an cleachdaiche seo seata atharraichean sam
         bith eile.
       load_more: Luchdaich barrachd dhiubh
+      feed:
+        title: Seata atharraichean %{id}
+        title_comment: Seata atharraichean %{id} - %{comment}
     timeout:
       sorry: Duilich ach thug e ro fhada gus an seata atharraichean a dh'iarr thu
         fhaighinn.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index f04f1468d..987212e45 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -371,14 +371,10 @@ gl:
       way_paginated: Vías (%{x}-%{y} de %{count})
       relation: Relacións (%{count})
       relation_paginated: Relacións (%{x}-%{y} de %{count})
-      comment: Comentarios (%{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
-      feed:
-        title: Conxunto de modificacións %{id}
-        title_comment: Conxunto de modificacións %{id} - %{comment}
       join_discussion: Inicia a sesión para unirte á parola
       discussion: Parola
       still_open: O conxunto de modificacións segue aberto. Abrirase a parola cando
@@ -497,6 +493,9 @@ gl:
       no_more_area: Non hai máis conxuntos de modificacións nesta zona.
       no_more_user: Non hai máis conxuntos de modificacións deste usuario.
       load_more: Amosar máis
+      feed:
+        title: Conxunto de modificacións %{id}
+        title_comment: Conxunto de modificacións %{id} - %{comment}
     timeout:
       sorry: Desculpe que levase moito tempo obter a listaxe do conxunto de modificacións
         que solicitou.
@@ -563,6 +562,7 @@ gl:
     show:
       title: Diario de %{user} | %{title}
       user_title: Diario de %{user}
+      discussion: Conversa
       leave_a_comment: Deixar un comentario
       login_to_leave_a_comment_html: '%{login_link} para deixar un comentario'
       login: Iniciar a sesión
diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index c5475f3d6..cf3854f93 100644
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@@ -113,12 +113,8 @@ gsw:
       way_paginated: Wäg (%{x}-%{y} von %{count})
       relation: Relatione (%{count})
       relation_paginated: Relatione (%{x}-%{y} of %{count})
-      comment: Kommendar (%{count})
       changesetxml: Changeset-XML
       osmchangexml: osmChange XML
-      feed:
-        title: Changeset %{id}
-        title_comment: Changeset %{id} - %{comment}
       join_discussion: Meld dich aa, wennd mitdiskutiere willsch.
       discussion: Diskussion
     node:
@@ -167,6 +163,11 @@ gsw:
       loading: Am Lade ...
     tag_details:
       tags: 'Tags:'
+  changesets:
+    index:
+      feed:
+        title: Changeset %{id}
+        title_comment: Changeset %{id} - %{comment}
   dashboards:
     popup:
       your location: Dyy Standort
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 78838d02a..ea2b675ab 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -407,14 +407,10 @@ he:
       way_paginated: קווים (%{x}–%{y} מתוך %{count})
       relation: יחסים (%{count})
       relation_paginated: יחסים (%{x}–%{y} מתוך %{count})
-      comment: הערות (%{count})
       hidden_comment_by_html: הערה מוסתרת מאת %{user} %{time_ago}
       comment_by_html: הערה מאת %{user} %{time_ago}
       changesetxml: XML של ערכת השינויים
       osmchangexml: osmChange XML
-      feed:
-        title: ערכת שינויים %{id}
-        title_comment: ערכת שינויים %{id} – %{comment}
       join_discussion: נא להיכנס לחשבון כדי להצטרף לדיון
       discussion: דיון
       still_open: ערכת השינויים עדיין פתוחה – הדיון ייפתח אחרי שערכת השיניים תיסגר.
@@ -537,6 +533,9 @@ he:
       no_more_area: אין עוד ערכות שינויים באזור הזה.
       no_more_user: אין ערכות שינויים נוספות מאת המשתמש הזה.
       load_more: לטעון עוד
+      feed:
+        title: ערכת שינויים %{id}
+        title_comment: ערכת שינויים %{id} – %{comment}
     timeout:
       sorry: קבלת רשימת ערכות השינויים שביקשת אורכת זמן רב מדי, עמך הסליחה.
   changeset_comments:
@@ -598,6 +597,7 @@ he:
     show:
       title: היומן של%{user} &rlm; | %{title}
       user_title: היומן של %{user}
+      discussion: דיון
       leave_a_comment: הוספת תגובה
       login_to_leave_a_comment_html: נא %{login_link} כדי להשאיר תגובה
       login: להיכנס
@@ -2296,8 +2296,8 @@ he:
         title: המדריך למתחילים
         description: מדריך בתחזוקת הקהילה למתחילים.
       community:
-        title: פורום קהילתי
-        description: מקום משותף לשיחות על OpenStreetMap.
+        title: עזרה ופורום קהילתי
+        description: מקום משותף לחפש עזרה ולנהל שיחות על OpenStreetMap.
       mailing_lists:
         title: רשימות תפוצה
         description: לשאול שאלה או לדון בדברים מעניינים ברשימות תפוצה נושאים ואזוריות
@@ -2659,6 +2659,7 @@ he:
   oauth_clients:
     new:
       title: רישון יישום חדש
+      disabled: רישום יישומי OAuth 1 הושבת
     edit:
       title: עריכת היישום שלך
     show:
@@ -2738,6 +2739,7 @@ he:
       title: האפליקציות המורשות שלי
       application: אפליקציה
       permissions: הרשאות
+      last_authorized: אושר בפעם האחרונה
       no_applications_html: לא אישרת עדיין יישומי %{oauth2}.
     application:
       revoke: שלילת גישה
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 68f43d8c3..baf8275ce 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -306,12 +306,8 @@ hi:
       way_paginated: रास्तें (%{count} का %{x}-%{y})
       relation: सम्बन्ध (%{count})
       relation_paginated: सम्बन्ध (%{count} के %{x}-%{y})
-      comment: जवाब (%{count})
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
-      feed:
-        title: 'Changeset: %{id}'
-        title_comment: Changeset %{id} - %{comment}
       join_discussion: चर्चा में भाग लेने के लिए लॉग इन करें
       discussion: चर्चा
       still_open: चेंजसेट अभी भी खुला - चेंजसेट के एक बार बंद होने के पश्चात चर्चा
@@ -419,6 +415,9 @@ hi:
       no_more_area: इस इलाके में और कोई चेंजसेट नहीं है।
       no_more_user: इस सदस्य द्वारा कोई चेंजसेट नहीं है।
       load_more: और पढ़ें
+      feed:
+        title: 'Changeset: %{id}'
+        title_comment: Changeset %{id} - %{comment}
     timeout:
       sorry: माफ़ कीजिए, जिन चेंजसेट की आपने अनुरोध की थी उन्हें लाने में कुछ ज़्यादा
         ही वक्त लग गया।
@@ -464,6 +463,7 @@ hi:
     show:
       title: '%{user} की डायरी | %{title}'
       user_title: '%{user}''s की डायरी'
+      discussion: चर्चा
       leave_a_comment: अपने विचार व्यक्त करें
       login_to_leave_a_comment_html: सत्रारंभ यहाँ %{login_link}, एक टिप्पणी लिखिने
         के लिए
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 084524196..561b54641 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -294,12 +294,8 @@ hr:
       way_paginated: Putovi(%{x}-%{y} od %{count})
       relation: Relacije (%{count})
       relation_paginated: Relacije(%{x}-%{y} od %{count})
-      comment: Komentari (%{count})
       changesetxml: XLM Set promjena
       osmchangexml: osmChange XML
-      feed:
-        title: Set promjena %{id}
-        title_comment: Set promjena %{id} - %{comment}
       join_discussion: Prijavi se za uključivanje u raspravu
       discussion: Razgovor
     node:
@@ -403,6 +399,9 @@ hr:
       no_more_area: Nema više paketa uređivanja na ovom području.
       no_more_user: Nema više setova promjena ovog korisnika.
       load_more: Učitaj više
+      feed:
+        title: Set promjena %{id}
+        title_comment: Set promjena %{id} - %{comment}
     timeout:
       sorry: Nažalost, preuzimanje popisa setova promjena predugo traje.
   changeset_comments:
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 9f9b2a01f..20dd33bd1 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -335,12 +335,8 @@ hsb:
       way_paginated: Puće (%{x}-%{y} z %{count})
       relation: Relacije (%{count})
       relation_paginated: Relacije (%{x}-%{y} z %{count})
-      comment: Komentary (%{count})
       changesetxml: Sadźba změnow XML
       osmchangexml: osmChange XML
-      feed:
-        title: Sadźba změnow %{id}
-        title_comment: Sadźba změnow %{id} - %{comment}
       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
@@ -453,6 +449,9 @@ hsb:
       no_more_area: Žane dalše sadźby změnow w tutej kónčinje.
       no_more_user: Žane dalše sadźby změnow wot tutoho wužiwarja.
       load_more: Wjace začitać
+      feed:
+        title: Sadźba změnow %{id}
+        title_comment: Sadźba změnow %{id} - %{comment}
     timeout:
       sorry: Bohužel je předołho trało, požadanu lisćinu změnow wotwołać.
   changeset_comments:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index f73ceb8af..106e86b5b 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -73,6 +73,8 @@ hu:
       messages:
         invalid_email_address: nem tűnik érvényes e-mail-címnek
         email_address_not_routable: nem irányítható
+        display_name_is_user_n: nem lehet user_n, hacsak nem az n a Te felhasználói
+          azonosítód
       models:
         user_mute:
           is_already_muted: már el van némítva
@@ -378,14 +380,10 @@ hu:
       way_paginated: 'Vonalak (%{x}-%{y} ennyiből: %{count})'
       relation: Kapcsolatok (%{count})
       relation_paginated: 'Kapcsolatok (%{x}-%{y} ennyiből: %{count})'
-      comment: Hozzászólások (%{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)
-      feed:
-        title: '%{id} módosításcsomag'
-        title_comment: '%{id} módosításcsomag - %{comment}'
       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,
@@ -495,6 +493,9 @@ hu:
       no_more_area: Nincs több módosításcsomag ezen a területen.
       no_more_user: Nincs több módosításcsomag ettől a felhasználótól.
       load_more: Továbbiak betöltése
+      feed:
+        title: '%{id} módosításcsomag'
+        title_comment: '%{id} módosításcsomag - %{comment}'
     timeout:
       sorry: Sajnáljuk, az általad kért módosításcsomagok listájának beolvasása túl
         sokáig tartott.
@@ -614,10 +615,32 @@ hu:
       newer_comments: Újabb hozzászólások
       older_comments: Régebbi hozzászólások
   doorkeeper:
+    errors:
+      messages:
+        account_selection_required: Az engedélyezési szerver megköveteli a végfelhasználói
+          fiók kiválasztását
+        consent_required: Az engedélyezési szerverhez a végfelhasználó beleegyezése
+          szükséges
+        interaction_required: Az engedélyezési szerver végfelhasználói interakciót
+          igényel
+        login_required: Az engedélyezési szerver végfelhasználói hitelesítést igényel
     flash:
       applications:
         create:
           notice: Alkalmazás regisztrálva.
+    openid_connect:
+      errors:
+        messages:
+          auth_time_from_resource_owner_not_configured: A Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner
+            konfiguráció hiánya miatti hiba.
+          reauthenticate_resource_owner_not_configured: A Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner
+            hiányzó konfiguráció miatt nem sikerült.
+          resource_owner_from_access_token_not_configured: A Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token
+            hiányzó konfigurációja miatt nem sikerült.
+          select_account_for_resource_owner_not_configured: A Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner
+            konfiguráció hiánya miatti hiba.
+          subject_not_configured: Az azonosítótoken generálása meghiúsult a Doorkeeper::OpenidConnect.configure.subject
+            konfiguráció hiánya miatt.
     scopes:
       address: Tartózkodási cím megtekintése
       email: Email cím megtekintése
@@ -1630,6 +1653,8 @@ hu:
         one: sikeresen betöltődött a lehetséges %{count} pontból %{trace_points} ponttal.
         other: sikeresen betöltődött a lehetséges %{count} pontból %{trace_points}
           ponttal.
+      all_your_traces_html: 'Az összes sikeresen feltöltött GPX nyomkövetés megtalálható
+        itt: %{url}.'
       subject: '[OpenStreetMap] Sikeres GPX importálás'
     signup_confirm:
       subject: '[OpenStreetMap] Üdvözlünk az OpenStreetMapen'
@@ -1793,6 +1818,9 @@ hu:
       people_mapping_nearby: közeli térképszerkesztő
     muted:
       title: Elnémított üzenetek
+      messages:
+        one: '%{count} némított üzeneted van'
+        other: '%{count} némított üzeneted van'
     reply:
       wrong_user: „%{user}” néven jelentkeztél be, de azt az üzenetet, amelyre válaszolni
         szeretnél, nem ez a felhasználó kapta. A válaszadáshoz jelentkezz be a helyes
@@ -1817,13 +1845,14 @@ hu:
       as_unread: Üzenet megjelölve olvasatlanként
     unmute:
       notice: Az üzenet átkerült a Beérkezett üzenetek mappába
+      error: Az üzenetet nem sikerült áthelyezni a Beérkezett üzenetek mappába.
     destroy:
       destroyed: Üzenet törölve
   passwords:
     new:
       title: Elvesztett jelszó
       heading: Elfelejtetted jelszavad?
-      email address: 'E-mail-cím:'
+      email address: E-mail-cím
       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.
@@ -1838,6 +1867,7 @@ hu:
       flash token bad: Nem találtad meg a tokent? Esetleg ellenőrizd az URL-t.
     update:
       flash changed: Jelszavad megváltozott.
+      flash token bad: Nem találtad meg a tokent? Esetleg ellenőrizd az URL-t.
   preferences:
     show:
       title: Megjelenési beállítások
@@ -1882,8 +1912,8 @@ hu:
     new:
       title: Bejelentkezés
       heading: Bejelentkezés
-      email or username: 'E-mail-cím vagy felhasználónév:'
-      password: 'Jelszó:'
+      email or username: E-mail-cím vagy felhasználónév
+      password: Jelszó
       remember: Emlékezz rám
       lost password link: Elfelejtetted a jelszavad?
       login_button: Bejelentkezés
@@ -1941,6 +1971,7 @@ hu:
       image: Kép
       alt: Alternatív szöveg
       url: URL
+      codeblock: Kódblokk
     richtext_field:
       edit: Szerkesztés
       preview: Előnézet
@@ -2084,6 +2115,7 @@ hu:
         contributors_es_cc_by: CC BY 4.0
         contributors_za_south_africa: Dél-Afrika
         contributors_gb_united_kingdom: Egyesült Királyság
+        contributors_2_contributors_page: Közreműködők oldala
         contributors_footer_2_html: Az adatok befoglalása az OpenStreetMapbe nem jelenti
           azt, hogy az eredeti adatszolgáltató támogatja az OpenStreetMapet, garanciát
           nyújt vagy felelősséget vállal rá.
@@ -2092,7 +2124,9 @@ hu:
           ne adjanak hozzá adatokat egyetlen szerzői jogvédett forrásból se (pl. Google
           Térkép vagy nyomtatott térképek) a szerzői jog tulajdonosának kifejezett
           engedélye nélkül.
+        infringement_2_1_online_filing_page: on-line bejelentési oldal
         trademarks_title: Védjegyek
+        trademarks_1_1_trademark_policy: Védjegypolitika
     index:
       js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a JavaScriptet,
         vagy letiltottad a JavaScriptet.
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 6273b658e..714f65380 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -355,14 +355,10 @@ ia:
       way_paginated: Vias (%{x}-%{y} de %{count})
       relation: Relationes (%{count})
       relation_paginated: Relationes (%{x}-%{y} de %{count})
-      comment: Commentos (%{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
-      feed:
-        title: Gruppo de modificationes %{id}
-        title_comment: Gruppo de modificationes %{id} - %{comment}
       join_discussion: Aperi session pro unir te al discussion
       discussion: Discussion
       still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira
@@ -481,6 +477,9 @@ ia:
       no_more_area: Nulle altere gruppo de modificationes in iste area.
       no_more_user: Nulle altere gruppo de modificationes facite per iste usator.
       load_more: Cargar plus
+      feed:
+        title: Gruppo de modificationes %{id}
+        title_comment: Gruppo de modificationes %{id} - %{comment}
     timeout:
       sorry: Le lista de gruppos de modificationes que tu requestava tardava troppo
         de tempore pro esser recuperate.
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 3c33b1f61..c930a0a2b 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -372,14 +372,10 @@ id:
       way_paginated: Jalan (%{x}-%{y} dari %{count})
       relation: Hubungan (%{count})
       relation_paginated: Hubungan (%{x}-%{y} dari %{count})
-      comment: Komentar %{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
-      feed:
-        title: Set Perubahan %{id}
-        title_comment: Set Perubahan %{id} - %{comment}
       join_discussion: Masuk untuk bergabung diskusi
       discussion: Diskusi
       still_open: Set perubahan masih terbuka - diskusi akan dibuka ketika set perubahan
@@ -495,6 +491,9 @@ id:
       no_more_area: Tidak ada set perubahan lainnya di daerah ini.
       no_more_user: Tidak ada set perubahan lainnya oleh pengguna ini.
       load_more: Muat lebih lanjut
+      feed:
+        title: Set Perubahan %{id}
+        title_comment: Set Perubahan %{id} - %{comment}
     timeout:
       sorry: Maaf, daftar kumpulan set perubahan yang Anda minta terlalu lama untuk
         diambil.
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 489c0d29b..dc7dd7427 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -214,7 +214,6 @@ is:
         one: fyrir %{count} ári síðan
         other: fyrir %{count} árum síðan
   printable_name:
-    with_version: '%{id}, útgáfa %{version}'
     with_name_html: '%{name} (%{id})'
   editor:
     default: Sjálfgefið (núna %{name})
@@ -365,14 +364,10 @@ is:
       way_paginated: Leiðir (%{x}-%{y} af %{count})
       relation: Vensl (%{count})
       relation_paginated: Vensl (%{x}-%{y} af %{count})
-      comment: Athugasemdir (%{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
-      feed:
-        title: Breytingasett %{id}
-        title_comment: Breytingasett %{id} - %{comment}
       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
@@ -484,6 +479,9 @@ is:
       no_more_area: Engin fleiri breytingasett á þessu svæði.
       no_more_user: Engin fleiri breytingasett eftir þennan notanda.
       load_more: Hlaða inn fleiri
+      feed:
+        title: Breytingasett %{id}
+        title_comment: Breytingasett %{id} - %{comment}
     timeout:
       sorry: Því miður, það tók of langan tíma að ná í listann yfir þau breytingasett
         sem þú baðst um.
@@ -1765,11 +1763,13 @@ is:
       to: Til
       subject: Viðfangsefni
       date: Dagsetning
+      actions: Aðgerðir
     message_summary:
       unread_button: Merkja sem ólesin
       read_button: Merkja sem lesin
       reply_button: Svara
       destroy_button: Eyða
+      unmute_button: Færa í innhólf
     new:
       title: Senda skilaboð
       send_message_to_html: Senda skilaboð til %{name}
@@ -1784,12 +1784,15 @@ is:
       body: Því miður er ekkert skilaboð með þetta auðkenni.
     outbox:
       title: Úthólf
+      actions: Aðgerðir
       messages:
         one: Þú hefur sent %{count} skilaboð
         other: Þú hefur sent %{count} skilaboð
       no_sent_messages_html: Þú hefur enn ekki seint nein skilaboð, því ekki að hafa
         samband við einhverja %{people_mapping_nearby_link}?
       people_mapping_nearby: nálæga notendur
+    muted:
+      title: Þögguð skilaboð
     reply:
       wrong_user: Þú hefur skráð þig inn sem `%{user}' en skilaboðin sem þú baðst
         um að svara voru ekki send til þess notanda. Skráðu þig inn sem réttan notanda
@@ -1817,7 +1820,7 @@ is:
     new:
       title: Glatað lykilorð
       heading: Gleymt lykilorð?
-      email address: 'Tölvupóstfang:'
+      email address: Tölvupóstfang
       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.
@@ -1874,8 +1877,8 @@ is:
     new:
       title: Innskrá
       heading: Innskrá
-      email or username: 'Netfang eða notandanafn:'
-      password: 'Lykilorð:'
+      email or username: Tölvupóstur eða notandanafn
+      password: Lykilorð
       remember: Muna innskráninguna
       lost password link: Gleymdirðu lykilorðinu þínu?
       login_button: Innskrá
@@ -2097,6 +2100,7 @@ is:
           Resources Canada), og StatCan (Geography Division,
           Statistics Canada).
         contributors_ca_canada: Kanada
+        contributors_cz_czechia: Tékkland
         contributors_fi_credit_html: |-
           %{finland}: Inniheldur gögn frá
           landupplýsingagagnagrunni Landmælinga Finnlands
@@ -2272,8 +2276,8 @@ is:
         description: Leiðarvísir fyrir byrjendur sem haldið er við af samfélaginu.
       community:
         url: https://community.openstreetmap.org/
-        title: Samfélagsgátt
-        description: Sameiginlegur staður fyrir umræður um OpenStreetMap.
+        title: Aðstoð og samfélagsgátt
+        description: Sameiginlegur staður fyrir aðstoð og umræður um OpenStreetMap.
       mailing_lists:
         title: Póstlistar
         description: Spyrðu spurninga eða spjallaðu um áhugaverð málefni á einhverjum
@@ -2336,53 +2340,76 @@ is:
           primary: Stofnvegur
           secondary: Tengivegur
           unclassified: Héraðsvegur
+          pedestrian: Gönguleið
           track: Slóði
           bridleway: Reiðstígur
           cycleway: Hjólaleið
           cycleway_national: Hjólaleið á landsneti
           cycleway_regional: Svæðisbundin hjólaleið
           cycleway_local: Staðbundin hjólaleið
+          cycleway_mtb: Fjallahjólaleið
           footway: Gönguleið
           rail: Lestarteinar
+          train: Lest
           subway: Neðanjarðarlest
+          ferry: Ferja
+          light_rail: Léttlest
+          tram: Sporvagn
+          bus: Strætó
           cable_car: Kláflyfta
-          chair_lift: stólalyfta
+          chair_lift: Stólalyfta
           runway: Flugbraut
-          taxiway: akstursbraut
+          taxiway: Akbraut flugvéla
           apron: Flughlað
           admin: Stjórnsýslumörk
+          capital: Höfuðborg
+          city: Borg
+          vineyard: Vínekra
           forest: Ræktaður skógur
-          wood: Náttúrulegur skógur
+          wood: Skógur
+          farmland: Ræktarland
+          grass: Gras
+          bare_rock: Berar klappir
+          sand: Sandur
           golf: Golfvöllur
           park: Almenningsgarður
           common: Almenningur
+          built_up: Byggt svæði
           resident: Íbúðasvæði
           retail: Smásölusvæði
           industrial: Iðnaðarsvæði
           commercial: Verslunarsvæði
           heathland: Heiðalönd
+          scrubland: Kjarrlendi
           lake: Vatn
-          reservoir: uppistöðulón
+          reservoir: Uppistöðulón
+          glacier: Jökull
+          reef: Sker
+          wetland: Votlendi
           farm: Bóndabær
           brownfield: Nýbyggingarsvæði
           cemetery: Grafreitur
           allotments: Ræktuð svæði úthlutuð í einkaeigu
           pitch: Íþróttavöllur
           centre: Íþróttamiðstöð
+          beach: Strönd
           reserve: Náttúruverndarsvæði
           military: Hersvæði
           school: Skóli
           university: Háskóli
+          hospital: Sjúkrahús
           building: Merkisbygging
           station: Lestarstöð
           summit: Fjallstindur
-          peak: tindur
+          peak: Tindur
           tunnel: Umkringt punktalínum = göng
           bridge: Umkringt svartri línu = brú
           private: Einkaaðgangur
           destination: Umferð leyfileg á ákveðinn áfangastað
           construction: Vegir í byggingu
+          bus_stop: Strætisvagnabiðstöð
           bicycle_shop: Hjólaverslun
+          bicycle_rental: Reiðhjólaleiga
           bicycle_parking: Reiðhjólastæði
           toilets: Salerni
     welcome:
@@ -2591,6 +2618,7 @@ is:
       oauth1_settings: OAuth 1 stillingar
       oauth2_applications: OAuth 2 forrit
       oauth2_authorizations: OAuth 2 auðkenningar
+      muted_users: Þaggaðir notendur
   oauth:
     authorize:
       title: Auðkenndu aðgang að notandaaðganginum þínum
@@ -2623,6 +2651,7 @@ is:
     permissions:
       missing: Þú hefur ekki gefið forritinu heimild fyrir aðgang að þessum eiginleikum
     scopes:
+      openid: Skráðu þig inn með OpenStreetMap
       read_prefs: Lesa notandastillingar
       write_prefs: Breyta notandastillingum
       write_diary: Búa til bloggfærslur, setja inn athugasemdir og bæta við vinum
@@ -2806,6 +2835,7 @@ is:
       my_dashboard: Stjórnborðið mitt
       blocks on me: Bönn gegn mér
       blocks by me: Bönn eftir mig
+      create_mute: Þagga þennan notanda
       edit_profile: Breyta notandasíðu
       send message: Senda skilaboð
       diary: Blogg
@@ -2999,12 +3029,20 @@ is:
       showing_page: Síða %{page}
       next: Næsta »
       previous: « Fyrri
+  user_mutes:
+    index:
+      table:
+        thead:
+          muted_user: Þaggaður notandi
+          actions: Aðgerðir
+        tbody:
+          send_message: Senda skilaboð
   notes:
     index:
       title: Minnispunktar sem hafa verið sendir inn eða gerðar athugasemdir við af
         %{user}
       heading: Minnispunktar frá %{user}
-      subheading_html: Minnispunktar sem hafa verið sendir inn eða gerðar athugasemdir
+      subheading_html: Minnispunktar sem hafa verið %{submitted} eða gerð %{commented}
         við af %{user}
       no_notes: Engir minnispunktar
       id: Auðkenni (ID)
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 5734fc540..712fbe1e5 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -411,14 +411,10 @@ it:
       way_paginated: Percorsi (%{x}-%{y} di %{count})
       relation: Relazioni (%{count})
       relation_paginated: Relazioni (%{x}-%{y} di %{count})
-      comment: Commenti (%{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
-      feed:
-        title: Gruppo di modifiche %{id}
-        title_comment: Gruppo di modifiche %{id} - %{comment}
       join_discussion: Accedi per unirti alla discussione
       discussion: Discussione
       still_open: Il gruppo di modifiche è ancora aperto - le discussioni saranno
@@ -529,6 +525,9 @@ it:
       no_more_area: Nessun altro gruppo di modifiche in quest'area.
       no_more_user: Nessun altro gruppo di modifiche da questo utente.
       load_more: Caricane ancora
+      feed:
+        title: Gruppo di modifiche %{id}
+        title_comment: Gruppo di modifiche %{id} - %{comment}
     timeout:
       sorry: Spiacenti, l'elenco dei gruppi di modifiche che hai richiesto ha impiegato
         troppo tempo per poter essere recuperato.
@@ -592,6 +591,7 @@ it:
     show:
       title: Diario di %{user} | %{title}
       user_title: Diario di %{user}
+      discussion: Discussione
       leave_a_comment: Lascia un commento
       login_to_leave_a_comment_html: '%{login_link} per lasciare un commento'
       login: Entra
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index ef05c2da7..a0e69c09e 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -243,8 +243,6 @@ ja:
         other: '%{count}ヶ月前'
       x_years:
         other: '%{count}年前'
-  printable_name:
-    with_version: '%{id}、第%{version}版'
   editor:
     default: 既定 (現在は %{name})
     id:
@@ -374,12 +372,8 @@ ja:
       way_paginated: ウェイ (%{x}-%{y} / %{count})
       relation: リレーション (%{count}件)
       relation_paginated: リレーション (%{x}-%{y} / %{count})
-      comment: コメント (%{count}件)
       changesetxml: 変更セット XML
       osmchangexml: OSM 差分 XML
-      feed:
-        title: 変更セット %{id}
-        title_comment: 変更セット %{id} - %{comment}
       join_discussion: 議論に参加するにはログインしてください
       discussion: 議論
       still_open: 変更セットが開いたままです - 議論を行うには変更セットを閉じる必要があります。
@@ -483,6 +477,9 @@ ja:
       no_more_area: この領域には変更セットはこれ以上ありません。
       no_more_user: この利用者による変更セットはこれ以上ありません。
       load_more: 続きを読み込む
+      feed:
+        title: 変更セット %{id}
+        title_comment: 変更セット %{id} - %{comment}
     timeout:
       sorry: 申し訳ありませんが、要求した変更セットの一覧は時間がかかりすぎたため取得できませんでした。
   changeset_comments:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 5a4fe12e5..baf9f28ed 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -156,12 +156,8 @@ ka:
       way_paginated: ხაზები (%{x}-%{y} %{count}-დან)
       relation: ურთიერთობები (%{count})
       relation_paginated: ურთიერთობები (%{x}-%{y} %{count}-დან)
-      comment: კომენტარები (%{count})
       changesetxml: ცვლილებების პაკეტის XML
       osmchangexml: osmChange XML
-      feed:
-        title: ცვლილებების პაკეტი %{id}
-        title_comment: ცვლილებების პაკეტი %{id} - %{comment}
       discussion: განხილვა
     node:
       title_html: 'წერტილი: %{name}'
@@ -229,6 +225,9 @@ ka:
     index:
       title: ცვლილებების პაკეტი
       load_more: მეტის ჩატვირთვა
+      feed:
+        title: ცვლილებების პაკეტი %{id}
+        title_comment: ცვლილებების პაკეტი %{id} - %{comment}
   changeset_comments:
     comment:
       commented_at_by_html: განაახლა %{when} წინ მომხმარებელმა %{user}
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 6cc9bc271..bde2c84e1 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -252,12 +252,8 @@ kab:
       way_paginated: Iberdan (%{x}-%{y} si %{count})
       relation: Assaɣen (%{count})
       relation_paginated: Assaɣen (%{x}-%{y} si %{count})
-      comment: Iwenniten (%{count})
       changesetxml: XML n ugraw n ibeddilen
       osmchangexml: XML osmChange
-      feed:
-        title: Agraw n usnifel %{id}
-        title_comment: Agraw n ubeddel %{id} - %{comment}
       join_discussion: Qqen akken ad tedduḍ ar usqerdec
       discussion: Asqerdec
       still_open: Tagrumma isenfilen zgan ldin - asqerdec ad yili mara isenfilen meṛṛa
@@ -357,6 +353,9 @@ kab:
       no_more_area: Ulac agraw-nniḍen n usnifel yettwafen di temnaḍt-agi.
       no_more_user: Ulac agraw-nniḍen n usnifel n useqdac-agi.
       load_more: Sali ugar
+      feed:
+        title: Agraw n usnifel %{id}
+        title_comment: Agraw n ubeddel %{id} - %{comment}
     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 76571b823..da3d4ddfc 100644
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -248,11 +248,8 @@ kk-cyrl:
       node: Нүктелер (%{count})
       way: Сызықтар (%{count})
       relation: Қатынастар (%{count})
-      comment: Пікірлер (%{count})
       changesetxml: Өңдеме дестесінің XML-і
       osmchangexml: osmChange XML
-      feed:
-        title: Өңдеме дестесі %{id}
       discussion: Талқылау
     node:
       title_html: 'Нүкте: %{name}'
@@ -322,6 +319,8 @@ kk-cyrl:
       title_user_link_html: '%{user_link} жасаған өңдеме дестелері'
       title_friend: Достарымның өңдемелер дестелері
       load_more: Көбірек жүктеу
+      feed:
+        title: Өңдеме дестесі %{id}
   changeset_comments:
     comment:
       commented_at_by_html: '%{when} %{user} жаңартқан'
diff --git a/config/locales/km.yml b/config/locales/km.yml
index b6a7d62fc..88cc6e7b8 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -131,11 +131,7 @@ km:
       way_paginated: ផ្លូវចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
       relation: ទំនាក់ទំនងចំនួន (%{count})
       relation_paginated: ទំនាក់ទំនងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
-      comment: មតិយោបល់ (%{count})
       changesetxml: សំណុំបន្លាស់ប្ដូរ​ XML
-      feed:
-        title: សំណុំបន្លាស់ប្ដូរ​ %{id}
-        title_comment: សំណុំបន្លាស់ប្តូរ​ %{id} - %{comment}
       join_discussion: កត់ឈ្មោះចូលដើម្បីចូលរួមពិភាក្សា
       discussion: ការពិភាក្សា
     node:
@@ -207,6 +203,9 @@ km:
       no_more_area: គ្មានសំណុំបន្លាស់ប្ដូរថែមទៀតទេក្នុងតំបន់នេះ។
       no_more_user: គ្មានសំណុំបន្លាស់ប្ដូរដោយអ្នកប្រើប្រាស់នេះថែមទៀតទេ។
       load_more: ផ្ទុកបន្ថែម
+      feed:
+        title: សំណុំបន្លាស់ប្ដូរ​ %{id}
+        title_comment: សំណុំបន្លាស់ប្តូរ​ %{id} - %{comment}
   dashboards:
     contact:
       km away: ចម្ងាយ %{count} គ.ម.
diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index d16523b6d..af159d052 100644
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -238,10 +238,6 @@ kn:
       way_paginated: ದಾರಿಗಳು (%{x}-%{y} ರ %{count})
       relation: ಸಂಬಂಧಗಳು (%{count})
       relation_paginated: ಸಂಬಂಧಗಳು(%{x}-%{y} of %{count})
-      comment: ಕಾಮೆಂಟ್ಗಳನ್ನು (%{count})
-      feed:
-        title: ಬದಲಾವಣೆಗಳು %{id}
-        title_comment: ಬದಲಾವಣೆಗಳು %{id} - %{comment}
       join_discussion: ‍ಚರ್ಚೆಗೆ ಸೇರಲು ಲಾಗ್ ಇನ್ ಆಗಿರಿ
       discussion: ಚರ್ಚೆ
     node:
@@ -318,6 +314,9 @@ kn:
       no_more_area: ಈ ಪ್ರದೇಶದಲ್ಲಿ ಇನ್ಯಾವುದೇ ಬದಲಾವಣೆಗಳಿಲ್ಲ.
       no_more_user: ಈ ಬಳಕೆದಾರರಿಂದ ಇನ್ಯಾವುದೇ ಬದಲಾವಣೆಗಳಿಲ್ಲ.
       load_more: ಇನ್ನೂ ತೋರಿಸಿ
+      feed:
+        title: ಬದಲಾವಣೆಗಳು %{id}
+        title_comment: ಬದಲಾವಣೆಗಳು %{id} - %{comment}
     timeout:
       sorry: ಕ್ಷಮಿಸಿ, ನೀವು ಕೇಳಿದ ಬದಲಾವಣಾ ಪಟ್ಟಿ ಪಡೆಯಲು ದೀರ್ಘ ಸಮಯ ಬೇಕಾಯಿತು.
   changeset_comments:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 3945f4f7b..6e1f58c76 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -353,14 +353,10 @@ ko:
       way_paginated: 길(%{count}개 중 %{x}-%{y})
       relation: 관계(%{count})
       relation_paginated: 관계(%{count}개 중 %{x}-%{y})
-      comment: 의견(%{count}개)
       hidden_comment_by_html: '%{time_ago} %{user}님의 비밀 의견'
       comment_by_html: '%{time_ago} %{user}님의 의견'
       changesetxml: 바뀜집합 XML
       osmchangexml: osmChange XML
-      feed:
-        title: 바뀜집합 %{id}
-        title_comment: 바뀜집합 %{id} - %{comment}
       join_discussion: 토론에 참여하려면 로그인하세요
       discussion: 토론
       still_open: 바뀜집합이 아직 열려 있습니다 - 토론은 바뀜집합이 닫히면 시작됩니다.
@@ -466,6 +462,9 @@ ko:
       no_more_area: 이 지역에서 바뀜집합이 더 없습니다.
       no_more_user: 이 사용자의 바뀜집합이 더 없습니다.
       load_more: 더 불러오기
+      feed:
+        title: 바뀜집합 %{id}
+        title_comment: 바뀜집합 %{id} - %{comment}
     timeout:
       sorry: 죄송합니다, 요청하는 바뀜집합 목록을 가져오는 데 너무 오래 걸렸습니다.
   changeset_comments:
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 315fd0dfd..45a4c5007 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -343,14 +343,10 @@ ku-Latn:
       way_paginated: Rê (%{x}-%{y} ji %{count})
       relation: Eleqe (%{count})
       relation_paginated: Eleqe (%{x}-%{y} bi tevahî %{count})
-      comment: Şîrove (%{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
-      feed:
-        title: Desteya guhartinan %{id}
-        title_comment: Desteya guhartinan %{id} - %{comment}
       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
@@ -461,6 +457,9 @@ ku-Latn:
       no_more_area: Li vê derê desteyên guhartinan zêdetir tine.
       no_more_user: Desteyên guhartinan yên vê bikarhênerê zêdetir tine.
       load_more: Zêdetir bar bike
+      feed:
+        title: Desteya guhartinan %{id}
+        title_comment: Desteya guhartinan %{id} - %{comment}
     timeout:
       sorry: Bibore, bidestxistina lîsteya desteyên guhartinan ê ku te xwest demeke
         dirêj girt.
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index ad2c3ab50..a17ce9aab 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -207,6 +207,9 @@ lb:
       x_years:
         one: virun %{count} Joer
         other: viru(n) %{count} Joer
+  printable_name:
+    version: v%{version}
+    current_and_old_links_html: '%{current_link}, %{old_link}'
   editor:
     default: Standard (elo %{name})
     id:
@@ -335,12 +338,8 @@ lb:
       way_paginated: Weeër (%{x}–%{y} vu(n) %{count})
       relation: Relatiounen (%{count})
       relation_paginated: Relatiounen (%{x}-%{y} vu(n) %{count})
-      comment: Bemierkungen (%{count})
       changesetxml: XML mam Set vun Ännerungen
       osmchangexml: osmChange XML
-      feed:
-        title: 'Set vun Ännerungen: %{id}'
-        title_comment: Set vun Ännerungen %{id} - %{comment}
       join_discussion: Loggt Iech an, fir bei der Diskussioun matzemaachen
       discussion: Diskussioun
       still_open: Den Ännerungssaz ass nach op. 'Diskussioun gëtt opgemaach, esoubal
@@ -450,6 +449,9 @@ lb:
       no_more_area: Keng weider Grupp vun Ännerungen an dëser Géigend.
       no_more_user: Keng weider Gruppe vun Ännerunge vun dësem Benotzer.
       load_more: Méi lueden
+      feed:
+        title: 'Set vun Ännerungen: %{id}'
+        title_comment: Set vun Ännerungen %{id} - %{comment}
     timeout:
       sorry: Et leider ze laang gedauert, déi ugefuerdert Ännerungssätz ofzeruffen.
   changeset_comments:
@@ -512,6 +514,7 @@ lb:
     show:
       title: Blog vun %{user} | %{title}
       user_title: Blog vun %{user}
+      discussion: Diskussioun
       leave_a_comment: Eng Bemierkung maachen
       login_to_leave_a_comment_html: '%{login_link} fir eng Bemierkung ze schreiwen'
       login: Aloggen
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index b31b07af7..7c569cd16 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -7,6 +7,7 @@
 # Author: Eitvys200
 # Author: Empers
 # Author: Garas
+# Author: Hugo.arg
 # Author: Kris2paz
 # Author: Macofe
 # Author: Mantak111
@@ -63,6 +64,10 @@ lt:
       messages:
         invalid_email_address: nepanašus į tinkamą e-pašto adresą
         email_address_not_routable: nemaršrutizuojamas
+        display_name_is_user_n: negali būti user_n, nebent n yra jūsų naudotojo id
+      models:
+        user_mute:
+          is_already_muted: jau nutildytas
     models:
       acl: Prieigos valdymo sąrašas
       changeset: Pakeitimas
@@ -274,6 +279,8 @@ lt:
         reopened_at_by_html: '%{user} iš naujo suaktyvino %{when}'
       rss:
         title: OpenStreetMap pastabos
+        description_all: Pastabų, apie kurias pranešta, kurios buvo pakomentuotos
+          ar uždarytos, sąrašas
         description_area: sąrašas pastabų, pranešta, pakomentuota arba uždaryta jūsų
           srityje (%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
         description_item: Rss kanalas pastabai %{id}
@@ -308,6 +315,8 @@ lt:
         retain_changeset_discussions: Jūsų pakeitimų diskusijos, jei tokių yra, bus
           išsaugotos.
         retain_email: Jūsų el. pašto adresas bus išsaugotas.
+        recent_editing_html: Kadangi neseniai redagavote, jūsų paskyros šiuo metu
+          ištrinti negalima. Ištrinti bus galima po %{time}.
         confirm_delete: Ar tikrai?
         cancel: Atšaukti
   accounts:
@@ -393,14 +402,10 @@ lt:
       way_paginated: Keliai (%{x}-%{y} iš %{count})
       relation: Ryšiai (%{count})
       relation_paginated: Ryšiai (%{x}-%{y} iš %{count})
-      comment: Komentarai (%{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
-      feed:
-        title: Pakeitimas %{id}
-        title_comment: Pakeitimas %{id} - %{comment}
       join_discussion: Prisijunkite norėdami dalyvauti aptarime
       discussion: Diskusija
       still_open: Pakeitimas vis dar atidarytas - diskusija prasidės tik uždarius
@@ -486,6 +491,9 @@ lt:
       introduction: Spauskite ant žemėlapio, norėdami rasti gretimus objektus
       nearby: Artimi objektai
       enclosing: Gaubiantys objektai
+  old_relations:
+    not_found:
+      sorry: Atsiprašome, santykio %{id} versijos %{version} nepavyko rasti.
   changesets:
     changeset_paging_nav:
       showing_page: Puslapis %{page}
@@ -514,6 +522,9 @@ lt:
       no_more_area: Daugiau pakeitimų šioje vietoje nėra.
       no_more_user: Daugiau šio naudotojo pakeitimų nėra.
       load_more: Įkelti daugiau
+      feed:
+        title: Pakeitimas %{id}
+        title_comment: Pakeitimas %{id} - %{comment}
     timeout:
       sorry: Atsiprašome, bet jūsų prašytų pakeitimų ištraukimas užtruko per ilgai.
   changeset_comments:
@@ -634,6 +645,12 @@ lt:
       applications:
         create:
           notice: Aplikacija užregistruota.
+    scopes:
+      address: Žiūrėti savo fizinį adresą
+      email: Žiūrėti savo el. pašto adresą
+      openid: Autentifikuokite savo paskyrą
+      phone: Žiūrėti savo telefono ryšio numerį
+      profile: Žiūrėti savo profilio informaciją
   errors:
     contact:
       contact_url_title: Įvairių susisiekimo būdų paaiškinimas
@@ -686,15 +703,19 @@ lt:
           "yes": Lyninis keltuvas
         aeroway:
           aerodrome: Aerodromas
+          airstrip: Pakilimo takas
           apron: Oro uosto aikštelė
           gate: Oro uosto vartai
           hangar: Angaras
           helipad: Sraigtasparnių aikštelė
           holding_position: Užlaikymo pozicija
+          navigationaid: Aviacijos navigacijos pagalba
           parking_position: Stovėjimo Pozicija
           runway: Pakilimo takas
+          taxilane: Taksi linija
           taxiway: Riedėjimo takas
           terminal: Oro uosto terminalas
+          windsock: Vėjarodis
         amenity:
           animal_boarding: Gyvūnų viešbutis
           animal_shelter: Gyvūnų prieglauda
@@ -773,8 +794,10 @@ lt:
           public_bath: Vieša Pirtis
           public_bookcase: Knygų dalinimosi lentyna
           public_building: Visuomeninis pastatas
+          ranger_station: Reindžerio stotis
           recycling: Perdirbimo punktas
           restaurant: Restoranas
+          sanitary_dump_station: Sanitarinis sąvartynas
           school: Mokykla
           shelter: Pastogė
           shower: Dušas
@@ -787,6 +810,7 @@ lt:
           theatre: Teatras
           toilets: Tualetas
           townhall: Rotušė
+          training: Mokymų įstaiga
           university: Universitetas
           vehicle_inspection: Automobilių Apžiūra
           vending_machine: Vendingas
@@ -794,9 +818,13 @@ lt:
           village_hall: Nedidelio miestelio valdžios būstinė
           waste_basket: Atliekų krepšelis
           waste_disposal: Atliekų šalinimas
+          waste_dump_site: Atliekų sąvartynas
+          watering_place: Laistymo vieta
           water_point: Vandens Punktas
           weighbridge: Svarstyklės
+          "yes": Patogumai
         boundary:
+          aboriginal_lands: Čiabuvių žemės
           administrative: Administracinė riba
           census: Gyventojų surašymo teritorijos riba
           national_park: Nacionalinis parkas
@@ -805,6 +833,7 @@ lt:
           "yes": Riba
         bridge:
           aqueduct: Akvedukas
+          boardwalk: Promenada
           suspension: Kabantis tiltas
           swing: Siūbuojantis tiltas
           viaduct: Viadukas
@@ -813,8 +842,11 @@ lt:
           apartment: Apartamentas
           apartments: Apartamentai
           barn: Tvartas
+          bungalow: Vila
+          cabin: Trobelė
           chapel: Koplyčia
           church: Bažnyčios Pastatas
+          civic: Civilinis statinys
           college: Koledžo Pastatas
           commercial: Komercinės paskirties pastatas
           construction: Statomas pastatas
@@ -822,6 +854,7 @@ lt:
           dormitory: Bendrabutis
           duplex: Dvibutis
           farm: Ūkinis Namas
+          farm_auxiliary: Pagalbinis Å«kis
           garage: Garažas
           garages: Garažai
           greenhouse: Å iltnamis
@@ -829,9 +862,11 @@ lt:
           hospital: Ligoninės pastatas
           hotel: Viešbučio Pastatas
           house: Namas
+          houseboat: Plaukiojantis namas
           hut: Trobelė
           industrial: Pramoninis pastatas
           kindergarten: Darželio Pastatas
+          manufacture: Pramoninis statinys
           office: Biurų pastatas
           public: Visuomeninis pastatas
           residential: Gyvenamasis pastatas
@@ -839,15 +874,19 @@ lt:
           roof: Stogas
           ruins: Sugriuvęs pastatas
           school: Mokyklos pastatas
+          semidetached_house: Pusiau atskiras namas
+          service: Pagalbinis statinys
           shed: Pašiūrė
           stable: Arklidė
           static_caravan: Karavanas
+          temple: Å ventyklos pastatas
           terrace: Terasos Pastatas
           train_station: Traukinių Stoties Pastatas
           university: Universiteto pastatas
           warehouse: Sandėlis
           "yes": Pastatas
         club:
+          scout: Skautų bazė
           sport: Sporto klubas
           "yes": Klubas
         craft:
@@ -855,28 +894,39 @@ lt:
           blacksmith: Kalvis
           brewery: Alaus darykla
           carpenter: Dailidė
+          caterer: Maisto tiekėjas
           confectionery: Konditerija
+          dressmaker: Siuvėjas
           electrician: Elektrikas
           electronics_repair: Elektronikos taisykla
           gardener: Sodininkas
+          glaziery: Stiklius
           handicraft: Rankdarbiai
+          metal_construction: Metalo gamykla
           painter: Dažytojas
           photographer: Fotografas
           plumber: Santechnikas
           roofer: Stogdengys
           sawmill: Lentpjūvė
           shoemaker: Batsiuvys
+          stonemason: Akmenskaldys
           tailor: Siuvėjas
+          window_construction: Langų gamintojas
           winery: Vyno darykla
           "yes": Amatų parduotuvė
         emergency:
+          access_point: Prieigos taškas
           ambulance_station: Greitosios medicinos pagalbos stotis
           assembly_point: Susirinkimo taškas
           defibrillator: Defibriliatorius
           fire_extinguisher: Gesintuvas
+          fire_water_pond: Priešgaisrinis telkinys
           landing_site: Avarinio nusileidimo aikštelė
           life_ring: Gelbėjimo ratas
           phone: Avarinis telefonas
+          siren: Avarinė sirena
+          suction_point: Avarinis siurbimo taškas
+          water_tank: Priešgaisrinis telkinys
         highway:
           abandoned: Apleistas kelias
           bridleway: Jodinėjimo takas
@@ -917,18 +967,23 @@ lt:
           tertiary: Trečios reikšmės kelias
           tertiary_link: Trečios reikšmės kelias
           track: Vėžės
+          traffic_mirror: Eismo veidrodis
           traffic_signals: Å viesoforas
           trunk: Magistralinis kelias
           trunk_link: Magistralinis kelias
           unclassified: Neklasifikuotas kelias
           "yes": Kelias
         historic:
+          aircraft: Istorinis lėktuvas
           archaeological_site: Archeologinė vieta
+          bomb_crater: Istorinis bombos krateris
           battlefield: MÅ«Å¡io vieta
           boundary_stone: Pasienio akmuo
           building: Istorinis pastatas
           bunker: Bunkeris
+          cannon: Istorinė patranka
           castle: Pilis
+          charcoal_pile: Istorinė anglių krūva
           church: Bažnyčia
           city_gate: Miesto vartai
           citywalls: Miesto sienos
@@ -938,13 +993,16 @@ lt:
           manor: Dvaras
           memorial: Memorialas
           mine: Kasykla
+          mine_shaft: Kasyklos Å¡achta
           monument: Paminklas
           railway: Istorinis geležinkelis
           roman_road: Romėnų kelias
           ruins: Griuvėsiai
+          rune_stone: Runų akmuo
           stone: Akmuo
           tomb: Kapas
           tower: Bokštas
+          wayside_chapel: Pakelės koplytėlė
           wayside_cross: Pakelės kryžius
           wayside_shrine: Koplytstulpis
           wreck: Nuskendęs laivas
@@ -953,6 +1011,7 @@ lt:
           "yes": Sandūra
         landuse:
           allotments: Sodai/sodininkų bendrijos
+          aquaculture: Akvakultūra
           basin: Baseinas
           brownfield: Apleista teritorija
           cemetery: Kapinės
@@ -971,9 +1030,11 @@ lt:
           military: Karinė zona
           mine: Kasykla
           orchard: vaisių sodas
+          plant_nursery: Daigynas
           quarry: Karjeras
           railway: Geležinkelis
           recreation_ground: Rekreacinė zona
+          religious: Šventvietė
           reservoir: Rezervuaras
           reservoir_watershed: Vandens rezervuaras
           residential: Gyvenamasis rajonas
@@ -982,8 +1043,12 @@ lt:
           vineyard: Vynuogynas
           "yes": Žemėnauda
         leisure:
+          adult_gaming_centre: Suaugusiųjų žaidimų centras
+          bandstand: Estrada
           beach_resort: Pajūrio kurortas
           bird_hide: paukščių stebėjimo vieta
+          bleachers: Tribūnos
+          bowling_alley: Boulingas
           common: Bendra žemė
           dance: Šokių salė
           dog_park: Šunų parkas
@@ -999,6 +1064,7 @@ lt:
           miniature_golf: Mini golfas
           nature_reserve: Gamtos draustinis
           park: Parkas
+          picnic_table: Pikniko stalas
           pitch: Sporto aikštė
           playground: Žaidimų aikštelė
           recreation_ground: Rekreacinis plotas
@@ -1027,25 +1093,32 @@ lt:
           cross: Kryžius
           dyke: Pylimas
           flagpole: Vėliavos stiebas
+          kiln: Krosnis
           lighthouse: Å vyturys
+          manhole: Liukas
           mast: Stiebas
           mine: Kasykla
           mineshaft: Kasyklos Å¡achta
           monitoring_station: Stebėjimo Stotis
           petroleum_well: Naftos Å¡ulinys
+          pier: Pirsas
           pipeline: Vamzdynas
           pumping_station: Siurblinė
           reservoir_covered: Uždengtas rezervuaras
           silo: Siloso bokštas
           snow_cannon: Sniego patranka
           snow_fence: Sniego tvora
+          storage_tank: Rezervuaras
           surveillance: Stebėjimas
           telescope: Teleskopas
           tower: Bokštas
+          utility_pole: Elektros stulpas
+          wastewater_plant: Vandenvalda
           watermill: Vandens Malūnas
           water_tap: Vandens čiaupas
           water_tower: Vandens Bokštas
           water_well: Å ulinys
+          water_works: Vandentiekis
           windmill: Vėjo malūnas
           works: Gamykla
           "yes": Žmogaus sukurta
@@ -1053,11 +1126,14 @@ lt:
           airfield: Karinis aerodromas
           barracks: Kareivinės
           bunker: Bunkeris
+          checkpoint: Patikros punktas
+          trench: Tranšėja
           "yes": Karinis
         mountain_pass:
           "yes": Kalnų perėja
         natural:
           atoll: Atolas
+          bare_rock: Plikos uolos
           bay: Įlanka
           beach: Paplūdimys
           cape: Kyšulys
@@ -1102,6 +1178,7 @@ lt:
           water: Vanduo
           wetland: Pelkė
           wood: Medžiai
+          "yes": Gamtinis objektas
         office:
           accountant: Buhalteris
           administrative: Administracija
@@ -1123,7 +1200,9 @@ lt:
           newspaper: Laikraščio biuras
           ngo: NGO įstaiga
           notary: Notaro biuras
+          religion: Religinė įstaiga
           research: Tyrimų biuras
+          tax_advisor: Mokesčių patarėjas
           telecommunication: Telekomunikacijų tarnyba
           travel_agent: Kelionių agentūra
           "yes": Biuras
@@ -1146,6 +1225,7 @@ lt:
           neighbourhood: Rajonas
           plot: Sklypas
           postcode: Pašto kodas
+          quarter: Mikrorajonas
           region: Regionas
           sea: JÅ«ra
           square: Aikštė
@@ -1183,12 +1263,14 @@ lt:
         shop:
           alcohol: Licencijuotos parduotuvės
           antiques: Antikvariniai daiktai
+          appliance: Buitinės technikos parduotuvė
           art: Meno parduotuvė
           baby_goods: Kūdikių prekių parduotuvė
           bag: Rankinių parduotuvė
           bakery: Kepykla
           bathroom_furnishing: Vonios kambario baldų parduotuvė
           beauty: Grožio salonas
+          bed: Patalynės gaminiai
           beverages: Gėrimų parduotuvė
           bicycle: Dviračių parduotuvė
           bookmaker: Žymė
@@ -1255,6 +1337,7 @@ lt:
           massage: Masažas
           medical_supply: Medicinos reikmenų parduotuvė
           mobile_phone: Mobiliųjų telefonų parduotuvė
+          money_lender: Pinigų skolintojas
           motorcycle: Motociklų parduotuvė
           motorcycle_repair: Motociklų remonto dirbtuvės
           music: Muzikos prekių parduotuvė
@@ -1269,6 +1352,7 @@ lt:
           pawnbroker: Lombardas
           perfumery: Parfumerijos parduotuvė
           pet: Naminių gyvūnėlių parduotuvė
+          pet_grooming: Naminių gyvūnėlių priežiūra
           photo: Foto prekių parduotuvė
           seafood: Jūros gėrybės
           second_hand: Dėvėtų parduotuvė
@@ -1276,6 +1360,7 @@ lt:
           shoes: Batų parduotuvė
           sports: Sporto prekių parduotuvė
           stationery: Raštinės reikmenys
+          storage_rental: Sandėliavimo nuoma
           supermarket: Prekybos centras
           tailor: Siuvėjas
           tattoo: Tatuiruočių salonas
@@ -1285,9 +1370,11 @@ lt:
           toys: Žaislų parduotuvė
           travel_agency: Kelionių agentūra
           tyres: Padangų Parduotuvė
+          vacant: Laisva parduotuvė
           variety_store: Įvairių prekių parduotuvė
           video: Video parduotuvė
           video_games: Vaizdo žaidimų parduotuvė
+          wholesale: Didmeninė parduotuvė
           wine: Vyno Parduotuvė
           "yes": Parduotuvė
         tourism:
@@ -1310,6 +1397,7 @@ lt:
           picnic_site: Poilsiavietė
           theme_park: Nuotykių parkas
           viewpoint: Apžvalgos aikštelė
+          wilderness_hut: Trobelė gamtoje
           zoo: Zoologijos sodas
         tunnel:
           building_passage: Praėjimas pro pastatą
@@ -1336,12 +1424,15 @@ lt:
           "yes": Vandens vektorius
       admin_levels:
         level2: Å alies sienos
+        level3: Regiono riba
         level4: Valstybės sienos
         level5: Regiono ribos
         level6: Apskrities ribos
+        level7: Savivaldybės riba
         level8: Miesto sienos
         level9: Kaimo riba
         level10: Priemiesčio riba
+        level11: Mikrorajono riba
       types:
         cities: Miestai
         towns: Miestai
@@ -1354,6 +1445,7 @@ lt:
       title: Problemos
       select_status: Parinkite būseną
       select_type: Pasirinkite tipą
+      reported_user: Pranešęs naudotojas
       not_updated: Neatnaujinta
       search: Ieškoti
       search_guidance: 'Problemų paieška:'
@@ -1362,6 +1454,7 @@ lt:
       status: BÅ«sena
       reports: Pranešimai
       last_updated: Paskutinis atnaujinimas
+      last_updated_time_ago_user_html: '%{time_ago} %{user}'
       link_to_reports: Žiūrėti pranešimus
       reports_count:
         one: '{%count} pranešimas'
@@ -1673,11 +1766,13 @@ lt:
       to: Kam
       subject: Tema
       date: Data
+      actions: Veiksmai
     message_summary:
       unread_button: Žymėti neskaitytu
       read_button: Žymėti skaitytu
       reply_button: Atsakyti
       destroy_button: IÅ¡trinti
+      unmute_button: Perkelti į gautuosius
     new:
       title: Siųsti žinutę
       send_message_to_html: Siųsti naują žinutę naudotojui %{name}
@@ -1692,12 +1787,15 @@ lt:
       body: Gaila, bet žinutės su tokiu id nėra.
     outbox:
       title: Išsiųstieji
+      actions: Veiksmai
       messages:
         one: Jūs %{count} nusiųstą pranešimą
         other: Jūs %{count} nusiųstus(-ų) pranešimus(-ų)
       no_sent_messages_html: Jūs dar negavote nei vienos žinutės. Kodėl gi nesusisiekus
         su %{people_mapping_nearby_link}?
       people_mapping_nearby: netoliese žyminčiais naudotojais
+    muted:
+      title: Nutildyti pranešimai
     reply:
       wrong_user: Jūs prisijungęs kaip „%{user}“, bet pranešimas, kuriuo jūsų prašyta
         atsakyti, nebuvo nusiųstas tam naudotojui. Prisijunkite prie teisingos naudotojo
@@ -1716,16 +1814,20 @@ lt:
     heading:
       my_inbox: Mano gauti
       my_outbox: Išsiųsti
+      muted_messages: Nutildyti pranešimai
     mark:
       as_read: Pranešimas pažymėtas kaip skaitytas
       as_unread: Pranešimas pažymėtas kaip neskaitytas
+    unmute:
+      notice: Žinutė perkelta į gautuosius
+      error: Žinutės nepavyko perkelti į gautuosius.
     destroy:
       destroyed: Pranešimas ištrintas
   passwords:
     new:
       title: Pamiršau slaptažodį
       heading: Pamiršote slaptažodį?
-      email address: 'E-pašto adresas:'
+      email address: El. pašto adresas
       new password button: Atstatyti slaptažodį
       help_text: Įveskite elektroninio pašto adresą, kurį naudojote užsiregistruodami.
         Mes atsiųsime nuorodą į elektroninį paštą, kurią galėsite naudoti norėdami
@@ -1741,6 +1843,7 @@ lt:
       flash token bad: Ženklas nerastas, galbūt bloga nuoroda?
     update:
       flash changed: Jūsų slaptažodis sėkmingai pakeistas.
+      flash token bad: Prieigos raktas nerastas, galbūt blogai nurodytas URL?
   preferences:
     show:
       title: Mano parinktys
@@ -1785,8 +1888,8 @@ lt:
     new:
       title: Prisijungti
       heading: Prisijungti
-      email or username: 'E-pašto adresas arba naudotojo vardas:'
-      password: 'Slaptažodis:'
+      email or username: 'El. pašto adresas ar naudotojo vardas:'
+      password: Slaptažodis
       remember: Prisiminti prisijungimą
       lost password link: Pamiršote slaptažodį?
       login_button: Prisijungti
@@ -1806,8 +1909,8 @@ lt:
           title: Prisijungti su Facebook
           alt: Prisijungti su Facebook paskyra
         microsoft:
-          title: Prisijungti su Windows Live
-          alt: Prisijungti su Windows Live paskyra
+          title: Prisijungti su Microsoft
+          alt: Prisijungti su Microsoft paskyra
         github:
           title: Prisijungti su GitHub
           alt: Prisijungti su GitHub Paskyra
@@ -1843,12 +1946,14 @@ lt:
       image: Paveikslėlis
       alt: Alternatyvusis tekstas
       url: Interneto adresas (URL)
+      codeblock: Kodo blokas
     richtext_field:
       edit: Redaguoti
       preview: Peržiūrėti
   site:
     about:
       next: Kitas
+      heading_html: '%{copyright}OpenStreetMap %{br} bendradarbiai'
       used_by_html: '%{name} pateikia žemėlapio duomenis tūkstančiams interneto puslapių,
         mobilių aplikacijų ir techninės įrangos įrenginių'
       lede_text: OpenStreetMap kuria bendruomenė žymėtojų, kuriančių ir prižiūrinčių
@@ -1858,6 +1963,8 @@ lt:
         orotofoto nuotraukas, GPS įrenginius ir paprastus lauko žemėlapius, tikrindami,
         kad OSM duomenys yra teisingi ir aktualūs.
       community_driven_title: Bendruomenės vystomas
+      community_driven_osm_blog: OpenStreetMap tinklaraštis
+      community_driven_user_diaries: naudotojų dienoraščiai
       community_driven_community_blogs: bendruomenių tinklaraščiai
       community_driven_osm_foundation: OSM fondas
       open_data_title: Atviri duomenys
@@ -1868,9 +1975,20 @@ lt:
       open_data_open_data: atviri duomenys
       open_data_copyright_license: Autorių teisių ir licencijos puslapis
       legal_title: Teisės
+      legal_1_1_html: |-
+        Ši svetainė ir daugelis susijusių paslaugų formaliai valdomi
+        %{openstreetmap_foundation_link} (OSMF)
+        bendruomenės vardu. Visų OSMF valdovų paslaugų naudojimui taikoma
+        %{terms_of_use_link}, %{aup_link} ir mūsų %{privacy_policy_link}.
       legal_1_1_openstreetmap_foundation: OpenStreetMap fondas
       legal_1_1_terms_of_use: Naudojimo sąlygos
+      legal_1_1_aup: Priimtino naudojimo politika
+      legal_1_1_privacy_policy: Privatumo politika
+      legal_2_1_html: |-
+        Prašome %{contact_the_osmf_link}
+        Jei turite licencijų, autorių teisių ar kitų teisinių klausimų.
       legal_2_1_contact_the_osmf: susisiekti su OSMF
+      legal_2_2_registered_trademarks: OSMF registruotie prekių ženklai
       partners_title: Partneriai
     copyright:
       foreign:
@@ -1887,28 +2005,97 @@ lt:
         mapping_link: pradėti žymėjimą
       legal_babble:
         title_html: Autorinės teisės ir licencija
+        introduction_1_html: |-
+          OpenStreetMap%{registered_trademark_link} yra %{open_data}, licencijuota pagal
+          %{odc_odbl_link} (ODbL) pagal %{osm_foundation_link} (OSMF).
+        introduction_1_open_data: atviri duomenys
+        introduction_1_odc_odbl: Open Data Commons Open Database licencija
+        introduction_1_osm_foundation: OpenStreetMap fondas
+        introduction_3_html: Mūsų dokumentai yra licencijuoti pagal %{creative_commons_link}
+          licenciją (CC BY-SA 2.0).
+        introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0
         credit_title_html: Kaip paminėti OpenStreetMap
         credit_1_html: 'Naudodami OpenStreetMap duomenis, privalote atlikti Å¡iuos
           du dalykus:'
+        credit_2_1: Nurodykite priskyrimą naudojant OpenStreetMap autorių teisių pranešimą.
+        credit_2_2: Paaiškinkite, kad duomenys yra prieinami pagal atviros duomenų
+          bazės licenciją.
+        credit_3_attribution_guidelines: Priskyrimo gairės
+        credit_4_1_this_copyright_page: šį autorių teisių puslapį
         attribution_example:
           alt: Pavyzdys kaip galima priskirti paskyrimus OpenStreetMap svetainėje
           title: Priskyrimo pavyzdys
         more_title_html: Papildoma informacija
+        more_1_1_html: Skaitykite daugiau apie mūsų duomenų naudojimą ir kaip mums
+          priskirti autorystę apsilankę %{osmf_licence_page_link}.
+        more_1_1_osmf_licence_page: OSMF licencijos puslapis
+        more_2_1_api_usage_policy: API naudojimo politika
         contributors_title_html: Mūsų autoriai
         contributors_intro_html: Mūsų autoriai yra tūkstančiai įvairių žmonių. Taip
           pat įtrauktas ir laisvai prieinamas turinys iš valstybinių kartografijos
           agentūrų bei įvairių kitų šaltinių.
         contributors_at_austria: Austrija
+        contributors_at_cc_by_at_with_amendments: CC BY AT su pakeitimais
         contributors_au_australia: Australija
+        contributors_au_geoscape_australia: Geoscape Australia
+        contributors_au_cc_licence: Creative Commons Attribution 4.0 tarptautinė licencija
+          (CC BY 4.0)
+        contributors_ca_credit_html: |-
+          %{canada}: yra duomenų iš
+          GeoBase&reg;, GeoGratis (&copy; Kanados gamtos
+          šaltinių departamentas), CanVec (&copy; Kanados gamtos
+          šaltinių departamentas), ir StatCan (Kanados statistikos
+          Geografijos skyriaus).
         contributors_ca_canada: Kanada
+        contributors_cz_credit_html: '%{czechia}: yra duomenų iš Valstybinės žemėtvarkos
+          administracijos ir kadastro, licencijuojama pagal %{cc_licence_link}'
+        contributors_cz_czechia: Čekija
+        contributors_cz_cc_licence: Creative Commons Attribution 4.0 tarptautinė licencija
+          (CC BY 4.0)
+        contributors_fi_credit_html: |-
+          %{finland}: yra duomenų iš
+          Suomijos topografinės duomenų bazės nacionalinės žemės tyrimo tarnybos
+          ir kitų duomenų rinkinių, pagal %{nlsfi_license_link}.
         contributors_fi_finland: Suomija
+        contributors_fi_nlsfi_license: NLSFI licencija
+        contributors_fr_credit_html: |-
+          %{france}: yra duomenų iš
+          Bendrojo mokesčių valdytojo.
         contributors_fr_france: Prancūzija
+        contributors_nl_credit_html: '%{netherlands}: Yra &copy; AND duomenų, 2007
+          (%{and_link})'
         contributors_nl_netherlands: Nyderlandai
+        contributors_nz_credit_html: |-
+          %{new_zealand}: yra duomenų iš %{linz_data_service_link}
+          licencijuojama antriniam panaudojimui pagal %{cc_by_link}.
         contributors_nz_new_zealand: Naujoji Zelandija
+        contributors_nz_linz_data_service: LINZ duomenų tarnyba
+        contributors_nz_cc_by: CC BY 4.0
+        contributors_rs_credit_html: |-
+          %{serbia}: yra duomenų iš %{rgz_link} ir %{open_data_portal}
+          (vieša Serbijos informacija), 2018.
+        contributors_rs_serbia: Serbija
+        contributors_rs_rgz: Serbijos geodezijos tarnyba
+        contributors_rs_open_data_portal: Nacionalinis atvirų duomenų portalas
+        contributors_si_credit_html: |-
+          %{slovenia}: yra duomenų iš %{gu_link} ir %{mkgp_link}
+          (vieša Slovėnijos informacija).
         contributors_si_slovenia: Slovėnija
+        contributors_si_gu: Matavimo ir žemėlapių tarnyba
+        contributors_si_mkgp: Žemės ūkio, miškų ir maisto ministerija
+        contributors_es_credit_html: |-
+          %{spain}: yra duomenų iš
+          Ispanijos nacionalinio geografijos instituto (%{ign_link}) ir
+          Nacionalinės kartografinės sistemos (%{scne_link})
+          licenzijuojama pakartotiniam naudojimui pagal %{cc_by_link}.
         contributors_es_spain: Ispanija
+        contributors_za_credit_html: '%{south_africa}: yra duomenų iš %{ngi_link},
+          valstybės teisės saugomos.'
         contributors_za_south_africa: Pietų Afrika
+        contributors_za_ngi: 'Vyriausiasis direktoratas: Nacionalinė geografinė erdvinė
+          informacija'
         contributors_gb_united_kingdom: Jungtinė Karalystė
+        contributors_2_contributors_page: Pagalbininkų puslapis
         contributors_footer_2_html: Duomenų įtraukimas į OpenStreetMap nereiškia,
           kad originalių duomenų tiekėjas remia OpenStreetMap. Nenumatomos jokios
           garantijos ir neprisiimama jokia atsakomybė.
@@ -1916,6 +2103,8 @@ lt:
         infringement_1_html: OSM pildytojai primenami niekada nesinaudoti autorių
           teisėmis apsaugotų šaltinių (pvz. Google Maps ar spausdintų žemėlapių) be
           leidimo naudoti.
+        infringement_2_1_takedown_procedure: pašalinimo procedūra
+        infringement_2_1_online_filing_page: pildymo internetu puslapis
     index:
       js_1: Jūs arba naudojate naršyklę, nepalaikančią JavaScript, arba išjungėte
         JavaScript palaikymą.
@@ -2053,37 +2242,61 @@ lt:
           cycleway_national: Nacionalinis dviračių takas
           cycleway_regional: Regioninis dviračių takas
           cycleway_local: Vietinis dviračių takas
+          cycleway_mtb: Kalnų dviračių maršrutas
           footway: Pėsčiųjų takas
           rail: Geležinkelis
+          train: Traukinys
           subway: Metropoliteno linija
+          ferry: Keltas
+          light_rail: Greitasis traukinys
+          tram: Tramvajus
+          trolleybus: Troleibusas
+          bus: Autobusas
           cable_car: Lyno keltuvas
-          chair_lift: keltuvas
+          chair_lift: Keltuvas
           runway: Kilimo takas
           taxiway: Riedėjimo takas
           apron: Oro uosto lėktuvų aikštelė
           admin: Administracinės ribos
+          capital: Sostinė
+          city: Miestas
+          orchard: Vaismedžių plantacija
+          vineyard: Vynuogynas
           forest: Miškas
-          wood: Medžių teritorija
+          wood: Miškas
+          farmland: Pasėliai
+          grass: Žolės
+          meadow: Pieva
+          bare_rock: Plikos uolos
+          sand: Smėlynas
           golf: Golfo laukas
           park: Parkas
           common: Bendras
+          built_up: Užstatyta teritorija
           resident: Gyvenamoji zona
           retail: Mažmeninis rajonas
           industrial: Pramoninė zona
           commercial: Komericinis plotas
           heathland: Å ilynas
+          scrubland: Krūmynai
           lake: Ežeras
-          reservoir: rezervuaras
+          reservoir: Tvenkinys
+          intermittent_water: Išdžiūstantis vandentakis
+          glacier: Ledynas
+          reef: Rifas
+          wetland: Šlapynė
           farm: Ūkis
           brownfield: Apleista teritorija
           cemetery: Kapinės
           allotments: Sodai
           pitch: Sportinis laukas
           centre: Sporto centras
+          beach: Paplūdimys
           reserve: Gamtos rezervatas
           military: Karinis rajonas
           school: Mokykla
-          university: universitetas
+          university: Universitetas
+          hospital: Ligoninė
           building: Didelis pastatas
           station: Geležinkelio stotis
           summit: Viršūnė
@@ -2093,8 +2306,12 @@ lt:
           private: Privati prieiga
           destination: Atvykimo susisiekimas
           construction: Statomi keliai
+          bus_stop: Autobusų stotelė
+          stop: Sustojimas
           bicycle_shop: Dviračių parduotuvė
+          bicycle_rental: Dviračių nuoma
           bicycle_parking: Dviračių stovėjimo aikštelė
+          bicycle_parking_small: Maža dviračių stovėjimo aikštelė
           toilets: Tualetai
     welcome:
       title: Sveiki atvykę!
@@ -2757,6 +2974,7 @@ lt:
         overlays: Įjungti papildomus sluoksnius problemų pranešimui
         title: Sluoksniai
       osm_france: OpenStreetMap Prancūzija
+      andy_allan: Endis Alanas
     site:
       edit_tooltip: Redaguoti žemėlapį
       edit_disabled_tooltip: Norėdami redaguoti, priartinkite
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index b1dfcb6db..7dfbe95f7 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -276,12 +276,8 @@ lv:
       way_paginated: Ceļi (%{x}-%{y} no %{count})
       relation: Relācijas (%{count})
       relation_paginated: Relācijas (%{x}-%{y} no %{count})
-      comment: Komentāri (%{count})
       changesetxml: Izmaiņu kopas XML
       osmchangexml: osmChange XML
-      feed:
-        title: Izmaiņu kopa %{id}
-        title_comment: Izmaiņu kopa %{id} - %{comment}
       join_discussion: Ieejiet sistēmā lai pievienotos diskusijai
       discussion: Diskusija
     node:
@@ -376,6 +372,9 @@ lv:
       no_more_area: Nav vairāk izmaiņu kopu šajā apgabalā.
       no_more_user: Nav vairāk izmaiņu kopu no šī lietotāja.
       load_more: Ielādēt vairāk
+      feed:
+        title: Izmaiņu kopa %{id}
+        title_comment: Izmaiņu kopa %{id} - %{comment}
     timeout:
       sorry: Atvainojiet, jūsu pieprasīto izmaiņu kopu ielāde prasīja pārāk daudz
         laika.
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index f3f88c78d..a846672a5 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -210,7 +210,8 @@ mk:
         one: пред %{count} година
         other: пред %{count} години
   printable_name:
-    with_version: '%{id}, вер. %{version}'
+    version: вер. %{version}
+    current_and_old_links_html: '%{current_link}, %{old_link}'
   editor:
     default: По основно (моментално %{name})
     id:
@@ -354,14 +355,10 @@ mk:
       way_paginated: Патишта (%{x}-%{y} од вкупно %{count})
       relation: Односи (%{count})
       relation_paginated: Односи (%{x}-%{y} од вкупно %{count})
-      comment: Коментари (%{count})
       hidden_comment_by_html: Скриен коментар од %{user} %{time_ago}
       comment_by_html: Коментар од %{user} %{time_ago}
       changesetxml: XML за измените
       osmchangexml: osmChange XML
-      feed:
-        title: Измени %{id}
-        title_comment: Измени %{id} - %{comment}
       join_discussion: Најавете се за да се приклучите во разговорот
       discussion: Разговор
       still_open: Измените сè уште се отворени — разговорот ќе се отвори штом ќе се
@@ -479,6 +476,9 @@ mk:
       no_more_area: Нема повеќе промени на ова подрчаје.
       no_more_user: Нема повеќе промени од овој корисник.
       load_more: Вчитај уште
+      feed:
+        title: Измени %{id}
+        title_comment: Измени %{id} - %{comment}
     timeout:
       sorry: За жал, на списокот на промени што го побаравте му требаше предолго за
         да се добие.
@@ -542,6 +542,7 @@ mk:
     show:
       title: Дневникот на %{user} | %{title}
       user_title: Дневникот на %{user}
+      discussion: Разговор
       leave_a_comment: Напиши коментар
       login_to_leave_a_comment_html: '%{login_link} за да оставите коментар'
       login: Најава
@@ -595,6 +596,12 @@ mk:
       comment: Коментар
       newer_comments: Понови коментари
       older_comments: Постари коментари
+    subscribe:
+      heading: Да ве претплатам на разговорот во следната дневничка ставка?
+      button: Претплати се на разговорот
+    unsubscribe:
+      heading: Да ве отпишам од претплатата на разговорот во следната дневничка ставка?
+      button: Отпиши се од разговорот
   doorkeeper:
     errors:
       messages:
@@ -1602,6 +1609,9 @@ mk:
         %{commenturl} или пак да му испратите порака на авторот на %{replyurl}
       footer_html: Можете и да го прочитате коментарот на %{readurl}, да коментирате
         на %{commenturl} или пак да му испратите порака на авторот на %{replyurl}
+      footer_unsubscribe: Можете да ја отпишете претплатата на разговорот на %{unsubscribeurl}
+      footer_unsubscribe_html: Можете да ја отпишете претплатата на разговорот на
+        %{unsubscribeurl}
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'
       hi: Здраво %{to_user},
diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 59955c5c6..0588febb3 100644
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -111,7 +111,6 @@ mo:
       way_paginated: Кэй (%{x}-%{y} дин %{count})
       relation: Релаций (%{count})
       relation_paginated: Релаций (%{x}-%{y} дин %{count})
-      comment: Коментарий (%{count})
       join_discussion: Вэ ругэм сэ ынтраць ын конт пентру а вэ алэтура дискуцией
       discussion: Дискуцие
     node:
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 7d80d6923..f5d0fcc0e 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -222,9 +222,6 @@ mr:
       relation_paginated: संबंध (%{x}-%{y}, %{count} पैकी)
       changesetxml: बदलसंच XML
       osmchangexml: osmChange XML
-      feed:
-        title: बदलसंच %{id}
-        title_comment: बदलसंच %{id} - %{comment}
       join_discussion: चर्चेत सहभागी होण्यासाठी सनोंद प्रवेश करा
     node:
       title_html: 'गाठ: %{name}'
@@ -311,6 +308,9 @@ mr:
       no_more_area: या भागात अधिक बदलसंच नाहीत.
       no_more_user: या सदस्याचे अधिक बदलसंच नाहीत.
       load_more: अधिक प्रभारण करा
+      feed:
+        title: बदलसंच %{id}
+        title_comment: बदलसंच %{id} - %{comment}
     timeout:
       sorry: क्षमा असावी, आपण मागितलेली बदलसंचाची यादी मिळविण्यास फार वेळ लागला.
   changeset_comments:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 56f2a4aca..7f6054720 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -290,12 +290,8 @@ ms:
       way_paginated: Jalan (%{x}-%{y} / %{count})
       relation: Hubungan (%{count})
       relation_paginated: Hubungan (%{x}-%{y} / %{count})
-      comment: Komen (%{count})
       changesetxml: XML Set Ubah
       osmchangexml: XML osmChange
-      feed:
-        title: Set Ubah %{id}
-        title_comment: Set Ubah %{id} - %{comment}
       join_discussion: Daftar masuk untuk perbincangan
       discussion: Perbincangan
     node:
@@ -393,6 +389,9 @@ ms:
       no_more_area: Tiada lagi set perubahan di kawasan ini.
       no_more_user: Tiada lagi set perubahan oleh pengguna ini.
       load_more: Selanjutnya
+      feed:
+        title: Set Ubah %{id}
+        title_comment: Set Ubah %{id} - %{comment}
     timeout:
       sorry: Maaf, senarai set perubahan yang anda minta mengambil masa yang terlalu
         lama untuk diambil.
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 00c5f1b4b..3cd4ae52b 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -146,7 +146,6 @@ my:
     location: 'တည်နေရာ:'
     changeset:
       belongs_to: စာရေးသူ
-      comment: မှတ်ချက်များ (%{count})
       join_discussion: ဆွေးနွေးရန် လော့အင်ဝင်ပါ
       discussion: ဆွေးနွေးချက်
     relation:
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index e17b4732c..e793981a5 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -343,12 +343,8 @@ nb:
       way_paginated: Strekninger (%{x}-%{y} av %{count})
       relation: Forbindelser (%{count})
       relation_paginated: Forbindelser (%{x}-%{y} av %{count})
-      comment: Kommentarer (%{count})
       changesetxml: XML for endringssett
       osmchangexml: osmChange-XML
-      feed:
-        title: Endringssett %{id}
-        title_comment: 'Endringsforløp: %{id} - %{comment}'
       join_discussion: Logg inn for å delta i diskusjonen
       discussion: Diskusjon
       still_open: Endringssettet er fortsatt åpent – diskusjonen åpner når endringssettet
@@ -453,6 +449,9 @@ nb:
       no_more_area: Ingen flere endringssett i dette området.
       no_more_user: Ingen flere endringssett av denne brukeren.
       load_more: Last inn mer
+      feed:
+        title: Endringssett %{id}
+        title_comment: 'Endringsforløp: %{id} - %{comment}'
     timeout:
       sorry: Listen over endringssett du ba om tok for lang tid å hente.
   changeset_comments:
@@ -510,6 +509,7 @@ nb:
     show:
       title: '%{user} sin dagbok | %{title}'
       user_title: Dagboken til %{user}
+      discussion: Diskusjon
       leave_a_comment: Legg igjen en kommentar
       login_to_leave_a_comment_html: '%{login_link} for å legge inn en kommentar'
       login: Logg inn
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index a9e9c35ff..79f9b8674 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -170,12 +170,8 @@ ne:
       way_paginated: बाटोहरू (जम्मा %{count} मध्येबाट %{x}-%{y})
       relation: सम्बन्धहरू (%{count})
       relation_paginated: सम्बन्धहरू (जम्मा %{count} मध्येबाट %{x}-%{y})
-      comment: टिप्पणीहरू (%{count})
       changesetxml: चेन्जसेट XML
       osmchangexml: osmChange XML
-      feed:
-        title: 'परिवर्तनहरू: %{id}'
-        title_comment: परिवर्तनहरू %{id} - %{comment}
       join_discussion: छलफलमा भाग लिन लग इन गर्नुहोस्
       discussion: छलफल
     node:
@@ -272,6 +268,9 @@ ne:
       no_more_area: यो क्षेत्रमा अन्य कुनै परिवर्तनहरू छैनन्।
       no_more_user: यस प्रयोगकर्तटद्वारा अन्य कुनै परिवर्तनहरू गरिएका छैनन् ।
       load_more: अझै बढी खोल्नुहोस्
+      feed:
+        title: 'परिवर्तनहरू: %{id}'
+        title_comment: परिवर्तनहरू %{id} - %{comment}
     timeout:
       sorry: माफ गर्नुहोला, तपाईंले खोज्नुभएको परिवर्तनहरूको सूची प्राप्त गर्न निकै
         समय लाग्यो ।
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 6bde8c521..c0d7323d4 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -410,14 +410,10 @@ nl:
       way_paginated: Wegen (%{x}-%{y} van %{count})
       relation: Relaties (%{count})
       relation_paginated: Relaties (%{x}-%{y} van %{count})
-      comment: Reacties (%{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
-      feed:
-        title: Wijzigingenset %{id}
-        title_comment: Wijzigingenset %{id} - %{comment}
       join_discussion: Meld u aan om mee te praten
       discussion: Overleg
       still_open: Wijzigingenset is nog open – overleg gaat open zodra de wijzigingenset
@@ -529,6 +525,9 @@ nl:
       no_more_area: Geen wijzigingensets meer in dit gebied.
       no_more_user: Geen wijzigingensets meer van deze gebruiker.
       load_more: Meer laden
+      feed:
+        title: Wijzigingenset %{id}
+        title_comment: Wijzigingenset %{id} - %{comment}
     timeout:
       sorry: Het oproepen van de lijst met wijzigingensets die u hebt opgevraagd duurde
         te lang.
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index f3b7c6610..ef6732bec 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -328,14 +328,10 @@ nn:
       way_paginated: Strekningar (%{x}-%{y} av %{count})
       relation: Samhøve (%{count})
       relation_paginated: Samhøve (%{x}–%{y} av %{count})
-      comment: Kommentarar (%{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
-      feed:
-        title: Endringssett %{id}
-        title_comment: 'Endringssett: %{id} - %{comment}'
       join_discussion: Logg inn for å vere med i diskusjonen
       discussion: Ordskifte
       still_open: Endringssettet er framleis ope – det vert opna for diskusjon når
@@ -443,6 +439,9 @@ nn:
       no_more_area: Ingen fleire endringssett i dette området.
       no_more_user: Ingen fleire endringssett av denne brukaren.
       load_more: Last inn meir
+      feed:
+        title: Endringssett %{id}
+        title_comment: 'Endringssett: %{id} - %{comment}'
     timeout:
       sorry: Lista over endringssett du ba om tok for lang tid å hente.
   changeset_comments:
diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 985005bf1..e9ed1945f 100644
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -304,14 +304,10 @@ nqo:
       way_paginated: ߛߌߟߊ (%{x}-%{y} ߦߋ߫ %{count})
       relation: ߕߍߓߊ߯ߦߊ (%{count})
       relation_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count})
-      comment: ߡߙߌߣߊ߲ (%{count})
       hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫
       comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬
       changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
       osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
-      feed:
-        title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id}
-        title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}
       join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
       discussion: ߘߊߘߐߖߊߥߏ
       still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ
@@ -410,6 +406,9 @@ nqo:
       no_more_area: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߜߘߍ߫ ߕߍ߫ ߕߌ߲߬ߞߎߘߎ߲ ߣߌ߲߬ ߘߐ߫.
       no_more_user: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߟߊߘߏ߲߬ߣߍ߲߬ ߜߘߍ߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߏ߫
       load_more: ߘߏߜߘߍ߫ ߟߎ߫ ߟߊߢߎ߲߫
+      feed:
+        title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id}
+        title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}
     timeout:
       sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ ߘߐ߫ ߌ ߓߟߏ߫߸
         ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߕߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 6d2040a60..d1ff013c1 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -340,12 +340,8 @@ oc:
       way_paginated: Linhas (%{x} a %{y} sus %{count})
       relation: Relacions (%{count})
       relation_paginated: Relacions (%{x} a %{y} sus %{count})
-      comment: Comentaris (%{count})
       changesetxml: Grop de modificacions XML
       osmchangexml: osmChange XML
-      feed:
-        title: Grop de modificacions %{id}
-        title_comment: Grop de modificacions %{id} – %{comment}
       join_discussion: Se connectar per rejónher la discussion
       discussion: Discussion
       still_open: Ensemble de modificacions totjorn dobèrt — la discussion se dobrirà
@@ -454,6 +450,9 @@ oc:
       no_more_area: Ges d'autre grop de modificacions dins aquesta zòna.
       no_more_user: Ges d'autre grop de modificacions per aqueste utilizaire.
       load_more: Cargar mai
+      feed:
+        title: Grop de modificacions %{id}
+        title_comment: Grop de modificacions %{id} – %{comment}
     timeout:
       sorry: O planhèm, la lista deis gropes de modificacions qu'avètz demandada met
         tròp de temps per èsser recuperada.
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 62853c128..de583cce9 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -171,11 +171,7 @@ pa:
     changeset:
       title: 'ਤਬਦੀਲੀ ਲੜੀ: %{id}'
       belongs_to: ਲੇਖਕ
-      comment: ਟਿੱਪਣੀਆਂ (%{count})
       changesetxml: ਤਬਦੀਲੀ ਲੜੀ XML
-      feed:
-        title: ਤਬਦੀਲੀ ਲੜੀ %{id}
-        title_comment: ਤਬਦੀਲੀ ਲੜੀ %{id} - %{comment}
       discussion: ਚਰਚਾ
     relation:
       members: ਜੀਅ
@@ -227,6 +223,9 @@ pa:
     index:
       title: ਤਬਦੀਲੀਆਂ
       load_more: ਹੋਰ ਲੋਡ ਕਰੋ
+      feed:
+        title: ਤਬਦੀਲੀ ਲੜੀ %{id}
+        title_comment: ਤਬਦੀਲੀ ਲੜੀ %{id} - %{comment}
   dashboards:
     contact:
       km away: '%{count}ਕਿ.ਮੀ. ਪਰ੍ਹਾਂ'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index d51e62246..9c36ded2e 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -105,6 +105,8 @@ pl:
       messages:
         invalid_email_address: nie wygląda na poprawny adres e-mail
         email_address_not_routable: nie jest routowalny
+        display_name_is_user_n: nie może mieć wartości user_n, chyba że n jest Twoim
+          identyfikatorem użytkownika
       models:
         user_mute:
           is_already_muted: jest już wyciszony
@@ -292,8 +294,6 @@ pl:
         few: '%{count} lata temu'
         many: '%{count} lat temu'
         other: '%{count} roku temu'
-  printable_name:
-    with_version: '%{id}, wersja %{version}'
   editor:
     default: edytorze domyślnym (obecnie %{name})
     id:
@@ -357,6 +357,8 @@ pl:
         retain_changeset_discussions: Twoje ewentualne komentarze pod zestawami zmian
           zostaną zachowane.
         retain_email: Twój adres e-mail zostanie zachowany.
+        recent_editing_html: Ponieważ niedawno edytowałeś, Twoje konto nie może zostać
+          obecnie usunięte. Usunięcie będzie możliwe za %{time}.
         confirm_delete: Na pewno?
         cancel: Anuluj
   accounts:
@@ -440,14 +442,10 @@ pl:
       way_paginated: Linie (%{x}-%{y} z %{count})
       relation: Relacje (%{count})
       relation_paginated: Relacje (%{x}-%{y} z %{count})
-      comment: Komentarze (%{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
-      feed:
-        title: Zestaw zmian %{id}
-        title_comment: Zestaw zmian %{id} - %{comment}
       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
@@ -561,6 +559,9 @@ pl:
       no_more_area: Brak zestawów zmian na tym obszarze.
       no_more_user: Brak zestawów zmian tego użytkownika.
       load_more: Wczytaj więcej
+      feed:
+        title: Zestaw zmian %{id}
+        title_comment: Zestaw zmian %{id} - %{comment}
     timeout:
       sorry: Niestety, pobieranie listy żądanych zestawów zmian trwało zbyt długo.
   changeset_comments:
@@ -679,6 +680,10 @@ pl:
       newer_comments: Nowsze komentarze
       older_comments: Starsze komentarze
   doorkeeper:
+    errors:
+      messages:
+        account_selection_required: Serwer autoryzacji wymaga wybrania konta użytkownika
+          końcowego
     flash:
       applications:
         create:
@@ -1841,6 +1846,7 @@ pl:
       to: Do
       subject: Temat
       date: Data
+      actions: Operacje
     message_summary:
       unread_button: Oznacz jako nieprzeczytaną
       read_button: Oznacz jako przeczytaną
@@ -1860,6 +1866,7 @@ pl:
       body: Niestety nie ma wiadomości o tym identyfikatorze.
     outbox:
       title: Wiadomości wysłane
+      actions: Operacje
       messages:
         one: '%{count} wysłana wiadomość'
         few: '%{count} wysłane wiadomości'
@@ -2032,6 +2039,7 @@ pl:
       community_driven_community_blogs: blogi społecznościowe
       community_driven_osm_foundation: Fundacja OSM
       open_data_title: Otwarte dane
+      open_data_open_data: otwarte dane
       open_data_copyright_license: Strona dotycząca praw autorskich i licencji
       legal_title: Pytania prawne
       legal_1_1_openstreetmap_foundation: Fundacja OpenStreetMap
@@ -2141,6 +2149,7 @@ pl:
         contributors_nz_linz_data_service: LINZ Data Service
         contributors_nz_cc_by: CC BY 4.0
         contributors_rs_serbia: Serbia
+        contributors_rs_open_data_portal: Krajowy Portal Otwartych Danych
         contributors_si_credit_html: '%{slovenia}: Zawiera dane %{gu_link} oraz %{mkgp_link}
           (informacja publiczna Słowenii).'
         contributors_si_slovenia: Słowenia
@@ -2257,8 +2266,9 @@ pl:
         title: Podręcznik dla początkujących
         description: Podręcznik dla początkujących tworzony przez społeczność.
       community:
-        title: Forum (nowe)
-        description: Wspólne miejsce do rozmów na temat OpenStreetMap.
+        title: Pomoc i forum społeczności
+        description: Wspólne miejsce, w którym można szukać pomocy i prowadzić rozmowy
+          na temat OpenStreetMap.
       mailing_lists:
         title: Listy dyskusyjne
         description: Zadaj pytanie lub przedyskutuj interesujący temat niezależnie
@@ -2281,6 +2291,8 @@ pl:
     potlatch:
       removed: Twój domyślny edytor OpenStreetMap to Potlatch. Ponieważ Adobe Flash
         Player został wycofany, Potlatch nie jest już dostępny w przeglądarce.
+      desktop_application_html: Nadal możesz używać Potlatch przez %{download_link}.
+      download: pobranie aplikacji komputerowej dla komputerów Mac i Windows
       change_preferences: Zmień swoje preferencje tutaj
     any_questions:
       title: Czy masz jakieś pytania?
@@ -2307,12 +2319,14 @@ pl:
           primary: Droga pierwszorzędna
           secondary: Droga drugorzędna
           unclassified: Droga czwartorzędna
+          pedestrian: Droga dla pieszych
           track: Droga polna lub leśna
           bridleway: Droga dla koni
           cycleway: Droga rowerowa
           cycleway_national: Droga rowerowa znaczenia państwowego
           cycleway_regional: Droga rowerowa znaczenia regionalnego
           cycleway_local: Droga rowerowa znaczenia lokalnego
+          cycleway_mtb: Górska trasa rowerowa
           footway: Droga dla pieszych
           rail: Tor kolejowy
           train: Kolej
@@ -2323,38 +2337,52 @@ pl:
           trolleybus: Trolejbus
           bus: Autobus
           cable_car: Kolej linowa
-          chair_lift: wyciąg krzesełkowy
+          chair_lift: Wyciąg krzesełkowy
           runway: Pas startowy
-          taxiway: kołowania
+          taxiway: Droga kołowania
           apron: Płyta lotniska
           admin: Granica
+          capital: Stolica
+          city: Miasto
+          orchard: Sad
+          vineyard: Winnica
           forest: Las
-          wood: Drzewa
+          wood: Drewno
+          farmland: Grunty rolne
+          grass: Trawnik
+          meadow: Łąka
+          sand: Piaski
           golf: Pole golfowe
           park: Park
           common: Pole
+          built_up: Obszar zabudowany
           resident: Teren mieszkalny
           retail: Zabudowa handlowo-usługowa
           industrial: Teren przemysłowy
           commercial: Teren komercyjny
           heathland: Wrzosowisko
+          scrubland: Zarośla
           lake: Jezioro
-          reservoir: zbiornik
+          reservoir: Zbiornik
           glacier: Lodowiec
+          reef: Rafa
+          wetland: Mokradła
           farm: Gospodarstwo rolne
           brownfield: Teren powyburzeniowy
           cemetery: Cmentarz
           allotments: Ogródki działkowe
           pitch: Boisko sportowe
           centre: Centrum sportowe
+          beach: Plaża
           reserve: Rezerwat przyrody
           military: Teren wojskowy
           school: Szkoła
-          university: uniwersytet
+          university: Uniwersytet
+          hospital: Szpital
           building: Ważny budynek
           station: Stacja kolejowa
           summit: Góra
-          peak: szczyt
+          peak: Szczyt
           tunnel: Kreskowany obrys – tunel
           bridge: Czarny obrys – most
           private: Dostęp za zezwoleniem
@@ -2363,6 +2391,7 @@ pl:
           bus_stop: Przystanek autobusowy
           stop: Stop
           bicycle_shop: Sklep rowerowy
+          bicycle_rental: Wypożyczalnia rowerów
           bicycle_parking: Parking dla rowerów
           toilets: Toalety
     welcome:
@@ -2392,6 +2421,7 @@ pl:
         imports: Import
         automated_edits: Zautomatyzowane edycje
       start_mapping: Rozpocznij mapowanie
+      continue_authorization: Kontynuuj autoryzację
       add_a_note:
         title: Nie masz czasu na edycję? Dodaj uwagę!
         para_1: Jeśli chcesz wprowadzić małą zmianę, ale nie masz czasu na rejestrację
@@ -2585,11 +2615,13 @@ pl:
       read_gpx: Odczytywanie ich prywatnych śladów GPS
       write_gpx: Przesyłanie śladów GPS
       write_notes: Modyfikowanie uwag
+      write_redactions: Redagowanie danych mapy
       read_email: Odczytywanie adresu e-mail użytkownika
       skip_authorization: Automatycznie akceptuj aplikację
   oauth_clients:
     new:
       title: Rejestrowanie nowej aplikacji
+      disabled: Rejestracja aplikacji OAuth 1 została wyłączona
     edit:
       title: Edycja aplikacji
     show:
@@ -2673,6 +2705,7 @@ pl:
       title: Moje upoważnione aplikacje
       application: Nazwa aplikacji
       permissions: Uprawnienia
+      last_authorized: Ostatnia autoryzacja
       no_applications_html: Nie upoważniłeś jeszcze żadnych aplikacji %{oauth2}.
     application:
       revoke: Odwołaj!
@@ -2755,8 +2788,8 @@ pl:
       my_dashboard: Mój panel
       blocks on me: Otrzymane blokady
       blocks by me: Nałożone blokady
-      create_mute: Wycisz tego użytkownika
-      destroy_mute: Odcisz tego użytkownika
+      create_mute: wycisz tego użytkownika
+      destroy_mute: odcisz tego użytkownika
       edit_profile: Edytuj profil
       send message: wyślij wiadomość
       diary: dziennik
@@ -2961,12 +2994,21 @@ pl:
       showing_page: Strona %{page}
       next: Następna »
       previous: « Poprzednia
+  user_mutes:
+    index:
+      table:
+        tbody:
+          unmute: Wyłącz wyciszenie
+          send_message: Wyślij wiadomość
+    create:
+      notice: Wyciszyłeś %{name}.
   notes:
     index:
-      title: Uwagi utworzone lub skomentowane przez %{user}
+      title: Uwagi użytkownika %{user}
       heading: Uwagi użytkownika %{user}
-      subheading_html: Uwagi utworzone lub skomentowane przez %{user}
-      subheading_commented: skomentował
+      subheading_html: Uwagi %{submitted} lub %{commented} przez %{user}
+      subheading_submitted: utworzone
+      subheading_commented: skomentowane
       no_notes: Brak uwag
       id: Identyfikator
       creator: Autor
diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 11b6746fd..b429a70a1 100644
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -194,7 +194,6 @@ pnb:
         one: ایہہ اِکّ سال پہلاں
         other: ایہہ %{count} سالاں پہلاں
   printable_name:
-    with_version: ایہہ %{id}، ورژن نمبر %{version}
     with_name_html: '%{name} (نمبر %{id})'
   editor:
     default: مول (مَوجودہ %{name})
@@ -305,12 +304,8 @@ pnb:
       way_paginated: راہ (⁠%{count} وچ %{x} توں %{y}⁠)
       relation: سمبندھ (⁠%{count}⁠)
       relation_paginated: سمبندھ (⁠%{count} وچ %{x} توں %{y}⁠)
-      comment: ٹپݨیاں (⁠%{count}⁠)
       changesetxml: تبدیلیاں لئی سروت دی فائل
       osmchangexml: تبدیلیاں لئی سروت دی فائل فارماٹ
-      feed:
-        title: 'تبدیلیاں: %{id}'
-        title_comment: تبدیلیاں نمبر %{id} • %{comment}
       join_discussion: ایہہ گل بات جوڑن لئی تسیں لوگ‌این کر سکدیو
       discussion: گل بات
     node:
@@ -411,6 +406,9 @@ pnb:
       no_more_area: اِتھے تبدیلیاں ہور نہیں اے۔
       no_more_user: ورتنوالے دیاں تبدیلیاں ہور نہیں لبھیاں۔
       load_more: ہور لوڈ کرو
+      feed:
+        title: 'تبدیلیاں: %{id}'
+        title_comment: تبدیلیاں نمبر %{id} • %{comment}
     timeout:
       sorry: افسوس، تبدیلیاں دیاں لڑیاں نہیں لبھ سکیاں، ٹائم آؤٹ ہوگیا سی۔
   changeset_comments:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 1b4aec322..b7c94fe4a 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -393,14 +393,10 @@ pt-PT:
       way_paginated: Linhas (%{x}-%{y} de %{count})
       relation: Relações (%{count})
       relation_paginated: Relações (%{x}-%{y} of %{count})
-      comment: Comentários (%{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
-      feed:
-        title: Conjunto de alterações %{id}
-        title_comment: Conjunto de alterações %{id} - %{comment}
       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
@@ -512,6 +508,9 @@ pt-PT:
       no_more_area: Não há mais conjuntos de alterações nesta área.
       no_more_user: Não há mais conjuntos de alterações deste utilizador.
       load_more: Ver mais
+      feed:
+        title: Conjunto de alterações %{id}
+        title_comment: Conjunto de alterações %{id} - %{comment}
     timeout:
       sorry: Lamentamos, mas a lista de conjuntos de alterações que pediste excedeu
         o tempo limite de resposta.
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index b02ba30dc..09c7525c5 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -412,14 +412,10 @@ pt:
       way_paginated: Linhas (%{x}-%{y} de %{count})
       relation: Relações (%{count})
       relation_paginated: Relações (%{x}-%{y} de %{count})
-      comment: Comentários (%{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
-      feed:
-        title: Conjunto de alterações %{id}
-        title_comment: Conjunto de alterações %{id} - %{comment}
       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
@@ -528,6 +524,9 @@ pt:
       no_more_area: Não há mais conjuntos de alterações nesta área.
       no_more_user: Não há mais conjuntos de alterações para este usuário.
       load_more: Carregar mais
+      feed:
+        title: Conjunto de alterações %{id}
+        title_comment: Conjunto de alterações %{id} - %{comment}
     timeout:
       sorry: A lista de conjuntos de alterações solicitada está demorando demais para
         chegar.
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 0a00a3819..a99bce959 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -379,14 +379,10 @@ ro:
       way_paginated: Căi (%{x}-%{y} din %{count})
       relation: Comunicații (%{count})
       relation_paginated: Comunicații (%{x}-%{y} din %{count})
-      comment: Comentarii (%{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
-      feed:
-        title: 'Set de modificări: %{id}'
-        title_comment: Set de modificări %{id} — %{comment}
       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
@@ -499,6 +495,9 @@ ro:
       no_more_area: Nu s-au mai găsit seturi de modificări în această zonă.
       no_more_user: Nu s-au mai găsit seturi de modificări făcute de acest utilizator.
       load_more: Încarcă mai multe
+      feed:
+        title: 'Set de modificări: %{id}'
+        title_comment: Set de modificări %{id} — %{comment}
     timeout:
       sorry: Ne pare rău, preluarea listei de modificări pe care ați solicitat-o a
         durat prea mult.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index bd700c7de..d22c9bbf1 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -457,13 +457,9 @@ ru:
       way_paginated: Линии (%{x}-%{y} из %{count})
       relation: Отношения (%{count})
       relation_paginated: Отношения (%{x}-%{y} из %{count})
-      comment: Комментарии (%{count})
       comment_by_html: Комментарий от %{user} %{time_ago}
       changesetxml: XML пакета правок
       osmchangexml: osmChange XML
-      feed:
-        title: Пакет правок %{id}
-        title_comment: Пакет правок %{id} — %{comment}
       join_discussion: Войдите в систему, чтобы присоединиться к обсуждению
       discussion: Обсуждение
       still_open: Пакет правок ещё открыт. Обсуждение будет доступно, как только пакет
@@ -577,6 +573,9 @@ ru:
       no_more_area: Нет больше пакетов правок в этой области.
       no_more_user: Нет больше пакетов правок от этого пользователя.
       load_more: Загрузить ещё
+      feed:
+        title: Пакет правок %{id}
+        title_comment: Пакет правок %{id} — %{comment}
     timeout:
       sorry: К сожалению, список пакетов правок, который вы запросили, требует слишком
         много времени для извлечения.
diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 7e0159361..bc6fff49d 100644
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -154,7 +154,6 @@ sat:
       way: (%{count}) ᱦᱚᱨᱠᱚ
       relation: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{count})
       relation_paginated: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{x}-%{y} of %{count})
-      comment: (%{count})ᱚᱠᱛᱟᱠᱚ
       discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ
     node:
       title_html: ᱜᱟᱸᱴᱷ:%{name}
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index b69c2a4f0..b96c20584 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -358,14 +358,10 @@ sc:
       way_paginated: Lìnias (%{x}-%{y} de %{count})
       relation: Relatziones (%{count})
       relation_paginated: Relatziones (%{x}-%{y} de %{count})
-      comment: Cummentos (%{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
-      feed:
-        title: Annantu de modìficas %{id}
-        title_comment: Grupu de modìficas %{id} - %{comment}
       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
@@ -477,6 +473,9 @@ sc:
       no_more_area: Perunu àteru annantu de modìficas in custa àrea.
       no_more_user: Perunu àteru grupu de modìficas de custu utente.
       load_more: Càrriga·nde de prus
+      feed:
+        title: Annantu de modìficas %{id}
+        title_comment: Grupu de modìficas %{id} - %{comment}
     timeout:
       sorry: S'elencu de annantos de modìficas chi as pedidu at bisongiadu de tropu
         tempus pro lu recuperare.
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 16870b4e7..a5f351844 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -253,12 +253,8 @@ scn:
       way_paginated: Camini (%{x}-%{y} di %{count})
       relation: Rilazzioni (%{count})
       relation_paginated: Rilazzioni (%{x}-%{y} di %{count})
-      comment: Cummenti (%{count})
       changesetxml: XML dû gruppu di canciamenti
       osmchangexml: XML osmChange
-      feed:
-        title: Gruppu di canciamenti %{id}
-        title_comment: Gruppu di canciamenti %{id} - %{comment}
       join_discussion: Pi participari ntâ discussioni trasi
       discussion: Discussioni
     node:
@@ -362,6 +358,9 @@ scn:
       no_more_area: Nuddu àutru gruppu di canciamenti nta st'ària.
       no_more_user: Nuddu àutru gruppu di canciamenti fattu di st'utenti.
       load_more: Carrìcanni àutri
+      feed:
+        title: Gruppu di canciamenti %{id}
+        title_comment: Gruppu di canciamenti %{id} - %{comment}
     timeout:
       sorry: Purtroppu, ci vosi troppu tempu pi pigghiari la lista dî gruppi di canciamenti
         c'addumannasti.
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 6a6d25b53..53982031b 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -124,12 +124,8 @@ sco:
       way_paginated: Ways (%{x}-%{y} of %{count})
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
-      comment: Comments (%{count})
       changesetxml: Chyngeset XML
       osmchangexml: osmChange XML
-      feed:
-        title: Chyngeset %{id}
-        title_comment: Chyngeset %{id} - %{comment}
       join_discussion: Log in tae jyn the discussion
       discussion: Discussion
     node:
@@ -217,6 +213,9 @@ sco:
       no_more_area: No mair chyngesets in this aurie.
       no_more_user: No mair chyngesets bi this uiser.
       load_more: Load mair
+      feed:
+        title: Chyngeset %{id}
+        title_comment: Chyngeset %{id} - %{comment}
     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.
   changeset_comments:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index e44e5c86c..c3800d316 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -63,6 +63,7 @@ sk:
       messages:
         invalid_email_address: nevyzerá ako platná e-mailová adresa
         email_address_not_routable: nie je routovateľná
+        display_name_is_user_n: nemôže byť user_n, pokiaľ n nie je vaše ID používateľa
     models:
       acl: Zoznam prístupových práv
       changeset: Sada zmien
@@ -335,6 +336,7 @@ sk:
       delete_account: Odstrániť účet...
     go_public:
       heading: Verejné úpravy
+      find_out_why: zistite prečo
       make_edits_public_button: Zverejniť všetky moje úpravy
     update:
       success_confirm_needed: Používateľské údaje boli úspešne aktualizované. Skontrolujte
@@ -379,14 +381,10 @@ sk:
       way_paginated: Cesty (%{x}–%{y} z %{count})
       relation: Relácie (%{count})
       relation_paginated: Relácie (%{x}–%{y} z %{count})
-      comment: Komentáre (%{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
-      feed:
-        title: Sada zmien %{id}
-        title_comment: Sada zmien %{id} - %{comment}
       join_discussion: Zapojte sa do diskusie
       discussion: Diskusia
       still_open: Sada zmien stále otvorená - diskusia bude otvorená, keď bude sada
@@ -500,6 +498,9 @@ sk:
       no_more_area: Nie sú ďalšie sady zmien v tejto oblasti.
       no_more_user: Nie sú ďalšie sady zmien tohoto používateľa.
       load_more: Načítať ďalšie
+      feed:
+        title: Sada zmien %{id}
+        title_comment: Sada zmien %{id} - %{comment}
     timeout:
       sorry: Ľutujeme, ale vami požadovaný zoznam sád zmien sa načítaval príliš dlho.
   changeset_comments:
@@ -579,6 +580,7 @@ sk:
         few: '%{count} komentáre'
         many: '%{count} komentárov}'
         other: '%{count} komentárov'
+      no_comments: Žiadne komentáre
       edit_link: Upraviť tento záznam
       hide_link: Skryť tento záznam
       unhide_link: Odkryť tento záznam
@@ -1371,7 +1373,9 @@ sk:
       reported_user: Nahlásený používateľ
       not_updated: Neaktualizované
       search: Hľadať
+      search_guidance: 'Hľadať hlásenia:'
       user_not_found: Používateľ neexistuje
+      issues_not_found: Nenašli sa žiadne také hlásenia
       status: Stav
       reports: Hlásenia
       last_updated: Posledná úprava
@@ -1394,6 +1398,7 @@ sk:
         few: '%{count} hlásenia'
         many: '%{count} hlásení'
         other: '%{count} hlásení'
+      no_reports: Žiadne hlásenia
       report_created_at_html: Prvýkrát nahlásené %{datetime}
       last_resolved_at_html: Naposledy vyriešené %{datetime}
       last_updated_at_html: Naposledy aktualizované %{datetime} používateľom %{displayname}
@@ -1712,7 +1717,7 @@ sk:
     new:
       title: Stratené heslo
       heading: Zabudli ste heslo?
-      email address: 'E-mailová adresa:'
+      email address: E-mailová adresa
       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.
@@ -1760,8 +1765,8 @@ sk:
     new:
       title: Prihlásiť sa
       heading: Prihlásenie
-      email or username: 'E-mailová adresa alebo prihlasovacie meno:'
-      password: 'Heslo:'
+      email or username: E-mailová adresa alebo prihlasovacie meno
+      password: Heslo
       remember: Zapamätať
       lost password link: Stratili ste heslo?
       login_button: Prihlásiť
@@ -1781,8 +1786,8 @@ sk:
           title: Prihlásenie sa pomocou Facebooku
           alt: Prihlásenie sa pomocou účtu na Facebooku
         microsoft:
-          title: Prihlásenie sa pomocou Windows Live
-          alt: Prihlásenie sa pomocou účtu Windows Live
+          title: Prihlásenie sa pomocou účtu Microsoft
+          alt: Prihlásenie sa pomocou účtu Microsoft
         github:
           title: Prihlásiť sa cez GitHub
           alt: Prihlásiť sa pomocou účtu na GitHube
@@ -2045,7 +2050,7 @@ sk:
         title: Sprievodca pre začiatočníkov
         description: Komunitou spravovaná príručka pre začiatočníkov.
       community:
-        title: Komunitné fórum
+        title: Pomoc & Komunitné fórum
       mailing_lists:
         title: E-mailové konferencie
         description: Spýtajte sa otázku alebo diskutuje zaujímavé témy v tematických
@@ -2098,13 +2103,13 @@ sk:
           rail: Železnica
           subway: Metro
           cable_car: Lanovka
-          chair_lift: sedačková lanovka
+          chair_lift: Sedačková lanovka
           runway: Letisková dráha
-          taxiway: pojazdová dráha
+          taxiway: Pojazdová dráha
           apron: Letisková odbavovacia plocha
           admin: Administratívne hranice
           forest: Les (udržiavaný)
-          wood: Les (neudržiavaný)
+          wood: Les
           golf: Golfové ihrisko
           park: Park
           common: Pastvina
@@ -2114,7 +2119,7 @@ sk:
           commercial: Komerčná oblasť
           heathland: Vresovisko
           lake: Jazero
-          reservoir: nádrž
+          reservoir: Nádrž
           farm: Farma
           brownfield: Zborenisko
           cemetery: Cintorín
@@ -2124,11 +2129,11 @@ sk:
           reserve: Prírodná rezervácia
           military: Vojenský priestor
           school: Å kola
-          university: univerzita
+          university: Univerzita
           building: Významná budova
           station: Železničná stanica
           summit: Vrchol
-          peak: vrchol
+          peak: Vrchol
           tunnel: Čiarkovaný obrys = tunel
           bridge: Čireny obrys = most
           private: Súkromný prístup
@@ -2631,7 +2636,7 @@ sk:
     index:
       title: Poznámky vytvorené alebo komentované používateľom %{user}
       heading: Poznámky používateľa %{user}
-      subheading_html: Poznámky vytvorené alebo komentované používateľom %{user}
+      subheading_html: Poznámky %{submitted} alebo %{commented}používateľom %{user}
       no_notes: Žiadne poznámky
       id: ID
       creator: Autor
diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index 10d7ccaf1..ef823dfc9 100644
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -207,7 +207,6 @@ skr-arab:
       belongs_to: مصنف
       node: نوݙاں(%{count})
       way: رستے(%{count})
-      comment: تبصرے (%{count})
       discussion: بحث مباحثہ
     node:
       title_html: 'نوڈ: %{name}'
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 318ae10bf..c5eccb826 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -245,8 +245,6 @@ sl:
         two: pred %{count} letoma
         few: pred %{count} leti
         other: pred %{count} leti
-  printable_name:
-    with_version: '%{id}, %{version}. različica'
   editor:
     default: Privzeti (trenutno %{name})
     id:
@@ -397,14 +395,10 @@ sl:
       way_paginated: Poti (%{x}-%{y} od %{count})
       relation: Relacije (%{count})
       relation_paginated: Zveze (%{x}-%{y} od %{count})
-      comment: Komentarji (%{count})
       hidden_comment_by_html: Skrit komentar %{user} %{time_ago}
       comment_by_html: Komentar %{user} %{time_ago}
       changesetxml: Nabor sprememb XML
       osmchangexml: osmChange XML
-      feed:
-        title: Nabor sprememb %{id}
-        title_comment: Nabor sprememb %{id} – %{comment}
       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
@@ -526,6 +520,9 @@ sl:
       no_more_area: Na tem območju ni drugih množic sprememb.
       no_more_user: Ni drugih naborov sprememb tega uporabnika.
       load_more: Naloži več
+      feed:
+        title: Nabor sprememb %{id}
+        title_comment: Nabor sprememb %{id} – %{comment}
     timeout:
       sorry: Žal je trajalo pridobivanje zahtevanega nabora sprememb predolgo.
   changeset_comments:
@@ -2948,8 +2945,8 @@ sl:
       support: podpora
       automatically_suspended: Oprostite, vaš račun je bil blokiran zaradi sumljive
         dejavnosti.
-      contact_support_html: To odločitev bo kmalu pregledal skrbnik, lahko pa se obrnete
-        na %{support_link}, če se želite o tem pogovoriti.
+      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:
       connection_failed: Povezava do ponudnika avtentikacije ni uspela
       invalid_credentials: Neveljavne avtentikacijske poverilnice
@@ -2968,8 +2965,8 @@ sl:
       not_a_role: Besedilo `%{role}' ni pravilna vloga.
       already_has_role: Uporabnik že ima vlogo %{role}.
       doesnt_have_role: Uporabnik nima vloge %{role}.
-      not_revoke_admin_current_user: Trenutnemu uporabniku ni mogoče preklicati vloge
-        skrbnika.
+      not_revoke_admin_current_user: Trenutnemu uporabniku ni mogoče odvzeti vloge
+        administratorja.
     grant:
       title: Potrdi dodeljevanje vloge
       heading: Potrdi dodeljevanje vloge
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index e3f572384..604314a0d 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -176,12 +176,8 @@ sq:
       way_paginated: Mënyrat (%{x}-%{y} nga %{count})
       relation: Marrëdhëniet (%{count})
       relation_paginated: Marrëdhëniet (%{x}-%{y} nga %{count})
-      comment: Komentet (%{count})
       changesetxml: Grupi i ndryshimeve në XML
       osmchangexml: osmNdrsyhimi XML
-      feed:
-        title: 'Grupi i ndryshimeve: %{id}'
-        title_comment: Grupi i ndryshimeve %{id} - %{comment}
       join_discussion: Identifikohuni për t'iu bashkuar diskutimit
       discussion: Diskutim
     node:
@@ -278,6 +274,9 @@ sq:
       no_more_area: Nuk ka më ndryshime në këtë zonë.
       no_more_user: Nuk ka më ndryshime nga ky përdorues.
       load_more: Ngarko më shumë
+      feed:
+        title: 'Grupi i ndryshimeve: %{id}'
+        title_comment: Grupi i ndryshimeve %{id} - %{comment}
     timeout:
       sorry: Na vjen keq, lista e ndryshimeve që ju kërkuat zgjati shumë për t'u rikuperuar.
   changeset_comments:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 763b5628e..5ec3fd879 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -115,8 +115,6 @@ sr-Latn:
         needs_view: Da li korisnik mora da se prijavi da bi blokada bila uklonjena?
       user:
         new_email: (nikada se ne prikazuje javno)
-  printable_name:
-    with_version: '%{id}, ver. %{version}'
   editor:
     default: Podrazumevano (trenutno %{name})
     remote:
@@ -157,9 +155,6 @@ sr-Latn:
       title: Skup izmena
       changesetxml: XML skup izmena
       osmchangexml: osmChange XML
-      feed:
-        title: Skup izmena %{id}
-        title_comment: Skup izmena %{id} – %{comment}
     relation_member:
       entry_role_html: '%{type} %{name} kao %{role}'
       type:
@@ -220,6 +215,9 @@ sr-Latn:
       title_user: Skupovi izmena korisnika %{user}
       title_friend: Izmene vaših prijatelja
       title_nearby: Izmene od okolnih korisnika
+      feed:
+        title: Skup izmena %{id}
+        title_comment: Skup izmena %{id} – %{comment}
     timeout:
       sorry: Žao nam je, ali spisak izmena koji ste zahtevali je predugačak.
   dashboards:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index b4efc2241..be5b9e49a 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -225,8 +225,6 @@ sr:
         one: пре %{count} године
         few: пре %{count} године
         other: пре %{count} година
-  printable_name:
-    with_version: '%{id}, вер. %{version}'
   editor:
     default: Подразумевано (тренутно %{name})
     id:
@@ -313,6 +311,10 @@ sr:
   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: Скуп промена
     anonymous: анониман
@@ -331,14 +333,10 @@ sr:
       way_paginated: Линије (%{x}-%{y} од %{count})
       relation: Односи (%{count})
       relation_paginated: Односи (%{x}-%{y} од %{count})
-      comment: Коментари (%{count})
       hidden_comment_by_html: Сакривени коментар корисника %{user} %{time_ago}
       comment_by_html: '%{user} коментарисао(ла) пре %{time_ago}'
       changesetxml: XML скуп промена
       osmchangexml: osmChange XML
-      feed:
-        title: Скуп промена %{id}
-        title_comment: Скуп промена %{id} – %{comment}
       join_discussion: Пријавите се да бисте се придружили дискусији
       discussion: Дискусија
     node:
@@ -435,6 +433,9 @@ sr:
       no_more_area: Нема више скупова промена у овој области.
       no_more_user: Нема више скупова промена овог корисника.
       load_more: Учитај још
+      feed:
+        title: Скуп промена %{id}
+        title_comment: Скуп промена %{id} – %{comment}
     timeout:
       sorry: Преузимање захтеваних скупова промена је трајало предуго.
   changeset_comments:
@@ -494,6 +495,7 @@ sr:
     show:
       title: Дневник корисника/це %{user} | %{title}
       user_title: Дневник корисника/це %{user}
+      discussion: Дискусија
       leave_a_comment: Остави коментар
       login_to_leave_a_comment_html: '%{login_link} да бисте оставили коментар'
       login: Пријавите се
@@ -610,7 +612,7 @@ sr:
           car_sharing: Краткорочно изнајмљивање аутомобила
           car_wash: Ауто-перионица
           casino: Казино
-          charging_station: Акумулаторска станица
+          charging_station: Станица за пуњење ЕВ
           childcare: Агенција за чување деце
           cinema: Биоскоп
           clinic: Клиника
@@ -1137,6 +1139,7 @@ sr:
           hardware: Продавница алата
           health_food: Продавница здраве хране
           hifi: Продавница аудио-опреме
+          ice_cream: Сладоледџиница
           interior_decoration: Декорација ентеријера
           jewelry: Јувелирница
           kiosk: Трафика
@@ -1258,6 +1261,7 @@ sr:
         open: Отвори
         resolved: Решено
     show:
+      no_reports: Нема пријава
       resolve: Разреши
       ignore: Игнориши
       reopen: Поново отвори
@@ -1362,6 +1366,7 @@ sr:
       see_their_profile: Можете видети његов/њен профил на %{userurl}.
       befriend_them: Можете га/је додати и као пријатеља на %{befriendurl}.
     gpx_failure:
+      hi: Здарво %{to_user},
       failed_to_import: 'Увоз није успео. Грешка:'
       import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=sr-ec
       subject: '[OpenStreetMap] GPX увоз није успео'
@@ -1653,8 +1658,14 @@ sr:
       community_driven_osm_foundation: OSM фондација
       open_data_title: Отворени подаци
       legal_title: Правни аспекти
-      legal_1_1_terms_of_use: Услови коришћења
-      legal_1_1_privacy_policy: Политика приватности
+      legal_1_1_html: |-
+        Овим сајтом и многим другим сродним сервисима управља
+        %{openstreetmap_foundation_link} (OSMF)
+        а у име заједнице. Коришћење OSMF сервиса предмет је наших %{terms_of_use_link}, %{aup_link} и %{privacy_policy_link}.
+      legal_1_1_openstreetmap_foundation: OpenStreetMap фондација
+      legal_1_1_terms_of_use: услова коришћења
+      legal_1_1_aup: политике прихватљиве употребе
+      legal_1_1_privacy_policy: политике приватности
       partners_title: Партнери
     copyright:
       foreign:
@@ -1671,7 +1682,13 @@ sr:
         mapping_link: почни с уређивањем карте
       legal_babble:
         title_html: Ауторска права и лиценца
+        introduction_2_html: Можете да умножавате, делите, преносите и прилагођавате
+          наше податке, све док наводите OpenStreetMap и њене уреднике. Ако желите
+          да мењате и дограђујете наше податке, можете их делити само под истом лиценцом.
+          Овај %{legal_code_link} наводи Ваша права и обавезе.
         introduction_2_legal_code: правни текст
+        introduction_3_html: Наша документација је доступна под лиценцом %{creative_commons_link}
+          (CC BY-SA 2.0).
         introduction_3_creative_commons: Creative Commons Ауторство-Делити под истим
           условима 2.0
         credit_title_html: Како да наведете OpenStreetMap
@@ -1706,14 +1723,13 @@ sr:
         contributors_za_south_africa: Јужна Африка
         contributors_gb_united_kingdom: Уједињено Краљевство
         contributors_2_contributors_page: доприносиоци
-        contributors_footer_2_html: |2-
-            Укључивање података у Опенстритмап не подразумева да изворни
-            власник података прихвата Опенстритмап, обезбеђује било какву
-            гаранцију или прихвата одговорност.
+        contributors_footer_2_html: Укључивањем података у OpenStreetMap не значи
+          да изворни власник података подржава OpenStreetMap, обезбеђује било какву
+          гаранцију или прихвата одговорност.
         infringement_title_html: Кршење ауторских права
-        infringement_1_html: ОСМ сарадници се подсећају да никад не додају податке
-          из извора заштићених ауторским правима (нпр. Гугл карте или штампане карте)
-          без изричите дозволе власника ауторских права.
+        infringement_1_html: OSM сарадници се подсећају да никад не додају податке
+          из извора заштићених ауторским правима (нпр. Гугл мапе или штампане карте)
+          без изричите дозволе носиоца ауторских права.
         trademarks_title: Заштитни знаци
         trademarks_1_1_trademark_policy: Робне марке
     index:
@@ -1913,6 +1929,7 @@ sr:
         para_1: Ако хоћеш нешто ситно да поправиш а немаш времена да се пријавиш или
           да научиш да уређујеш, једноставно додај белешку.
     communities:
+      title: Заједнице
       local_chapters:
         title: Локални огранци
       other_groups:
@@ -2177,6 +2194,7 @@ sr:
       my profile: Мој профил
       my settings: Моје поставке
       my comments: Моји коментари
+      my_preferences: Моја подешавања
       my_dashboard: Tабла
       blocks on me: Мени забрањено
       blocks by me: Моје забране
@@ -2445,7 +2463,7 @@ sr:
         gps: Јавне GPS трасе
         overlays: Омогући преклапање за тражење грешака на карти
         title: Слојеви
-      openstreetmap_contributors: Творци OpenStreetMap
+      openstreetmap_contributors: OpenStreetMap сарадници
       make_a_donation: Донација
       website_and_api_terms: Веб-сајт и API услови
     site:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 6568473e7..2f18d5892 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -79,8 +79,8 @@ sv:
         create: Registrera
         update: Uppdatera
       redaction:
-        create: Skapa redaktering
-        update: Spara redaktering
+        create: Skapa maskering
+        update: Spara maskering
       trace:
         create: Uppladdning
         update: Spara ändringar
@@ -93,6 +93,9 @@ sv:
         invalid_email_address: verkar inte vara en giltig e-postadress.
         email_address_not_routable: kan inte ruttas
         display_name_is_user_n: kan inte vara user_n om inte n är ditt användar-id
+      models:
+        user_mute:
+          is_already_muted: är redan tystad
     models:
       acl: Tillgångskontrollista (ACL)
       changeset: Ändringsuppsättning
@@ -359,7 +362,7 @@ sv:
       make_edits_public_button: Gör alla mina redigeringar offentliga
     update:
       success_confirm_needed: Användarinformation uppdaterades. Kontrollera din e-post
-        för att bekräfta din e-postadress.
+        för att bekräfta din nya e-postadress.
       success: Användarinformation uppdaterades.
     destroy:
       success: Kontot har raderats.
@@ -396,14 +399,10 @@ sv:
       way_paginated: Sträckor (%{x}-%{y} av %{count})
       relation: Förbindelser (%{count})
       relation_paginated: Förbindelser (%{x}-%{y} av %{count})
-      comment: Kommentarer (%{count})
-      hidden_comment_by_html: Dolde kommentar från %{user} %{time_ago}
+      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
-      feed:
-        title: Ändringsuppsättning %{id}
-        title_comment: Ändringsset %{id} - %{comment}
       join_discussion: Logga in för att delta i diskussionen
       discussion: Diskussion
       still_open: Ändringsuppsättningen är fortfarande öppen - diskussionen kommer
@@ -479,7 +478,7 @@ sv:
       wikimedia_commons_link: Sidan %{page} finner du på Wikimedia Commons
       telephone_link: Ring %{phone_number}
       colour_preview: Förhandsgranskning av färgen %{colour_value}
-      email_link: E-posta %{email}
+      email_link: Mejla %{email}
     query:
       title: Undersök kartobjekt
       introduction: Klicka på kartan för att hitta funktioner i närheten.
@@ -491,6 +490,9 @@ sv:
   old_ways:
     not_found:
       sorry: 'Tyvärr, sträckan #%{id} version %{version} kunde inte hittas.'
+  old_relations:
+    not_found:
+      sorry: 'Tyvärr, sträckan #%{id} version %{version} kunde inte hittas.'
   changesets:
     changeset_paging_nav:
       showing_page: Sida %{page}
@@ -519,6 +521,9 @@ sv:
       no_more_area: Inga fler ändringsuppsättningar i det här området.
       no_more_user: Inga fler ändringsuppsättningar av den här användaren.
       load_more: Läs in fler
+      feed:
+        title: Ändringsuppsättning %{id}
+        title_comment: Ändringsset %{id} - %{comment}
     timeout:
       sorry: Kunde tyvärr inte lista begärda ändringsuppsättningar. Begäran tog för
         lång tid att hämta.
@@ -714,12 +719,12 @@ sv:
           pylon: Pylon
           station: Linbanestation
           t-bar: Ankarlift
-          "yes": Svävarbana
+          "yes": Luftväg
         aeroway:
           aerodrome: Flygfält
           airstrip: Landningsbana
-          apron: Flygplatsplatta
-          gate: Flygplatsgate
+          apron: Flygplatsramp
+          gate: Flygplatsport
           hangar: Hangar
           helipad: Helikopterplatta
           holding_position: Väntplats
@@ -814,9 +819,9 @@ sv:
           restaurant: Restaurang
           sanitary_dump_station: Sanitär tömningsstation
           school: Skola
-          shelter: Hydda
+          shelter: Skydd
           shower: Dusch
-          social_centre: Nöjescenter
+          social_centre: Socialcenter
           social_facility: Socialtjänst
           studio: Studio
           swimming_pool: Simbassäng
@@ -825,7 +830,7 @@ sv:
           theatre: Teater
           toilets: Toaletter
           townhall: RÃ¥dhus
-          training: Träningsanstalt
+          training: Träningsanläggning
           university: Universitet
           vehicle_inspection: Fordonsbesiktning
           vending_machine: Varuautomat
@@ -862,7 +867,7 @@ sv:
           chapel: Kapell
           church: Kyrkbyggnad
           civic: Offentlig byggnad
-          college: Universitetsbyggnad
+          college: Högskolebyggnad
           commercial: Kommersiell byggnad
           construction: Byggnad under uppförande
           detached: Fristående hus
@@ -871,7 +876,7 @@ sv:
           farm: GÃ¥rd
           farm_auxiliary: Utbyggnad på en gård
           garage: Garage
-          garages: Garage
+          garages: Garagelänga
           greenhouse: Växthus
           hangar: Hangar
           hospital: Sjukhusbyggnad
@@ -901,7 +906,7 @@ sv:
           warehouse: Varuhus
           "yes": Byggnad
         club:
-          scout: Scoutklubbhus
+          scout: Scoutkollo
           sport: Idrottsförening
           "yes": Klubb
         craft:
@@ -917,7 +922,7 @@ sv:
           gardener: Trädgårdsmästare
           glaziery: Glasmästeri
           handicraft: Konsthantverk
-          hvac: Värme- och ventilationsverk
+          hvac: VVS-hantverk
           metal_construction: Metallkonstruktör
           painter: MÃ¥lare
           photographer: Fotograf
@@ -1036,7 +1041,7 @@ sv:
           allotments: Kolonilotter
           aquaculture: Akvakultur
           basin: Bäcken
-          brownfield: Outvecklat område
+          brownfield: Övergiven industrimark
           cemetery: Begravningsplats
           commercial: Kommersiellt område
           conservation: Naturskyddsområde
@@ -1044,9 +1049,9 @@ sv:
           farmland: Jordbruksmark
           farmyard: GÃ¥rdsplan
           forest: Skog
-          garages: Garage
+          garages: Garagelänga
           grass: Gräs
-          greenfield: Outvecklat område
+          greenfield: Outvecklad jordbruksmark
           industrial: Industriområde
           landfill: Soptipp
           meadow: Äng
@@ -1119,12 +1124,12 @@ sv:
           communications_tower: Kommunikationstorn
           crane: Kran
           cross: Kors
-          dolphin: Dykdalb
+          dolphin: Förtöjningsstolpe
           dyke: Dike
           embankment: Fördämning
           flagpole: Flaggstång
-          gasometer: Gasometer
-          groyne: VÃ¥gbrytare
+          gasometer: Gasklocka
+          groyne: Hövd
           kiln: Kalkugn
           lighthouse: Fyr
           manhole: Gatubrunn
@@ -1145,13 +1150,13 @@ sv:
           surveillance: Övervakning
           telescope: Teleskop
           tower: Torn
-          utility_pole: Bruksstolpe
-          wastewater_plant: Avfallsfabrik
+          utility_pole: Elstolpe
+          wastewater_plant: Vattenreningsverk
           watermill: Vattenkvarn
           water_tap: Vattenkran
           water_tower: Vattentorn
           water_well: Brunn
-          water_works: Vattenreningsverk
+          water_works: Vattenverk
           windmill: Väderkvarn
           works: Fabrik
           "yes": Konstgjord
@@ -1166,7 +1171,7 @@ sv:
           "yes": Bergspass
         natural:
           atoll: Atoll
-          bare_rock: Klippa
+          bare_rock: Blottat berggrund
           bay: Bukt
           beach: Strand
           cape: Udde
@@ -1222,7 +1227,7 @@ sv:
           company: Företag
           diplomatic: Diplomatiskt kontor
           educational_institution: Utbildningsinstitution
-          employment_agency: Bemanningsföretag
+          employment_agency: Arbetsförmedling
           energy_supplier: Energileverantörskontor
           estate_agent: Fastighetsmäklare
           financial: Finanskontor
@@ -1233,7 +1238,7 @@ sv:
           logistics: Logistik kontor
           newspaper: Tidningskontor
           ngo: Icke-statligt kontor
-          notary: Notar
+          notary: Notarie
           religion: Religiöst kontor
           research: Forskningskontor
           tax_advisor: Skatterådgivare
@@ -1320,7 +1325,7 @@ sv:
           carpet: Mattaffär
           charity: Välgörenhetsbutik
           cheese: Ostbutik
-          chemist: Apotek
+          chemist: Apotek (Chemist)
           chocolate: Choklad
           clothes: Klädbutik
           coffee: Kaffebutik
@@ -1340,14 +1345,14 @@ sv:
           e-cigarette: E-cigarettbutik
           electronics: Elektronikbutik
           erotic: Sexbutik
-          estate_agent: Egendomsmäklare
+          estate_agent: Fastighetsmäklare
           fabric: Tygaffär
           farm: GÃ¥rdsbutik
           fashion: Modebutik
           fishing: Fiskebutik
           florist: Florist
           food: Mataffär
-          frame: Ramhandlare
+          frame: Rambutik
           funeral_directors: Begravningsentreprenör
           furniture: Möbler
           garden_centre: Trädgårdshandel
@@ -1383,10 +1388,10 @@ sv:
           newsagent: Tidningskiosk
           nutrition_supplements: Kosttillskottsbutik
           optician: Optiker
-          organic: Ekologiska livsmedelsaffär
+          organic: Ekologisk matbutik
           outdoor: Friluftsbutik
           paint: Färgbutik
-          pastry: Kafeteria
+          pastry: Konditori
           pawnbroker: Pantlånare
           perfumery: Parfymbutik
           pet: Djuraffär
@@ -1425,7 +1430,7 @@ sv:
           camp_pitch: Campingplats
           camp_site: Campingplats
           caravan_site: Husvagnsuppställningsplats
-          chalet: Stuga
+          chalet: Fjällstuga
           gallery: Galleri
           guest_house: Gäststuga
           hostel: Vandrarhem
@@ -1671,6 +1676,7 @@ sv:
       loaded:
         one: inläst med %{trace_points} av %{count} möjlig punkt.
         other: inläst med %{trace_points} av %{count} möjliga punkter.
+      all_your_traces_html: Alla dina framgångsrikt uppladdade GPX-spår finns på %{url}.
       subject: '[OpenStreetMap] Lyckades importera GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Välkommen till OpenStreetMap'
@@ -1742,14 +1748,14 @@ sv:
         subject_own: '[OpenStreetMap] %{commenter} har kommenterat på en av dina ändringsuppsättningar'
         subject_other: '[OpenStreetMap] %{commenter} har kommenterat på ett ändringsuppsättning
           du är intresserad av'
-        your_changeset: '%{commenter} har lämnat en kommentar på en av dina ändringsuppsättningar
-          skapt den %{time}'
+        your_changeset: '%{commenter} lämnade en kommentar vid %{time} på en av dina
+          ändringar'
         your_changeset_html: '%{commenter} lämnade en kommentar kl. %{time} på en
           av dina ändringsuppsättningar'
-        commented_changeset: '%{commenter} har lämnat en kommentar på en ändringsuppsättning
-          på en karta du bevakar, skapad av %{changeset_author} %{time}'
-        commented_changeset_html: '%{commenter} har lämnat en kommentar på en ändringsuppsättning
-          på en karta du bevakar, skapad av %{changeset_author} %{time}'
+        commented_changeset: '%{commenter} lämnade en kommentar vid %{time} på en
+          ändringsuppsättning du tittar på skapad av %{changeset_author}'
+        commented_changeset_html: '%{commenter} lämnade en kommentar vid %{time} på
+          en ändringsuppsättning du tittar på skapad av %{changeset_author}'
         partial_changeset_with_comment: med kommentar '%{changeset_comment}'
         partial_changeset_with_comment_html: med kommentar '%{changeset_comment}'
         partial_changeset_without_comment: utan kommentar
@@ -1834,6 +1840,11 @@ sv:
       no_sent_messages_html: Du har inte skickat några meddelanden ännu. Varför inte
         ta kontakt med någon av de %{people_mapping_nearby_link}?
       people_mapping_nearby: folk som kartlägger i närheten
+    muted:
+      title: Tystade meddelanden
+      messages:
+        one: '%{count} tystat meddelande'
+        other: '%{count} nya meddelanden'
     reply:
       wrong_user: Du är inloggad som '%{user}', men meddelandet du har bett om att
         besvara skickades inte till den användaren. Logga in med korrekt användare
@@ -1852,9 +1863,13 @@ sv:
     heading:
       my_inbox: Min inkorg
       my_outbox: Min utkorg
+      muted_messages: Tystade meddelanden
     mark:
       as_read: Meddelandet markerat som läst
       as_unread: Meddelandet markerat som oläst
+    unmute:
+      notice: Meddelandet har flyttats till inkorgen
+      error: Meddelandet kunde inte flyttas till inkorgen.
     destroy:
       destroyed: Meddelande raderat
   passwords:
@@ -1866,8 +1881,9 @@ sv:
       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: Synd att du förlorade det, men ett nytt är på väg via e-post.
-      notice email cannot find: Kunde inte hitta den e-postadressen.
+      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}
@@ -1875,6 +1891,7 @@ sv:
       flash token bad: Hittade inte den nyckeln, kontrollera webbadressen.
     update:
       flash changed: Ditt lösenord har ändrats.
+      flash token bad: Hittade inte den nyckeln, kontrollera webbadressen kanske?
   preferences:
     show:
       title: Mina alternativ
@@ -2088,12 +2105,16 @@ sv:
           alt: Exempel på hur en webbsida kan ange OpenStreetMap som källa
           title: Exempel på attribuering.
         more_title_html: Mer information
+        more_1_1_html: Läs mer om hur du använder vår data och hur du krediterar oss
+          på %{osmf_licence_page_link}.
         more_1_1_osmf_licence_page: OSMF-licenssida
         more_2_1_html: |-
           Även om OpenStreetMap är öppen data kan vi inte tillhandahålla ett
           gratis kart-API för tredje part.
           Se våra %{api_usage_policy_link}, %{tile_usage_policy_link} och %{nominatim_usage_policy_link}.
         more_2_1_api_usage_policy: API-användningspolicy
+        more_2_1_tile_usage_policy: Användningspolicy för Brickor
+        more_2_1_nominatim_usage_policy: Nominativ användningspolicy
         contributors_title_html: VÃ¥ra bidragsgivare
         contributors_intro_html: |-
           Våra bidragsgivare är tusentals individer. Vi inkluderar också
@@ -2257,8 +2278,9 @@ sv:
         title: Guide för nybörjare
         description: Guide för nybörjare som underhålls av gemenskapen.
       community:
-        title: Gemenskapsforum
-        description: En delad plats för konversationer om OpenStreetMap.
+        title: Hjälp- och gemenskapsforum
+        description: En gemensam plats för att söka hjälp och föra konversationer
+          om OpenStreetMap.
       mailing_lists:
         title: E-postlistor
         description: Ställ en fråga eller diskutera intressanta saker på ett brett
@@ -2329,12 +2351,14 @@ sv:
           train: TÃ¥g
           subway: Tunnelbana
           ferry: Färja
+          light_rail: Snabbspårväg
           tram: Spårvagn
+          trolleybus: Trådbuss
           bus: Buss
           cable_car: Linbana
-          chair_lift: stollift
+          chair_lift: Stollift
           runway: Landningsbana
-          taxiway: taxibana
+          taxiway: Taxibana
           apron: Flygplatsplatta
           admin: Administrativ gräns
           capital: Huvudstad
@@ -2357,8 +2381,10 @@ sv:
           industrial: Industriellt område
           commercial: Kommersiellt område
           heathland: Hed
+          scrubland: Buskskog
           lake: Sjö
           reservoir: vattenmagasin
+          intermittent_water: Intermittent vattenkropp
           glacier: Glaciär
           reef: Rev
           wetland: VÃ¥tmark
@@ -2439,9 +2465,9 @@ sv:
         para_1: Om du bara vill ha ett litet problem fixat och inte har tid att registrera
           dig så är det lätt att lämna en kartanteckning.
         para_2_html: |-
-          Gå till %{map_link} och tryck på anteckningsikonen: %{note_icon}.
-          En markör, som du kan dra omkring, kommer att läggas till på kartan.
-          Lägg till ett meddelande och spara. Någon annan kommer att undersöka frågan.
+          Gå bara till %{map_link} och klicka på anteckningsikonen: %{note_icon}.
+          Detta lägger till en markör på kartan som du kan flytta genom att dra.
+          Lägg till ditt meddelande, klicka sedan på spara och annat kartläggare kommer att undersöka.
         the_map: kartan
     communities:
       title: Gemenskaper
@@ -2588,6 +2614,7 @@ sv:
       oauth1_settings: OAuth 1-inställningar
       oauth2_applications: OAuth 2-applikationer
       oauth2_authorizations: OAuth 2-auktoriseringar
+      muted_users: Tystade användare
   oauth:
     authorize:
       title: Auktorisera tillgång till ditt konto
@@ -2626,11 +2653,13 @@ sv:
       read_gpx: Läs privata GPS-spår
       write_gpx: Ladda upp GPS-spår
       write_notes: Ändra anteckningar
+      write_redactions: Omarbeta kartdata
       read_email: Läs användarens e-postadress
       skip_authorization: Godkänn applikation automatiskt
   oauth_clients:
     new:
       title: Registrera en ny applikation
+      disabled: Registrering av OAuth 1-applikationer har inaktiverats
     edit:
       title: Redigera ditt tillägg
     show:
@@ -2714,6 +2743,7 @@ sv:
       title: Mina auktoriserade applikationer
       application: Applikation
       permissions: Behörigheter
+      last_authorized: Sista auktoriserade
       no_applications_html: Du har ännu inte auktoriserad några %{oauth2}-applikationer.
     application:
       revoke: Återkalla åtkomst
@@ -2784,13 +2814,13 @@ sv:
     no_such_user:
       title: Finns ingen sådan användare
       heading: Användaren %{user} finns inte
-      body: Det finns ingen användare med namnet %{user}. Kontrollera stavningen,
-        eller så kanske länken är trasig.
+      body: Tyvärr, det finns ingen användare med namnet %{user}. Kontrollera din
+        stavning, eller så kanske länken du klickade på är fel.
       deleted: raderad
     show:
       my diary: Min dagbok
       my edits: Mina redigeringar
-      my traces: Mina GPS-spår
+      my traces: Mina spår
       my notes: Mina kartanteckningar
       my messages: Mina meddelanden
       my profile: Min profil
@@ -2800,11 +2830,13 @@ sv:
       my_dashboard: Min kontrollpanel
       blocks on me: Blockeringar av mig
       blocks by me: Blockeringar lagda av mig
+      create_mute: Tysta denna användare
+      destroy_mute: Sluta tysta användaren
       edit_profile: Redigera profil
       send message: Skicka meddelande
       diary: Dagbok
       edits: Redigeringar
-      traces: GPS-spår
+      traces: Spår
       notes: Kartanteckningar
       remove as friend: Ta bort vän
       add as friend: Lägg till vän
@@ -2831,6 +2863,7 @@ sv:
           importer: Återkalla importåtkomst
       block_history: Aktiva blockeringar
       moderator_history: Utdelade blockeringar
+      revoke_all_blocks: Återkalla alla blockeringar
       comments: Kommentarer
       create_block: Blockera denna användare
       activate_user: Aktivera denna användare
@@ -2854,7 +2887,7 @@ sv:
       summary_no_ip_html: '%{name} skapad den %{date}'
       confirm: Bekräfta valda användare
       hide: Dölj valda användare
-      empty: Inga användare hittades
+      empty: Inga motsvarande användare hittades
     suspended:
       title: Kontot avstängt
       heading: Kontot avstängt
@@ -2868,7 +2901,7 @@ sv:
       invalid_credentials: Ogiltiga autentiseringsuppgifter
       no_authorization_code: Ingen behörighetskod
       unknown_signature_algorithm: Okänd signaturalgoritm
-      invalid_scope: Ogiltiga omfattning
+      invalid_scope: Ogiltig omfattning
       unknown_error: Autentisering misslyckades
     auth_association:
       heading: Ditt ID är inte associerat med ett OpenStreetMap-konto ännu.
@@ -2896,9 +2929,9 @@ sv:
         både användare och roll är korrekta.
     revoke:
       title: Bekräfta återkallning av roll
-      heading: Bekräfta återkallning av roll
-      are_you_sure: Är du säker på att du vill avlägsna rollen "%{role}" från användaren
-        "%{name}"?
+      heading: Bekräfta återkallande av roll
+      are_you_sure: Är du säker på att du vill återkalla rollen `%{role}' från användaren
+        `%{name}'?
       confirm: Bekräfta
       fail: Kunde inte återkalla rollen "%{role}" från användaren "%{name}". Kontrollera
         att både användaren och rollen är korrekta.
@@ -2913,13 +2946,12 @@ sv:
     new:
       title: Skapa blockering på %{name}
       heading_html: Skapa blockering på %{name}
-      period: Hur lång tid, från och med nu, användaren ska vara blockerad från API.
+      period: Hur lång tid, från och med nu, användaren ska vara blockerad från API:t.
       back: Visa alla blockeringar
     edit:
       title: Redigera blockering på %{name}
       heading_html: Redigera blockering på %{name}
-      period: Hur lång tid, från och med nu, som användaren ska vara blockerad från
-        API.
+      period: Hur lång tid, från och med nu, användaren ska vara blockerad från API:t.
       show: Visa denna blockering
       back: Visa alla blockeringar
     filter:
@@ -2943,6 +2975,16 @@ sv:
       confirm: Är du säker på att du vill återkalla denna blockering?
       revoke: Upphäv!
       flash: Denna blockering har upphävts.
+    revoke_all:
+      title: Upphäv alla blockeringar av %{block_on}
+      heading_html: Upphäver alla blockeringar av %{block_on}
+      empty: '%{name} har inga aktiva blockeringar.'
+      confirm: Är du säker på att du vill upphäva %{active_blocks}?
+      active_blocks:
+        one: '%{count} aktiv blockering'
+        other: '%{count} aktiva blockeringar'
+      revoke: Upphäv!
+      flash: Alla aktiva blockningar har upphävts.
     helper:
       time_future_html: Slutar om %{time}.
       until_login: Aktiv till dess användaren loggar in.
@@ -3003,11 +3045,28 @@ sv:
       previous: « Föregående
   user_mutes:
     index:
+      title: Tystade användare
+      my_muted_users: Mina tystade användare
+      you_have_muted_n_users:
+        one: Du har tystat %{count} användare
+        other: Du har tystat {count} användare
+      user_mute_explainer: Meddelanden från tystade användare flyttas till en separat
+        inkorg och du kommer inte att få e-postaviseringar.
+      user_mute_admins_and_moderators: Du kan tysta administratörer och moderatorer
+        men deras meddelanden kommer inte att stängas av.
       table:
         thead:
+          muted_user: Tystad användare
           actions: Åtgärder
         tbody:
+          unmute: Ljud på
           send_message: Skicka meddelande
+    create:
+      notice: Du tystade %{name}.
+      error: '%{name} kunde inte tystas. %{full_message}.'
+    destroy:
+      notice: Du av-tystade %{name}.
+      error: Det gick inte att av-tysta användaren. Var god försök igen.
   notes:
     index:
       title: Anteckningar skapade eller kommenterade av %{user}
@@ -3115,8 +3174,12 @@ sv:
       openstreetmap_contributors: OpenStreetMap-bidragsgivare
       make_a_donation: Gör en donation
       website_and_api_terms: Webbplats och API-villkor
+      cyclosm_credit: Brickstil av %{cyclosm_link} värd av %{osm_france_link}
       osm_france: OpenStreetMap Frankrike
+      thunderforest_credit: Brickor satt till förfogande av %{thunderforest_link}
       andy_allan: Andy Allan
+      tracestrack_credit: Brickor satt till förfogande av %{tracestrack_link}
+      hotosm_credit: Brickstil av %{hotosm_link} värd av %{osm_france_link}
       hotosm_name: Humanitärt OpenStreetMap-team
     site:
       edit_tooltip: Redigera kartan
@@ -3127,6 +3190,7 @@ sv:
       map_data_zoom_in_tooltip: Zooma in för att se kartdata
       queryfeature_tooltip: Undersök kartobjekt
       queryfeature_disabled_tooltip: Zooma in för att undersöka kartobjekt
+      embed_html_disabled: HTML-inbäddning är inte tillgänglig för det här kartlagret
     changesets:
       show:
         comment: Kommentera
@@ -3168,14 +3232,14 @@ sv:
         offramp_right_with_name: Ta rampen till höger in på %{name}
         offramp_right_with_directions: Ta rampen åt höger mot %{directions}
         offramp_right_with_name_directions: Ta rampen åt höger till %{name}, mot %{directions}
-        onramp_right_without_exit: Sväng vänster på rampen till %{name}
+        onramp_right_without_exit: Sväng höger på rampen in på %{name}
         onramp_right_with_directions: Sväng höger till rampen mot %{directions}
         onramp_right_with_name_directions: Sväng höger på rampen till %{name}, mot
           %{directions}
         onramp_right_without_directions: Sväng höger till rampen
         onramp_right: Sväng höger upp på rampen
         endofroad_right_without_exit: Vid slutet av vägen, sväng höger in på %{name}
-        merge_right_without_exit: Sväng rakt in på %{name}
+        merge_right_without_exit: Gå smman rakt in på %{name}
         fork_right_without_exit: Vid vägskälet sväng höger in på %{name}
         turn_right_without_exit: Högersväng in på %{name}
         sharp_right_without_exit: Skarp högersväng in på %{name}
@@ -3183,9 +3247,9 @@ sv:
         sharp_left_without_exit: Skarp vänstersväng in på %{name}
         turn_left_without_exit: Vänstersväng in på %{name}
         offramp_left: Ta rampen till vänster
-        offramp_left_with_exit: Ta utfarten %{exit} åt vänster
-        offramp_left_with_exit_name: Ta utfarten %{exit} åt vänster till %{name}
-        offramp_left_with_exit_directions: Ta utfarten %{exit} åt vänster mot %{directions}
+        offramp_left_with_exit: Ta avfart %{exit} till vänster
+        offramp_left_with_exit_name: Ta avfart %{exit} till vänster in på %{name}
+        offramp_left_with_exit_directions: Ta avfart %{exit} till vänster mot %{directions}
         offramp_left_with_exit_name_directions: Ta utfarten %{exit} åt vänster till
           %{name}, mot %{directions}
         offramp_left_with_name: Ta rampen till vänster in på %{name}
@@ -3196,10 +3260,10 @@ sv:
         onramp_left_with_directions: Sväng vänster till rampen mot %{directions}
         onramp_left_with_name_directions: Sväng vänster på rampen till %{name}, mot
           %{directions}
-        onramp_left_without_directions: Sväng vänster till rampen
+        onramp_left_without_directions: Sväng vänster in på rampen
         onramp_left: Sväng vänster till rampen
         endofroad_left_without_exit: Vid slutet av vägen, sväng vänster in på %{name}
-        merge_left_without_exit: Sväng vänster in på %{name}
+        merge_left_without_exit: Gå samman vänster till %{name}
         fork_left_without_exit: Vid vägskälet sväng vänster in på %{name}
         slight_left_without_exit: Svag vänstersväng in på %{name}
         via_point_without_exit: (via punkt)
@@ -3214,7 +3278,7 @@ sv:
         roundabout_with_exit: Vid rondellen, ta avfart %{exit} mot %{name}
         roundabout_with_exit_ordinal: Vid rondellen, ta avfart %{exit} mot %{name}
         exit_roundabout: Lämna rondellen mot %{name}
-        unnamed: namnlös
+        unnamed: icke namngiven väg
         courtesy: Vägbeskrivning med tillstånd av %{link}
         exit_counts:
           first: 1:a
@@ -3247,29 +3311,29 @@ sv:
       heading: Redigera redaktering
       title: Redigera redaktering
     index:
-      empty: Inga redakteringar att visa.
-      heading: Lista över redakteringar
-      title: Lista över redakteringar
+      empty: Inga maskeringar att visa.
+      heading: Lista över maskeringar
+      title: Lista över maskeringar
     new:
-      heading: Ange information för ny redaktering
-      title: Skapa ny redaktering
+      heading: Ange information för ny maskering
+      title: Skapa ny maskering
     show:
       description: 'Beskrivning:'
-      heading: Visa redaktering "%{title}"
-      title: Visa redaktering
+      heading: Visa maskering "%{title}"
+      title: Visa maskering
       user: 'Skapad av:'
-      edit: Redigera denna redaktering
-      destroy: Ta bort denna redaktering
+      edit: Redigera denna maskeiring
+      destroy: Ta bort denna maskering
       confirm: Är du säker?
     create:
-      flash: Redaktering skapad.
+      flash: Maskering skapad.
     update:
       flash: Ändringarna sparade.
     destroy:
-      not_empty: Redakteringen är inte tom. Avredaktera alla versioner som tillhör
-        denna redaktering innan den förstörs.
-      flash: Redaktering förstörd.
-      error: Det uppstod ett fel när redakteringen skulle förstöras.
+      not_empty: Maskeringen är inte tom. Avmaskera alla versioner som tillhör denna
+        maskering innan den förstörs.
+      flash: Maskeringen förstörd.
+      error: Det uppstod ett fel när maskeringen skulle förstöras.
   validations:
     leading_whitespace: har ett inledande mellanslag
     trailing_whitespace: har ett avslutande mellanslag
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 7a9cc619d..e34397786 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -191,9 +191,6 @@ ta:
       belongs_to: ஆசிரியர்
       changesetxml: மாற்றத்தொடுப்பு XML
       osmchangexml: osmChange XML
-      feed:
-        title: 'மாற்றங்கள்: %{id}'
-        title_comment: மாற்றங்கள் %{id}-%{comment}
       discussion: உரையாடல்
     relation:
       members: உறுப்பினர்கள்
@@ -251,6 +248,9 @@ ta:
     index:
       title: மாற்றங்கள்
       load_more: மேலும் படிக்க
+      feed:
+        title: 'மாற்றங்கள்: %{id}'
+        title_comment: மாற்றங்கள் %{id}-%{comment}
   dashboards:
     contact:
       km away: '%{count}கிமீ தாண்டி'
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 986ecc828..e440515d6 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -331,12 +331,8 @@ te:
       way_paginated: దారులు (%{count} లో %{x}-%{y})
       relation: సంబంధాలు (%{count})
       relation_paginated: '%{count} లో %{x}-%{y} యొక్క సంబంధాలు'
-      comment: వ్యాఖ్యలు (%{count})
       changesetxml: మార్పులసమితి XML
       osmchangexml: osmChange XML
-      feed:
-        title: మార్పులసమితి %{id}
-        title_comment: మార్పులసమితి %{id} - %{comment}
       join_discussion: చర్చలో పాల్గొనేందుకు లాగినవండి
       discussion: చర్చ
       still_open: మార్పులసమితి ఇంకా తెరిచే ఉంది - దాన్ని మూసివేయగానే చర్చ తెరుచుకుంటుంది.
@@ -439,6 +435,9 @@ te:
       no_more_area: ఈ ప్రాంతంలో మార్పులసమితులు మరి లేవు.
       no_more_user: ఈ వాడుకరి మార్పులసమితులు ఇక లేవు.
       load_more: మరిన్ని చూపించు
+      feed:
+        title: మార్పులసమితి %{id}
+        title_comment: మార్పులసమితి %{id} - %{comment}
     timeout:
       sorry: సారీ, మీరడిగిన మార్పులసమితుల జాబితాను తేవడంలో చాలా సమయం పట్టింది.
   changeset_comments:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 0fb6e5832..e2e19e3a6 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -304,14 +304,10 @@ th:
       way_paginated: เส้นทางที่ (%{x}-%{y} จาก %{count})
       relation: ความสัมพันธ์ (%{count})
       relation_paginated: ความสัมพันธ์ (%{x}-%{y} จาก %{count})
-      comment: ความคิดเห็น (%{count})
       hidden_comment_by_html: ความคิดเห็นที่ซ่อนอยู่จาก %{user} %{time_ago}
       comment_by_html: ความคิดเห็นจาก %{user} %{time_ago}
       changesetxml: ชุดการเปลี่ยนแปลง XML
       osmchangexml: เอ็กซ์เอ็มแอลของ osmChange
-      feed:
-        title: ชุดการเปลี่ยนแปลง %{id}
-        title_comment: ชุดการเปลี่ยนแปลง %{id} - %{comment}
       join_discussion: เข้าสู่ระบบเพื่อเข้าร่วมการอภิปราย
       discussion: การอภิปราย
       still_open: ชุดการเปลี่ยนแปลงกำลังเปิดอยู่ การอภิปรายจะเริ่มได้หลังจากปิดชุดการเปลี่ยนแปลงแล้ว
@@ -413,6 +409,9 @@ th:
       no_more_area: ไม่พบชุดการเปลี่ยนแปลงอีกในพื้นที่นี้
       no_more_user: ไม่พบชุดการเปลี่ยนแปลงอีกโดยผู้ใช้คนนี้
       load_more: แสดงเพิ่มขึ้น
+      feed:
+        title: ชุดการเปลี่ยนแปลง %{id}
+        title_comment: ชุดการเปลี่ยนแปลง %{id} - %{comment}
     timeout:
       sorry: ขออภัย รายการชุดการเปลี่ยนแปลงที่ท่านร้องขอใช้เวลานานเกินสมควรในการสืบค้น
   changeset_comments:
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 492d7eebf..c1d1f810d 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -294,12 +294,8 @@ tl:
       way_paginated: Mga daan (%{x}-%{y} ng %{count})
       relation: Mga kaugnayan (%{count})
       relation_paginated: Mga kaugnayan (%{x}-%{y} ng %{count})
-      comment: Mga puna (%{count})
       changesetxml: XML ng pangkat ng pagbabago
       osmchangexml: XML ng osmChange
-      feed:
-        title: '%{id} ng pangkat ng pagbabago'
-        title_comment: '%{id} ng angkat ng pagbabago - %{comment}'
       join_discussion: Lumagda para sumali sa talakayan
       discussion: Talakayan
       still_open: Bukas pa rin ang pangkat ng pagbabago - magbubukas ang talakayan
@@ -404,6 +400,9 @@ tl:
       no_more_area: Wala nang mga pangkat ng pagbabago sa lugar na ito.
       no_more_user: Wala nang mga pangkat ng pagbabago mula sa tagagamit na ito.
       load_more: Magkarga pa
+      feed:
+        title: '%{id} ng pangkat ng pagbabago'
+        title_comment: '%{id} ng angkat ng pagbabago - %{comment}'
     timeout:
       sorry: Paumanhin, ang talaan ng mga pangkat ng pagbabagong hiniling mo ay naging
         napakatagal bago nakuhang muli.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index ac2146595..31b5d7853 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -9,6 +9,7 @@
 # Author: Archaeodontosaurus
 # Author: Asma
 # Author: BaRaN6161 TURK
+# Author: Bulut
 # Author: Captantrips
 # Author: Cobija
 # Author: Emperyan
@@ -106,7 +107,7 @@ tr:
       issue: Sorun
       language: Dil
       message: Mesaj
-      node: Nokta
+      node: Düğüm
       node_tag: Düğüm Etiketi
       old_node: Eski Nokta
       old_node_tag: Eski Nokta Etiketi
@@ -253,6 +254,9 @@ tr:
       x_years:
         one: '%{count} yıl önce'
         other: '%{count} yıl önce'
+  printable_name:
+    version: v%{version}
+    current_and_old_links_html: '%{current_link}, %{old_link}'
   editor:
     default: Varsayılan (şu anda %{name})
     id:
@@ -398,14 +402,10 @@ tr:
       way_paginated: Yol (%{x}-%{y} - toplam %{count})
       relation: İlişkiler (%{count})
       relation_paginated: İlişkiler (%{x}-%{y} - toplam %{count})
-      comment: Yorumlar (%{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
-      feed:
-        title: Değişiklik kaydı %{id}
-        title_comment: Değişiklik takımı %{id} - %{comment}
       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
@@ -524,6 +524,9 @@ tr:
       no_more_area: Bu alanda daha fazla değişiklik kaydı bulunmuyor.
       no_more_user: Bu kullanıcı tarafından daha fazla değişiklik kaydı yok.
       load_more: Daha fazla yükle
+      feed:
+        title: Değişiklik kaydı %{id}
+        title_comment: Değişiklik takımı %{id} - %{comment}
     timeout:
       sorry: Üzgünüz, değişiklik kayıtlarının listelenmesi fazla sürdü.
   changeset_comments:
@@ -587,6 +590,7 @@ tr:
     show:
       title: '%{user} Kullanıcısının Günlüğü | %{title}'
       user_title: '%{user} Kullanıcısının Günlüğü'
+      discussion: Tartışma
       leave_a_comment: Yorum yap
       login_to_leave_a_comment_html: Yorum yazmak için %{login_link}
       login: Oturum Aç
@@ -642,6 +646,12 @@ tr:
       comment: Yorum
       newer_comments: Daha Yeni Yorumlar
       older_comments: Daha Eski Yorumlar
+    subscribe:
+      heading: Aşağıdaki günlük girdisi tartışmasına abone olmak ister misiniz?
+      button: Tartışmaya abone ol
+    unsubscribe:
+      heading: Aşağıdaki günlük girdisi tartışmasının aboneliği iptal edilsin mi?
+      button: Tartışma aboneliğinden çık
   doorkeeper:
     errors:
       messages:
@@ -697,7 +707,7 @@ tr:
     make_friend:
       heading: '%{user}, arkadaş olarak eklensin mi?'
       button: Arkadaş olarak ekle
-      success: '%{name} arkadaş listesine eklendi!'
+      success: '%{name}, arkadaş listesine eklendi!'
       failed: Üzgünüz, %{name} arkadaş olarak eklenemedi.
       already_a_friend: '%{name} ile zaten arkadaşsın.'
       limit_exceeded: Son zamanlarda çok sayıda kullanıcıyla arkadaş oldunuz. Lütfen
@@ -1650,6 +1660,9 @@ tr:
         yorum yapabilir veya yazara %{replyurl} adresinden mesaj gönderebilirsiniz.
       footer_html: Ayrıca yorumu %{readurl} adresinden okuyabilir ve %{commenturl}
         adresinden yorum yapabilir veya yazara %{replyurl} adresinden mesaj gönderebilirsiniz.
+      footer_unsubscribe: '%{unsubscribeurl} sayfasında tartışma aboneliğinden çıkabilirsiniz.'
+      footer_unsubscribe_html: '%{unsubscribeurl} sayfasında tartışma aboneliğinden
+        çıkabilirsiniz.'
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'
       hi: Merhaba %{to_user},
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 5d49c1487..074631aa5 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -347,14 +347,10 @@ tt:
       way_paginated: Сызыклар (%{count} сызыктан %{x}-%{y})
       relation: Мөнәсәбәтләр (%{count})
       relation_paginated: Мөнәсәбәтләр (%{count} мөнәсәбәттән %{x}-%{y})
-      comment: Шәрехләр (%{count})
       hidden_comment_by_html: '%{user} исемле кулланучыдан яшерен шәрех %{time_ago}'
       comment_by_html: '%{user} исемле кулланучыдан шәрех %{time_ago}'
       changesetxml: Үзгәртүләр өеменең XMLы
       osmchangexml: osmChange XML
-      feed:
-        title: '%{id} үзгәртүләр өеме'
-        title_comment: '%{id} үзгәртүләр өеме  -  %{comment}'
       join_discussion: Бәхәстә катнашу өчен хисапъязмагызга керегез
       discussion: Фикер алышу
       still_open: Үзгәртүләр өеме әлегә ачык. Ул ябылгач бәхәскә шунда ук керергә
@@ -428,6 +424,9 @@ tt:
     index:
       title: Үзгәрешләр пакетлары
       load_more: Күбрәк төяү
+      feed:
+        title: '%{id} үзгәртүләр өеме'
+        title_comment: '%{id} үзгәртүләр өеме  -  %{comment}'
   dashboards:
     contact:
       latest_edit_html: 'Соңгы төзәтмә (%{ago}):'
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 68b8fb293..4fe97ebea 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -428,14 +428,10 @@ uk:
       way_paginated: Лінії (%{x}-%{y} із %{count})
       relation: Зв’язки (%{count})
       relation_paginated: Зв’язки (%{x}-%{y} із %{count})
-      comment: Коментарі (%{count})
       hidden_comment_by_html: Прихований коментар від %{user} %{time_ago}
       comment_by_html: Коментар від %{user} %{time_ago}
       changesetxml: XML опис набору змін
       osmchangexml: osmChange XML
-      feed:
-        title: Набір змін %{id}
-        title_comment: Набір змін %{id} — %{comment}
       join_discussion: Увійдіть в систему, щоб приєднатися до обговорення
       discussion: Обговорення
       still_open: Набір змін досі відкритий — обговорення буде відкрито, як тільки
@@ -551,6 +547,9 @@ uk:
       no_more_area: Наборів змін на цій ділянці більше немає.
       no_more_user: Наборів змін від цього мапера більше немає.
       load_more: Завантажити ще
+      feed:
+        title: Набір змін %{id}
+        title_comment: Набір змін %{id} — %{comment}
     timeout:
       sorry: На жаль, перелік наборів змін, який ви запросили, потребує забагато часу
         для завантаження.
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index d5f7d70be..82df5b4fe 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -342,14 +342,10 @@ vi:
       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})
-      comment: Bình luậ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
-      feed:
-        title: Bộ thay đổi %{id}
-        title_comment: Bộ thay đổi %{id} – %{comment}
       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
@@ -457,6 +453,9 @@ vi:
       no_more_area: Không có thêm bộ thay đổi trong khu vực này.
       no_more_user: Không có thêm bộ thay đổi bởi người dùng này.
       load_more: Tải thêm
+      feed:
+        title: Bộ thay đổi %{id}
+        title_comment: Bộ thay đổi %{id} – %{comment}
     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:
@@ -532,7 +531,6 @@ vi:
       comment_link: Nhận xét về mục này
       reply_link: Nhắn tin cho tác giả
       comment_count:
-        zero: Chưa có bình luận
         other: '%{count} bình luận'
       edit_link: Sửa đổi mục này
       hide_link: Ẩn mục này
@@ -598,6 +596,10 @@ vi:
       success: '%{name} đã được xóa khỏi danh sách bạn của bạn.'
       not_a_friend: '%{name} đã không phải người bạn.'
   geocoder:
+    search:
+      title:
+        results_from_html: Kết quả từ %{results_link}
+        latlon: Nội bộ
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -1318,8 +1320,6 @@ vi:
     show:
       title: 'Vấn đề %{status} #%{issue_id}'
       reports:
-        zero: Không có báo cáo
-        one: 1 báo cáo
         other: '%{count} báo cáo'
       report_created_at_html: Báo cáo lần đầu tiên vào %{datetime}
       last_resolved_at_html: Giải quyết lần cuối cùng vào %{datetime}
@@ -1611,6 +1611,7 @@ vi:
       to: Tới
       subject: Tiêu đề
       date: Ngày
+      actions: Tác vụ
     message_summary:
       unread_button: Đánh dấu là chưa đọc
       read_button: Đánh dấu là đã đọc
@@ -1630,6 +1631,7 @@ vi:
       body: Rất tiếc, không có thư nào với ID đó.
     outbox:
       title: Hộp thư đã gửi
+      actions: Tác vụ
       messages: Bạn có %{count} thư đã gửi
       no_sent_messages_html: Bạn chưa gửi thư cho người nào. Hãy thử liên lạc với
         %{people_mapping_nearby_link}?
@@ -1661,7 +1663,7 @@ vi:
     new:
       title: Quên mất mật khẩu
       heading: Quên mất Mật khẩu?
-      email address: 'Địa chỉ Thư điện tử:'
+      email address: Địa chỉ Thư điện tử
       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.
@@ -1711,6 +1713,9 @@ vi:
       no home location: Bạn chưa định vị trí nhà.
       update home location on click: Cập nhật vị trí nhà khi tôi nhấn chuột vào bản
         đồ?
+      show: Hiện
+      delete: Xóa
+      undelete: Phục hồi
     update:
       success: Đã cập nhật hồ sơ.
       failure: Không thể cập nhật hồ sơ.
@@ -1718,8 +1723,8 @@ vi:
     new:
       title: Đăng nhập
       heading: Đăng nhập
-      email or username: 'Địa chỉ Thư điện tử hoặc Tên người dùng:'
-      password: 'Mật khẩu:'
+      email or username: Địa chỉ Thư điện tử hoặc Tên người dùng
+      password: Mật khẩu
       remember: Nhớ tôi
       lost password link: Quên mất Mật khẩu?
       login_button: Đăng nhập
@@ -1764,6 +1769,7 @@ vi:
       support: nhóm hỗ trợ
   shared:
     markdown_help:
+      heading_html: Được phân tích dưới dạng %{kramdown_link}
       headings: Đề mục
       heading: Đề mục
       subheading: Đề mục con
@@ -1776,6 +1782,7 @@ vi:
       image: Hình ảnh
       alt: Văn bản thay thế
       url: URL
+      codeblock: Đoạn mã
     richtext_field:
       edit: Sửa đổi
       preview: Xem trước
@@ -1810,8 +1817,19 @@ vi:
       open_data_open_data: dữ liệu mở
       open_data_copyright_license: trang Bản quyền và Giấy phép
       legal_title: Pháp luật
+      legal_1_1_html: |-
+        Trang này và nhiều dịch vụ có liên quan do
+        %{openstreetmap_foundation_link} (OSMF) hoạt động thay mặt cho cộng đồng. Việc sử dụng tất cả các dịch vụ do OSMF hoạt động phải tuân theo %{terms_of_use_link}, %{aup_link}, và %{privacy_policy_link} của chúng tôi.
+      legal_1_1_openstreetmap_foundation: Quỹ OpenStreetMap
       legal_1_1_terms_of_use: Điều khoản Sử dụng
+      legal_1_1_aup: Quy định Sử dụng Đàng hoàng
+      legal_1_1_privacy_policy: Quy định về Quyền riêng tư
+      legal_2_1_html: |-
+        Xin vui lòng %{contact_the_osmf_link}
+        nếu có thắc mắc về giấy phép, bản quyền, hoặc vấn đề pháp lý khác.
       legal_2_1_contact_the_osmf: liên lạc với Quỹ OSM
+      legal_2_2_html: OpenStreetMap, biểu trưng kính lúp, và State of the Map là %{registered_trademarks_link}.
+      legal_2_2_registered_trademarks: nhãn hiệu đăng ký của OSMF
       partners_title: Nhà bảo trợ
     copyright:
       foreign:
@@ -1827,42 +1845,104 @@ vi:
         mapping_link: bắt đầu vẽ bản đồ
       legal_babble:
         title_html: Bản quyền và Giấy phép
+        introduction_1_html: |-
+          OpenStreetMap%{registered_trademark_link} là %{open_data} được %{osm_foundation_link} (OSMF) phát hành theo
+          %{odc_odbl_link} (ODbL).
         introduction_1_open_data: dữ liệu mở
+        introduction_1_odc_odbl: Giấy phép Cơ sở dữ liệu Mở của Open Data Commons
         introduction_1_osm_foundation: Quỹ OpenStreetMap
+        introduction_2_html: Bạn được tự do sao chép, phân phối, truyền, và tạo ra
+          các tác phẩm phái sinh từ các dữ liệu của chúng ta, miễn là bạn ghi công
+          OpenStreetMap và những người đóng góp vào nó. Nếu bạn sửa đổi hoặc tạo sản
+          phẩm dựa trên các dữ liệu của chúng tôi, bạn chỉ được phép phân phối kết
+          quả theo cùng giấy phép. %{legal_code_link} đầy đủ giải thích các quyền
+          và trách nhiệm của bạn.
+        introduction_2_legal_code: Mã pháp lý
+        introduction_3_html: Tài liệu của chúng tôi được phát hành theo giấy phép
+          %{creative_commons_link} (CC BY-SA 2.0).
         introduction_3_creative_commons: Creative Commons Ghi công–Chia sẻ tương tự
           2.0
         credit_title_html: Cách ghi công OpenStreetMap
         credit_1_html: 'Khi nào bạn sử dụng dữ liệu OpenStreetMap, bạn cần phải tuân
           tho hai quy tắc sau:'
-        credit_4_1_this_copyright_page: trang bản quyền
+        credit_2_1: Ghi công OpenStreetMap bằng cách hiển thị lời thông báo bản quyền
+          của chúng tôi.
+        credit_2_2: Làm rõ rằng dữ liệu được phát hành theo Giấy phép Cơ sở dữ liệu
+          Mở.
+        credit_3_html: "Việc hiển thị lời thông báo bản quyền có yêu cầu tùy theo
+          cách sử dụng dữ liệu của chúng tôi, ví dụ tùy bạn tạo ra bản đồ tương tác
+          trên mạng, bản đồ in ấn, hoặc hình ảnh tĩnh. Có chi tiết đầy đủ về các quy
+          tắc trong \n%{attribution_guidelines_link}."
+        credit_3_attribution_guidelines: Hướng dẫn ghi công
+        credit_4_1_html: "Để ghi rõ ràng rằng dữ liệu được phát hành theo Giấy phép
+          Cơ sở dữ liệu Mở, bạn có thể đặt liên kết đến \n%{this_copyright_page_link}.\nThay
+          thế, bạn có thể ghi tên giấy phép và đặt liên kết trực tiếp đến văn bản
+          giấy phép; bạn cần phải ghi công theo kiểu này nếu phân phối OSM dưới dạng
+          dữ liệu. Đối với các phương tiện không có khả năng liên kết (chẳng hạn tác
+          phẩm in ấn), gợi ý bạn chỉ dẫn đọc giả tới openstreetmap.org (thí dụ bằng
+          cách thay thế “OpenStreetMap” bằng địa chỉ đầy đủ) và tới opendatacommons.org.\nTrong
+          ví dụ này, lời ghi công xuất hiện ở góc bản đồ."
+        credit_4_1_this_copyright_page: trang bản quyền này
         attribution_example:
           alt: Ví dụ ghi công OpenStreetMap trên một trang Web
           title: Ví dụ ghi công
         more_title_html: Tìm hiểu thêm
+        more_1_1_html: Đọc thêm về cách sử dụng dữ liệu của chúng tôi và cách ghi
+          công chúng tôi tại %{osmf_licence_page_link}.
         more_1_1_osmf_licence_page: trang Giấy phép của Quỹ OSM
+        more_2_1_html: Mặc dù OpenStreetMap là dữ liệu mở, nhưng chúng tôi không thể
+          cung cấp một API bản đồ miễn phí để bên thứ ba sử dụng. Xem %{api_usage_policy_link},
+          %{tile_usage_policy_link}, và %{nominatim_usage_policy_link} của chúng tôi.
+        more_2_1_api_usage_policy: Quy định Sử dụng API
+        more_2_1_tile_usage_policy: Quy định Sử dụng Mảnh bản đồ
+        more_2_1_nominatim_usage_policy: Quy định Sử dụng Nominatim
         contributors_title_html: Những người đóng góp vào đây
         contributors_intro_html: 'Dự án này nhờ công sức đóng góp của hàng ngàn cá
           nhân và cũng bao gồm các dữ liệu có giấy phép mở từ các cơ quan khảo sát
           quốc gia và những nguồn gốc khác, chẳng hạn:'
+        contributors_at_credit_html: |-
+          %{austria}: Chứa dữ liệu từ %{stadt_wien_link} (theo %{cc_by_link}), %{land_vorarlberg_link}
+          và Bang Tirol (theo %{cc_by_at_with_amendments_link}).
         contributors_at_austria: Áo
         contributors_at_stadt_wien: Thành phố Viên
         contributors_at_cc_by: CC BY
         contributors_at_land_vorarlberg: Bang Vorarlberg
         contributors_at_cc_by_at_with_amendments: CC BY AT sửa đổi
+        contributors_au_credit_html: |-
+          %{australia}: Bao gồm hoặc được phát triển dùng các Biên giới Hành chính &copy; %{geoscape_australia_link}
+          được Thịnh vượng chung Úc cấp phép theo %{cc_licence_link}.
         contributors_au_australia: Úc
+        contributors_au_geoscape_australia: Geoscape Úc
         contributors_au_cc_licence: giấy phép Creative Commons Ghi công 4.0 Quốc tế
           (CC BY 4.0)
+        contributors_ca_credit_html: '%{canada}: Bao gồm dữ liệu từ GeoBase®, GeoGratis
+          (© Bộ Tài nguyên Canada), CanVec (© Bộ Tài nguyên Canada), và StatCan (Sở
+          Địa lý, Statistics Canada).'
         contributors_ca_canada: Canada
+        contributors_cz_czechia: Séc
+        contributors_cz_cc_licence: giấy phép Creative Commons Ghi công 4.0 Quốc tế
+          (CC BY 4.0)
         contributors_fi_finland: Phần Lan
+        contributors_fi_nlsfi_license: Giấy phép NLSFI
         contributors_fr_france: Pháp
+        contributors_nl_credit_html: '%{netherlands}: Chứa dữ liệu &copy; AND, 2007
+          (%{and_link})'
         contributors_nl_netherlands: Hà Lan
+        contributors_nz_credit_html: |-
+          %{new_zealand}: Chứa dữ liệu bắt nguồn từ %{linz_data_service_link}
+          và được cấp phép để tái sử dụng theo %{cc_by_link}.
         contributors_nz_new_zealand: New Zealand
+        contributors_nz_linz_data_service: Dịch vụ Dữ liệu LINZ
         contributors_nz_cc_by: CC BY 4.0
+        contributors_rs_serbia: Serbia
         contributors_si_slovenia: Slovenia
         contributors_es_spain: Tây Ban Nha
         contributors_es_cc_by: CC BY 4.0
         contributors_za_south_africa: Nam Phi
+        contributors_gb_credit_html: '%{united_kingdom}: Bao gồm dữ liệu Ordnance
+          Survey © bản quyền bản quyền Hoàng gia và quyền cơ sở dữ liệu 2010–2023.'
         contributors_gb_united_kingdom: Vương quốc Anh
+        contributors_2_contributors_page: Trang Người đóng góp
         contributors_footer_2_html: '  Việc bao gồm dữ liệu trong OpenStreetMap không
           ngụ ý rằng nhà cung cấp dữ liệu đầu tiên ủng hộ OpenStreetMap, biện hộ sự
           chính xác của nó, hoặc nhận trách nhiệm pháp lý nào.'
@@ -1871,6 +1951,10 @@ vi:
           bổ sung dữ liệu từ những nguồn có bản quyền (chẳng hạn Bản đồ Google hoặc
           các bản đồ trên giấy) trước khi các nhà giữ bản quyền cho phép rõ ràng.
         trademarks_title: Nhãn hiệu
+        trademarks_1_1_html: |-
+          OpenStreetMap, biểu trưng kính lúp, và State of the Map là các nhãn hiệu do Quỹ OpenStreetMap đăng ký. Nếu bạn có thắc mắc về việc sử dụng các nhãn hiệu, xin vui lòng xem
+          %{trademark_policy_link} của chúng tôi.
+        trademarks_1_1_trademark_policy: Quy định Nhãn hiệu
     index:
       js_1: Hoặc trình duyệt của bạn không hỗ trợ JavaScript, hoặc bạn đã tắt JavaScript.
       js_2: OpenStreetMap sử dụng JavaScript cho chức năng bản đồ trơn.
@@ -1895,6 +1979,9 @@ vi:
       title: Xuất
       manually_select: Chọn vùng khác thủ công
       licence: Giấy phép
+      licence_details_html: Dữ liệu OpenStreetMap được phát hành theo %{odbl_link}
+        (ODbL).
+      odbl: Giấy phép Cơ sở dữ liệu Mở của Open Data Commons
       too_large:
         advice: 'Nếu việc xuất dữ liệu ở trên bị thất bại, hãy nghĩ đến việc sử dụng
           một trong những nguồn bên dưới:'
@@ -1926,6 +2013,11 @@ vi:
             chúng tôi, chẳng hạn thiếu con đường hoặc địa chỉ của bạn, cách xử lý
             tốt nhất là tham gia cộng đồng OpenStreetMap để thêm hoặc sửa dữ liệu
             lấy.
+        add_a_note:
+          instructions_1_html: Chỉ việc bấm %{note_icon} hoặc hình này trên bản đồ.
+            Đinh ghim sẽ được thả trên bản đồ. Kéo ghim vào đúng vị trí, ghi lời miêu
+            tả vấn đề, và bấm “Thêm Ghi chú”. Cộng đồng sẽ cố gắng sửa theo ý của
+            bạn.
       other_concerns:
         title: Vấn đề khác
         copyright: trang bản quyền
@@ -1943,8 +2035,8 @@ vi:
         title: Hướng dẫn Bắt đầu
         description: Hướng dẫn bắt đầu do cộng đồng biên tập.
       community:
-        title: Diễn đàn cộng đồng
-        description: Trang thảo luận chung về OpenStreetMap.
+        title: Diễn đàn trợ giúp & cộng đồng
+        description: Trang nhận trợ giúp và thảo luận chung về OpenStreetMap.
       mailing_lists:
         title: Danh sách thư
         description: Hỏi han hoặc thảo luận về các chuyện quan trọng trên nhiều danh
@@ -1968,8 +2060,15 @@ vi:
       removed: Bạn đã đặt trình vẽ OpenStreetMap mặc định là Potlatch. Vì Adobe Flash
         Player không còn được hỗ trợ, Potlatch không còn hoạt động trong trình duyệt
         Web.
+      desktop_application_html: Bạn vẫn có thể sử dụng Potlatch bằng cách %{download_link}.
+      download: tải về ứng dụng dành cho macOS và Windows
+      id_editor_html: Thay thế, bạn có thể đổi trình vẽ mặc định thành iD, trình vẽ
+        này vẫn còn hoạt động trong trình duyệt Web của bạn giống như Potlatch trước
+        đây. %{change_preferences_link}.
+      change_preferences: Thay đổi tùy chọn của bạn tại đây
     any_questions:
       title: Có thắc mắc?
+      get_help_here: Nhận trợ giúp tại đây
     sidebar:
       search_results: Kết quả Tìm kiếm
       close: Đóng
@@ -1992,23 +2091,38 @@ vi:
           primary: Đường chính
           secondary: Đường lớn
           unclassified: Đường không phân loại
+          pedestrian: Đường dành cho người đi bộ
           track: Đường mòn
           bridleway: Đường cưỡi ngựa
           cycleway: Đường xe đạp
           cycleway_national: Quốc lộ xe đạp
           cycleway_regional: Xa lộ xe đạp
           cycleway_local: Đường xe đạp địa phương
+          cycleway_mtb: Tuyến đường xe đạp leo núi
           footway: Đường đi bộ
           rail: Đường sắt
+          train: Xe lá»­a
           subway: Đường ngầm
+          ferry: Phà
+          light_rail: Đường sắt nhẹ
+          tram: Xe điện
+          bus: Xe buýt
           cable_car: Đường xe cáp
-          chair_lift: ghế cáp treo
+          chair_lift: Ghế cáp treo
           runway: Đường băng
-          taxiway: đường băng
+          taxiway: Đường băng
           apron: Sân đậu máy bay
           admin: Biên giới hành chính
+          capital: Thủ đô
+          city: Thành phố
+          orchard: Vườn cây
+          vineyard: Vườn nho
           forest: Rừng trồng cây
           wood: Rừng
+          farmland: Trại
+          grass: Cỏ
+          meadow: Đồng cỏ
+          sand: Cát
           golf: Sân golf
           park: Công viên
           common: Đất công
@@ -2018,27 +2132,35 @@ vi:
           commercial: Khu vực thương mại
           heathland: Vùng cây bụi
           lake: Hồ
-          reservoir: hồ chứa nước
+          reservoir: Hồ chứa nước
+          glacier: Sông băng
+          reef: Rạn san hô
+          wetland: Đầm lầy
           farm: Ruộng
           brownfield: Cánh đồng nâu
           cemetery: Nghĩa địa
           allotments: Khu vườn gia đình
           pitch: Sân cỏ
           centre: Trung tâm thể thao
+          beach: Bãi biển
           reserve: Khu bảo tồn thiên niên
           military: Khu vực quân sự
           school: Trường học
-          university: đại học
+          university: Đại học
+          hospital: Bệnh viện
           building: Kiến trúc quan trọng
           station: Nhà ga
           summit: Đỉnh núi
-          peak: đồi
+          peak: Đỉnh
           tunnel: Đường đứt nét = đường hầm
           bridge: Đường rắn = cầu
           private: Đường riêng
           destination: Chỉ giao thông địa phương
           construction: Đường đang xây
+          bus_stop: Điểm dừng xe buýt
+          stop: Điểm dừng lại
           bicycle_shop: Tiệm xe đạp
+          bicycle_rental: Cho thuê xe đạp
           bicycle_parking: Chỗ đậu xe đạp
           toilets: Vệ sinh
     welcome:
@@ -2049,14 +2171,31 @@ vi:
         góp.
       whats_on_the_map:
         title: Mục đích của Bản đồ
+        on_the_map_html: OpenStreetMap là bản đồ chứa bất cứ những gì %{real_and_current}
+          – nó chứa biết bao tòa nhà, con đường, cửa hàng, cơ sở hạ tầng, cây cối…
+          đủ mọi thứ. Mời bạn bổ sung bất cứ những gì thu hút sự quan tâm của bạn.
+        real_and_current: hiện tại có thật
+        off_the_map_html: Nó %{doesnt} chứa các ý kiến như bài đánh giá, những gì
+          không hoặc không còn tồn tại, hoặc thông tin từ các nguồn giữ bản quyền.
+          Bạn phải xin phép của nhà giữ bản quyền mới được sao chép từ bản đồ giấy
+          hay bản đồ trực tuyến khác.
+        doesnt: không
       basic_terms:
         title: Thuật ngữ Cơ bản
         paragraph_1: 'Đây là những thuật ngữ thường gặp khi sử dụng và đóng góp vào
           OpenStreetMap:'
-        editor: trình vẽ
-        node: nốt
-        way: lối
-        tag: thẻ
+        an_editor_html: '%{editor} là một ứng dụng hoặc trang Web cho phép sửa đổi
+          bản đồ.'
+        a_node_html: '%{node} là một địa điểm trên bản đồ, thí dụ một nhà hàng hoặc
+          một cái cây.'
+        a_way_html: '%{way} là một đường kẻ hoặc vùng, thí dụ con đường, dòng nước,
+          hồ nước, hoặc tòa nhà.'
+        a_tag_html: '%{tag} là một chi tiết về một nốt hoặc lối, thí dụ tên của một
+          nhà hàng hoặc tốc độ tối đa của một con đường.'
+        editor: Trình vẽ
+        node: Nốt
+        way: Lối
+        tag: Thẻ
       rules:
         title: Quy định!
       start_mapping: Bắt đầu Đóng góp
@@ -2064,6 +2203,9 @@ vi:
         title: Không có Thì giờ Sửa đổi? Thêm một Ghi chú!
         para_1: Nếu bạn chỉ muốn sửa một chi tiết nhỏ và không có thì giờ tập sửa
           đổi, bạn có thể thêm một ghi chú dễ dàng.
+        para_2_html: 'Chỉ việc %{map_link} và bấm hình ghi chú: %{note_icon}. Đinh
+          ghim sẽ được thả trên bản đồ. Kéo ghim vào đúng vị trí, ghi lời miêu tả
+          vấn đề, và bấm “Thêm Ghi chú”. Cộng đồng sẽ cố gắng sửa theo ý của bạn.'
         the_map: bản đồ
     communities:
       title: Cộng đồng
@@ -2081,7 +2223,11 @@ vi:
           địa phương:'
       other_groups:
         title: Các Nhóm Khác
-        communities_wiki: trang wiki về cộng đồng
+        other_groups_html: Một nhóm cộng đồng không nhất thiết phải được công nhận
+          là chi nhánh địa phương để ủng hộ dự án OpenStreetMap. Thực ra nhiều nhóm
+          rất thành công tuy chỉ là cuộc họp mặt thoải mái. Ai có thể tổ chức một
+          nhóm cộng đồng bình thường như thế. Để biết thêm chi tiết, xem %{communities_wiki_link}.
+        communities_wiki: trang wiki về nhóm người dùng
   traces:
     visibility:
       private: Bí mật (chỉ hiển thị các điểm vô danh không có thứ tự)
@@ -2230,6 +2376,7 @@ vi:
     permissions:
       missing: Bạn chưa cấp phép cho ứng dụng sử dụng chức năng này
     scopes:
+      openid: Đăng nhập qua OpenStreetMap
       read_prefs: Đọc tùy chọn người dùng
       write_prefs: Thay đổi tùy chọn người dùng
       write_diary: Tạo mục nhật ký, bình luận, và kết bạn
@@ -2339,6 +2486,11 @@ vi:
       support: hỗ trợ
       about:
         header: Tự do sử dụng và sửa đổi
+        paragraph_1: Không giống như với các bản đồ kia, OpenStreetMap được xây dựng
+          hoàn toàn nhờ những người như bạn, và mọi người có thể tự do sửa chữa, cập
+          nhật, tải về, và sử dụng miễn phí.
+        paragraph_2: Hãy mở tài khoản để bắt đầu đóng góp. Chúng tôi sẽ gửi thư điện
+          tử cho bạn để xác nhận tài khoản của bạn.
       display name description: Tên người dùng của bạn được hiển thị công khai. Bạn
         có thể thay đổi tên này về sau trong tùy chọn.
       external auth: 'Xác minh qua Dịch vụ Bên thứ ba:'
@@ -2347,6 +2499,11 @@ vi:
         khẩu, nhưng một số công cụ hoặc máy chủ khác có thể vẫn yêu cầu mật khẩu.
       continue: Mở tài khoản
       terms accepted: Cám ơn bạn đã chấp nhận các điều khoản đóng góp mới!
+      email_confirmation_help_html: Địa chỉ thư điện tử không được hiển thị công khai,
+        xem thêm thông tin trong %{privacy_policy_link} của chúng tôi.
+      privacy_policy: quy định về quyền riêng tư
+      privacy_policy_title: Quy định về quyền riêng tư của OSMF, bao gồm phần về địa
+        chỉ thư điện tử
     terms:
       title: Điều khoản
       heading: Điều khoản
@@ -2364,6 +2521,9 @@ vi:
         thuộc về phạm vi công cộng
       consider_pd_why: đây là gì?
       consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain?uselang=vi
+      guidance_info_html: 'Thông tin giúp hiểu các thuật ngữ này: a %{readable_summary_link}
+        và một số %{informal_translations_link}'
+      readable_summary: bản tóm tắt dễ đọc
       informal_translations: bản dịch không chính thức
       continue: Tiếp tục
       declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=vi
@@ -2408,6 +2568,7 @@ vi:
       remove as friend: Hủy Kết Bạn
       add as friend: Kết Bạn
       mapper since: 'Tham gia:'
+      uid: 'Số người dùng:'
       ct status: 'Điều khoản đóng góp:'
       ct undecided: Chưa quyết định
       ct declined: Từ chối
@@ -2593,7 +2754,9 @@ vi:
     index:
       title: Các ghi chú do %{user} lưu hoặc bình luận
       heading: Ghi chú của %{user}
-      subheading_html: Các ghi chú do %{user} lưu hoặc bình luận
+      subheading_html: Các ghi chú do %{user} %{submitted} hoặc %{commented}
+      subheading_submitted: lÆ°u
+      subheading_commented: bình luận
       no_notes: Không có ghi chú
       id: Mã số
       creator: Người tạo
@@ -2606,6 +2769,15 @@ vi:
       open_title: 'Ghi chú chưa giải quyết #%{note_name}'
       closed_title: 'Ghi chú đã giải quyết #%{note_name}'
       hidden_title: 'Ghi chú ẩn #%{note_name}'
+      event_opened_by_html: Được %{user} tạo %{time_ago}
+      event_opened_by_anonymous_html: Được người vô danh tạo %{time_ago}
+      event_commented_by_html: Nhận xét của %{user} từ %{time_ago}
+      event_commented_by_anonymous_html: Nhận xét của người vô danh %{time_ago}
+      event_closed_by_html: Được %{user} giải quyết %{time_ago}
+      event_closed_by_anonymous_html: Được người vô danh giải quyết %{time_ago}
+      event_reopened_by_html: Được %{user} mở lại %{time_ago}
+      event_reopened_by_anonymous_html: Được người vô danh mở lại %{time_ago}
+      event_hidden_by_html: Được %{user} ẩn %{time_ago}
       report: báo cáo ghi chú này
       anonymous_warning: Ghi chú này có bình luận của người dùng vô danh đóng góp;
         các bình luận này cần được xác nhận lại.
@@ -2614,6 +2786,7 @@ vi:
       reactivate: Mở lại
       comment_and_resolve: Bình luận & Giải quyết
       comment: Bình luận
+      log_in_to_comment: Đăng nhập để nhận xét về ghi chú này
       report_link_html: Nếu ghi chú này chứa thông tin nhạy cảm có thể cần xóa, bạn
         có thể %{link}.
       other_problems_resolve: Còn nếu ghi chú có vấn đề khác, xin vui lòng giải quyết
@@ -2672,6 +2845,7 @@ vi:
         standard: Chuẩn
         cycle_map: Bản đồ Xe đạp
         transport_map: Bản đồ Giao thông
+        tracestracktop_topo: Tracestrack Địa hình
         hot: Nhân đạo Chủ nghĩa
       layers:
         header: Lớp Bản đồ
@@ -2680,6 +2854,18 @@ vi:
         gps: Tuyến đường GPS Công khai
         overlays: Bật lớp phủ để gỡ lỗi trên bản đồ
         title: Lớp
+      openstreetmap_contributors: Người đóng góp vào OpenStreetMap
+      make_a_donation: Quyên góp
+      website_and_api_terms: Điều khoản trang và API
+      cyclosm_credit: Kiểu mảnh bản đồ do %{cyclosm_link} cung cấp và %{osm_france_link}
+        lưu trữ
+      osm_france: OpenStreetMap Pháp
+      thunderforest_credit: Mảnh bản đồ do %{thunderforest_link} cung cấp
+      andy_allan: Andy Allan
+      tracestrack_credit: Mảnh bản đồ do %{tracestrack_link} cung cấp
+      hotosm_credit: Kiểu mảnh bản đồ do %{hotosm_link} cung cấp và %{osm_france_link}
+        lưu trữ
+      hotosm_name: Tổ chức Nhân đạo OpenStreetMap
     site:
       edit_tooltip: Sửa đổi bản đồ
       edit_disabled_tooltip: Phóng to để sửa đổi bản đồ
@@ -2689,6 +2875,7 @@ vi:
       map_data_zoom_in_tooltip: Phóng to để xem dữ liệu bản đồ
       queryfeature_tooltip: Thăm dò yếu tố
       queryfeature_disabled_tooltip: Phóng to để thăm dò yếu tố
+      embed_html_disabled: Chức năng nhúng HTML không có sẵn đối với lớp bản đồ này
     changesets:
       show:
         comment: Bình luận
diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 0a4ed84eb..47efe981f 100644
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -301,12 +301,8 @@ xmf:
       way_paginated: ღოზეფი (%{x}-%{y} %{count}-შე)
       relation: ურთიართობეფი (%{count})
       relation_paginated: ურთიართობეფი (%{x}-%{y} %{count}-შე)
-      comment: კომენტარეფი (%{count})
       changesetxml: თირუეფიშ პაკეტიშ XML
       osmchangexml: osmChange XML
-      feed:
-        title: თირუეფიშ პაკეტი %{id}
-        title_comment: თირუეფიშ პაკეტი %{id} - %{comment}
       join_discussion: გემშართით სისტემაშა, თიშენ ნამჷ-და, სხუნუას ქაკათათინ
       discussion: სხუნუა
       still_open: თირუეფიშ პაკეტი დიო ღილე რე. სხუნუა ხემიოჭირინაფუ იჸი, მუჭო თირუეფიშ
@@ -413,6 +409,9 @@ xmf:
       no_more_area: თე ტერიტორიას თირუეფიშ პაკეტეფქ ვეგორუ.
       no_more_user: თე მახვარებუშ თირუეფიშ პაკეტეფქ ვეგორუ.
       load_more: უმოსიშ გჷმოხარგუა
+      feed:
+        title: თირუეფიშ პაკეტი %{id}
+        title_comment: თირუეფიშ პაკეტი %{id} - %{comment}
     timeout:
       sorry: სანარღოთ, თირუეფიშ პაკეტეფიშ ერკებული, ნამუთ თქვა მითხითჷნ, ძალამ დიდი
         ბორჯი ოკო გიშაღალარო.
diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index 7edd241cb..db03f5a88 100644
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -1,6 +1,7 @@
 # Messages for Yoruba (Yorùbá)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: BigDareLibrary
 # Author: Demmy
 ---
 yo:
@@ -33,6 +34,7 @@ yo:
     form:
       use_map_link: Lo map
     show:
+      discussion: Ijiroro
       login: wole
   layouts:
     home: ibùdó
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 7a45c4391..2fe9875a2 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -281,8 +281,6 @@ zh-CN:
       x_years:
         one: '%{count}年前'
         other: '%{count}年前'
-  printable_name:
-    with_version: '%{id}，版本 %{version}'
   editor:
     default: 默认（目前为 %{name}）
     id:
@@ -412,14 +410,10 @@ zh-CN:
       way_paginated: 路径 (%{x}-%{y}，共 %{count})
       relation: 关系 (%{count})
       relation_paginated: 关系 (%{x}-%{y}，共 %{count})
-      comment: 评论（%{count}）
       hidden_comment_by_html: '%{user} 于 %{time_ago} 的隐藏评论'
       comment_by_html: '%{user} 于 %{time_ago} 的评论'
       changesetxml: 变更集 XML
       osmchangexml: osmChange XML
-      feed:
-        title: 变更集 %{id}
-        title_comment: 变更集 %{id} - %{comment}
       join_discussion: 登录以加入讨论
       discussion: 讨论
       still_open: 变更集依然开放——一旦变更集关闭讨论将开放。
@@ -532,6 +526,9 @@ zh-CN:
       no_more_area: 该区域内没有更多变更集。
       no_more_user: 该用户无更多变更集。
       load_more: 加载更多
+      feed:
+        title: 变更集 %{id}
+        title_comment: 变更集 %{id} - %{comment}
     timeout:
       sorry: 抱歉，您所请求的变更集列表检索时间过长。
   changeset_comments:
@@ -591,6 +588,7 @@ zh-CN:
     show:
       title: '%{user} 的日记 | %{title}'
       user_title: '%{user}的日记'
+      discussion: 讨论
       leave_a_comment: 留下评论
       login_to_leave_a_comment_html: '%{login_link}以留下评论'
       login: 登录
@@ -2488,6 +2486,7 @@ zh-CN:
   oauth_clients:
     new:
       title: 注册新应用程序
+      disabled: OAuth 1 应用程序的注册已被禁用
     edit:
       title: 编辑您的应用程序
     show:
@@ -2565,6 +2564,7 @@ zh-CN:
       title: 我的已授权应用程序
       application: 应用程序
       permissions: 权限
+      last_authorized: 最后授权
       no_applications_html: 您还没有授权任何%{oauth2}应用程序。
     application:
       revoke: 撤销访问权限
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 3e2ac86f7..e7bcfe949 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -290,8 +290,6 @@ zh-HK:
       belongs_to: 製作者
       changesetxml: 變更集XML
       osmchangexml: osmChange格式XML
-      feed:
-        title: 變更集 %{id}
     relation_member:
       type:
         node: 節點
@@ -341,6 +339,8 @@ zh-HK:
       no_more_area: 此區域沒有更多變更集。
       no_more_user: 此用戶沒有更多變更集。
       load_more: 載入更多
+      feed:
+        title: 變更集 %{id}
   dashboards:
     show:
       nearby users: 其他附近的用戶
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 010edccbb..a6b6d366a 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -244,8 +244,6 @@ zh-TW:
       x_years:
         one: '%{count} 年前'
         other: '%{count} 年前'
-  printable_name:
-    with_version: '%{id}，版本%{version}'
   editor:
     default: 預設 (目前為 %{name})
     id:
@@ -374,14 +372,10 @@ zh-TW:
       way_paginated: 路線 (%{count} 的 %{x}-%{y})
       relation: 關聯 (%{count})
       relation_paginated: 關聯 (%{count} 的 %{x}-%{y})
-      comment: 評論 (%{count})
       hidden_comment_by_html: '%{user}%{time_ago}隱藏評論'
       comment_by_html: 來自%{user}%{time_ago}的評論
       changesetxml: 變更集 XML
       osmchangexml: osmChange 格式 XML
-      feed:
-        title: 變更集 %{id}
-        title_comment: 變更集 %{id} - %{comment}
       join_discussion: 登入以參加討論
       discussion: 討論
       still_open: 變更集仍為開啟 - 討論要在變更集關閉後才會開啟。
@@ -496,6 +490,9 @@ zh-TW:
       no_more_area: 此區域沒有更多變更集。
       no_more_user: 此使用者沒有更多變更集。
       load_more: 載入更多
+      feed:
+        title: 變更集 %{id}
+        title_comment: 變更集 %{id} - %{comment}
     timeout:
       sorry: 很抱歉，您請求的變更集清單過長無法讀取。
   changeset_comments:
@@ -555,6 +552,7 @@ zh-TW:
     show:
       title: '%{user} 的日記|%{title}'
       user_title: '%{user} 的日記'
+      discussion: 討論
       leave_a_comment: 留下評論
       login_to_leave_a_comment_html: '%{login_link}來留下評論'
       login: 登入
diff --git a/config/routes.rb b/config/routes.rb
index 09afe8fd9..da27f0754 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -244,8 +244,8 @@ OpenStreetMap::Application.routes.draw do
   post "/user/:display_name/diary/:id/unhide" => "diary_entries#unhide", :id => /\d+/, :as => :unhide_diary_entry
   post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entries#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment
   post "/user/:display_name/diary/:id/unhidecomment/:comment" => "diary_entries#unhidecomment", :id => /\d+/, :comment => /\d+/, :as => :unhide_diary_comment
-  post "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :as => :diary_entry_subscribe, :id => /\d+/
-  post "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/
+  match "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :via => [:get, :post], :as => :diary_entry_subscribe, :id => /\d+/
+  match "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :via => [:get, :post], :as => :diary_entry_unsubscribe, :id => /\d+/
 
   # user pages
   resources :users, :path => "user", :param => :display_name, :only => [:show, :destroy]
diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index 0709d544e..2bb743636 100644
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -142,6 +142,15 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
     browse_check :changeset_path, changeset.id, "browse/changeset"
   end
 
+  def test_read_changeset_element_links
+    changeset = create(:changeset)
+    node = create(:node, :with_history, :changeset => changeset)
+
+    browse_check :changeset_path, changeset.id, "browse/changeset"
+    assert_dom "a[href='#{node_path node}']", :count => 1
+    assert_dom "a[href='#{old_node_path node, 1}']", :count => 1
+  end
+
   ##
   #  Methods to check redaction.
   #
diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
index d9a4b256b..dba7642c4 100644
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -243,6 +243,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     create(:changeset_tag, :changeset => changeset)
     create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/")
     closed_changeset = create(:changeset, :closed, :num_changes => 1)
+    create(:changeset_tag, :changeset => closed_changeset, :k => "website", :v => "https://osm.org/")
     _empty_changeset = create(:changeset, :num_changes => 0)
 
     get history_feed_path(:format => :atom)
@@ -250,7 +251,21 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_template "index"
     assert_equal "application/atom+xml", response.media_type
 
-    check_feed_result([changeset, closed_changeset])
+    check_feed_result([closed_changeset, changeset])
+  end
+
+  ##
+  # This should correctly escape XML special characters in the comment
+  def test_feed_with_comment_tag
+    changeset = create(:changeset, :num_changes => 1)
+    create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "tested<changeset>comment")
+
+    get history_feed_path(:format => :atom)
+    assert_response :success
+    assert_template "index"
+    assert_equal "application/atom+xml", response.media_type
+
+    check_feed_result([changeset])
   end
 
   ##
@@ -268,7 +283,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_template "index"
     assert_equal "application/atom+xml", response.media_type
 
-    check_feed_result([changeset, closed_changeset])
+    check_feed_result([closed_changeset, changeset])
   end
 
   ##
@@ -286,7 +301,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_template "index"
     assert_equal "application/atom+xml", response.media_type
 
-    check_feed_result(changesets)
+    check_feed_result(changesets.reverse)
   end
 
   ##
@@ -325,15 +340,26 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
     assert_select "feed", :count => [changesets.size, 1].min do
       assert_select "> title", :count => 1, :text => /^Changesets/
-      assert_select "> entry", :count => changesets.size
-
-      changesets.each do |changeset|
-        assert_select "> entry > id", changeset_url(:id => changeset.id)
+      assert_select "> entry", :count => changesets.size do |entries|
+        entries.zip(changesets) do |entry, changeset|
+          assert_select entry, "> id", :text => changeset_url(:id => changeset.id)
+
+          changeset_comment = changeset.tags["comment"]
+          if changeset_comment
+            assert_select entry, "> title", :count => 1, :text => "Changeset #{changeset.id} - #{changeset_comment}"
+          else
+            assert_select entry, "> title", :count => 1, :text => "Changeset #{changeset.id}"
+          end
 
-        assert_select "> entry > content > xhtml|div > xhtml|table" do
-          assert_select "> xhtml|tr > xhtml|td > xhtml|table" do
-            changeset.tags.each_key do |key|
-              assert_select "> xhtml|tr > xhtml|td", :text => /^#{key} = /
+          assert_select entry, "> content > xhtml|div > xhtml|table" do
+            if changeset.tags.empty?
+              assert_select "> xhtml|tr > xhtml|td > xhtml|table", :count => 0
+            else
+              assert_select "> xhtml|tr > xhtml|td > xhtml|table", :count => 1 do
+                changeset.tags.each_key do |key|
+                  assert_select "> xhtml|tr > xhtml|td", :text => /^#{key} = /
+                end
+              end
             end
           end
         end
diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index b83e9b7a0..e7d812b3e 100644
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -98,10 +98,18 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
       { :path => "/user/username/diary/1/unhidecomment/2", :method => :post },
       { :controller => "diary_entries", :action => "unhidecomment", :display_name => "username", :id => "1", :comment => "2" }
     )
+    assert_routing(
+      { :path => "/user/username/diary/1/subscribe", :method => :get },
+      { :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" }
+    )
     assert_routing(
       { :path => "/user/username/diary/1/subscribe", :method => :post },
       { :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" }
     )
+    assert_routing(
+      { :path => "/user/username/diary/1/unsubscribe", :method => :get },
+      { :controller => "diary_entries", :action => "unsubscribe", :display_name => "username", :id => "1" }
+    )
     assert_routing(
       { :path => "/user/username/diary/1/unsubscribe", :method => :post },
       { :controller => "diary_entries", :action => "unsubscribe", :display_name => "username", :id => "1" }
@@ -916,6 +924,25 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     assert_response :not_found
   end
 
+  def test_subscribe_page
+    user = create(:user)
+    other_user = create(:user)
+    diary_entry = create(:diary_entry, :user => user)
+    path = diary_entry_subscribe_path(:id => diary_entry, :display_name => user.display_name)
+
+    get path
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => path)
+
+    session_for(other_user)
+    get path
+    assert_response :success
+    assert_dom ".content-body" do
+      assert_dom "a[href='#{diary_entry_path(:id => diary_entry, :display_name => user.display_name)}']", :text => diary_entry.title
+      assert_dom "a[href='#{user_path(user)}']", :text => user.display_name
+    end
+  end
+
   def test_subscribe_success
     user = create(:user)
     other_user = create(:user)
@@ -953,6 +980,25 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_unsubscribe_page
+    user = create(:user)
+    other_user = create(:user)
+    diary_entry = create(:diary_entry, :user => user)
+    path = diary_entry_unsubscribe_path(:id => diary_entry, :display_name => user.display_name)
+
+    get path
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => path)
+
+    session_for(other_user)
+    get path
+    assert_response :success
+    assert_dom ".content-body" do
+      assert_dom "a[href='#{diary_entry_path(:id => diary_entry, :display_name => user.display_name)}']", :text => diary_entry.title
+      assert_dom "a[href='#{user_path(user)}']", :text => user.display_name
+    end
+  end
+
   def test_unsubscribe_success
     user = create(:user)
     other_user = create(:user)
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index a94a9a158..4234bee70 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -48,6 +48,14 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
     post login_path, :params => { :username => user.display_name, :password => "test" }
     assert_response :redirect
     assert_redirected_to root_path
+
+    post login_path, :params => { :username => " #{user.display_name}", :password => "test" }
+    assert_response :redirect
+    assert_redirected_to root_path
+
+    post login_path, :params => { :username => "#{user.display_name} ", :password => "test" }
+    assert_response :redirect
+    assert_redirected_to root_path
   end
 
   def test_logout_without_referer
diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index a20e1703d..4cf0ab69a 100644
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -4,7 +4,7 @@ class BrowseHelperTest < ActionView::TestCase
   include ERB::Util
   include ApplicationHelper
 
-  def test_printable_name
+  def test_printable_element_name
     node = create(:node, :with_history, :version => 2)
     node_v1 = node.old_nodes.find_by(:version => 1)
     node_v2 = node.old_nodes.find_by(:version => 2)
@@ -19,46 +19,54 @@ class BrowseHelperTest < ActionView::TestCase
 
     deleted_node = create(:node, :deleted)
 
-    assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node)
-    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
-    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
-    assert_dom_equal node.id.to_s, printable_name(node_v1)
-    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
-    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
-    assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
+    assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node)
+    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node)
+    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node_v2)
+    assert_dom_equal node.id.to_s, printable_element_name(node_v1)
+    assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_element_name(node_with_ref_without_name)
 
     I18n.with_locale "pt" do
-      assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node)
-      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
-      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
-      assert_dom_equal node.id.to_s, printable_name(node_v1)
-      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
-      assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
-      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
+      assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node_v2)
+      assert_dom_equal node.id.to_s, printable_element_name(node_v1)
+      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_element_name(node_with_ref_without_name)
     end
 
     I18n.with_locale "pt-BR" do
-      assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node)
-      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
-      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
-      assert_dom_equal node.id.to_s, printable_name(node_v1)
-      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
-      assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
-      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
+      assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node)
+      assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node_v2)
+      assert_dom_equal node.id.to_s, printable_element_name(node_v1)
+      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_element_name(node_with_ref_without_name)
     end
 
     I18n.with_locale "de" do
-      assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node)
-      assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
-      assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
-      assert_dom_equal node.id.to_s, printable_name(node_v1)
-      assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
-      assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
-      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
+      assert_dom_equal deleted_node.id.to_s, printable_element_name(deleted_node)
+      assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node)
+      assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_element_name(node_v2)
+      assert_dom_equal node.id.to_s, printable_element_name(node_v1)
+      assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_element_name(node_with_ref_without_name)
     end
   end
 
-  def test_link_class
+  def test_element_strikethrough
+    node = create(:node, :with_history, :version => 2)
+    node_v1 = node.old_nodes.find_by(:version => 1)
+    node_v2 = node.old_nodes.find_by(:version => 2)
+    node_v1.redact!(create(:redaction))
+
+    normal_output = element_strikethrough(node_v2) { "test" }
+    assert_equal "test", normal_output
+
+    redacted_output = element_strikethrough(node_v1) { "test" }
+    assert_equal "<s>test</s>", redacted_output
+
+    deleted_output = element_strikethrough(create(:node, :deleted)) { "test" }
+    assert_equal "<s>test</s>", deleted_output
+  end
+
+  def test_element_class
     node = create(:node, :with_history, :version => 2)
     node_v1 = node.old_nodes.find_by(:version => 1)
     node_v2 = node.old_nodes.find_by(:version => 2)
@@ -68,15 +76,15 @@ class BrowseHelperTest < ActionView::TestCase
     add_old_tags_selection(node_v2)
     add_old_tags_selection(node_v1)
 
-    assert_equal "node", link_class("node", create(:node))
-    assert_equal "node deleted", link_class("node", create(:node, :deleted))
+    assert_equal "node", element_class("node", create(:node))
+    assert_equal "node", element_class("node", create(:node, :deleted))
 
-    assert_equal "node building yes shop gift tourism museum", link_class("node", node)
-    assert_equal "node building yes shop gift tourism museum", link_class("node", node_v2)
-    assert_equal "node deleted", link_class("node", node_v1)
+    assert_equal "node building yes shop gift tourism museum", element_class("node", node)
+    assert_equal "node building yes shop gift tourism museum", element_class("node", node_v2)
+    assert_equal "node", element_class("node", node_v1)
   end
 
-  def test_link_title
+  def test_element_title
     node = create(:node, :with_history, :version => 2)
     node_v1 = node.old_nodes.find_by(:version => 1)
     node_v2 = node.old_nodes.find_by(:version => 2)
@@ -86,12 +94,12 @@ class BrowseHelperTest < ActionView::TestCase
     add_old_tags_selection(node_v2)
     add_old_tags_selection(node_v1)
 
-    assert_equal "", link_title(create(:node))
-    assert_equal "", link_title(create(:node, :deleted))
+    assert_equal "", element_title(create(:node))
+    assert_equal "", element_title(create(:node, :deleted))
 
-    assert_equal "building=yes, shop=gift, and tourism=museum", link_title(node)
-    assert_equal "building=yes, shop=gift, and tourism=museum", link_title(node_v2)
-    assert_equal "", link_title(node_v1)
+    assert_equal "building=yes, shop=gift, and tourism=museum", element_title(node)
+    assert_equal "building=yes, shop=gift, and tourism=museum", element_title(node_v2)
+    assert_equal "", element_title(node_v1)
   end
 
   def test_icon_tags
diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb
index 751adcd82..998e97330 100644
--- a/test/mailers/user_mailer_test.rb
+++ b/test/mailers/user_mailer_test.rb
@@ -53,4 +53,19 @@ class UserMailerTest < ActionMailer::TestCase
     assert_match("Jack & Jill <br>", email.text_part.body.to_s)
     assert_match("Jack &amp; Jill &lt;br&gt;", email.html_part.body.to_s)
   end
+
+  def test_diary_comment_notification
+    create(:language, :code => "en")
+    user = create(:user)
+    other_user = create(:user)
+    diary_entry = create(:diary_entry, :user => user)
+    diary_comment = create(:diary_comment, :diary_entry => diary_entry)
+    email = UserMailer.diary_comment_notification(diary_comment, other_user)
+    body = Rails::Dom::Testing.html_document_fragment.parse(email.html_part.body)
+
+    url = Rails.application.routes.url_helpers.diary_entry_url(user, diary_entry, :host => Settings.server_url, :protocol => Settings.server_protocol)
+    unsubscribe_url = Rails.application.routes.url_helpers.diary_entry_unsubscribe_url(user, diary_entry, :host => Settings.server_url, :protocol => Settings.server_protocol)
+    assert_select body, "a[href^='#{url}']"
+    assert_select body, "a[href='#{unsubscribe_url}']", :count => 1
+  end
 end
diff --git a/yarn.lock b/yarn.lock
index f113d5752..e84af42fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -34,18 +34,18 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
-  integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
-
-"@humanwhocodes/config-array@^0.11.13":
-  version "0.11.13"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
-  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
-  dependencies:
-    "@humanwhocodes/object-schema" "^2.0.1"
-    debug "^4.1.1"
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
+  dependencies:
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
     minimatch "^3.0.5"
 
 "@humanwhocodes/module-importer@^1.0.1":
@@ -53,10 +53,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
-  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
+  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -186,7 +186,7 @@ cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-debug@^4.1.1, debug@^4.3.2:
+debug@^4.3.1, debug@^4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -229,15 +229,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
 eslint@^8.0.0:
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15"
-  integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
     "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.56.0"
-    "@humanwhocodes/config-array" "^0.11.13"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     "@ungap/structured-clone" "^1.2.0"