From: Tom Hughes <tom@compton.nu>
Date: Tue, 16 Nov 2021 08:21:17 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3353'
X-Git-Tag: live~1986
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e342314d8b513dd1b7693a40885fd61d439a3557?hp=aad81eb74c9e6d70971f938da542271b8a70b638

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

diff --git a/Gemfile b/Gemfile
index 15348a989..3df9bc7eb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -149,7 +149,7 @@ group :test do
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
-  gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2
+  gem "rubocop-rails"
   gem "rubocop-rake"
   gem "selenium-webdriver", "~> 3.142.7"
   gem "simplecov", :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 9c46a8653..7d510c09c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,17 +80,17 @@ GEM
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.522.0)
-    aws-sdk-core (3.121.5)
+    aws-partitions (1.525.0)
+    aws-sdk-core (3.122.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.520.1)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.50.0)
-      aws-sdk-core (~> 3, >= 3.121.2)
+    aws-sdk-kms (1.51.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.104.0)
-      aws-sdk-core (~> 3, >= 3.121.2)
+    aws-sdk-s3 (1.105.1)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
@@ -124,8 +124,8 @@ GEM
     bzip2-ffi (1.1.0)
       ffi (~> 1.0)
     cancancan (3.3.0)
-    canonical-rails (0.2.12)
-      rails (>= 4.1, < 6.2)
+    canonical-rails (0.2.13)
+      rails (>= 4.1, <= 7.0)
     capybara (3.36.0)
       addressable
       matrix
@@ -239,11 +239,11 @@ GEM
     globalid (0.5.2)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
-    hashie (4.1.0)
+    hashie (5.0.0)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.0)
       i18n (>= 0.6.6)
@@ -334,7 +334,7 @@ GEM
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
-    omniauth-oauth2 (1.7.1)
+    omniauth-oauth2 (1.7.2)
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
     omniauth-openid (2.0.1)
@@ -423,14 +423,14 @@ GEM
       rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
+    rubocop-ast (1.13.0)
       parser (>= 3.0.1.1)
     rubocop-minitest (0.15.2)
       rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.12.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.11.3)
+    rubocop-rails (2.12.4)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -571,7 +571,7 @@ DEPENDENCIES
   rubocop
   rubocop-minitest
   rubocop-performance
-  rubocop-rails (~> 2.11.3)
+  rubocop-rails
   rubocop-rake
   sanitize
   sassc-rails
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index ccb0d7493..f2afdcf7a 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -370,8 +370,6 @@ body.compact-nav {
     }
 
     h3, h4 {
-      margin-top: $lineheight;
-      margin-bottom: $lineheight/2;
       font-size: 1.25rem;
     }
 
@@ -813,7 +811,6 @@ tr.turn:hover {
     border-bottom: 1px solid $grey;
 
     h4:first-child {
-      margin-top: 0;
       word-wrap: break-word;
     }
   }
@@ -858,6 +855,7 @@ tr.turn:hover {
     border-collapse: separate;
     border-spacing: 0;
     width: 100%;
+    margin-bottom: $spacer;
 
     th, td {
       border-bottom: 1px solid $grey;
@@ -910,7 +908,7 @@ tr.turn:hover {
 
   .subscribe-buttons {
     float: left;
-    margin: 18px 10px 10px;
+    margin: 0 10px;
     min-width: 80px;
   }
 
@@ -966,7 +964,7 @@ tr.turn:hover {
   }
 
   .export_area_inputs {
-    margin-bottom: $lineheight/2;
+    margin-bottom: $spacer;
     input[type="text"] {
       width: 100px;
       text-align: center;
@@ -1094,13 +1092,6 @@ tr.turn:hover {
   }
 }
 
-/* Rules for the user profile page */
-
-.contact-activity {
-  margin-top: $lineheight;
-  width: 100%;
-}
-
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {
@@ -1117,30 +1108,12 @@ tr.turn:hover {
     margin-top: 0 0 0 60px;
     font-size: 12px;
   }
-  img.user_thumbnail {
-    float: left;
-    margin: 0 $lineheight/2 0 0;
-  }
 }
 
 /* Rules for the user list */
 
 #user_list {
   width: 100%;
-
-  tr {
-    vertical-align: middle;
-  }
-
-  p {
-    margin-top: 0px;
-    margin-bottom: 0px;
-  }
-}
-
-#user_list_actions {
-  float: right;
-  margin-top: $lineheight/2;
 }
 
 /* Rules for the diary list page */
@@ -1425,28 +1398,12 @@ img.user_image {
   max-width: 100px;
   max-height: 100px;
   border: 1px solid $grey;
-  margin-bottom: $lineheight;
-  float: left;
-  margin-right: $lineheight;
-}
-
-img.user_image_no_margins {
-  max-width: 100px;
-  max-height: 100px;
-  border: 1px solid $grey;
 }
 
 img.user_thumbnail {
   max-width: 50px;
   max-height: 50px;
   border: 1px solid $grey;
-  margin-right: $lineheight;
-}
-
-img.user_thumbnail_no_margins {
-  max-width: 50px;
-  max-height: 50px;
-  border: 1px solid $grey;
 }
 
 img.user_thumbnail_tiny {
@@ -1612,10 +1569,6 @@ dl.dl-inline {
   }
 }
 
-.comments .richtext {
-  margin-left: 70px;
-}
-
 /* Rules for the user notes list */
 
 .note_list {
diff --git a/app/assets/stylesheets/leaflet-all.scss b/app/assets/stylesheets/leaflet-all.scss
index 34e3d094e..d12c61f77 100644
--- a/app/assets/stylesheets/leaflet-all.scss
+++ b/app/assets/stylesheets/leaflet-all.scss
@@ -15,9 +15,6 @@ div.leaflet-marker-icon.location-filter.move-marker {
 
 /* Override some conflicting styles.
    https://github.com/openstreetmap/openstreetmap-website/pull/121#issuecomment-10206946 */
-.leaflet-popup-content img.user_thumbnail {
-  max-width: 50px !important;
-}
 
 .user_popup p {
   margin: 0 !important;
diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 356207754..5505ee4a9 100644
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -11,7 +11,7 @@
   <% end %>
 </p>
 
-<div class="details">
+<p class="details">
   <%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
         :time => time_ago_in_words(common_details.timestamp, :scope => :"datetime.distance_in_words_ago"),
         :user => changeset_user_link(common_details.changeset),
@@ -19,7 +19,7 @@
   &middot;
   <%= t "browse.in_changeset" %>
   #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
-</div>
+</p>
 
 <% if @type == "node" and common_details.visible? %>
 <div class="details geo">
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 079915fcf..496589a08 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -6,7 +6,7 @@
   <p class="font-italic">
     <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
   </p>
-  <div class="details"><%= changeset_details(@changeset) %></div>
+  <p class="details"><%= changeset_details(@changeset) %></p>
 
   <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>
 
@@ -63,14 +63,14 @@
   <% end %>
 
   <% unless current_user %>
-    <div class="notice">
+    <p class="notice">
       <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %>
-    </div>
+    </p>
   <% end %>
 
   <% if current_user %>
     <% unless @changeset.is_open? %>
-      <form action="#">
+      <form action="#" class="mb-3">
         <div class="form-group">
           <textarea class="form-control" name="text" cols="40" rows="5"></textarea>
         </div>
@@ -79,9 +79,9 @@
         </div>
       </form>
     <% else %>
-      <div class="notice">
-      <%= t(".still_open") %>
-      </div>
+      <p class="notice">
+        <%= t(".still_open") %>
+      </p>
     <% end %>
   <% end %>
 
diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb
index 7614c0c4d..77363dbdb 100644
--- a/app/views/dashboards/_contact.html.erb
+++ b/app/views/dashboards/_contact.html.erb
@@ -4,9 +4,9 @@
      :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
      :description => render(:partial => "popup", :object => contact, :locals => { :type => type })
    } %>
-<%= tag.div :class => "contact-activity clearfix row", :data => { :user => user_data } do %>
+<%= tag.div :class => "clearfix row", :data => { :user => user_data } do %>
   <div class="col-auto">
-    <%= user_thumbnail contact, :class => "user_thumbnail_no_margins" %>
+    <%= user_thumbnail contact %>
   </div>
   <div class="col">
     <p class='text-muted mb-0'>
diff --git a/app/views/dashboards/_popup.html.erb b/app/views/dashboards/_popup.html.erb
index a643b5c90..ef86f042d 100644
--- a/app/views/dashboards/_popup.html.erb
+++ b/app/views/dashboards/_popup.html.erb
@@ -1,5 +1,9 @@
-<div class="user_popup">
-  <%= user_thumbnail popup %>
-  <p><%= t(".#{type}") %></p>
-  <p><%= link_to popup.display_name, user_path(popup) %></p>
+<div class="user_popup row no-gutters mx-1">
+  <div class="col-auto mx-1">
+    <%= user_thumbnail popup %>
+  </div>
+  <div class="col mx-1">
+    <p><%= t(".#{type}") %></p>
+    <p><%= link_to popup.display_name, user_path(popup) %></p>
+  </div>
 </div>
diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb
index 9aa4abed4..0f04dafb9 100644
--- a/app/views/dashboards/show.html.erb
+++ b/app/views/dashboards/show.html.erb
@@ -32,7 +32,7 @@
       <% if friends.empty? %>
         <%= t ".no friends" %>
       <% else %>
-        <nav class='secondary-actions'>
+        <nav class='secondary-actions mb-3'>
           <ul class='clearfix'>
             <li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
             <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
@@ -50,7 +50,7 @@
       <% if nearby.empty? %>
         <%= t ".no nearby users" %>
       <% else %>
-        <nav class='secondary-actions'>
+        <nav class='secondary-actions mb-3'>
           <ul class='clearfix'>
             <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
             <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb
index a7cdf21d7..403d30742 100644
--- a/app/views/diary_entries/_diary_comment.html.erb
+++ b/app/views/diary_entries/_diary_comment.html.erb
@@ -1,19 +1,23 @@
-<div class="clearfix diary-comment<%= " text-muted deleted" unless diary_comment.visible? %>">
-  <%= user_thumbnail diary_comment.user %>
-  <p class="text-muted comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
-    <% if current_user and diary_comment.user.id != current_user.id %>
-      | <%= report_link(t(".report"), diary_comment) %>
-    <% end %>
-  </p>
-
-  <div class="richtext text-break"><%= diary_comment.body.to_html %></div>
-  <% if can? :hidecomment, DiaryEntry %>
-    <span>
-      <% if diary_comment.visible? %>
-        <%= link_to t(".hide_link"), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %>
-      <% else %>
-        <%= link_to t(".unhide_link"), unhide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %>
+<div class="row diary-comment<%= " text-muted deleted" unless diary_comment.visible? %>">
+  <div class="col-auto">
+    <%= user_thumbnail diary_comment.user %>
+  </div>
+  <div class="col">
+    <p class="text-muted comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
+      <% if current_user and diary_comment.user.id != current_user.id %>
+        | <%= report_link(t(".report"), diary_comment) %>
       <% end %>
-    </span>
-  <% end %>
+    </p>
+
+    <div class="richtext text-break"><%= diary_comment.body.to_html %></div>
+    <% if can? :hidecomment, DiaryEntry %>
+      <span>
+        <% if diary_comment.visible? %>
+          <%= link_to t(".hide_link"), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %>
+        <% else %>
+          <%= link_to t(".unhide_link"), unhide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %>
+        <% end %>
+      </span>
+    <% end %>
+  </div>
 </div>
diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index 4080b8f95..2b3dad055 100644
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -1,11 +1,18 @@
 <div class='diary_post<%= " text-muted px-3 deleted" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
-  <div class='post_heading clearfix'>
-    <% if !@user %>
-      <%= user_thumbnail diary_entry.user %>
+  <div class='post_heading'>
+    <% 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 %>
 
-    <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
-
     <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)) %>
diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 6803c761e..9c0112cd0 100644
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -1,26 +1,31 @@
-<% content_for :head, tag(:meta, :name => :robots, :content => :noindex) %>
+<% content_for :head, tag.meta(:name => :robots, :content => :noindex) %>
 <% content_for :heading do %>
-  <div <% if @user %> id="userinformation"<% end %>>
+  <div class="row">
     <% if @user %>
-      <%= user_image @user %>
+        <div class="col-auto">
+          <%= user_image @user %>
+        </div>
     <% end %>
-    <h1><%= @title %></h1>
-
-    <nav class="secondary-actions">
-      <ul class="clearfix">
-        <% unless params[:friends] or params[:nearby] -%>
-          <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
-          <% end -%>
-
-          <% if @user && @user == current_user || !@user && current_user %>
-            <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
-          <% end %>
-
-          <% if !@user && current_user %>
-            <li><%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %></li>
-          <% end %>
-      </ul>
-    </nav>
+
+    <div class="col">
+      <h1><%= @title %></h1>
+
+      <nav class="secondary-actions">
+        <ul class="clearfix">
+          <% unless params[:friends] or params[:nearby] -%>
+            <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
+            <% end -%>
+
+            <% if @user && @user == current_user || !@user && current_user %>
+              <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
+            <% end %>
+
+            <% if !@user && current_user %>
+              <li><%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %></li>
+            <% end %>
+        </ul>
+      </nav>
+    </div>
   </div>
 <% end %>
 
diff --git a/app/views/diary_entries/no_such_entry.html.erb b/app/views/diary_entries/no_such_entry.html.erb
index db8bc6f09..da7d18524 100644
--- a/app/views/diary_entries/no_such_entry.html.erb
+++ b/app/views/diary_entries/no_such_entry.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= t ".heading", :id => h(params[:id]) %></h2>
+  <h1><%= t ".heading", :id => h(params[:id]) %></h1>
 <% end %>
 
 <p><%= t ".body", :id => h(params[:id]) %></p>
diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 2b7245356..879207495 100644
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -1,8 +1,12 @@
 <% content_for :heading do %>
-  <div id="userinformation">
-    <%= user_image @entry.user %>
-    <h2><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h2>
-    <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
+  <div class="row">
+    <div class="col-sm-auto">
+      <%= user_image @entry.user %>
+    </div>
+    <div class="col">
+      <h1><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h1>
+      <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
+    </div>
   </div>
 <% end %>
 
diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index 6a90dbbff..e55bf4257 100644
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,14 +1,16 @@
 <div>
   <% comments.each do |comment| %>
-    <div class="comment">
-      <div class="float-left">
+    <div class="row">
+      <div class="col-auto">
         <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
       </div>
-      <p class="text-muted mb-0">
-        <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
-                                    :comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
-      </p>
-      <p><%= comment.body %></p>
+      <div class="col">
+        <p class="text-muted mb-0">
+          <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
+                                      :comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
+        </p>
+        <p><%= comment.body %></p>
+      </div>
     </div>
     <hr>
   <% end %>
diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 143f2d887..b1b690f8c 100644
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,14 +1,16 @@
 <% reports.each do |report| %>
-  <div class="report">
-    <div class="float-left">
+  <div class="row">
+    <div class="col-auto">
       <%= link_to user_thumbnail(report.user), user_path(report.user) %>
     </div>
-    <p class="text-muted mb-0">
-      <%= t ".reported_by_html", :category => report.category,
-                                 :user => link_to(report.user.display_name, user_path(report.user)),
-                                 :updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>
-    </p>
-    <p><%= report.details %></p>
+    <div class="col">
+      <p class="text-muted mb-0">
+        <%= t ".reported_by_html", :category => report.category,
+                                   :user => link_to(report.user.display_name, user_path(report.user)),
+                                   :updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>
+      </p>
+      <p><%= report.details %></p>
+    </div>
   </div>
   <hr>
 <% end %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 5a457cea7..ba2738b74 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-<h2><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h2>
+<h1><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h1>
 <p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
 <p class="text-muted">
   <small>
diff --git a/app/views/layouts/_meta.html.erb b/app/views/layouts/_meta.html.erb
index dc08424f3..2052b1d64 100644
--- a/app/views/layouts/_meta.html.erb
+++ b/app/views/layouts/_meta.html.erb
@@ -7,19 +7,19 @@
 <%= favicon_link_tag "favicon-96x96.png", :rel => "icon", :sizes => "96x96", :type => "image/png" %>
 <%= favicon_link_tag "android-chrome-192x192.png", :rel => "icon", :sizes => "192x192", :type => "image/png" %>
 <%= favicon_link_tag "favicon-16x16.png", :rel => "icon", :sizes => "16x16", :type => "image/png" %>
-<%= tag("link", :rel => "mask-icon", :href => asset_path("tab-icon.svg"), :color => "#7ebc6f") %>
-<%= tag("link", :rel => "manifest", :href => asset_path("manifest.json")) %>
-<%= tag("meta", :name => "msapplication-config", :content => asset_path("browserconfig.xml")) %>
-<%= tag("meta", :name => "msapplication-TileColor", :content => "#00a300") %>
-<%= tag("meta", :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png")) %>
-<%= tag("meta", :name => "theme-color", :content => "#ffffff") %>
+<%= tag.link :rel => "mask-icon", :href => asset_path("tab-icon.svg"), :color => "#7ebc6f" %>
+<%= tag.link :rel => "manifest", :href => asset_path("manifest.json") %>
+<%= tag.meta :name => "msapplication-config", :content => asset_path("browserconfig.xml") %>
+<%= tag.meta :name => "msapplication-TileColor", :content => "#00a300" %>
+<%= tag.meta :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png") %>
+<%= tag.meta :name => "theme-color", :content => "#ffffff" %>
 <%= canonical_tag %>
 <% if Settings.key?(:publisher_url) -%>
-<%= tag("link", :rel => "publisher", :href => Settings.publisher_url) %>
+<%= tag.link :rel => "publisher", :href => Settings.publisher_url %>
 <% end -%>
-<%= tag("link", :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml")) %>
-<%= tag("meta", :name => "description", :content => "OpenStreetMap is the free wiki world map.") %>
+<%= tag.link :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") %>
+<%= tag.meta :name => "description", :content => "OpenStreetMap is the free wiki world map." %>
 <%= opengraph_tags(@title) %>
 <% if flash[:piwik_goal] -%>
-<%= tag("meta", :name => "piwik-goal", :content => flash[:piwik_goal]) %>
+<%= tag.meta :name => "piwik-goal", :content => flash[:piwik_goal] %>
 <% end -%>
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index 663456ec7..7c91722ff 100644
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= t(".send_message_to_html", :name => link_to(@message.recipient.display_name, user_path(@message.recipient))) %></h2>
+  <h1><%= t(".send_message_to_html", :name => link_to(@message.recipient.display_name, user_path(@message.recipient))) %></h1>
 <% end %>
 
 <%= bootstrap_form_for @message do |f| %>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 74c61669f..9ade68121 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= @message.title %></h2>
+  <h1><%= @message.title %></h1>
 <% end %>
 
 <% if current_user == @message.recipient %>
diff --git a/app/views/notes/index.html.erb b/app/views/notes/index.html.erb
index b5af25321..a627e1c54 100644
--- a/app/views/notes/index.html.erb
+++ b/app/views/notes/index.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= t ".heading", :user => @user.display_name %></h2>
+  <h1><%= t ".heading", :user => @user.display_name %></h1>
   <p><%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>
 <% end %>
 
diff --git a/app/views/traces/edit.html.erb b/app/views/traces/edit.html.erb
index 13829727c..7365295bd 100644
--- a/app/views/traces/edit.html.erb
+++ b/app/views/traces/edit.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= t ".heading", :name => @trace.name %></h2>
+  <h1><%= t ".heading", :name => @trace.name %></h1>
 <% end %>
 
 <img src="<%= url_for :controller => "traces", :action => "picture", :id => @trace.id, :display_name => @trace.user.display_name %>">
diff --git a/app/views/traces/offline.html.erb b/app/views/traces/offline.html.erb
index 8a26744fd..b3958d6a3 100644
--- a/app/views/traces/offline.html.erb
+++ b/app/views/traces/offline.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-<h2><%= t ".heading" %></h2>
+  <h1><%= t ".heading" %></h1>
 <% end %>
 
 <p><%= t ".message" %></p>
diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb
index 6df31760a..e72c423d7 100644
--- a/app/views/traces/show.html.erb
+++ b/app/views/traces/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= t ".heading", :name => @trace.name %></h2>
+  <h1><%= t ".heading", :name => @trace.name %></h1>
 <% end %>
 
 <% if Settings.status != "gpx_offline" %>
diff --git a/app/views/user_mailer/diary_comment_notification.html.erb b/app/views/user_mailer/diary_comment_notification.html.erb
index b4efae83b..7f9368fe3 100644
--- a/app/views/user_mailer/diary_comment_notification.html.erb
+++ b/app/views/user_mailer/diary_comment_notification.html.erb
@@ -11,8 +11,8 @@
 
 <% content_for :footer do %>
   <p><%= t ".footer_html",
-           :readurl => link_to(@readurl, @readurl) + tag(:br),
-           :commenturl => link_to(@commenturl, @commenturl) + tag(:br),
+           :readurl => link_to(@readurl, @readurl) + tag.br,
+           :commenturl => link_to(@commenturl, @commenturl) + tag.br,
            :replyurl => link_to(@replyurl, @replyurl) %>
   </p>
 <% end %>
diff --git a/app/views/user_mailer/message_notification.html.erb b/app/views/user_mailer/message_notification.html.erb
index 4095b5e59..a39a3fe5d 100644
--- a/app/views/user_mailer/message_notification.html.erb
+++ b/app/views/user_mailer/message_notification.html.erb
@@ -14,7 +14,7 @@
 <% content_for :footer do %>
   <p>
     <%= t ".footer_html",
-          :readurl => link_to(@readurl, @readurl) + tag(:br),
+          :readurl => link_to(@readurl, @readurl) + tag.br,
           :replyurl => link_to(@replyurl, @replyurl) %>
   </p>
 <% end %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index cc7170222..12d5ae7af 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -35,9 +35,9 @@
       <%= render @users %>
     </table>
 
-    <div id="user_list_actions buttons">
-      <%= submit_tag t(".confirm"), :name => "confirm" %>
-      <%= submit_tag t(".hide"), :name => "hide" %>
+    <div>
+      <%= submit_tag t(".confirm"), :name => "confirm", :class => "btn btn-primary" %>
+      <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-primary" %>
     </div>
   <% end %>
 <% else %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 5aaeabb23..2a195ca60 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading do %>
-  <div id="userinformation" class="row">
+  <div class="row">
     <div class="col-sm-auto">
-      <%= user_image @user, :class => "user_image_no_margins" %>
+      <%= user_image @user %>
     </div>
     <div class="col">
       <h1><%= @user.display_name %> <%= role_icons(@user) %></h1>
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 4e7b0df12..effbf216b 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -66,7 +66,7 @@ af:
       old_relation: Ou Verband
       old_relation_member: Ou Verbandslid
       old_relation_tag: Ou Verbandsmerker
-      old_way: Ou pad
+      old_way: Ou weg
       old_way_node: Ou weg-knooppunt
       old_way_tag: Ou weg-merker
       relation: Verband
@@ -86,16 +86,16 @@ af:
     attributes:
       client_application:
         name: Naam (verplig)
-        url: Hoof-URL van toepassing (verplig)
+        url: Hoof-URL van program (verplig)
         callback_url: Callback-URL
         support_url: Ondersteunings-URL
-        allow_read_prefs: lees hul gebruikersvoorkeure
-        allow_write_prefs: verander hul gebruikersvoorkeure
+        allow_read_prefs: hul gebruikersvoorkeure lees
+        allow_write_prefs: hul gebruikersvoorkeure wysig
         allow_write_diary: skep dagboekinskrywings, lewer kommentaar en ontmoet vriende
         allow_write_api: die kaart wysig
         allow_read_gpx: lees hul privaat GPS-spore
         allow_write_gpx: laai GPS-spore op
-        allow_write_notes: wysig notas
+        allow_write_notes: notas wysig
       diary_comment:
         body: Teks
       diary_entry:
@@ -113,7 +113,7 @@ af:
       trace:
         user: Gebruiker
         visible: Sigbaar
-        name: Spoornaam
+        name: Lêernaam
         size: Grootte
         latitude: Breedtegraad
         longitude: Lengtegraad
@@ -121,7 +121,7 @@ af:
         description: Beskrywing
         gpx_file: 'Laai GPX-lêer op:'
         visibility: 'Sigbaarheid:'
-        tagstring: 'Merkers:'
+        tagstring: Merkers
       message:
         sender: Sender
         title: Onderwerp
@@ -137,7 +137,7 @@ af:
         auth_provider: Verifikasie verskaffer
         auth_uid: Verifikasie UID
         email: E-pos
-        email_confirmation: Emailbevestiging
+        email_confirmation: E-posbevestiging
         new_email: 'Nuwe e-posadres:'
         active: Bedrywig
         display_name: Skermnaam
@@ -231,8 +231,8 @@ af:
         reopened_at_html: '%{when} heraktiveer'
         reopened_at_by_html: '%{when} deur %{user} geheraktiveer'
       rss:
-        title: OpenStreetMap-nota
-        description_area: '''N Lys met aantekeninge, gerapporteer, opmerkings of geslote
+        title: OpenStreetMap-notas
+        description_area: '''N lys met notas, gerapporteer, opmerkings of geslote
           in u omgewing [(%{min_lat}|%{min_lon})--(%{max_lat}|%{max_lon})]'
         description_item: '''N RSS-voer vir nota %{id}'
         opened: nuwe nota (naby %{place})
@@ -267,7 +267,7 @@ af:
     view_details: Bekyk detail
     location: 'Ligging:'
     changeset:
-      title: 'Wysigingsstel: %{id}'
+      title: 'Wysigingstel: %{id}'
       belongs_to: Skrywer
       node: Knooppunte (%{count})
       node_paginated: Knooppunte (%{x}-%{y} van %{count})
@@ -276,14 +276,14 @@ af:
       relation: Verwantskappe (%{count})
       relation_paginated: Verwantskappe (%{x}-%{y} of %{count})
       comment: Kommentaar (%{count})
-      hidden_commented_by_html: Verskuilde kommentaar deur %{user} <abbr title='%{exact_time}'>%{when}
+      hidden_commented_by_html: Verskuilde kommentaar van %{user} <abbr title='%{exact_time}'>%{when}
         ago</abbr>
       commented_by_html: Kommentaar deur %{user} <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      changesetxml: Wysigingsstel XML
+      changesetxml: Wysigingstel XML
       osmchangexml: osmWysiging XML
       feed:
-        title: Wysigingsstel %{id}
+        title: Wysigingstel %{id}
         title_comment: Wysigingstel %{id} - %{comment}
       join_discussion: Meld aan en gesels saam
       discussion: Bespreking
@@ -320,7 +320,7 @@ af:
       entry_role_html: Verwantskap %{relation_name} (as %{relation_role})
     not_found:
       title: Kon nie gevind word
-      sorry: 'Jammer, %{type} #%{id} blyk onverkrygbaar.'
+      sorry: 'Jammer, %{type} #%{id} kon nie gevind word.'
       type:
         node: knooppunt
         way: weg
@@ -338,7 +338,7 @@ af:
         changeset: wysigingstel
         note: nota
     redacted:
-      redaction: Redigering %{id}
+      redaction: Redaksie %{id}
       message_html: Weergawe %{version} van hierdie %{type} kan nie vertoon word nie,
         synde dit geredigeer is. Raadpleeg asseblief %{redaction_link} vir besonderhede.
       type:
@@ -353,7 +353,7 @@ af:
     tag_details:
       tags: Merkers
       wiki_link:
-        key: Die wiki-beskrywingsblad vir etiket %{key}
+        key: Die wiki-beskrywingsblad vir merker %{key}
         tag: Die wikibeskrywingsblad vir die merker %{key}=%{value}
       wikidata_link: Die item %{page} op Wikidata
       wikipedia_link: Die bladsy %{page} op Wikipedia
@@ -370,7 +370,7 @@ af:
       opened_by_html: Geskep deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
       opened_by_anonymous_html: Geskep deur anoniem <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      commented_by_html: Kommentaar deur %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Kommentaar van %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by_anonymous_html: Kommentaar deur anoniem <abbr title='%{exact_time}'>%{when}</abbr>
       closed_by_html: Opgelos deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
       closed_by_anonymous_html: Opgelos deur anoniem <abbr title ='%{exact_time}'>%{when}</abbr>
@@ -391,18 +391,18 @@ af:
     changeset:
       anonymous: Anoniem
       no_edits: (geen wysigings)
-      view_changeset_details: Bekyk die wysigingstel se besonderhede
+      view_changeset_details: Beskou die wysigingstel se besonderhede
     changesets:
       id: ID
       saved_at: Gestoor op
       user: Gebruiker
-      comment: Opmerking
+      comment: Kommentaar
       area: Gebied
     index:
       title: Wysigingstelle
       title_user: Veranderings deur %{user}
       title_friend: Wysigingstelle deur my vriende
-      title_nearby: Veranderings deur mense naby
+      title_nearby: Veranderings deur gebruikers naby
       empty: Geen wysigingstelle gevind nie.
       empty_area: Geen wysigingstelle in hierdie gebied.
       empty_user: Geen wysigingstelle deur hierdie gebruiker.
@@ -415,15 +415,15 @@ af:
         haal.
   changeset_comments:
     comment:
-      comment: 'Nuwe opmerking oor veranderingset #%{changeset_id} deur %{author}'
+      comment: 'Nuwe opmerking oor wysigingstel #%{changeset_id} deur %{author}'
       commented_at_by_html: '%{when} gelede deur %{user} opgedateer'
     comments:
-      comment: 'Nuwe opmerking oor veranderingstel #%{changeset_id} deur %{author}'
+      comment: 'Nuwe opmerking oor wysigingstel #%{changeset_id} deur %{author}'
     index:
       title_all: OpenStreetMap bespreking oor wysigingstelle
-      title_particular: 'OpenStreetMap veranderingset #%{changeset_id} bespreking'
+      title_particular: 'OpenStreetMap wysigingstel #%{changeset_id} bespreking'
     timeout:
-      sorry: Jammer, die lys met opmerkings wat u versoek het, het te lank geneem
+      sorry: Jammer, die lys met kommentaar wat u versoek het, het te lank geneem
         om op te spoor.
   dashboards:
     contact:
@@ -438,10 +438,11 @@ af:
       edit_your_profile: Wysig u profiel
       my friends: My vriende
       no friends: U het nog geen vriende bygevoeg nie.
-      nearby users: Ander nabygeleë gebruikers
+      nearby users: Ander gebruikers naby
       no nearby users: Daar is nog geen ander gebruikers wat sê dat hulle in die nabye
         omgewing karteer nie.
       friends_changesets: Wysigingstelle deur my vriende
+      nearby_changesets: gebruikerswysigingstelle naby
   diary_entries:
     new:
       title: Nuwe dagboekinskrywing
@@ -491,10 +492,10 @@ af:
       report: Rapporteer hierdie inskrywing
     diary_comment:
       comment_from_html: Kommentaar van %{link_user} op %{comment_created_at}
-      hide_link: Steek hierdie opmerking weg
+      hide_link: Steek hierdie kommentaar weg
       unhide_link: Onthul hierdie opmerking
       confirm: Bevestig
-      report: Rapporteer hierdie opmerking
+      report: Rapporteer hierdie kommentaar
     location:
       location: 'Ligging:'
       view: Beskou
@@ -505,19 +506,23 @@ af:
         description: Onlangse OpenStreetMap-dagboekinskrywings van %{user}
       language:
         title: OpenStreetMap dagboekinskrywings in %{language_name}
-        description: Onlangse dagboekinskrywings deur OpenStreetMap-gebruikers in
-          %{language_name}
+        description: Onlangse dagboekinskrywings van OpenStreetMap-gebruikers in %{language_name}
       all:
         title: OpenStreetMap-dagboekinskrywings
-        description: Onlangse dagboekinskrywings deur OpenStreetMap-gebruikers
+        description: Onlangse dagboekinskrywings van OpenStreetMap-gebruikers
     comments:
       has_commented_on: '%{display_name} het kommentaar gelewer op die volgende dagboekinskrywings'
-      no_comments: Geen dagboekeopmerkings
+      no_comments: Geen dagboekkommentaar
       post: Inskrywing
       when: Wanneer
       comment: Kommentaar
       newer_comments: Nuwer kommentaar
       older_comments: Ouer Kommentaar
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Program geregistreer.
   friendships:
     make_friend:
       heading: '%{user} as vriend toevoeg?'
@@ -549,9 +554,9 @@ af:
           cable_car: Sweefspoor
           chair_lift: Stoelhyser
           drag_lift: Sleephysbak
-          gondola: Gondel lift
+          gondola: Gondel hysbak
           magic_carpet: Towertapythyser
-          platter: Platter Lift
+          platter: Platter hysbak
           pylon: Spantoring
           station: Lugwegstasie
           t-bar: T-bar hysbak
@@ -563,7 +568,7 @@ af:
           gate: Hek
           hangar: Loods
           helipad: Helikopterplatform
-          holding_position: Hou Posisie
+          holding_position: Hou posisie
           navigationaid: Lugvaartnavigasiehulp
           parking_position: Parkeerplek
           runway: Aanloopbaan
@@ -573,7 +578,7 @@ af:
           windsock: Windkous
         amenity:
           animal_boarding: Dierehotel
-          animal_shelter: Dierebeskermingsvereniging
+          animal_shelter: Dierebeskerming
           arts_centre: Kunssentrum
           atm: OTM
           bank: Bank
@@ -588,9 +593,9 @@ af:
           boat_rental: Boothuur
           brothel: Bordeel
           bureau_de_change: Wisselkantoor
-          bus_station: Bushalte
+          bus_station: Busstasie
           cafe: Kafee
-          car_rental: Motorverhuurder
+          car_rental: Motorhuur
           car_sharing: Saam-ry
           car_wash: Karwas
           casino: Dobbelhuis
@@ -610,15 +615,15 @@ af:
           driving_school: Bestuurskool
           embassy: Ambassade
           events_venue: Onthaallokaal
-          fast_food: Wegneemetes
+          fast_food: Kitskos
           ferry_terminal: Pontterminaal
           fire_station: Brandweerstasie
-          food_court: Kosarea
+          food_court: Kosgebied
           fountain: Fontein
           fuel: Brandstof
           gambling: Dobbelary
           grave_yard: Begraafplaas
-          grit_bin: Grit Bin
+          grit_bin: Grit bin
           hospital: Hospitaal
           hunting_stand: Jagtoring
           ice_cream: Roomys
@@ -687,7 +692,7 @@ af:
           "yes": Grens
         bridge:
           aqueduct: Waterbrug
-          boardwalk: Boardwalk
+          boardwalk: Plankenweg
           suspension: Hangbrug
           swing: Swaaibrug
           viaduct: Viaduk
@@ -701,8 +706,8 @@ af:
           chapel: Kapel
           church: Kerkgebou
           civic: Openbare gebou
-          college: Kollege gebou
-          commercial: Kommersiële-gebou
+          college: Kollegegebou
+          commercial: Kommersiële gebou
           construction: Gebou in aanbou
           detached: Alleenstaande woning
           dormitory: Studentehuis
@@ -713,7 +718,7 @@ af:
           garages: Vulstasies
           greenhouse: Kweekhuis
           hangar: Loods
-          hospital: Hospitaal-gebou
+          hospital: Hospitaalgebou
           hotel: Hotelgebou
           house: Huis
           houseboat: Huisboot
@@ -748,10 +753,10 @@ af:
           brewery: Brouery
           carpenter: Skrynwerker
           caterer: Spysenier
-          confectionery: Gebak
+          confectionery: Lekkergoed
           dressmaker: Kleremaker
           electrician: Elektrisiën
-          electronics_repair: Elektronieseherstelwerk
+          electronics_repair: Elektronieseherstel
           gardener: Tuinier
           glaziery: Glaswerk
           handicraft: Handwerk
@@ -768,6 +773,7 @@ af:
           window_construction: Vensterraamwerk
           winery: Wynboer
           "yes": Handwerkwinkel
+        crossing: Kruis
         emergency:
           access_point: Reddingsdienstoegangspunt
           ambulance_station: Ambulansstasie
@@ -775,7 +781,7 @@ af:
           defibrillator: Defibrillator
           fire_extinguisher: Brandblusser
           fire_water_pond: Bluswaterdam
-          landing_site: Noodlandingsarea
+          landing_site: Noodlandingsplek
           life_ring: Reddingsboei
           phone: Noodtelefoon
           siren: Noodsirene
@@ -783,11 +789,11 @@ af:
           water_tank: Noodwatertenk
           "yes": Noodgeval
         highway:
-          abandoned: Verlate snelweg
+          abandoned: Verlate weg
           bridleway: Ruiterpad
           bus_guideway: Toegewyde busbaan
           bus_stop: Bushalte
-          construction: Snelweg in aanbou
+          construction: Weg in aanbou
           corridor: Korridor
           cycleway: Fietspad
           elevator: Hysbak
@@ -802,36 +808,36 @@ af:
           motorway_link: Motorweg
           passing_place: Verbygaanplek
           path: Pad
-          pedestrian: Voetgangerspad
+          pedestrian: Voetgangersweg
           platform: Platform
-          primary: Primêre pad
-          primary_link: Primêre pad
-          proposed: Voorgestelde pad
+          primary: Primêre weg
+          primary_link: Primêre weg
+          proposed: Voorgestelde weg
           raceway: Renbaan
-          residential: Residensiële straat
-          rest_area: Rusarea
-          road: Pad
-          secondary: Sekondêre pad
-          secondary_link: Sekondêre pad
-          service: Dienspad
+          residential: Residensiële weg
+          rest_area: Rusgebied
+          road: Weg
+          secondary: Sekondêre weg
+          secondary_link: Sekondêre weg
+          service: Diensweg
           services: Snelwegdienste
           speed_camera: Snelheidskamera
           steps: Trappe
           stop: Stopteken
           street_lamp: Straatlig
-          tertiary: Tersiêre pad
+          tertiary: Tersiêre weg
           tertiary_link: Tersiêre pad
           track: Spoor
           traffic_mirror: Verkeerspieël
           traffic_signals: Verkeerstekens
           trailhead: Wandelvertrekpunt
-          trunk: Hoofroete
+          trunk: Hoofweg
           trunk_link: Hoofroete
           turning_loop: Draailus
-          unclassified: Ongeklassifiseerde pad
-          "yes": Straat
+          unclassified: Ongeklassifiseerde weg
+          "yes": Weg
         historic:
-          aircraft: Historiese Vliegtuig
+          aircraft: Historiese vliegtuig
           archaeological_site: Argeologiese terrein
           bomb_crater: Historiese bomkrater
           battlefield: Slagveld
@@ -846,32 +852,33 @@ af:
           fort: Fort
           heritage: Erfenisterrein
           house: Huis
-          manor: Landgoed
+          manor: Landhuis
           memorial: Gedenkteken
-          milestone: Historiese myl paal
+          milestone: Historiese mylpaal
           mine: Myn
           mine_shaft: Mynskag
           monument: Monument
-          railway: Historiese spoorlyn
-          roman_road: Romeinse pad
+          railway: Historiese spoorweg
+          roman_road: Romeinse weg
           ruins: Ruïnes
           stone: Steen
           tomb: Graf
           tower: Toring
-          wayside_cross: Padkruis
-          wayside_shrine: Padaltaar
+          wayside_chapel: Wegkapel
+          wayside_cross: Wegkruis
+          wayside_shrine: Wegaltaar
           wreck: Wrak
           "yes": Historiese terrein
         junction:
-          "yes": Verkeersaansluiting
+          "yes": Verkeerskruising
         landuse:
           allotments: Volkstuine
           aquaculture: Akwakultuur
           basin: Kom
           cemetery: Begraafplaas
-          commercial: Handelsarea
+          commercial: Handelsgebied
           conservation: Natuurbewaring
-          construction: Konstruksie
+          construction: In aanbou
           farm: Plaas
           farmland: Landbougrond
           farmyard: Plaaswerf
@@ -880,7 +887,7 @@ af:
           grass: Gras
           industrial: Nywerheidsgebied
           landfill: Stortingsterrein
-          meadow: Vleiweiding
+          meadow: Weiland
           military: Militêre gebied
           mine: Myn
           orchard: Vrugteboord
@@ -958,7 +965,7 @@ af:
           monitoring_station: Moniteringstasie
           petroleum_well: Oliebron
           pier: Pier
-          pipeline: Pypleiding
+          pipeline: Pyplyn
           pumping_station: Pompstasie
           reservoir_covered: Bedekte Reservoir
           silo: Silo
@@ -1000,7 +1007,7 @@ af:
           forest: Woud
           geyser: Geiser
           glacier: Gletser
-          grassland: Grasveld
+          grassland: Grasland
           heath: Heide
           hill: Heuwel
           hot_spring: Warmwaterbron
@@ -1023,11 +1030,13 @@ af:
           stone: Steen
           strait: Seestraat
           tree: Boom
+          tree_row: Bomery
           valley: Vallei
           volcano: Vuurspuwende berg
           water: Water
           wetland: Vleiland
           wood: Bos
+          "yes": Natuurlike baken
         office:
           accountant: Boekhouer
           administrative: Administrasie
@@ -1068,7 +1077,7 @@ af:
           houses: Huise
           island: Eiland
           islet: Eilandjie
-          isolated_dwelling: Geïsoleerde woning
+          isolated_dwelling: Afgeleë blyplek
           locality: Ligging
           municipality: Munisipaliteit
           neighbourhood: Woonbuurt
@@ -1098,24 +1107,24 @@ af:
           platform: Spoorwegperron
           preserved: Historiese spoorweg
           proposed: Voorgestelde spoorlyn
-          spur: Spoorweg Spur
+          spur: Spoorweg spur
           station: Spoorwegstasie
           stop: Spoorweghalte
-          subway: Duikwegspoor
+          subway: Ondergrondse spoorweg
           subway_entrance: Ondergrondse spoorwegingang
-          switch: Spoogwegpunte
+          switch: Spoorwegpunte
           tram: Tremspoor
           tram_stop: Tremhalte
           yard: Spoorwegterrein
         shop:
           agrarian: Landbouwinkel
           alcohol: Drankwinkel
-          antiques: Antiek / Oudhede
+          antiques: Antiek
           appliance: Toestellewinkel
           art: Kunswinkel
           baby_goods: Babaware
           bakery: Bakkery
-          beauty: Skoonheidsalon
+          beauty: Skoonheidswinkel
           beverages: Drankgoedwinkel
           bicycle: Fietswinkel
           bookmaker: Beroepswedder
@@ -1125,7 +1134,7 @@ af:
           car: Motorhandelaar
           car_parts: Motoronderdele
           car_repair: Motorherstel
-          carpet: Mat-/tapytwinkel
+          carpet: Tapytwinkel
           charity: Liefdadigheidswinkel
           cheese: Kaaswinkel
           chemist: Apteek
@@ -1133,7 +1142,7 @@ af:
           clothes: Klerewinkel
           coffee: Koffiewinkel
           computer: Rekenaarwinkel
-          confectionery: Banketbakkery
+          confectionery: Lekkergoedwinkel
           convenience: Geriefswinkel
           copyshop: Fotostaatwinkel
           cosmetics: Kosmetiekwinkel
@@ -1154,11 +1163,11 @@ af:
           frame: Raamwerk winkel
           funeral_directors: Begrafnisondernemer
           furniture: Meubels
-          garden_centre: Kwekery/Tuinsentrum
+          garden_centre: Tuinsentrum
           gas: Gaswinkel
           general: Algemene handelaar
           gift: Geskenkewinkel
-          greengrocer: Groentehandelaar
+          greengrocer: Groentewinkel
           grocery: Kruidenierswinkel
           hairdresser: Haarkapper
           hardware: Hardewarewinkel
@@ -1202,7 +1211,7 @@ af:
           ticket: Kaartjiewinkel
           tobacco: Tabakwinkel
           toys: Speelgoedwinkel
-          travel_agency: Reisagentskap
+          travel_agency: Reisagent
           tyres: Bandwinkel
           vacant: Vakante winkel
           variety_store: Verskeidenheidswinkel
@@ -1290,7 +1299,7 @@ af:
       last_updated: Laas opgedateer
       last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> deur %{user}
-      link_to_reports: Bekyk verslae
+      link_to_reports: Beskou verslae
       reports_count:
         one: 1 verslag
         other: '%{count} verslae'
@@ -1324,7 +1333,7 @@ af:
     reopen:
       reopened: Probleemstatus is op 'Oop' gestel
     comments:
-      comment_from_html: Opmerking deur %{user_link} op %{comment_created_at}
+      comment_from_html: Kommentaar van %{user_link} op %{comment_created_at}
       reassign_param: Ken die probleem weer toe?
     reports:
       reported_by_html: As %{category} gerapporteer deur %{user} op %{updated_at}
@@ -1375,7 +1384,7 @@ af:
   layouts:
     logo:
       alt_text: OpenStreetMap-embleem
-    home: Keer terug na tuisligging
+    home: Na tuisligging gaan
     logout: Meld af
     log_in: Meld aan
     log_in_tooltip: Meld aan met 'n bestaande rekening
@@ -1484,6 +1493,7 @@ af:
     inbox:
       title: In-vakkie
       my_inbox: My in-vakkie
+      my_outbox: My uit-vakkie
       from: Van
       subject: Onderwerp
       date: Datum
@@ -1508,6 +1518,8 @@ af:
       heading: Geen so 'n boodskap nie
     outbox:
       title: Uit-vakkie
+      my_inbox: My in-vakkie
+      my_outbox: My uit-vakkie
       to: Aan
       subject: Onderwerp
       date: Datum
@@ -1542,7 +1554,7 @@ af:
       title: Herstel wagwoord
       heading: Herstel wagwoord vir %{user}
       reset: Herstel wagwoord
-      flash changed: U wagwoord is verander.
+      flash changed: U wagwoord is gewysig.
   preferences:
     show:
       title: My voorkeure
@@ -1568,7 +1580,7 @@ af:
     new:
       title: Meld aan
       heading: Meld aan
-      email or username: 'E-posadres of gebruikersnaam:'
+      email or username: 'E-posadres of gebruikernaam:'
       password: 'Wagwoord:'
       remember: Onthou my
       lost password link: Wagwoord vergeet?
@@ -1623,6 +1635,7 @@ af:
       next: Volgende
       local_knowledge_title: Plaaslike kennis
       community_driven_title: Gemeenskapsgedrewe
+      open_data_title: Open Data
       legal_title: Regsaspekte
       partners_title: Vennote
     copyright:
@@ -1681,6 +1694,7 @@ af:
       paste_html: Plak HTML om in die webblad te versteek
       export_button: Voer uit
     fixthemap:
+      title: Rapporteer 'n probleem / Corrigeer die kaart
       how_to_help:
         title: Hoe om te help
         join_the_community:
@@ -1716,7 +1730,7 @@ af:
       search: Soek
       get_directions: Kry rigtingaanwysings
       get_directions_title: Kry rigtingaanwysings tussen twee punte
-      from: Vanaf
+      from: Van
       to: Na
       where_am_i: Waar is dié?
       submit_text: Soek
@@ -1724,11 +1738,11 @@ af:
       table:
         entry:
           motorway: Snelweg
-          main_road: Hoofpad
+          main_road: Hoofweg
           trunk: Hoofroete
-          primary: Primêre pad
+          primary: Primêre weg
           secondary: Sekondêre pad
-          unclassified: Ongeklassifiseerde pad
+          unclassified: Ongeklassifiseerde weg
           track: Spoor
           bridleway: Ruiterpad
           cycleway: Fietspad
@@ -1743,7 +1757,7 @@ af:
           - Sweefspoor
           - stoelhyser
           runway:
-          - Lughawe se aanloopbaan
+          - Aanloopbaan
           - vliegtuigrybaan
           apron:
           - Lughaweplatform
@@ -1757,9 +1771,9 @@ af:
           common:
           - Gemeen
           - weiland
-          retail: Handelsgebied
+          retail: Kleinhandel-gebied
           industrial: Nywerheidsgebied
-          commercial: Kommersiële gebied
+          commercial: Handelsgebied
           heathland: Heide
           lake:
           - Meer
@@ -1784,7 +1798,7 @@ af:
           bridge: Swart omhulsel = brug
           private: Privaat toegang
           destination: Bestemmingsverkeer
-          construction: Paaie in aanbou
+          construction: Wege in aanbou
           bicycle_shop: Fietswinkel
           bicycle_parking: Fietsparkering
           toilets: Toilette
@@ -1819,12 +1833,12 @@ af:
     trace_optionals:
       tags: Merkers
     show:
-      title: Besigtig spoor %{name}
+      title: Beskou spoor %{name}
       heading: Besigtig spoor %{name}
       pending: HANGEND
       filename: 'Lêernaam:'
       download: laai af
-      uploaded: 'Opgelaai op:'
+      uploaded: 'Opgelaai:'
       points: 'Punte:'
       start_coordinates: 'Beginkoördinaat:'
       coordinates_html: '%{latitude}; %{longitude}'
@@ -1858,6 +1872,7 @@ af:
       public_traces_from: Openbare GPS-spore van %{user}
       tagged_with: gemerk met %{tags}
       upload_trace: Laai 'n GPS-spoor op
+      traces_from: Openbare spore van %{user}
     destroy:
       scheduled_for_deletion: Spoor is vir verwydering geoormerk
     make_public:
@@ -1866,13 +1881,16 @@ af:
     settings_menu:
       account_settings: Rekeninginstellings
       oauth1_settings: OAuth 1 instellings
+      oauth2_applications: OAuth 2 programme
   oauth:
     authorize:
-      allow_read_prefs: lees u gebruikersvoorkeure.
-      allow_write_prefs: verander jou gebruikersvoorkeure.
-      allow_write_api: wysig die kaart.
+      allow_to: 'Sta die kliëntprogram toe om:'
+      allow_read_prefs: u gebruikersvoorkeure lees.
+      allow_write_prefs: jou gebruikersvoorkeure wysig.
+      allow_write_diary: skep dagboekinskrywings, lewer kommentaar en ontmoet vriende.
+      allow_write_api: die kaart wysig.
       allow_write_gpx: laai GPS-spore op.
-      allow_write_notes: wysig notas.
+      allow_write_notes: notas wysig.
       grant_access: Verleen toegang
     authorize_success:
       title: Magtigingsversoek toegestaan
@@ -1887,9 +1905,12 @@ af:
     permissions:
       missing: U het nie die program toegang tot hierdie fasiliteit verleen nie.
     scopes:
-      write_api: Wysig die kaart
+      read_prefs: Gebruikersvoorkeure lees
+      write_prefs: Gebruikersvoorkeure wysig
+      write_diary: skep dagboekinskrywings, lewer kommentaar en ontmoet vriende
+      write_api: Die kaart wysig
       write_gpx: Laai GPS-spore op
-      write_notes: Wysig notas
+      write_notes: Notas wysig
   oauth_clients:
     new:
       title: Registreer 'n nuwe toepassing
@@ -1903,6 +1924,7 @@ af:
       authorize_url: 'Magtig URL:'
       edit: Redigeer besonderhede
       confirm: Is u seker?
+      requests: 'Versoek die volgende regte van die gebruiker:'
     index:
       title: My OAuth-gegewens
       application: Programnaam
@@ -1911,8 +1933,10 @@ af:
       my_apps: My kliëntprogramme
       oauth: OAuth
       register_new: Registreer u program
+    form:
+      requests: 'Versoek die volgende regte van die gebruiker:'
     not_found:
-      sorry: Jammer, die %{type} blyk onverkrygbaar te wees.
+      sorry: Jammer, die %{type} kon nie gevind word.
   oauth2_applications:
     index:
       name: Naam
@@ -1920,15 +1944,21 @@ af:
     application:
       edit: Wysig
       delete: Skrap
+      confirm_delete: Diehier program verwyder?
     edit:
       title: Redigeer u program
     show:
       edit: Wysig
       delete: Skrap
+      confirm_delete: Diehier program verwyder?
       permissions: Regte
+    not_found:
+      sorry: Jammer, die program kon nie gevind word.
   oauth2_authorized_applications:
     index:
       permissions: Regte
+    application:
+      revoke: Herroep toegang
   users:
     new:
       title: Meld aan
@@ -1955,6 +1985,8 @@ af:
         france: Frankryk
         italy: Italië
         rest_of_world: Die res van die wêreld
+    terms_declined_flash:
+      terms_declined_link: diehier wiki-bladsy
     no_such_user:
       title: Geen so 'n gebruiker nie
       heading: Die gebruiker %{user} bestaan nie
@@ -1964,11 +1996,12 @@ af:
     show:
       my diary: My Dagboek
       new diary entry: nuwe dagboekinskrywing
-      my edits: My Redigerings
+      my edits: My Wysigings
       my traces: My Spore
       my notes: My notas
       my profile: My profiel
       my settings: My Instellings
+      my comments: My kommentaar
       my_preferences: My voorkeure
       my_dashboard: My paneelbord
       blocks on me: Versperrings vir u
@@ -1976,13 +2009,14 @@ af:
       edit_profile: Wysig profiel
       send message: Stuur boodskap
       diary: Dagboek
-      edits: Redigerings
+      edits: Wysigings
       traces: Spore
       notes: Kaartnotas
       remove as friend: Verwyder as vriend
       add as friend: Voeg by as vriend
       mapper since: 'Karteerder sedert:'
       ct status: 'Bydraervoorwaardes:'
+      latest edit: 'Meest onlangse wysiging (%{ago}):'
       email address: 'E-posadres:'
       created from: 'Geskep vanaf:'
       status: 'Status:'
@@ -2000,6 +2034,7 @@ af:
           moderator: Herroep moderatorregte
       block_history: Aktiewe Versperrings
       moderator_history: Uitgevoerde Versperrings
+      comments: Kommentaar
       create_block: Versper hierdie gebruiker
       activate_user: Aktiveer hierdie gebruiker
       deactivate_user: Deaktiveer hierdie gebruiker
@@ -2008,10 +2043,11 @@ af:
       unhide_user: Wys hierdie gebruiker
       delete_user: Skrap dié Gebruiker
       confirm: Bevestig
+      report: Rapporteer hierdie gebruiker
     account:
       title: Redigeer rekening
       my settings: My instellings
-      current email address: 'Huidige e-posadres:'
+      current email address: Huidige e-posadres
       public editing:
         heading: Openbare redigerings
         enabled: Geaktiveer. Nie anoniem nie en kan data redigeer.
@@ -2023,13 +2059,16 @@ af:
         heading: Bydraervoorwaardes
         link text: wat is dié?
       save changes button: Stoor Wysigings
-      make edits public button: Stel al my redigerings openbaar
+      make edits public button: Stel al my wysigings openbaar
       flash update success: Gebruikersbesonderhede suksesvol bygewerk.
     set_home:
       flash success: U tuisligging is suksesvol gestoor
     index:
       title: Gebruikers
       heading: Gebruikers
+      showing:
+        one: Bladsy %{page} (%{first_item} van %{items})
+        other: Bladsy %{page} (%{first_item}-%{last_item} van %{items})
       summary_html: '%{name} geskep vanaf %{ip_address} op %{date}'
       summary_no_ip_html: '%{name} geskep op %{date}'
       confirm: Bevestig geselekteerde gebruikers
@@ -2048,7 +2087,7 @@ af:
       confirm: Bevestig
   user_blocks:
     not_found:
-      sorry: Jammer, die gebruiker met ID %{id} kon nie gevind word nie.
+      sorry: Jammer, die gebruiker met ID %{id} kon nie gevind word.
       back: Terug na die register
     new:
       heading_html: Skep versperring op %{name}
@@ -2071,6 +2110,7 @@ af:
       heading: Lys van gebruikersversperrings
       empty: Niemand is nog versper nie.
     revoke:
+      time_future: Diehier versperring sal tyd oor %{time} verstreke.
       confirm: Wil u definitief hierdie versperring herroep?
       revoke: Herroep!
       flash: Hierdie versperring is herroep.
@@ -2082,6 +2122,15 @@ af:
         hours:
           one: 1 uur
           other: '%{count} ure'
+        days:
+          one: 1 dag
+          other: '%{count} dae'
+        weeks:
+          one: 1 week
+          other: '%{count} weke'
+        months:
+          one: 1 maand
+          other: '%{count} maande'
     blocks_on:
       title: Versperrings op %{name}
       heading_html: Lys van versperrings teen %{name}
@@ -2093,6 +2142,7 @@ af:
     show:
       title: '%{block_on} is deur %{block_by} versper'
       heading_html: '%{block_on} is deur %{block_by} versper'
+      created: 'Geskep:'
       status: Status
       show: Wys
       edit: Redigeer
@@ -2114,6 +2164,7 @@ af:
       reason: Rede vir die versperring
       status: Status
       revoker_name: Herroep deur
+      showing_page: Bladsy %{page}
       next: Volgende »
       previous: « Vorige
   notes:
@@ -2121,6 +2172,8 @@ af:
       heading: Notas van %{user}
       no_notes: Geen notas
       id: Id
+      created_at: Geskep op
+      last_changed: Laas gewysig
   javascripts:
     close: Sluit
     share:
@@ -2134,7 +2187,10 @@ af:
       format: 'Formaat:'
       scale: 'Skaal:'
       download: Laai af
+      paste_html: Plak HTML om in die webblad te versteek
       only_standard_layer: Slegs die standaardlaag kan as ’n beeld uitgevoer word
+    embed:
+      report_problem: Rapporteer 'n probleem
     key:
       title: Kaartsleutel
       tooltip: Kaartsleutel
@@ -2148,15 +2204,19 @@ af:
         cycle_map: Fietskaart
       layers:
         notes: Kaartnotas
+        data: Kaartdata
     site:
       edit_tooltip: Wysig die kaart
       edit_disabled_tooltip: Zoem in om die kaart te wysig
       createnote_tooltip: Voeg 'n nota by die kaart
       createnote_disabled_tooltip: Zoem in om 'n nota by die kaart te voeg
+      map_notes_zoom_in_tooltip: Zoem in om kaartnotas te sien
       map_data_zoom_in_tooltip: Zoem in om kaartdata te sien
+      queryfeature_tooltip: Soek bakens op
+      queryfeature_disabled_tooltip: Zoem in om bakens te zoek
     changesets:
       show:
-        comment: Opmerking
+        comment: Kommentaar
         subscribe: Skryf in
         unsubscribe: Kanselleer subskripsie
         hide_comment: versteek
@@ -2172,6 +2232,7 @@ af:
         graphhopper_bicycle: Fiets (GraphHopper)
         graphhopper_car: Kar (GraphHopper)
       instructions:
+        continue_without_exit: Gaan voort op %{name}
         courtesy: Aanwysings danksy %{link}
       time: Tyd
     query:
@@ -2184,5 +2245,19 @@ af:
       directions_to: Ringtingaanwysings hierheen
       add_note: Voeg 'n nota hier by
       show_address: Wys adres
+      query_features: Soek bakens op
       centre_map: Sentreer kaart hier
+  redactions:
+    edit:
+      heading: Redigeer redaksie
+    index:
+      heading: Lys van redaksies
+      title: Lys van redaksies
+    show:
+      edit: Redigeer hierdie redaksie
+      confirm: Is u seker?
+    create:
+      flash: Redaksie geskep.
+    update:
+      flash: Wysigings gestoor.
 ...
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 7606ac259..aea02d239 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -9,6 +9,7 @@
 # Author: Heroid
 # Author: Kosovastar
 # Author: Macofe
+# Author: McDutchie
 # Author: Mdupont
 # Author: MicroBoy
 # Author: Nemo bis
@@ -798,7 +799,7 @@ aln:
       heading: Kycu
       email or username: 'Email Adresa ose Username:'
       password: 'Fjalekalimi:'
-      remember: 'Kujtom mu:'
+      remember: Kujtom mu
       lost password link: Keni harru fjalëkalimin tuaj?
       login_button: Kyçu
       account not active: Na vjen keq, akonti juej nuk asht hala aktiv<br /> Ju lutemi
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index cb0ec7098..7f4715cb1 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -7,6 +7,7 @@
 # Author: Azouz.anis
 # Author: Bassem JARKAS
 # Author: ButterflyOfFire
+# Author: Danieldegroot2
 # Author: Dr. Mohammed
 # Author: Fahad
 # Author: Faris knight
@@ -17,6 +18,7 @@
 # Author: Kassem7899
 # Author: Kuwaity26
 # Author: Majid Al-Dharrab
+# Author: McDutchie
 # Author: Meno25
 # Author: Mido
 # Author: Mohammed Qubati
@@ -61,6 +63,9 @@ ar:
       client_application:
         create: سجِّل
         update: تحديث
+      doorkeeper_application:
+        create: سجِّل
+        update: تحديث
       redaction:
         create: إنشاء تنقيح
         update: حفظ التنقيح
@@ -132,6 +137,9 @@ ar:
         latitude: خط العرض
         longitude: خط الطول
         language: اللغة
+      doorkeeper/application:
+        name: الاسم
+        scopes: الصلاحيات
       friend:
         user: المستخدم
         friend: صديق
@@ -1293,8 +1301,8 @@ ar:
     intro_text: خريطة الشارع المفتوحة هي خريطة العالم، أُنشِئت بواسطة أشخاص مثلك وحرة
       الاستخدام برخصة مفتوحة.
     intro_2_create_account: أنشئ حساب مستخدم
-    hosting_partners_html: يتم دعم الاستضافة بواسطة %{ucl} و%{bytemark} و%{partners}
-      آخرين.
+    hosting_partners_html: يتم دعم الاستضافة بواسطة %{ucl} و%{fastly} و%{bytemark}
+      و%{partners} آخرين.
     partners_ucl: UCL
     partners_bytemark: استضافة Bytemark
     partners_partners: الشركاء
@@ -1325,6 +1333,7 @@ ar:
       footer: يمكنك أيضًا قراءة التعليق على %{readurl} ويمكنك التعليق على %{commenturl}
         أو الرد على %{replyurl}
     message_notification:
+      subject: '[خريطة الشارع المفتوحة] %{message_title}'
       hi: مرحبًا %{to_user}،
       header: '%{from_user} قام بإرسال رسالة لك عبر خريطة الشارع المفتوحة بالعنوان
         %{subject}:'
@@ -1336,10 +1345,12 @@ ar:
       see_their_profile: يمكنك أن تشاهد ملفهم الشخصي على %{userurl}.
       befriend_them: "\uFEFFيمكنك أيضًا إضافتهم كصديق على %{befriendurl}."
     gpx_failure:
+      hi: مرحبًا %{to_user}،
       failed_to_import: 'فشل الاستيراد، الخطأ هو:'
       import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       subject: '[خريطة الشارع المفتوحة] فشل استيراد جي بي إكس'
     gpx_success:
+      hi: مرحبًا %{to_user}،
       loaded_successfully: تم تحميل بنجاح %{trace_points} نقطة من أصل %{possible_points}
         نقطة ممكنة.
       subject: '[خريطة الشارع المفتوحة] نجاح استيراد جي بي إكس'
@@ -1367,21 +1378,22 @@ ar:
       anonymous: مستخدم مجهول
       greeting: مرحبا،
       commented:
-        subject_own: '[OpenStreetMap] قدعلق %{commenter} على إحدى ملاحظاتك'
-        subject_other: '[OpenStreetMap] علق %{commenter} على ملاحظة تههتم بها'
+        subject_own: '[خريطة الشارع المفتوحة] قدعلق %{commenter} على إحدى ملاحظاتك'
+        subject_other: '[خريطة الشارع المفتوحة] علق %{commenter} على ملاحظة تههتم
+          بها'
         your_note: علق %{commenter} على إحدى ملاحظات خريطتك بالقرب من %{place}.
         commented_note: علق %{commenter} على ملاحظة الخريطة التي علقت عليها، كانت
           الملاحظة بالقرب من %{place}.
       closed:
-        subject_own: '[OpenStreetMap] حل %{commenter} إحدى ملاحظاتك'
-        subject_other: '[OpenStreetMap] حل %{commenter} ملاحظة تهتم بها'
+        subject_own: '[خريطة الشارع المفتوحة] حل %{commenter} إحدى ملاحظاتك'
+        subject_other: '[خريطة الشارع المفتوحة] حل %{commenter} ملاحظة تهتم بها'
         your_note: حل %{commenter} إحدى ملاحظات خريطتك بالقرب من %{place}.
         commented_note: حل %{commenter} ملاحظة الخريطة التي علقت عليها، الملاحظة بالقرب
           من %{place}.
       reopened:
-        subject_own: لقد أعاد [OpenStreetMap] %{commenter} تنشيط إحدى ملاحظاتك
-        subject_other: لقد أعاد [OpenStreetMap] %{commenter} تنشيط ملاحظة كنت مهتما
-          بها
+        subject_own: لقد أعاد [خريطة الشارع المفتوحة] %{commenter} تنشيط إحدى ملاحظاتك
+        subject_other: لقد أعاد [خريطة الشارع المفتوحة] %{commenter} تنشيط ملاحظة
+          كنت مهتما بها
         your_note: لقد أعاد %{commenter} تنشيط إحدى ملاحظات الخريطة بالقرب من %{place}.
         commented_note: لقد أعاد %{commenter} تنشيط ملاحظة الخريطة التي علقت عليها،
           الملاحظة بالقرب من %{place}.
@@ -1390,8 +1402,10 @@ ar:
       hi: أهلا %{to_user}،
       greeting: مرحبا،
       commented:
-        subject_own: '[OpenStreetMap] علق %{commenter} على على إحدى مجموعات تغييراتك'
-        subject_other: '[OpenStreetMap] علق %{commenter} على مجموعة تغييرات تهتم بها'
+        subject_own: '[خريطة الشارع المفتوحة] علق %{commenter} على على إحدى مجموعات
+          تغييراتك'
+        subject_other: '[خريطة الشارع المفتوحة] علق %{commenter} على مجموعة تغييرات
+          تهتم بها'
         your_changeset: '%{commenter} علق على إحدى مجموعات تغييراتك في %{time}'
         commented_changeset: ترك %{commenter} تعليقا في %{time} على مجموعة تغييرات
           تراقبها أنشأها %{changeset_author}
@@ -1513,9 +1527,12 @@ ar:
       preferred_languages: اللغات المفضلة
     edit:
       title: تفضيلات التحرير
+      cancel: إلغاء
   profiles:
     edit:
-      image: "\uFEFFالصورة:"
+      title: عدل الملف
+      cancel: إلغاء
+      image: "\uFEFFالصورة"
       gravatar:
         gravatar: استخدام Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar
@@ -1526,7 +1543,7 @@ ar:
       delete image: أزل الصورة الحالية
       replace image: "\uFEFFاستبدل الصورة الحالية"
       image size hint: "\uFEFF(صورة مربعة على الأقل 100 × 100 تعمل بشكل أفضل)"
-      home location: 'موقع المنزل:'
+      home location: موقع المنزل
       no home location: لم تدخل موقع منزلك.
       update home location on click: تحديث موقع المنزل عندما أنقر على الخريطة؟
   sessions:
@@ -1536,7 +1553,7 @@ ar:
       email or username: 'عنوان البريد الإلكتروني أو اسم المستخدم:'
       password: 'كلمة السر:'
       openid_html: '%{logo} الهوية المفتوحة:'
-      remember: 'تذكرني:'
+      remember: تذكرني
       lost password link: أنسيت كلمة المرور؟
       login_button: تسجيل الدخول
       register now: سجل حسابًا الآن
@@ -1589,8 +1606,11 @@ ar:
       unordered: قائمة غير مرتبة
       ordered: قائمة مرتبة
       link: وصلة
+      image: الصورة
       alt: كل النص
+      url: المسار
     richtext_field:
+      edit: تعديل
       preview: معاينة
   site:
     about:
@@ -2046,6 +2066,7 @@ ar:
       traces_waiting: لديك %{count} أثر في انتظار التحميل. يرجى مراعاة الانتظار قبل
         تحميل أكثر من ذلك، بحيث تتجنب إعاقة طابور التحميل لباقي المستخدمين.
     edit:
+      cancel: إلغاء
       title: تعديل الأثر %{name}
       heading: تعديل الأثر %{name}
       visibility_help: ماذا يعني هذا؟
@@ -2201,8 +2222,22 @@ ar:
     destroy:
       flash: دُمِّر تسجيل تطبيق العميل
   oauth2_applications:
+    index:
+      name: الاسم
+      permissions: الصلاحيات
+    application:
+      edit: تعديل
+      delete: حذف
     show:
       edit: عدل
+      delete: حذف
+      permissions: الصلاحيات
+  oauth2_authorizations:
+    new:
+      deny: رفض
+  oauth2_authorized_applications:
+    index:
+      permissions: الصلاحيات
   users:
     new:
       title: أنشئ حسابا
@@ -2275,6 +2310,7 @@ ar:
       my comments: تعليقاتي
       blocks on me: عمليات منعي
       blocks by me: عمليات المنع بواسطتي
+      edit_profile: عدل الملف
       send message: إرسل رسالة
       diary: يومية
       edits: مساهمات
@@ -2317,13 +2353,13 @@ ar:
     account:
       title: عدل الحساب
       my settings: إعداداتي
-      current email address: 'عنوان البريد الإلكرتروني الحالي:'
-      external auth: 'مصادقة خارجية:'
+      current email address: عنوان البريد الإلكرتروني الحالي
+      external auth: مصادقة خارجية
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: ما هذا؟
       public editing:
-        heading: 'تعديل عام:'
+        heading: تعديل عام
         enabled: مفعَّل، غير مجهول ويمكنك تعديل البيانات.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: ما هذا؟
@@ -2338,7 +2374,7 @@ ar:
           السبب</a>).<ul><li>لن يتم الكشف عن عنوان بريدك الإلكتروني من خلال جعله عاما.</li><li>لا
           يمكن عكس هذا الإجراء وأصبح جميع المستخدمين الجدد عامين افتراضيا.</li></ul>
       contributor terms:
-        heading: 'شروط المساهم:'
+        heading: شروط المساهم
         agreed: لقد وافقت على شروط المساهم الجديدة.
         not yet agreed: لم توافق بعد على شروط المساهم الجديدة.
         review link text: يُرجَى اتباع هذا الرابط في الوقت الذي يناسبك لمراجعة وقبول
@@ -2485,8 +2521,9 @@ ar:
     show:
       title: '%{block_on} عُرقل بواسطة %{block_by}'
       heading_html: '%{block_on} عُرقل بواسطة %{block_by}'
-      created: تم الإنشاء
-      status: الحالة
+      created: 'تم الإنشاء:'
+      duration: 'المدة:'
+      status: 'الحالة:'
       show: اعرض
       edit: تعديل
       revoke: ابطل!
@@ -2568,6 +2605,7 @@ ar:
           other: أنت على بعد %{count} قدم من هذه النقطة
       base:
         standard: قياسي
+        cyclosm: CyclOSM
         cycle_map: خريطة الدراجات
         transport_map: خريطة النقل و المواصلات
         hot: الخريطة الإنسانية
@@ -2581,6 +2619,8 @@ ar:
       copyright: © <a href='%{copyright_url}'>مساهمو خريطة الشارع المفتوحة</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>تقديم تبرع</a>
       terms: <a href='%{terms_url}' target='_blank'> مصطلحات الموقع و API</a>
+      cyclosm: نمط البلاط بواسطة <a href='%{cyclosm_url}' target='_blank'></a> المستضاف
+        بواسطة <a href='%{osmfrance_url}' target='_blank'></a>
       thunderforest: البلاط من <a href='%{thunderforest_url}' target='_blank'>Andy
         Allan</a>
       hotosm: نمط البلاط بواسطة <a href='%{hotosm_url}' target='_blank'>Humanitarian
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index d9d02bc25..c063c38e0 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -4,6 +4,7 @@
 # Author: Enolp
 # Author: Fitoschido
 # Author: Macofe
+# Author: McDutchie
 # Author: Tokvo
 # Author: TomH
 # Author: Xuacu
@@ -1459,7 +1460,7 @@ ast:
       email or username: 'Direición de corréu o nome d''usuariu:'
       password: 'Contraseña:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Recordame:'
+      remember: Recordame
       lost password link: ¿Perdisti la contraseña?
       login_button: Entrar
       register now: Rexistrate agora
diff --git a/config/locales/be.yml b/config/locales/be.yml
index ea12eb8f4..bceb460f8 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -12,6 +12,7 @@
 # Author: Mechanizatar
 # Author: Nerogaf
 # Author: Unomano
+# Author: ZlyiLev
 # Author: Дзяніс Тутэйшы
 # Author: Тест
 # Author: Чаховіч Уладзіслаў
@@ -516,7 +517,7 @@ be:
       heading: Перастаць сябраваць з %{user}?
       button: Выдаліць з сяброў
       success: '%{name} выдалены са спіса сяброў.'
-      not_a_friend: '%{name} не з''яўляецца вашым сябрам.'
+      not_a_friend: '%{name} не з’яўляецца вашым сябрам.'
   geocoder:
     search:
       title:
@@ -1175,23 +1176,23 @@ be:
         resolve_with_user: Вы ўжо спрабавалі вырашыць гэтую праблему з карыстальнікам
       categories:
         diary_entry:
-          spam_label: Гэты дзённікавы запіс з'яўляецца або змяшчае спам
-          offensive_label: Гэты дзённікавы запіс з'яўляецца непрыстойным або нецэнзурным
+          spam_label: Гэты дзённікавы запіс з’яўляецца або змяшчае спам
+          offensive_label: Гэты дзённікавы запіс з’яўляецца непрыстойным або нецэнзурным
           threat_label: Гэты дзённікавы запіс змяшчае пагрозу
           other_label: Іншыя
         diary_comment:
-          spam_label: Гэты каментар у дзённіку з'яўляецца спамам ці змяшчае яго
+          spam_label: Гэты каментар у дзённіку з’яўляецца спамам ці змяшчае яго
           offensive_label: Гэты каментар у дзённіку непрыстойны обо нецэнзурны
           threat_label: Гэты каментар у дзённіку змяшчае пагрозу
           other_label: Іншае
         user:
-          spam_label: Профіль гэтага карыстальніка з'яўляецца спамам ці змяшчае яго
-          offensive_label: Гэты профіль з'яўляецца непрыстойным або нецэнзурным
+          spam_label: Профіль гэтага карыстальніка з’яўляецца спамам ці змяшчае яго
+          offensive_label: Гэты профіль з’яўляецца непрыстойным або нецэнзурным
           threat_label: Профіль гэтага карыстальніка змяшчае пагрозу
-          vandal_label: Гэты карыстальнік з'яўляецца вандалам
+          vandal_label: Гэты карыстальнік з’яўляецца вандалам
           other_label: Іншае
         note:
-          spam_label: Гэтая заўвага з'яўляецца спамам
+          spam_label: Гэтая заўвага з’яўляецца спамам
           personal_label: Гэтая заўвага змяшчае персанальныя даныя
           abusive_label: Гэта заўвага абразлівая
           other_label: Іншае
@@ -1212,7 +1213,7 @@ be:
     history: Гісторыя
     export: Экспарт
     issues: Праблемы
-    data: Дадзеныя
+    data: Даныя
     export_data: Экспарт дадзеных
     gps_traces: GPS-сляды
     gps_traces_tooltip: Кіраваць GPS-слядамі
@@ -1620,8 +1621,8 @@ be:
         more_1_html: |-
           Даведайцеся больш аб выкарыстанні нашых дадзеных і аб тым, як паказваць нас як крыніцу паходжання дадзеных на <a
           href="http://osmfoundation.org/Licence">старонцы OSMF Licence</a> і <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">адказах на прававыя пытанні</a>.
-        more_2_html: Хоць дадзеныя OpenStreetMap з'яўляецца адкрытымі дадзенымі, мы
-          не ў стане прадастаўляць бясплатны картаграфічны API для іншых распрацоўшчыкаў.
+        more_2_html: Хоць даныя OpenStreetMap з’яўляюцца адкрытымі данымі, мы не ў
+          стане прадастаўляць бясплатны картаграфічны API для іншых распрацоўшчыкаў.
           Азнаёмцеся з нашымі <a href="https://operations.osmfoundation.org/policies/api/">Правіламі
           выкарыстання API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">Правіламі
           выкарыстання графічных карт</a> і <a href="https://operations.osmfoundation.org/policies/nominatim/">Правіламі
@@ -2235,8 +2236,8 @@ be:
       description: Апісанне
       user location: Месцазнаходжанне
       role:
-        administrator: Гэты карыстальнік з'яўляецца адміністратарам
-        moderator: Гэты карыстальнік з'яўляецца мадэратарам
+        administrator: Гэты карыстальнік з’яўляецца адміністратарам
+        moderator: Гэты карыстальнік з’яўляецца мадэратарам
         grant:
           administrator: Надаць правы адміністратара
           moderator: Надаць правы мадэратара
@@ -2336,7 +2337,7 @@ be:
         карыстальніка.
   user_role:
     filter:
-      not_a_role: Радок «%{role}» не з'яўляецца слушнай роляй.
+      not_a_role: Радок «%{role}» не з’яўляецца слушнай роляй.
       already_has_role: Карыстальнік ужо мае ролю %{role}.
       doesnt_have_role: Карыстальнік не мае ролі %{role}.
       not_revoke_admin_current_user: Немагчыма адазваць ролю адміністратара для гэтага
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index baf3b593f..414afdb0e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: BennyZ2304
 # Author: DCLXVI
+# Author: Danieldegroot2
 # Author: Kareyac
 # Author: Lyubomirv
 # Author: MrPanyGoff
@@ -1753,7 +1754,7 @@ bg:
     authorize:
       allow_to: 'Позволи приложението на клиента да:'
       allow_read_prefs: прочетете вашите потребителски предпочитания
-      allow_write_prefs: променете вашите потребителски предпочитания
+      allow_write_prefs: променете вашите потребителски предпочитания.
       allow_write_diary: създай дневник на бележките, коментарите и новите приятелства
       allow_write_api: промени картата.
       allow_read_gpx: прочети вашите лични GPS следи.
@@ -1768,6 +1769,10 @@ bg:
       title: Искането за достъп не успя
     revoke:
       flash: Анулирахте удостоверяването на %{application}
+    scopes:
+      write_prefs: Променете потребителски предпочитания
+      write_api: Промени картата
+      write_notes: Промени бележки
   oauth_clients:
     show:
       key: 'Клиентски ключ:'
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 34f9b23a0..4b88f3fbf 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -9,6 +9,7 @@
 # Author: Gwenn-Ael
 # Author: Iriep
 # Author: Macofe
+# Author: McDutchie
 # Author: Nemo bis
 # Author: Shirayuki
 # Author: Y-M D
@@ -1676,7 +1677,7 @@ br:
       email or username: 'Chomlec''h postel pe anv implijer :'
       password: 'Ger-tremen :'
       openid_html: '%{logo} OpenID :'
-      remember: 'Derc''hel soñj ac''hanon :'
+      remember: Derc'hel soñj ac'hanon
       lost password link: Ankouaet ho ker-tremen ganeoc'h ?
       login_button: Kevreañ
       register now: En em enskrivañ bremañ
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index d1c9ef790..05e523c55 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -8,6 +8,7 @@
 # Author: Annamerida
 # Author: Bc0ed5a28dfc189b971a689bae2d31b45cb5f3fd
 # Author: Bogreudell
+# Author: Danieldegroot2
 # Author: Eduardo Martinez
 # Author: El libre
 # Author: Fitoschido
@@ -2307,8 +2308,7 @@ ca:
     new:
       upload_trace: Pujar traça GPS
       visibility_help: què significa això?
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibilitat_de_traces_de
-        GPS
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Ca:Visibility_of_GPS_traces
       help: Ajuda
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     create:
@@ -2330,6 +2330,7 @@ ca:
       title: Editant traça %{name}
       heading: Editant traça %{name}
       visibility_help: què vol dir això?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Ca:Visibility_of_GPS_traces
     update:
       updated: Traça actualitzada
     trace_optionals:
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index d32c4a4ab..b9a3a60ac 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -1,6 +1,7 @@
 # Messages for Chechen (нохчийн)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: McDutchie
 # Author: Sasan700
 # Author: Умар
 ---
@@ -814,7 +815,7 @@ ce:
     reset_password:
       title: Йуха а йазйе пароль
       heading: Йуха а йазйе пароль %{user}
-      reset: ХӀоттае пароль
+      reset: ХӀоттайе пароль
       flash changed: Хьан пароль хийцина.
   profiles:
     edit:
@@ -828,7 +829,7 @@ ce:
       email or username: 'Эл. пошт йа декъашхочун цӀе:'
       password: 'Пароль:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Дагалаца со:'
+      remember: Дагалаца со
       lost password link: Йицъелла пароль?
       login_button: ЧугӀо
       register now: ДӀадазло
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 77a954c74..d1ea5d0be 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -115,12 +115,12 @@ da:
         callback_url: Callback URL
         support_url: Support URL
         allow_read_prefs: læse deres brugeralternativer
-        allow_write_prefs: ændre deres brugerindstillinger
+        allow_write_prefs: ændre deres brugeralternativer
         allow_write_diary: oprette blogindlæg, kommentarer og indgå venskaber
-        allow_write_api: redigere kortet
+        allow_write_api: ændre kortet
         allow_read_gpx: læse deres private GPS-spor
         allow_write_gpx: overføre GPS-spor
-        allow_write_notes: redigere bemærkninger
+        allow_write_notes: ændre bemærkninger
       diary_comment:
         body: Brødtekst
       diary_entry:
@@ -131,6 +131,8 @@ da:
         language: Sprog
       doorkeeper/application:
         name: Navn
+        redirect_uri: Omdirigerings-URI:jer
+        confidential: Konfidentiell applikation?
         scopes: Tilladelser
       friend:
         user: Bruger
@@ -174,6 +176,11 @@ da:
         pass_crypt: Adgangskode
         pass_crypt_confirmation: Bekræft adgangskode
     help:
+      doorkeeper/application:
+        confidential: Applikation vil blive anvendt hvor klient-hemmeligheden kan
+          holdes skjult (native mobilapplikationer og single page-applikationer kan
+          ikke dette)
+        redirect_uri: Brug en linje pr. URI
       trace:
         tagstring: kommasepareret
       user_block:
@@ -458,6 +465,9 @@ da:
       friend: Ven
     show:
       title: Min kontrolpanel
+      no_home_location_html: '%{edit_profile_link} og definer hvor du bor for at se
+        brugere i nærheden.'
+      edit_your_profile: Rediger din profil
       my friends: Mine venner
       no friends: Du har ikke tilføjet nogle venner endnu.
       nearby users: 'Andre brugere i nærheden:'
@@ -542,6 +552,11 @@ da:
       comment: Kommentar
       newer_comments: Nyere kommentarer
       older_comments: Ældre kommentarer
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Applikation registrerad.
   friendships:
     make_friend:
       heading: Tilføj %{user} som en ven?
@@ -1385,7 +1400,7 @@ da:
       ignore: Ignorér
       reopen: Genåbn
       reports_of_this_issue: Rapporteringer af denne sag
-      read_reports: Læs rapporter
+      read_reports: Læse rapporter
       new_reports: Nye rapporter
       other_issues_against_this_user: Andre sager omhandlende denne bruger
       no_other_issues: Ingen andre sager omhandlende denne bruger.
@@ -1654,6 +1669,12 @@ da:
       success: Bekræftet din ændring af e-mailadresse!
       failure: En e-mailadresse er allerede blevet bekræftet med denne nøgle.
       unknown_token: Den bekræftelseskode er udløbet eller eksisterer ikke.
+    resend_success_flash:
+      confirmation_sent: Vi har sendt en bekræftelsesmeddelelse til %{email} og så
+        snart du bekræfter din konto vil du være i stand til at begynde kortlægningen.
+      whitelist: Hvis du bruger et antispam-system som sender bekræftelsesforespørgsler
+        så vær sikker på at du tilføjer %{sender} til whitelist, da vi ikke kan svare
+        på nogen bekræftelsesforespørgsler.
   messages:
     inbox:
       title: Indbakke
@@ -1709,7 +1730,7 @@ da:
         svare på blev ikke sendt til den bruger. Log venligst på som den korrekte
         bruger for at svare.
     show:
-      title: Læs besked
+      title: Læse besked
       from: Fra
       subject: Emne
       date: Dato
@@ -1748,10 +1769,21 @@ da:
   preferences:
     show:
       title: Mine alternativer
+      preferred_editor: Foretrukken editor
+      preferred_languages: Foretrukne sprog
+      edit_preferences: Rediger alternativer
     edit:
+      title: Rediger alternativer
+      save: Opdater alternativer
       cancel: Annuller
+    update:
+      failure: Kunne ikke opdatere alternativer.
+    update_success_flash:
+      message: Alternativer opdateret.
   profiles:
     edit:
+      title: Rediger profil
+      save: Opdater profil
       cancel: Annuller
       image: Billede
       gravatar:
@@ -1768,6 +1800,9 @@ da:
       home location: Hjemmeposition
       no home location: Du har ikke angivet din hjemmeposition.
       update home location on click: Opdater hjemmeposition når jeg klikker på kortet?
+    update:
+      success: Profil opdateret.
+      failure: Kunne ikke opdatere profil.
   sessions:
     new:
       title: Log på
@@ -1790,7 +1825,7 @@ da:
         bekræftelsesemailen for at aktivere din konto eller <a href="%{reconfirm}">få
         sendt en ny bekræftelsesemail</a>.
       account is suspended: Beklager, din konto er suspenderet på grund af mistænkelig
-        aktivitet.<br />Kontakt <a href="%{webmaster}">webmasteren</a> , hvis du ønsker
+        aktivitet.<br />Kontakt <a href="%{webmaster}">support</a> , hvis du ønsker
         at drøfte dette.
       auth failure: Kunne ikke logge på med disse oplysninger.
       openid_logo_alt: Log på med et OpenID
@@ -1915,11 +1950,10 @@ da:
           I medier\n hvor hyperlinks ikke er mulige (f.eks. trykte værker), foreslår
           vi, at du\n henviser dine læsere til openstreetmap.org (måske ved at udvide\n'OpenStreetMap'
           i kildeangivelsen til denne fuld adresse) og opendatacommons.org."
-        credit_3_1_html: "Kort-fliserne i &ldquo;standard kortlaget&rdquo; på www.openstreetmap.org
-          er et produceret værk (\"Produced Work\") af OpenStreetMap Foundation ved
-          brug af OpenStreetMap-data licenseret  \nunder Open Database License. Hvis
-          du anvender disse fliser så brug venligst den følgende kreditering: \n&ldquo;Grundkort
-          og data fra OpenStreetMap og OpenStreetMap Foundation&rdquo;."
+        credit_3_1_html: Kort-fliserne i &ldquo;standard kortlaget&rdquo; på www.openstreetmap.org
+          er et produceret værk ("Produced Work") af OpenStreetMap Foundation ved
+          brug af OpenStreetMap-data licenseret under Open Database License. Hvis
+          du anvender disse fliser kræves den samme kreditering som for kortdata.
         credit_4_html: |-
           For et navigerbart elektronisk kort, skal kildeangivelsen være i hjørnet af kortet.
           For eksempel:
@@ -1949,8 +1983,10 @@ da:
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Delstaten Vorarlberg</a> og
           Delstaten Tyrol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT med tilføjelser</a>).
         contributors_au_html: |-
-          <strong>Australien</strong>: Indeholder forstadsdata baseret
-          på data fra Australian Bureau of Statistics.
+          <strong>Australien</strong>: Indeholder eller er udviklet med administrative grænser ("Administrative Boundaries") &copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
+          licenseret af Commonwealth of Australia under
+          <a href="https://creativecommons.org/licenses/by/4.0/deed.da">Creative Commons Kreditering 4.0 International licence (CC BY 4.0)</a>.
         contributors_ca_html: |-
           <strong>Canada</strong>: Indeholder data fra
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -2143,9 +2179,9 @@ da:
         Player er blevet trukket tilbage, er Potlatch ikke længere tilgængelig i browseren.
       desktop_html: Du kan stadig bruge Potlatch ved at <a href="https://www.systemed.net/potlatch/">hente
         applikationen til Mac og Windows</a>.
-      id_html: Alternativt kan du sætte iD som din foretrukne editor. iD kører i din
-        browser, ligesom Potlatch gjorde. <a href="%{settings_url}">Du kan ændre din
-        foretrukne editor her</a>.
+      id_html: Alternativt kan du sætte iD som din foretrukne editor, denne afvikles
+        i din browser, ligesom Potlatch gjorde. <a href="%{settings_url}">Ændr dine
+        alternativer her</a>.
     sidebar:
       search_results: Søgeresultater
       close: Luk
@@ -2401,6 +2437,11 @@ da:
       need_to_see_terms: Din adgang til API-et er midlertidig stoppet. Log ind på
         netsiden for at læse bidragsydervilkårene. Du behøver ikke at godkende vilkårene,
         men du skal læse dem.
+    settings_menu:
+      account_settings: Kontoindstillinger
+      oauth1_settings: OAuth 1-indstillinger
+      oauth2_applications: OAuth 2-applikationer
+      oauth2_authorizations: OAuth 2-autorisationer
   oauth:
     authorize:
       title: Tillad adgang til din konto
@@ -2409,9 +2450,9 @@ da:
         kan vælge lige så mange eller så få, som du ønsker.
       allow_to: 'Tillad klient-applikationen at:'
       allow_read_prefs: læse dine brugeralternativer.
-      allow_write_prefs: ændre dine brugerindstillinger.
+      allow_write_prefs: ændre dine brugeralternativer.
       allow_write_diary: oprette blogindlæg, kommentarer og indgå venskaber.
-      allow_write_api: tilpas kortet.
+      allow_write_api: ændre kortet.
       allow_read_gpx: læse dine private GPS-spor.
       allow_write_gpx: overfør GPS-spor.
       allow_write_notes: ændre bemærkninger.
@@ -2429,8 +2470,14 @@ da:
     permissions:
       missing: Du har ikke givet applikationen adgang til denne facilitet
     scopes:
-      read_prefs: Læs brugeralternativer
-      read_email: Læs brugerens e-mailadresse
+      read_prefs: Læse brugeralternativer
+      write_prefs: Ændre brugeralternativer
+      write_diary: Udgiv brugerblogs, kommenter og få venner
+      write_api: Ændre kortet
+      read_gpx: Læse private GPS-spor
+      write_gpx: Overføre GPS-spor
+      write_notes: Ændre bemærkninger
+      read_email: Læse brugerens e-mailadresse
       skip_authorization: Godkend applikation automatisk
   oauth_clients:
     new:
@@ -2475,22 +2522,59 @@ da:
       flash: Annulerede klient programmets registrering
   oauth2_applications:
     index:
+      title: Mine klient-applikationer
+      no_applications_html: Har du en applikation, du gerne vil registrere til brug
+        med os ved hjælp af %{oauth2} standarden? Du skal registrere din applikation,
+        før det kan foretage OAuth-anmodninger til denne tjeneste.
+      new: Registrer ny applikation
       name: Navn
       permissions: Tilladelser
     application:
+      edit: Rediger
       delete: Slet
+      confirm_delete: Slete denne applikation?
+    new:
+      title: Registrere en ny applikation
+    edit:
+      title: Rediger din applikation
     show:
+      edit: Rediger
       delete: Slet
+      confirm_delete: Slet denne applikation?
+      client_id: Klient-ID
+      client_secret: Klient-hemmelighed
+      client_secret_warning: Sørg for at gemme denne hemmelighed - den vil ikke være
+        tilgængelig senere
       permissions: Tilladelser
+      redirect_uris: Omdirigerings-URI:jer
+    not_found:
+      sorry: Beklager, applikationen kunne ikke findes.
+  oauth2_authorizations:
+    new:
+      title: Autorisation påkrævet
+      introduction: Autoriser %{application} til at tilgå din konto med de følgende
+        tilladelser?
+      authorize: Autoriser
+      deny: Nægt
+    error:
+      title: Der opstod en fejl
+    show:
+      title: Autoriseringskode
   oauth2_authorized_applications:
     index:
+      title: Mine autoriserede applikationer
+      application: Applikation
       permissions: Tilladelser
+      no_applications_html: Du har endnu ikke autoriseret nogle %{oauth2}-applikationer.
+    application:
+      revoke: Fjern adgang
+      confirm_revoke: Fjern adgang for denne applikation?
   users:
     new:
       title: Opret konto
       no_auto_account_create: Vi kan desværre ikke oprette en konto automatisk for
         dig pt.
-      contact_support_html: Kontakt venligst <a href="%{support}">webmaster</a> for
+      contact_support_html: Kontakt venligst <a href="%{support}">support</a> for
         at få oprettet en konto - vi vil forsøge at håndtere forespørgslen så hurtigt
         som muligt.
       about:
@@ -2540,6 +2624,9 @@ da:
         italy: Italien
         rest_of_world: Resten af verden
     terms_declined_flash:
+      terms_declined_html: Vi er kede af at du har besluttet at du ikke kan acceptere
+        de nye vilkår for bidragsydere. For yderligere oplysninger, se venligst %{terms_declined_link}.
+      terms_declined_link: denne wiki-side
       terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     no_such_user:
       title: Ingen sådan bruger
@@ -2561,6 +2648,7 @@ da:
       my_dashboard: Min kontrolpanel
       blocks on me: Mine blokeringer
       blocks by me: Blokeringer udført af mig
+      edit_profile: Rediger profil
       send message: Send besked
       diary: Blog
       edits: Redigeringer
@@ -2659,6 +2747,7 @@ da:
     suspended:
       title: Konto suspenderet
       heading: Konto suspenderet
+      support: support
       body_html: "<p>\n Beklager, din konto er automatisk blevet suspenderet på grund
         af mistænkelig aktivitet. \n</p>\n<p>\n Denne beslutning vil blive gennemgået
         af en administrator snarest, eller du kan kontakte %{webmaster} hvis du ønsker
diff --git a/config/locales/de.yml b/config/locales/de.yml
index a15227e86..34c927990 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -18,6 +18,7 @@
 # Author: ChrisiPK
 # Author: ChristianSW
 # Author: CygnusOlor
+# Author: Danieldegroot2
 # Author: Daswaldhorn
 # Author: Diebuche
 # Author: Dieterdreist
@@ -168,7 +169,7 @@ de:
         callback_url: Callback-URL
         support_url: Support-URL
         allow_read_prefs: Ihre Benutzereinstellungen auslesen.
-        allow_write_prefs: Ihre Benutzereinstellungen verändern.
+        allow_write_prefs: Ihre Benutzereinstellungen verändern
         allow_write_diary: Blogeinträge und Kommentare schreiben und Freunde finden
         allow_write_api: Karte bearbeiten
         allow_read_gpx: Zugriff auf ihre privaten GPS-Tracks
@@ -1612,7 +1613,7 @@ de:
       failed_to_import: 'konnte nicht importiert werden, die Fehlermeldung:'
       more_info_html: Weitere Informationen über Fehler bei GPX-Importen und wie sie
         vermieden werden können finden sich in %{url}
-      import_failures_url: https://wiki.openstreetmap.org/wiki/DE:GPX
+      import_failures_url: https://wiki.openstreetmap.org/wiki/DE:GPX#Warum_wurde_meine_GPX-Datei_nicht_richtig_hochgeladen.3F
       subject: '[OpenStreetMap] GPX-Import Fehler'
     gpx_success:
       hi: Hallo %{to_user},
@@ -1841,7 +1842,7 @@ de:
         möglicherweise vertippt oder du bist einem ungültigem Link gefolgt.
   preferences:
     show:
-      title: Meine Benutzereinstellungen
+      title: Benutzereinstellungen
       preferred_editor: Bevorzugter Editor
       preferred_languages: Bevorzugte Sprachen
       edit_preferences: Benutzereinstellungen bearbeiten
@@ -2540,12 +2541,12 @@ de:
         gewähren:'
       allow_to: 'Erlaube der Anwendung:'
       allow_read_prefs: Deine Benutzereinstellungen zu lesen
-      allow_write_prefs: Deine Benutzereinstellungen zu verändern
+      allow_write_prefs: Deine Benutzereinstellungen verändern.
       allow_write_diary: Blogeinträge und Kommentare zu schreiben und Freunde einzutragen
-      allow_write_api: Die OSM-Datenbank zu ändern
+      allow_write_api: Karte bearbeiten.
       allow_read_gpx: Deine privaten GPS-Tracks auszulesen
       allow_write_gpx: GPS-Tracks hochzuladen
-      allow_write_notes: Hinweise zu geben/Fehler zu melden
+      allow_write_notes: Notizen bearbeiten.
       grant_access: Zugriff gewähren
     authorize_success:
       title: Autorisierungsanfrage genehmigt
@@ -3068,13 +3069,14 @@ de:
       terms: <a href='%{terms_url}' target='_blank'>Nutzungsbedingungen der Website
         und API</a>
       cyclosm: Kachelstil von <a href='%{cyclosm_url}' target='_blank'>CyclOSM</a>
-        gehostet von <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap Frankreich</a>
+        bereitgestellt von <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+        Frankreich</a>
       thunderforest: Kacheln mit freundlicher Genehmigung von <a href='%{thunderforest_url}'
         target='_blank'>Andy Allan</a>
       opnvkarte: Kacheln mit freundlicher Genehmigung von <a href='%{memomaps_url}'
         target='_blank'>MeMoMaps</a>
       hotosm: Kachelstil von <a href='%{hotosm_url}' target='_blank'>Humanitarian
-        OpenStreetMap Team</a> gehostet von <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+        OpenStreetMap Team</a> bereitgestellt von <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
         Frankreich</a>
     site:
       edit_tooltip: Karte bearbeiten
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index ee290903f..6a4f522f9 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Derbeth
 # Author: Macofe
+# Author: McDutchie
 # Author: Michawiki
 # Author: Shirayuki
 ---
@@ -1115,7 +1116,7 @@ dsb:
       email or username: 'E-mailowa adresa abo wužywarske mě:'
       password: 'Gronidło:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Spomnjeś se:'
+      remember: Spomnjeś se
       lost password link: Sy swójo gronidło zabył?
       login_button: Pśizjawiś se
       register now: Něnto registrěrowaś
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 8fc79363f..3d2b784e6 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1868,7 +1868,7 @@ es:
       email or username: 'Dirección de correo electrónico o nombre de usuario:'
       password: 'Contraseña:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Recordarme:'
+      remember: Recordarme
       lost password link: ¿Ha perdido su contraseña?
       login_button: Iniciar sesión
       register now: Regístrese ahora
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 65187c697..d62ce46e3 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -11,6 +11,7 @@
 # Author: Ibai
 # Author: Iñaki LL
 # Author: Maite
+# Author: McDutchie
 # Author: Mikel Ibaiba
 # Author: MikelEH
 # Author: PerroVerd
@@ -1553,7 +1554,7 @@ eu:
       email or username: 'Eposta helbidea edo Erabiltzaile izena:'
       password: 'Pasahitza:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Gogora nazazu:'
+      remember: Gogora nazazu
       lost password link: Pasahitza ahaztu duzu?
       login_button: Saioa hasi
       register now: Erregistratu orain
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2ec525701..8d8b7be5d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -10,6 +10,7 @@
 # Author: Crochet.david
 # Author: Cybereric
 # Author: Damouns
+# Author: Danieldegroot2
 # Author: DavidL
 # Author: Dereckson
 # Author: Derugon
@@ -672,7 +673,7 @@ fr:
           holding_position: Position d’attente
           navigationaid: Aide à la navigation aérienne
           parking_position: Place de parking
-          runway: Piste
+          runway: Piste d’aéroport
           taxilane: Voie de taxi
           taxiway: Piste de circulation d’un aéroport
           terminal: Terminal
@@ -1040,7 +1041,7 @@ fr:
           picnic_table: Table de pique-nique
           pitch: Terrain de sport
           playground: Aire de jeux
-          recreation_ground: Terrain de jeux
+          recreation_ground: Aire de jeux
           resort: Villégiature
           sauna: Sauna
           slipway: Cale de lancement
@@ -2547,10 +2548,10 @@ fr:
       allow_write_prefs: modifier vos préférences utilisateur ;
       allow_write_diary: créer pour vous des entrées dans votre journal, faire des
         commentaires et ajouter des amis ;
-      allow_write_api: modifier la carte en votre nom ;
+      allow_write_api: modifier la carte ;
       allow_read_gpx: lire vos traces GPS privées ;
       allow_write_gpx: envoyer des traces GPS en votre nom ;
-      allow_write_notes: modifier des notes en votre nom.
+      allow_write_notes: modifier des notes.
       grant_access: Accorder l’accès
     authorize_success:
       title: La demande d’autorisation a été acceptée
@@ -2566,8 +2567,8 @@ fr:
     permissions:
       missing: Vous n’avez pas autorisé l’application à accéder à cette fonctionnalité
     scopes:
-      read_prefs: Lire les préférences utilisateur
-      write_prefs: Modifier les préférences utilisateur
+      read_prefs: Lire les préférences de l’utilisateur
+      write_prefs: Modifier les préférences de l’utilisateur
       write_diary: Créer les entrées d’agenda, les commentaires, et faire des amis
       write_api: Modifier la carte
       read_gpx: Lire les traces GPC privées
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 90e4bfee6..1340578a2 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -9,27 +9,45 @@ fy:
     formats:
       friendly: '%e %B %Y om %H.%M'
   helpers:
+    file:
+      prompt: Bestân kieze
     submit:
       diary_comment:
         create: Bewarje
+      message:
+        create: Ferstjoere
       client_application:
         update: Bywurkje
+      trace:
+        update: Feroarings bewarje
   activerecord:
     models:
       acl: Tagongskontrôlelist
+      changeset: Wizigingsset
+      changeset_tag: Wizigingssetlebel
       country: Lân
       friend: Freon
       language: Taal
       message: Berjocht
       node: Punt
+      node_tag: Puntlebel
       old_node: Ald punt
+      old_node_tag: Ald puntlebel
+      old_relation: Alde relaasje
+      old_relation_member: Ald relaasjelid
+      old_relation_tag: Ald relaasjelebel
+      old_way: Ald gebiet
       old_way_node: Ald gebietspunt
+      old_way_tag: Ald gebietslebel
       relation: Relaasje
+      relation_member: Relaasjelid
+      relation_tag: Relaasjelebel
       session: Sesje
       trace: Trajekt
       tracepoint: Trajektpunt
       tracetag: Trajektlebel
       user: Meidogger
+      user_preference: Meidoggerfoarkar
       way: Gebiet
       way_node: Gebietspunt
       way_tag: Gebietslebel
@@ -62,19 +80,30 @@ fy:
       message:
         sender: Ofstjoerder
         title: Underwerp
-        body: Tekst
+        body: Ynhâld
         recipient: Untfanger
       redaction:
         title: Titel
         description: Beskriuwing
       user:
         email: E-mail
+        email_confirmation: Befêstiging e-mail
+        new_email: Nij e-mailadres
         active: Aktyf
+        display_name: Werjûne namme
         description: Profylbeskriuwing
         home_lat: Breedtegraad
         home_lon: Lingtegraad
         languages: Foarkarstalen
+        preferred_editor: Bewurker fan foarkar
         pass_crypt: Wachtwurd
+        pass_crypt_confirmation: Wachtwurd befêstigje
+    help:
+      user:
+        email_confirmation: Jo adres wurdt net publikelik toand; sjoch ús <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
+          title="Privacybelied fan OSMF mei in stik oer e-mailadressen">Privacybelied</a>
+          foar mear ynformaasje.
+        new_email: (nea publikelik toand)
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -115,71 +144,147 @@ fy:
         one: 1 jier lyn
         other: '%{count} jier lyn'
   editor:
-    default: Standert (op it stuit %{name})
+    default: standert (op it stuit %{name})
     id:
       name: iD
       description: iD (bewurker yn 'e webblêder)
     remote:
-      name: Ofstânsbetsjinning
+      name: ôfstânsbetsjinning
       description: ôfstânsbetsjinning (JOSM, Potlatch, Merkaartor)
   auth:
     providers:
-      none: Gjint
+      none: gjint
       wikipedia: Wikipedy
+  api:
+    notes:
+      comment:
+        opened_at_html: Makke %{when}
+        opened_at_by_html: Makke %{when} troch %{user}
+        commented_at_html: Bywurke %{when}
+        commented_at_by_html: Bywurke %{when} troch %{user}
+        closed_at_html: Oplost %{when}
+        closed_at_by_html: Oplost %{when} troch %{user}
+        reopened_at_html: Weraktivearre %{when}
+        reopened_at_by_html: Weraktivearre %{when} troch %{user}
+      rss:
+        title: OpenStreetMap Notysjes
   browse:
+    created: Makke
+    closed: Ofdien
+    created_html: Makke <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Ofdien <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Makke <abbr title='%{title}'>%{time}</abbr> troch %{user}
+    deleted_by_html: Wiske <abbr title='%{title}'>%{time}</abbr> troch %{user}
     edited_by_html: Bewurke <abbr title='%{title}'>%{time}</abbr> troch %{user}
+    closed_by_html: Ofdien <abbr title='%{title}'>%{time}</abbr> troch %{user}
     version: Ferzje
+    in_changeset: Wizigingsset
     anonymous: anonym
+    no_comment: (gjin opmerking)
     part_of: Part fan
+    part_of_relations:
+      one: 1 relaasje
+      other: '%{count} relaasjes'
+    part_of_ways:
+      one: 1 gebiet
+      other: '%{count} gebieten'
+    download_xml: XML ynlade
+    view_history: Skiednis besjen
+    view_details: Gegevens besjen
     location: 'Lokaasje:'
     changeset:
+      title: 'Wizigingsset: %{id}'
       belongs_to: Auteur
       node: Punten (%{count})
+      node_paginated: Punten (%{x}-%{y} fan %{count})
+      way: Gebieten (%{count})
+      way_paginated: Gebieten (%{x}-%{y} fan %{count})
       relation: Relaasjes (%{count})
       relation_paginated: Relaasjes (%{x}-%{y} fan %{count})
+      comment: Reäksjes (%{count})
+      hidden_commented_by_html: Ferburgen reäksje fan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Reäksje fan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      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
     node:
       title_html: 'Punt: %{name}'
+      history_title_html: 'Skiednis fan punt: %{name}'
     way:
-      title_html: 'Wei: %{name}'
+      title_html: 'Gebiet: %{name}'
+      history_title_html: 'Skiednis fan gebiet: %{name}'
       nodes: Punten
       nodes_count:
         one: 1 punt
         other: '%{count} punten'
+      also_part_of_html:
+        one: part fan gebiet %{related_ways}
+        other: part fan gebieten %{related_ways}
     relation:
       title_html: 'Relaasje: %{name}'
+      history_title_html: 'Skiednis fan relaasje: %{name}'
       members: Lidden
+      members_count:
+        one: 1 lid
+        other: '%{count} lidden'
     relation_member:
       entry_role_html: '%{type} %{name} as %{role}'
       type:
         node: Punt
-        way: Wei
+        way: Gebiet
         relation: Relaasje
     containing_relation:
       entry_html: Relaasje %{relation_name}
       entry_role_html: Relaasje %{relation_name} (as %{relation_role})
     not_found:
+      title: Net fûn
+      sorry: 'Spitich, %{type} #%{id} koe net fûn wurde.'
       type:
         node: punt
-        way: wei
+        way: gebiet
         relation: relaasje
+        changeset: wizigingsset
+        note: notysje
     timeout:
       type:
         node: punt
-        way: wei
+        way: gebiet
         relation: relaasje
+        changeset: wizigingsset
+        note: notysje
     redacted:
       type:
         node: punt
-        way: wei
+        way: gebiet
         relation: relaasje
+    start_rjs:
+      loading: Laden ...
     tag_details:
       tags: Lebels
     note:
-      new_note: Nije opmerking
+      title: 'Notysje: %{id}'
+      new_note: Nije notysje
       description: Beskriuwing
+      open_title: 'Unoploste notysje #%{note_name}'
+      closed_title: 'Oploste notysje #%{note_name}'
+      hidden_title: 'Ferburgen notysje #%{note_name}'
+      opened_by_html: Makke troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Makke troch anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Reäksje fan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Reäksje fan anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Oplost troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Oplost troch anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Weraktivearre troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Weraktivearre troch anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Ferburgen troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: Dizze notysje melde
     query:
       title: Skaaimerken opfreegje
-      introduction: Klik op 'e kaart foar skaaimerken yn 'e omkriten.
+      introduction: Klik op 'e kaart foar skaaimerken yn 'e krite.
       nearby: Skaaimerken yn 'e omkriten
       enclosing: Omfetsjende skaaimerken
   changesets:
@@ -189,22 +294,70 @@ fy:
       previous: « Foarige
     changeset:
       anonymous: Anonym
+      no_edits: (gjin bewurkings)
+      view_changeset_details: Wizigingssetgegevens besjen
     changesets:
       id: ID
+      saved_at: Bewarre op
       user: Meidogger
-      area: Gebiet
+      comment: Opmerking
+      area: Krite
     index:
       title: Wizigingssets
+      title_user: Wizigingssets fan %{user}
+      title_friend: Wizigingssets fan myn freonen
+      title_nearby: Wizigingssets fan meidoggers yn 'e omkriten
       empty: Gjin wizigingssets fûn.
+      empty_area: Gjin wizigingssets yn dizze krite.
+      empty_user: Gjin wizigingssets fan dizze meidogger.
+      no_more: Gjin wizigingssets mear fûn.
+      no_more_area: Gjin wizigingssets mear yn dizze krite.
+      no_more_user: Gjin wizigingssets mear fan dizze meidogger.
       load_more: Mear lade
   dashboards:
+    contact:
+      km away: '%{count}km fuort'
+      m away: '%{count}m fuort'
     popup:
+      your location: Jo lokaasje
+      nearby mapper: Kaartmakker fuortby
       friend: Freon
+    show:
+      title: Myn oersjochpaniel
+      no_home_location_html: '%{edit_profile_link} en stel jo fêste lokaasje yn, om
+        meidoggers yn ''e omkriten te sjen.'
+      edit_your_profile: Bewurkje jo profyl
+      my friends: Myn freonen
+      no friends: Jo hawwe noch gjin freonen tafoege.
+      nearby users: Oare meidoggers yn 'e omkriten
+      no nearby users: Noch gjin oare kaartmakker hat oanjûn fuort by jo om te sitten.
+      friends_changesets: wizigingssets fan freonen
+      friends_diaries: deiboekstikken fan freonen
+      nearby_changesets: wizigingssets fan meidoggers fuortby
+      nearby_diaries: deiboekstikken fan meidoggers fuortby
   diary_entries:
+    new:
+      title: Nij deiboekstik
     form:
       location: Lokaasje
+      use_map_link: Kaart brûke
     index:
       title: Deiboeken fan meidoggers
+      title_friends: Deiboeken fan freonen
+      title_nearby: Deiboeken fan meidoggers fuortby
+      user_title: Deiboek fan %{user}
+      in_language_title: Deiboekstikken yn it %{language}
+      new: Nij deiboekstik
+      my_diary: Myn deiboek
+      no_entries: Gjin deiboekstikken
+      older_entries: Aldere stikken
+      newer_entries: Nijere stikken
+    edit:
+      title: Deiboekstik bewurkje
+      marker_text: Lokaasje deiboekstik
+    show:
+      title: Deiboek fan %{user} | %{title}
+      user_title: Deiboek fan %{user}
     location:
       location: 'Lokaasje:'
       edit: Bewurkje
@@ -311,6 +464,8 @@ fy:
           school: Skoalle
           shelter: Skûlplak
           shower: Dûs
+          social_centre: Sosjaal sintrum
+          social_facility: Sosjale foarsjenning
           studio: Studio
           swimming_pool: Swimbad
           taxi: Taksy
@@ -326,9 +481,15 @@ fy:
           weighbridge: Weachbrêge
         boundary:
           administrative: Bestjoerlike grins
+          census: Folkstellingsgrins
           national_park: Nasjonaal park
+          political: Kiesgrins
+          "yes": Grins
         bridge:
           aqueduct: Akwadukt
+          boardwalk: Plankier
+          suspension: Hingbrêge
+          swing: Draaibrêge
           viaduct: Fiadukt
           "yes": Brêge
         building:
@@ -336,32 +497,85 @@ fy:
           apartments: Apparteminten
           chapel: Kapel
           church: Tsjerkegebou
+          hospital: Sikehûs
+          hotel: Hotelgebou
+          house: Hûs
+          houseboat: Wenboat
+          hut: Hutte
+          kindergarten: Beukerskoalle
+          office: Kantoargebou
+          public: Iepenbier gebou
+          residential: Wengebou
+          retail: Winkelpân
+          roof: Dak
+          train_station: Treinstasjon
+          warehouse: Pakhûs
           "yes": Gebou
+        craft:
+          beekeeper: Ymker
+          photographer: Fotograaf
         highway:
           bridleway: Ruterpaad
           bus_stop: Bushalte
+          construction: Wei yn oanlis
+          cycleway: Fytspaad
+          elevator: Lift
+          footway: Fuotpaad
+          ford: Furde
+          give_way: Boerd foarrang jaan
           living_street: Wenhiem
           milestone: Mylpeal
           motorway: Autogongwei
           motorway_junction: Knooppunt autogongwei
           motorway_link: Op-/ôfreed autogongwei
+          passing_place: Utwykplak
           path: Paad
+          pedestrian: Fuotgongersgebiet
           platform: Perron
+          primary: Primêre wei
+          primary_link: Primêre wei
+          proposed: Plende wei
+          raceway: Racesirkwy
           residential: Strjitte
-          road: Strjitwei
+          road: Wei
+          secondary: Sekundêre wei
+          secondary_link: Sekundêre wei
+          service: Parallelwei
+          services: Sjauffeursfoarsjennings
+          speed_camera: Flitser
+          steps: Trep
+          stop: Stopboerd
           street_lamp: Strjitlampe
+          tertiary: Tertsjêre wei
+          tertiary_link: Tertsjêre wei
+          track: Lânpaad
+          traffic_mirror: Ferkearsspegel
+          traffic_signals: Ferkearsljochten
+          unclassified: Net-klassifisearre wei
+          "yes": Wei
         historic:
+          archaeological_site: Archeologysk plak
+          bomb_crater: Histoaryske bomkrater
           battlefield: Slachfjild
           building: Histoarysk gebou
+          bunker: Bunker
+          cannon: Histoarysk kanon
           castle: Kastiel
           church: Tsjerke
+          city_gate: Stedspoarte
           citywalls: Stedsmuorren
           fort: Fort
+          heritage: Erfgoedplak
           house: Hûs
           memorial: Betinkingsmonumint
+          milestone: Histoaryske mylpeal
           mine: Myn
+          mine_shaft: Mynskacht
           monument: Monumint
+          railway: Histoaryske spoarwei
+          roman_road: Romeinske wei
           ruins: Ruïne
+          stone: Stien
           tomb: Tombe
           tower: Toer
           wreck: Wrak
@@ -376,8 +590,10 @@ fy:
           grass: Gers
           landfill: Jiskebult
           meadow: Greide
+          military: Militêr terrein
           mine: Myn
           quarry: Stiengat
+          railway: Spoarwei
           reservoir: Opslachmar
           residential: Wengebiet
           retail: Lytshannel
@@ -385,6 +601,7 @@ fy:
         leisure:
           beach_resort: Badplak
           common: Mientlân
+          dog_park: Hûnepark
           fishing: Fiskgrûn
           garden: Tún
           golf_course: Golfbaan
@@ -399,43 +616,88 @@ fy:
           stadium: Stadion
           swimming_pool: Swimbad
         man_made:
+          communications_tower: Antennetoer
           dyke: Bediking
+          mast: Mêst
+          petroleum_well: Oaljeboarne
+          pier: Pier
+          pipeline: Piiplieding
+          pumping_station: Pompstasjon
+          silo: Silo
+          snow_cannon: Sniekanon
+          storage_tank: Opslachtenk
+          street_cabinet: Nutskast
+          surveillance: Bewekking
+          telescope: Tilleskoop
+          tower: Toer
+          utility_pole: Nutspeal
+          wastewater_plant: Wettersuvering
+          watermill: Wettermûne
+          water_tap: Wetterkraan
+          water_tower: Wettertoer
+          water_well: Saad
+          water_works: Wetterliedingbedriuw
+          windmill: Wynmûne
+          works: Fabryk
+          "yes": Keunstmjittich
         military:
+          airfield: Militêr fleanfjild
           barracks: Kazerne
           bunker: Bunker
+          checkpoint: Kontrôlepost
+          trench: Rinfuorge
+          "yes": Militêr
+        mountain_pass:
+          "yes": Berchpas
         natural:
+          atoll: Atol
+          bare_rock: Keale rotsen
           bay: Baai
           beach: Strân
           cape: Kaap
+          cave_entrance: Grotyngong
           cliff: Klif
+          coastline: Kustline
           crater: Krater
           dune: Dún
+          fell: Fjell
           fjord: Fjord
           forest: Bosk
           geyser: Geiser
           glacier: Gletsjer
+          grassland: Greidlân
+          heath: Heide
           hill: Heuvel
+          hot_spring: Waarmwetterboarne
           island: Eilân
+          isthmus: Lâningte
           land: Lân
           marsh: Sompe
           moor: Fean
           mud: Modder
           peak: Pyk
           peninsula: Skiereilân
-          point: Punt
+          point: Lânpunt
           reef: Rif
           ridge: Berchkaam
           rock: Rotsen
+          saddle: Berchseal
+          sand: Sân
           scree: Púnhelling
           scrub: Strewel
+          shingle: Keizel
           spring: Boarne
           stone: Stien
+          strait: Ingte
           tree: Beam
+          tree_row: Beammerige
+          tundra: Toendra
           valley: Fallei
           volcano: Fulkaan
           water: Wetter
           wetland: Somplân
           wood: Wâld
+          "yes": Lânskipselemint
         office:
           accountant: Boekhâlder
           architect: Arsjitekt
@@ -446,7 +708,10 @@ fy:
           travel_agent: Reisburo
           "yes": Kantoar
         place:
+          allotments: Folkstunen
+          archipelago: Arsjipel
           city: Grutte stêd
+          city_block: Wenblok
           country: Lân
           county: Distrikt
           farm: Boerepleats
@@ -454,28 +719,58 @@ fy:
           house: Hûs
           houses: Huzen
           island: Eilân
+          islet: Eilantsje
+          isolated_dwelling: Ofhandige wente
           locality: Plak
           municipality: Gemeente
           neighbourhood: Buert
+          plot: Perseel
           postcode: Postkoade
+          quarter: Wyk
           region: Regio
           sea: See
+          square: Plein
           state: Steat
           subdivision: Dielgebiet
           suburb: Foarstêd
           town: Stêd
           village: Doarp
+          "yes": Plak
         railway:
+          abandoned: Spoarwei yn ferfal
+          construction: Spoarwei yn oanlis
+          disused: Spoarwei yn ûnbrûk
+          funicular: Kabelspoarwei
+          halt: Treinhalte
+          junction: Oansluting
+          level_crossing: Oerwei
           light_rail: Sneltrem
+          miniature: Miniatuerspoar
+          monorail: Monorail
+          narrow_gauge: Smelspoarwei
+          platform: Spoarbaanperron
+          preserved: Museumspoarwei
+          proposed: Spoarwei yn plenning
+          spur: Lokaalspoarwei
           station: Spoarweistasjon
+          stop: Spoarhalte
+          subway: Metro
+          subway_entrance: Metroyngong
+          switch: Wiksel
           tram: Trembaan
           tram_stop: Tremhalte
+          yard: Spoaremplasemint
         shop:
           bakery: Bakker
           boutique: Boetyk
           butcher: Slachter
           chemist: Drogist
+          department_store: Warehûs
+          doityourself: Doch-it-sels
           dry_cleaning: Stomerij
+          electronics: Elektroanikasaak
+          erotic: Sekswinkel
+          fashion: Moadesaak
           florist: Blommist
           furniture: Meubelsaak
           greengrocer: Grientesaak
@@ -484,8 +779,10 @@ fy:
           jewelry: Juwelier
           laundry: Waskerij
           optician: Optisien
+          perfumery: Parfumery
           pet: Bistewinkel
           photo: Fotosaak
+          seafood: Seebanket
           second_hand: Omrinwinkel
           supermarket: Supermerk
           tailor: Kleanmakker
@@ -495,11 +792,17 @@ fy:
           "yes": Winkel
         tourism:
           alpine_hut: Berchhutte
+          apartment: Fakânsje-appartemint
+          artwork: Keunstwurk
           attraction: Attraksje
           bed_and_breakfast: Bêd en brochje
           cabin: Blokhutte
+          camp_pitch: Kampearplak
           camp_site: Kampearterrein
+          caravan_site: Kampearweinterrein
           chalet: Sjalet
+          gallery: Keunstmuseum
+          guest_house: Pinsjon
           hostel: Hostel
           hotel: Hotel
           information: Ynformaasje
@@ -507,14 +810,23 @@ fy:
           museum: Museum
           picnic_site: Piknikplak
           theme_park: Ferdivedaasjepark
+          viewpoint: Utsjochpunt
+          wilderness_hut: Natuerhutte
           zoo: Dieretún
         tunnel:
+          building_passage: Geboutrochgong
           culvert: Dûker
           "yes": Tunnel
         waterway:
+          artificial: Keunstmjittige wetterwei
+          boatyard: Skipswerf
           canal: Kanaal
           dam: Daam
+          derelict_canal: Fertutearze kanaal
           ditch: Sleat
+          dock: Dok
+          drain: Ofwettering
+          lock: Slûs
           lock_gate: Slûsdoar
           mooring: Oanlisplak
           rapids: Streamfersnelling
@@ -523,10 +835,16 @@ fy:
           wadi: Wady
           waterfall: Wetterfal
           weir: Keardaam
+          "yes": Wetterwei
       admin_levels:
         level2: Lânsgrins
+        level3: Regiogrins
         level4: Steatsgrins
+        level5: Regiogrins
         level7: Gemeentegrins
+        level8: Stedsgrins
+        level9: Doarpsgrins
+        level11: Buertgrins
       types:
         cities: Grutte stêden
         towns: Stêden
@@ -557,6 +875,7 @@ fy:
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
+    tou: Gebrûksbetingsten
     help: Help
     about: Oer
     copyright: Auteursrjochten
@@ -580,58 +899,170 @@ fy:
       greeting: Goeie,
   messages:
     inbox:
+      title: Ynfek
+      my_inbox: Myn ynfek
+      my_outbox: Myn útfek
+      messages: Jo hawwe %{new_messages} en %{old_messages}
+      new_messages:
+        one: '%{count} nij berjocht'
+        other: '%{count} nije berjochten'
+      old_messages:
+        one: '%{count} âld berjocht'
+        other: '%{count} âlde berjochten'
       from: Fan
       subject: Underwerp
       date: Datum
+      no_messages_yet_html: Jo hawwe noch gjin berjochten. Kom ris yn 'e kunde mei
+        in pear %{people_mapping_nearby_link}.
+      people_mapping_nearby: kaartmakkers yn 'e omkriten
     message_summary:
-      destroy_button: Fuortsmite
+      unread_button: As net-lêzen oanmerke
+      read_button: As lêzen oanmerke
+      reply_button: Beäntwurdzje
+      destroy_button: Wiskje
     new:
+      title: Berjocht stjoere
+      send_message_to_html: In nij berjocht stjoere oan %{name}
       subject: Underwerp
-      body: Tekst
+      body: Ynhâld
+      back_to_inbox: Werom nei ynfek
+    create:
+      message_sent: Berjocht ferstjoerd
     outbox:
+      title: Utfek
+      my_inbox: Myn ynfek
+      my_outbox: Myn útfek
+      messages:
+        one: Jo hawwe %{count} ferstjoerd berjocht
+        other: Jo hawwe %{count} ferstjoerde berjochten
       to: Oan
       subject: Underwerp
       date: Datum
+      no_sent_messages_html: Jo hawwe noch gjin berjochten ferstjoerd. Kom ris yn
+        'e kunde mei in pear %{people_mapping_nearby_link}.
+      people_mapping_nearby: kaartmakkers yn 'e omkriten
     show:
+      title: Berjocht lêze
       from: Fan
       subject: Underwerp
       date: Datum
+      reply_button: Beäntwurdzje
+      unread_button: As net-lêzen oanmerke
+      destroy_button: Wiskje
       back: Werom
       to: Oan
     sent_message_summary:
-      destroy_button: Fuortsmite
+      destroy_button: Wiskje
+    mark:
+      as_read: Berjocht as lêzen oanmurken
+      as_unread: Berjocht as net-lêzen oanmurken
+    destroy:
+      destroyed: Berjocht wiske
   passwords:
     lost_password:
       email address: 'E-mailadres:'
+    reset_password:
+      flash changed: Jo wachtwurd is feroare.
   preferences:
     show:
+      title: Myn foarkarren
+      preferred_editor: Bewurker fan foarkar
+      preferred_languages: Foarkarstalen
       edit_preferences: Foarkarren bewurkje
+    edit:
+      title: Foarkarren bewurkje
+      save: Foarkarren bywurkje
+      cancel: Annulearje
+    update:
+      failure: Koe de foarkarren net bywurkje.
+    update_success_flash:
+      message: Foarkarren bywurke.
   profiles:
     edit:
       title: Profyl bewurkje
+      save: Profyl bywurkje
+      cancel: Annulearje
       image: Ofbylding
+      gravatar:
+        gravatar: Gravatar brûke
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Wat is Gravatar?
+        disabled: Gravatar is útskeakele.
+        enabled: Werjefte fan jo Gravatar is ynskeakele.
+      new image: Ofbyld tafoegje
+      keep image: Hjoeddeisk ôfbyld hâlde
+      delete image: Hjoeddeisk ôfbyld wiskje
+      replace image: Hjoeddeisk ôfbyld ferfange
+      image size hint: (fjouwerkante plaatsjes fan teminsten 100x100 eagje kreazer)
+      home location: Fêste lokaasje
+      no home location: Jo hawwe jo fêste lokaasje net opjûn.
+      update home location on click: Fêste lokaasje bywurkje at ik op 'e kaart klik?
+    update:
+      success: Profyl bywurke.
+      failure: Koe it profyl net bywurkje.
   sessions:
     new:
+      title: Oanmelde
+      heading: Oanmelde
+      email or username: 'E-mailadres as meidochnamme:'
       password: 'Wachtwurd:'
       openid_html: '%{logo} OpenID:'
+      remember: My ûnthâlde
+      lost password link: Jo wachtwurd kwyt?
+      login_button: Oanmelde
+      register now: No ynskriuwe
+      with external: 'Brûk oars in treddepartij en meld jo oan:'
+      new to osm: Nij op OpenStreetMap?
+      no account: Hawwe jo gjin akkount?
+      auth_providers:
+        openid:
+          title: Oanmelde mei OpenID
+        google:
+          title: Oanmelde mei Google
+        facebook:
+          title: Oanmelde mei Facebook
+        windowslive:
+          title: Oanmelde mei Windows Live
+        github:
+          title: Oanmelde mei GitHub
+        wikipedia:
+          title: Oanmelde mei de Wikipedy
+        wordpress:
+          title: Oanmelde mei Wordpress
+        aol:
+          title: Oanmelde mei AOL
     destroy:
       title: Ofmelde
       logout_button: Ofmelde
   shared:
     markdown_help:
+      title_html: Ferwurke mei <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
       headings: Koppen
       heading: Kop
       subheading: Subkop
+      unordered: Puntelist
+      ordered: Nûmere list
+      first: Earste rigel
+      second: Twadde rigel
+      link: Keppeling
+      text: Tekst
+      image: Ofbyld
+      alt: Alternative tekst
+      url: URL
     richtext_field:
       edit: Bewurkje
+      preview: Proefbyld
   site:
     about:
       next: Folgjende
       copyright_html: <span>&copy;</span>OpenStreetMap-<br>bydragers
       used_by_html: '%{name} leveret kaartdata foar tûzenen websteeën, mobile apps
         en kompjûterapparaten'
+      legal_title: Juridysk
       partners_title: Partners
     copyright:
+      foreign:
+        title: Oer dizze oersetting
       native:
         native_link: Frysktalige ferzje
       legal_babble:
@@ -639,6 +1070,7 @@ fy:
     export:
       title: Eksportearje
       manually_select: Mei de hân in oar gebiet selektearje
+      osm_xml_data: OpenStreetMap-XML-data
       licence: Lisinsje
       export_details_html: OpenStreetMap-data is beskikber ûnder de <a href="https://opendatacommons.org/licenses/odbl/1.0/">Iepen
         Databank-lisinsje</a> (ODbL) fan Open Data Commons.
@@ -661,7 +1093,7 @@ fy:
         geofabrik:
           title: Geofabrik Downloads
           description: Geregeldwei bywurke parten mei kontininten, lannen en selektearre
-            grutte stêden
+            stêden
         metro:
           title: Metro Extracts
           description: Parten mei grutte wrâldstêden en harren omkriten
@@ -798,6 +1230,8 @@ fy:
         oardere punten mei tiidstimpels)
     new:
       help: Help
+    edit:
+      cancel: Annulearje
     update:
       updated: Trajekt bywurke
     trace_optionals:
@@ -810,7 +1244,7 @@ fy:
       download: ynlade
       uploaded: 'Opladen:'
       points: 'Punten:'
-      start_coordinates: 'Startkoördinaat:'
+      start_coordinates: 'Begjinkoördinaat:'
       coordinates_html: '%{latitude}; %{longitude}'
       map: kaart
       edit: bewurkje
@@ -852,16 +1286,40 @@ fy:
       all_traces: Alle trajekten
       traces_from: Iepenbiere trajekten fan %{user}
       remove_tag_filter: Lebelfilter weilitte
+    georss:
+      title: OpenStreetMap GPS-trajekten
+  application:
+    settings_menu:
+      account_settings: Akkountynstellings
+      oauth1_settings: OAuth 1-ynstellings
+      oauth2_applications: OAuth 2-applikaasjes
+      oauth2_authorizations: OAuth 2-autorisaasjes
   oauth2_applications:
     application:
       edit: Bewurkje
   users:
     new:
       title: Ynskriuwe
+      about:
+        header: Frij en bewurkber
+        html: |-
+          <p>Yn tsjinstelling ta oare kaarten, wurdt hiel OpenStreetMap makke troch minsken krekt as jo,
+          en elkenien mei it frij ferbetterje, bywurkje, ynlade en brûke.</p>
+          <p>Skriuw jo yn en set útein mei bydragen. Wy stjoere in e-mail foar it befêstigjen fan jo akkount.</p>
       email address: 'E-mailadres:'
       confirm email address: 'E-mailadres befêstigje:'
+      display name: 'Werjûne namme:'
+      display name description: Jo meidochnamme dy't elkenien sjen kin. Jo kinne dy
+        letter yn 'e foarkarren feroarje.
+      external auth: 'Tredde-autentifikaasje:'
+      use external auth: Brûk oars in treddepartij en meld jo oan
+      auth no password: Mei autentifikaasje troch in tredde is in wachtwurd oerstallich,
+        mar guon ark as tsjinners soene ien freegje kinne.
       continue: Ynskriuwe
     terms:
+      title: Betingsten
+      heading: Betingsten
+      heading_ct: Bydragersbetingsten
       continue: Fierder
       legale_names:
         france: Frankryk
@@ -870,22 +1328,47 @@ fy:
       my diary: Myn deiboek
       my edits: Myn bewurkings
       my traces: Myn trajekten
-      my notes: Myn opmerkings
+      my notes: Myn notysjes
       my messages: Myn berjochten
       my profile: Myn profyl
       my settings: Myn ynstellings
+      my comments: Myn reäksjes
       my_preferences: Myn foarkarren
+      my_dashboard: Myn oersjochpaniel
       edit_profile: Profyl bewurkje
+      send message: Berjocht stjoere
       diary: Deiboek
       edits: Bewurkings
+      traces: Trajekten
+      notes: Kaartnotysjes
+      remove as friend: Untfreonje
+      add as friend: Freon tafoegje
+      mapper since: 'Kaartmakker sûnt:'
       email address: 'E-mailadres:'
       status: 'Status:'
       description: Beskriuwing
+      comments: Reäksjes
+      report: Dizze meidogger melde
     account:
+      my settings: Myn ynstellings
+      current email address: Hjoeddeisk e-mailadres
+      external auth: Autentifikaasje om utens
       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: wat is dit?
       public editing:
+        heading: Iepenbier bewurkjen
+        enabled: Ynskeakele. Net anonym en kin data bewurkje.
         enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: wat is dit?
+      public editing note:
+        heading: Iepenbier bewurkjen
+      contributor terms:
+        heading: Bydragersbetingsten
+        agreed: Jo binne akkoart gien mei de nije Bydragersbetingsten.
+        not yet agreed: Jo binne noch net akkoart gien mei de nije Bydragersbetingsten.
+        link text: wat is dit?
+      save changes button: Feroarings bewarje
     index:
       title: Meidoggers
       heading: Meidoggers
@@ -902,16 +1385,22 @@ fy:
       previous: « Foarige
   notes:
     index:
+      title: Troch %{user} yntsjinne as op reägearre notysjes
+      heading: Notysjes fan %{user}
+      subheading_html: Troch %{user} yntsjinne as op reägearre notysjes
+      no_notes: Gjin notysjes
       id: Id
       creator: Auteur
       description: Beskriuwing
+      created_at: Makke op
+      last_changed: Lêst wizige
   javascripts:
     close: Slute
     share:
       title: Diele
       cancel: Annulearje
       image: Ofbylding
-      link: Keppeling as HTML
+      link: Keppeling of HTML
       long_link: Kepp.
       short_link: Lytse kepp.
       geo_uri: Geo-URI
@@ -954,7 +1443,7 @@ fy:
         opnvkarte: Ferfiermiddels
       layers:
         header: Kaartlagen
-        notes: Kaartopmerkings
+        notes: Kaartnotysjes
         data: Kaartdata
         gps: Iepenbiere GPS-trajekten
         overlays: Boppelagen ynskeakelje ta oplossing fan kaartproblemen
@@ -973,10 +1462,10 @@ fy:
     site:
       edit_tooltip: De kaart bewurkje
       edit_disabled_tooltip: Zoom yn om 'e kaart bewurkje te kinnen
-      createnote_tooltip: In opmerking oan 'e kaart taheakje
-      createnote_disabled_tooltip: Zoom yn om in opmerking oan 'e kaart taheakje te
+      createnote_tooltip: In notysje oan 'e kaart taheakje
+      createnote_disabled_tooltip: Zoom yn om in notysje oan 'e kaart taheakje te
         kinnen
-      map_notes_zoom_in_tooltip: Zoom yn om kaartopmerkings sjen te kinnen
+      map_notes_zoom_in_tooltip: Zoom yn om kaartnotysjes sjen te kinnen
       map_data_zoom_in_tooltip: Zoom yn om kaartdata sjen te kinnen
       queryfeature_tooltip: Skaaimerken opfreegje
       queryfeature_disabled_tooltip: Zoom yn om skaaimerken opfreegje te kinnen
@@ -984,11 +1473,19 @@ fy:
       new:
         intro: Flater sjoen of mist der wat? Lit it de oare kaartmakkers witte, dan
           meitsje wy it yn oarder. Sko de markearder op it krekte plak, en typ in
-          opmerking oer it probleem.
-        advice: Jo opmerking is iepenbier en kin brûkt wurde ta ferbettering fan 'e
-          kaart; dat fier neat persoanliks yn, gjin ynformaasje fan kaarten of yndeksen
-          mei auteursrjocht.
-        add: Opmerking taheakje
+          notysje oer it probleem.
+        advice: Jo notysje is iepenbier en kin brûkt wurde ta ferbettering fan 'e
+          kaart; dat fier neat persoanliks yn, gjin ynfo fan kaarten of yndeksen mei
+          auteursrjocht.
+        add: Notysje taheakje
+      show:
+        anonymous_warning: Dizze notysje befettet reäksjes fan anonime meidoggers
+          dy't apart neigien wurde moatte.
+        hide: Ferbergje
+        resolve: Oplosse
+        reactivate: Weraktivearje
+        comment_and_resolve: Reägearje & oplosse
+        comment: Reägearje
     edit_help: Sko de kaart en zoom yn op 'e lokaasje dy't jo bewurkje wolle, klik
       dan hjir.
     directions:
@@ -1090,7 +1587,7 @@ fy:
     context:
       directions_from: Rûte hjir wei
       directions_to: Rûte hjir hinne
-      add_note: Hjir in opmerking taheakje
+      add_note: Hjir in notysje taheakje
       show_address: Adres werjaan
       query_features: Skaaimerken opfreegje
       centre_map: Kaart hjir sintrearje
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 6f2a3598e..62543818e 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: J budissin
 # Author: Macofe
+# Author: McDutchie
 # Author: Michawiki
 # Author: Mikławš
 ---
@@ -1758,7 +1759,7 @@ hsb:
       email or username: 'E-mejlowa adresa abo wužiwarske mjeno:'
       password: 'Hesło:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Spomjatkować sej:'
+      remember: Spomjatkować sej
       lost password link: Swoje hesło zabył?
       login_button: Přizjewjenje
       register now: Nětko registrować
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index c51637059..697b360fc 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1792,7 +1792,7 @@ ia:
       email or username: 'Adresse de e-mail o nomine de usator:'
       password: 'Contrasigno:'
       openid_html: 'OpenID de %{logo}:'
-      remember: 'Memorar me:'
+      remember: Memorar me
       lost password link: Contrasigno perdite?
       login_button: Aperir session
       register now: Registrar ora
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 122316109..1b563d851 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Macofe
+# Author: McDutchie
 # Author: Nemo bis
 # Author: Snævar
 # Author: Sveinki
@@ -1694,7 +1695,7 @@ is:
       email or username: 'Netfang eða notandanafn:'
       password: 'Lykilorð:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Muna innskráninguna:'
+      remember: Muna innskráninguna
       lost password link: Gleymdirðu lykilorðinu þínu?
       login_button: Innskrá
       register now: Skrá þig núna
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 7ce8efa1d..54a0ebcda 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2301,6 +2301,8 @@ ja:
       read_gpx: 非公開GPSトレースを読む
       write_gpx: GPSトレースをアップロードする。
       write_notes: メモを変更する。
+      read_email: ユーザーの電子メールアドレスを読む
+      skip_authorization: 自動的に申請を承認する
   oauth_clients:
     new:
       title: アプリケーションの新規登録
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index b00886d57..a24d392f4 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: David1010
 # Author: MIKHEIL
+# Author: McDutchie
 # Author: Temuri rajavi
 # Author: Გიო ოქრო
 # Author: Იო ოქრო
@@ -893,7 +894,7 @@ ka:
       email or username: 'ელ. ფოსტის მისამართი, ან მომხმარებლის სახელი:'
       password: 'პაროლი:'
       openid_html: '%{logo} OpenID:'
-      remember: 'დამიმახსოვრე:'
+      remember: დამიმახსოვრე
       lost password link: დაგავიწყდათ პაროლი?
       login_button: შესვლა
       register now: დარეგისტრირდით ახლავე
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 126124394..74508bc83 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -14,6 +14,8 @@
 # Author: SlimaneAmiri
 ---
 kab:
+  html:
+    dir: ltr
   time:
     formats:
       friendly: '%e %B %Y ɣef %H:%M'
@@ -164,6 +166,15 @@ kab:
         new_email: (werǧin ad d-iban s wudem azayez)
   datetime:
     distance_in_words_ago:
+      about_x_hours:
+        one: qrib 1 n usrag aya
+        other: qrib %{count} n yisragen aya
+      about_x_months:
+        one: 'qrib 1 n wayyur aya '
+        other: about %{count} n wagguren aya
+      about_x_years:
+        one: qrib 1 n useggas aya
+        other: qrib %{count} n yiseggasen aya
       half_a_minute: Azgen n tsedast aya
   editor:
     default: Amezwer (tura %{name})
@@ -383,6 +394,7 @@ kab:
       your location: Adig-ik
       friend: Amdakkel
     show:
+      my friends: Imeddukal-iw
       nearby users: Iseqdacen-nniḍen iqeṛben
       friends_changesets: Igrawen n usnifel n yidukkal
       friends_diaries: Inekcam n uɣmis n yimdukkal
@@ -392,20 +404,21 @@ kab:
     new:
       title: Anekcam amaynut n uɣmis
     form:
-      location: 'Adig:'
-      use_map_link: seqdec takarḍa
+      location: Adig
+      use_map_link: Seqdec takarḍa
     index:
-      title: IÉ£misen n useqdac
-      title_friends: IÉ£misen n imdukal
-      title_nearby: Iɣmisen n iseqdacen iqeṛben
+      title: IÉ£misen n yiseqdacen
+      title_friends: IÉ£misen n yimeddukal
+      title_nearby: Iɣmisen n yiseqdacen iqeṛben
       user_title: AÉ£mis n %{user}
       in_language_title: Inekcam n uɣmis s %{language}
       new: Anekcam amaynut n uɣmis
       new_title: Aru anekcam amaynut deg uɣmis-ik n useqdac
-      no_entries: Ulac amagrad n uɣmis
-      recent_entries: Imagraden n melmi kan n uɣmis
+      my_diary: AÉ£mis-iw
+      no_entries: Ulac anekcam n uɣmis
+      recent_entries: Inekcamen ineggura n uɣmis
       older_entries: Inekcam iqbuṛen
-      newer_entries: Inekcam n melmi kan
+      newer_entries: Inekcam ineggura
     edit:
       title: Ẓreg anekcam n uɣmis
       marker_text: Adig n unekcam n uɣmis
@@ -547,7 +560,7 @@ kab:
           gambling: Uraren yidrimen
           grave_yard: Tajebbant
           grit_bin: Asenduq n tasent
-          hospital: Sbiá¹­ar
+          hospital: Asegnaf
           hunting_stand: Tanefsart n uselfeɣ
           ice_cream: Tamagrist
           kindergarten: Tibḥirt n warrac
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 32e064e38..702042304 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -2526,7 +2526,7 @@ lb:
       relation: Relatioun
     context:
       directions_from: Vun hei fort
-      directions_to: Heihinn
+      directions_to: Heihin
       add_note: Eng Notiz hei derbäisetzen
       show_address: Adress weisen
       query_features: Objetsoffro
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 09b4b1726..fefe8669b 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -11,6 +11,7 @@
 # Author: Mantak111
 # Author: Manvydasz
 # Author: Matasg
+# Author: McDutchie
 # Author: Pauliuz
 # Author: Pdxx
 # Author: Perkunas
@@ -1473,7 +1474,7 @@ lt:
       email or username: 'E-pašto adresas arba naudotojo vardas:'
       password: 'Slaptažodis:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Prisiminti prisijungimą:'
+      remember: Prisiminti prisijungimą
       lost password link: Pamiršote slaptažodį?
       login_button: Prisijungti
       register now: Užsiregistruoti
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index e7bc2853b..01a749915 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -11,6 +11,7 @@
 # Author: Karlis
 # Author: Lafriks
 # Author: Macofe
+# Author: McDutchie
 # Author: Nemo bis
 # Author: Papuass
 # Author: PeterisP
@@ -1287,7 +1288,7 @@ lv:
       email or username: 'E-pasta adrese vai lietotājvārds:'
       password: 'Parole:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Atcerēties mani:'
+      remember: Atcerēties mani
       lost password link: Aizmirsi paroli?
       login_button: Pieslēgties
       register now: Reģistrēties
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index ea020b7fe..0b233f470 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -858,7 +858,7 @@ mk:
           "yes": Пат
         historic:
           aircraft: Историски воздухоплов
-          archaeological_site: Археолошки локалитет
+          archaeological_site: Археолошко наоѓалиште
           bomb_crater: Историски кратер од бомба
           battlefield: Бојно поле
           boundary_stone: Граничен камен
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 8696befb3..88da1cfa4 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -95,7 +95,7 @@ nb:
       tracepoint: Punkt i spor
       tracetag: Spormerkelapp
       user: Bruker
-      user_preference: Brukerinnstillinger
+      user_preference: Brukeralternativ
       user_token: Brukernøkkel
       way: Linje
       way_node: Veinode
@@ -106,8 +106,8 @@ nb:
         url: Hovedapplikasjons-URL (påkrevd)
         callback_url: 'URL for tilbakekall:'
         support_url: Støtte-URL
-        allow_read_prefs: lese brukerinnstillingene deres
-        allow_write_prefs: endre brukerinnstillingene deres
+        allow_read_prefs: lese brukeralternativ deres
+        allow_write_prefs: endre brukeralternativ deres
         allow_write_diary: opprette dagbokoppføringer, kommentarer og finne venner
         allow_write_api: endre kartet
         allow_read_gpx: lese deres private GPS-spor
@@ -2185,8 +2185,8 @@ nb:
         %{user}. Sjekk om du vil at applikasjonen skal ha følgende muligheter. Du
         kan velge så mange eller få du vil.
       allow_to: 'Gi programmet lov til å:'
-      allow_read_prefs: lese brukerinnstillingene dine.
-      allow_write_prefs: endre innstillingene dine.
+      allow_read_prefs: lese brukeralternativ dine.
+      allow_write_prefs: endre brukeralternativ dine.
       allow_write_diary: opprette dagbokoppføringer, kommentarer og finne venner.
       allow_write_api: endre kartet.
       allow_read_gpx: lese dine private GPS-spor.
@@ -2206,7 +2206,9 @@ nb:
     permissions:
       missing: Du har ikke latt applikasjonen få tilgang til denne fasiliteten
     scopes:
-      write_api: endre kartet
+      read_prefs: Lese brukeralternativ
+      write_prefs: Endre brukeralternativ
+      write_api: Endre kartet
       read_gpx: Les private GPS-spor
       write_gpx: Last opp GPS-spor
       write_notes: Endre merknader
@@ -2274,7 +2276,7 @@ nb:
       confirm email address: 'Bekreft e-postadresse:'
       display name: 'Visningsnavn:'
       display name description: Ditt offentlig fremviste brukernavn. Du kan endre
-        dette senere i innstillingene.
+        dette senere i alternativ.
       external auth: 'Tredjepartsgodkjenning:'
       use external auth: Alternativt kan du bruke en tredjepart til å logge inn
       auth no password: Med tredjepartsbekreftelse er passord ikke påkrevd, men en
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 1ce593fa6..442db7bf2 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -203,7 +203,7 @@ nl:
         pass_crypt_confirmation: Wachtwoord bevestigen
     help:
       doorkeeper/application:
-        confidential: Applicatie wordt gebruikt waar het clientgeheim vertrouwelijk
+        confidential: Toepassing wordt gebruikt waar het clientgeheim vertrouwelijk
           kan worden gehouden (native mobiele apps en apps met één pagina zijn niet
           vertrouwelijk)
         redirect_uri: Gebruik één regel per URI
@@ -550,7 +550,7 @@ nl:
         zero: Geen reactie
         one: '%{count} reactie'
         other: '%{count} reacties'
-      edit_link: Bewerk dit bericht
+      edit_link: Dit bericht bewerken
       hide_link: Verberg dit bericht
       unhide_link: Toevoeging zichtbaar maken
       confirm: Bevestigen
@@ -708,7 +708,7 @@ nl:
           nightclub: Nachtclub
           nursing_home: Verpleeghuis
           parking: Parkeerterrein
-          parking_entrance: Ingang parkeerterrein
+          parking_entrance: Ingang parkeergarage
           parking_space: Parkeerplaats
           payment_terminal: Betaalautomaat
           pharmacy: Apotheek
@@ -760,7 +760,7 @@ nl:
           "yes": Grens
         bridge:
           aqueduct: Aquaduct
-          boardwalk: Plankenweg
+          boardwalk: Vlonderpad
           suspension: Hangbrug
           swing: Draaibrug
           viaduct: Viaduct
@@ -924,7 +924,7 @@ nl:
           heritage: Erfgoedlocatie
           hollow_way: Holle weg / grubbe
           house: Huis
-          manor: Landgoed
+          manor: Manoir
           memorial: Herdenkingsmonument
           milestone: Historische mijlpaal
           mine: Mijn
@@ -1790,7 +1790,7 @@ nl:
       title: Wachtwoord vergeten
       heading: Wachtwoord vergeten?
       email address: 'E-mailadres:'
-      new password button: Nieuw wachtwoord verzenden
+      new password button: Wachtwoord opnieuw instellen
       help_text: Voer het e-mailadres in dat u hebt opgegeven bij uw registratie.
         We sturen u dan een webkoppeling die u kunt gebruiken om uw wachtwoord opnieuw
         in te stellen.
@@ -1848,7 +1848,7 @@ nl:
       email or username: 'E-mailadres of gebruikersnaam:'
       password: 'Wachtwoord:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Aanmeldgegevens onthouden:'
+      remember: Aanmeldgegevens onthouden
       lost password link: Wachtwoord vergeten?
       login_button: Aanmelden
       register now: Nu inschrijven
@@ -1977,7 +1977,7 @@ nl:
         intro_2_html: |-
           Het staat u vrij onze gegevens te kopiëren, te distribueren,
           weer te geven en aan te passen, zo lang u OpenStreetMap en haar
-          auteurs vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt,
+          bijdragers vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt,
           mag u het resultaat enkel onder dezelfde licentie distribueren. In de
           volledige <a href="https://opendatacommons.org/licenses/odbl/1.0/">juridische
           tekst</a> worden uw rechten en verantwoordelijkheden uitgelegd.
@@ -1989,15 +1989,13 @@ nl:
           We vereisen dat u het volgende vermeldt bij gebruik:
           &ldquo;&copy; OpenStreetMap-bijdragers&rdquo;.
         credit_2_1_html: "U moet ook duidelijk maken dat de gegevens beschikbaar zijn
-          onder de Open\nDatabase License, en als u onze kaarttegels gebruikt, dat
-          de cartografie\nde licentie CC BY-SA heeft. U kunt dit doen door te verwijzen
-          naar\n<a href=\"https://www.openstreetmap.org/copyright\">de auteursrechtenpagina</a>.
+          onder de Open\nDatabase License. U kunt dit doen door te verwijzen naar\n<a
+          href=\"https://www.openstreetmap.org/copyright\">de auteursrechtenpagina</a>.
           \nU kunt ook direct verwijzen naar de licentie(s). Dat laatste is verplicht
           als u OSM in gegevensvorm distribueert. In media waar\nhyperlinks niet mogelijk
           zijn, bijvoorbeeld in gedrukte werken, raden we u aan\nuw lezer te verwijzen
           naar openstreetmap.org (mogelijk door de naam \"OpenStreetMap\" naar dit
-          webadres uit te breiden), naar opendatacommons.org en naar, indien van toepassing,
-          creativecommons.org."
+          webadres uit te breiden) en naar opendatacommons.org."
         credit_3_1_html: De kaarttegels in de &ldquo;standaard stijl&rdquo; op www.openstreetmap.org
           zijn een geproduceerd werk van de OpenStreetMap Foundation met OpenStreetMap-gegevens
           onder de Open Database Licentie. Wanneer deze kaartstijl wordt gebruikt
@@ -2079,7 +2077,7 @@ nl:
           aansprakelijkheid aanvaardt.
         infringement_title_html: Auteursrechtenschending
         infringement_1_html: |-
-          Bijdragers aan OSM horen nooit gegevens toe te voegen
+          OSM-bijdragers horen nooit gegevens toe te voegen
           uit bronnen waarvan de licentie niet vrij is (bijvoorbeeld Google Maps of gedrukte kaarten)
           zonder expliciete toestemming van de auteursrechtenhouders.
         infringement_2_html: |-
@@ -2230,7 +2228,7 @@ nl:
         Omdat Adobe Flash Player niet meer bestaat, kan Potlatch niet langer gebruikt
         worden in de webbrowser.
       desktop_html: U kunt Potlatch nog gebruiken door <a href="https://www.systemed.net/potlatch/">de
-        applicatie voor Mac en Windows te downloaden</a>.
+        toepassing voor Mac en Windows te downloaden</a>.
       id_html: U kunt ook uw standaardeditor op iD zetten. Dat werkt in uw browser
         zoals Potlatch dat vroeger deed. <a href="%{settings_url}">Wijzig hier uw
         voorkeuren</a>.
@@ -2262,7 +2260,7 @@ nl:
           cycleway_national: Nationale fietsroute
           cycleway_regional: Regionale fietsroute
           cycleway_local: Lokale fietsroute
-          footway: Wandelpad of voetpad
+          footway: Voetpad
           rail: Spoorweg
           subway: Metro
           tram:
@@ -2376,7 +2374,7 @@ nl:
     new:
       upload_trace: Gps-traject uploaden
       visibility_help: wat betekent dit?
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces‎
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/NL:Visibility_of_GPS_traces
       help: Hulp
       help_url: http://wiki.openstreetmap.org/wiki/NL:Upload
     create:
@@ -2398,6 +2396,7 @@ nl:
       title: Traject %{name} bewerken
       heading: Traject %{name} bewerken
       visibility_help: wat betekent dit?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/NL:Visibility_of_GPS_traces
     update:
       updated: Traject bijgewerkt
     trace_optionals:
@@ -2500,9 +2499,9 @@ nl:
         U kunt zoveel of zo weinig rechten toewijzen als u wilt.
       allow_to: 'De clienttoepassing de volgende rechten geven:'
       allow_read_prefs: uw gebruikersvoorkeuren lezen
-      allow_write_prefs: uw gebruikersvoorkeuren wijzigen
+      allow_write_prefs: uw gebruikersvoorkeuren wijzigen.
       allow_write_diary: dagboekberichten schrijven, reacties geven en vrienden maken
-      allow_write_api: de kaart wijzigen
+      allow_write_api: de kaart wijzigen.
       allow_read_gpx: uw persoonlijke gps-trajecten lezen
       allow_write_gpx: Gps-trajecten uploaden
       allow_write_notes: opmerkingen wijzigen.
@@ -2523,12 +2522,12 @@ nl:
       read_prefs: Gebruikersvoorkeuren lezen
       write_prefs: Gebruikersvoorkeuren wijzigen
       write_diary: Dagboekberichten schrijven, reacties geven en vrienden maken
-      write_api: Wijzig de kaart
+      write_api: De kaart wijzigen
       read_gpx: Persoonlijke gps-trajecten lezen
       write_gpx: Gps-trajecten uploaden
-      write_notes: Notities wijzigen
+      write_notes: Opmerkingen wijzigen
       read_email: E-mailadres lezen
-      skip_authorization: Aanvraag automatisch goedkeuren
+      skip_authorization: Toepassing automatisch goedkeuren
   oauth_clients:
     new:
       title: Nieuwe toepassing registreren
@@ -2598,7 +2597,7 @@ nl:
       permissions: Rechten
       redirect_uris: Omleidings-URI's
     not_found:
-      sorry: Sorry, die applicatie kan niet worden gevonden.
+      sorry: Sorry, die toepassing kan niet worden gevonden.
   oauth2_authorizations:
     new:
       title: Autorisatie vereist
@@ -2615,7 +2614,7 @@ nl:
       title: Mijn geautoriseerde toepassingen
       application: Toepassing
       permissions: Rechten
-      no_applications_html: U heeft nog geen %{oauth2}-applicaties geautoriseerd.
+      no_applications_html: U heeft nog geen %{oauth2}-toepassingen geautoriseerd.
     application:
       revoke: Toegang intrekken
       confirm_revoke: Toegang voor deze toepassing intrekken?
@@ -3014,13 +3013,12 @@ nl:
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Doneer nu</a>
       terms: <a href='%{terms_url}' target='_blank'>Website en API-voorwaarden</a>
       cyclosm: Rasterkaart in de stijl van <a href='%{cyclosm_url}' target='_blank'>CyclOSM</a>
-        wordt gehost door <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
-        Frankrijk</a>
+        gehost door <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap Frankrijk</a>
       thunderforest: Rasterkaart met dank aan <a href='%{thunderforest_url}' target='_blank'>Andy
         Allan</a>
       opnvkarte: Rasterkaart met dank aan <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
       hotosm: Rasterkaart in de stijl van <a href='%{hotosm_url}' target='_blank'>Humanitarian
-        OpenStreetMap Team</a> wordt gehost door <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+        OpenStreetMap Team</a> gehost door <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
         Frankrijk</a>
     site:
       edit_tooltip: Kaart bewerken
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 94bdeed0a..3cb800d0b 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -10,6 +10,7 @@
 # Author: Gunnernett
 # Author: Harald Khan
 # Author: Macofe
+# Author: McDutchie
 # Author: Nemo bis
 # Author: Nghtwlkr
 # Author: Njardarlogar
@@ -1219,7 +1220,7 @@ nn:
       email or username: 'E-postadresse eller brukarnamn:'
       password: 'Passord:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Hugs meg:'
+      remember: Hugs meg
       lost password link: Mista passordet ditt?
       login_button: Logg inn
       register now: Registrer deg no
diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 3c7d55248..f813dc749 100644
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -320,6 +320,19 @@ nqo:
       no_more_area: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߜߘߍ߫ ߕߍ߫ ߕߌ߲߬ߞߎߘߎ߲ ߣߌ߲߬ ߘߐ߫.
       no_more_user: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߟߊߘߏ߲߬ߣߍ߲߬ ߜߘߍ߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߏ߫
       load_more: ߘߏߜߘߍ߫ ߟߎ߫ ߟߊߢߎ߲߫
+  dashboards:
+    contact:
+      km away: ߞߎߘߍ %{count} ߝߏ߬ߣߊ߲ ߠߊ߫
+      m away: ߡߟߌ %{count} ߝߏ߬ߣߊ߲ ߠߊ߫
+    popup:
+      your location: ߌ ߘߌ߲߬ߞߌߙߊ
+      nearby mapper: ߛߌ߰ߢߐ߲߮ ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ
+      friend: ߕߋߙߌ
+    show:
+      my friends: ߒ ߕߋߙߌ ߟߎ߬
+      no friends: ߌ ߡߊ߫ ߕߋߙߌ߫ ߛߌ߫ ߝߙߊ߬ ߡߎߣߎ߲߬.
+      nearby users: ߛߌ߰ߢߐ߲߮ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߜߘߍ ߟߎ߬
+      friends_diaries: ߕߋߙߌ ߟߎ߬ ߟߊ߫ ߕߋ߬ߟߋ߲ ߓߊ߯ߙߊ ߟߎ߬
   diary_entries:
     new:
       title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ
@@ -1036,6 +1049,20 @@ nqo:
       reset: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       flash changed: ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߓߘߊ߫ ߓߊ߲߫ ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫.
       flash token bad: ߌ ߞߊߣߊ߬ ߖߐߟߐ߲ߞߐ ߏ߬ ߢߌߣߌ߲߫߸ URL ߡߊߝߟߍ߫ ߕߎ߬ߡߊ߬ߘߐ߫؟
+  preferences:
+    show:
+      title: ߒ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬
+  profiles:
+    edit:
+      cancel: ߊ߬ ߘߐߛߊ߬
+      image: ߖߌ߬ߦߊ߬ߓߍ
+      new image: ߖߌ߬ߦߊ߬ߓߍ ߘߏ߫ ߝߙߊ߬
+      keep image: ߖߌ߬ߦߊ߬ߓߍ ߞߘߐ߬ߡߊ߲ ߠߊߡߙߊ߬
+      delete image: ߖߌ߬ߦߊ߬ߓߍ ߞߘߐ߬ߡߊ߲ ߛߋ߲߬ߓߐ߫
+      replace image: ߖߌ߬ߦߊ߬ߓߍ ߡߍ߲ ߦߋ߫ ߦߋ߲߬ ߕߊ߲߬߸ ߏ߬ ߣߐ߬ߘߐߓߌ߬ߟߊ߬
+      home location: ߌ ߓߘߊ ߘߌ߲߬ߞߌߙߊ
+      no home location: ߌ ߡߴߌ ߟߊ߫ ߟߎ ߘߌ߲߬ߞߌߙߊ ߟߊߘߏ߲߬ ߝߟߐ߫
+      update home location on click: ߞߊ߬ ߟߎ ߘߌ߲߬ߞߌߙߊ ߡߊߝߊ߬ߟߋ߲߫ ߣߌ߫ ߒ ߞߊ߬ ߡߊߔ ߛߐ߲߬ߞߌ߲߫؟
   sessions:
     new:
       title: ߌ ߜߊ߲߬ߞߎ߲߫
@@ -1298,6 +1325,7 @@ nqo:
       older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
       newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
     trace:
+      more: ߡߊ߬ߞߊ߬ߝߏ߬ ߜߘߍ ߟߎ߬
       view_map: ߡߊߔ ߦߋ߫
       edit_map: ߡߊߔ ߡߊߦߟߍ߬ߡߊ߲߫
       public: ߡߌ߬ߙߌ߲߬ߘߌ
@@ -1372,8 +1400,10 @@ nqo:
       read_prefs: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߘߐߞߊ߬ߙߊ߲߬
       write_prefs: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
       write_api: ߔߊ߬ߔߘߊ ߡߊߦߟߍ߬ߡߊ߲߫
+      read_gpx: ߌ ߘߎ߲߬ߘߊ߬ߡߊ߬ GPS ߝߏ߲߬ߝߏ߲ ߠߎ߬ ߘߐߞߊ߬ߙߊ߲߬
       write_gpx: GPS ߝߏ߲߬ߝߏ߲ ߠߊߦߟߍ߬
       write_notes: ߦߟߌߣߐ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
+      read_email: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߞߊ߬ߙߊ߲߬
   oauth_clients:
     new:
       title: ߟߥߊ߬ߟߌ߬ߟߌ߬ ߞߎߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
@@ -1402,8 +1432,20 @@ nqo:
     show:
       edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
       delete: ߊ߬ ߖߏ߬ߛߌ߬
+  oauth2_authorizations:
+    error:
+      title: ߝߎ߬ߕߎ߲߬ߕߌ ߘߏ߫ ߓߘߊ߫ ߓߌ߬ߟߵߊ߬ ߘߐ߫
+    show:
+      title: ߘߏߝߙߍߕߍ ߖߡߊ߬ߙߌ߬ߦߊ߬ߟߌ
+  oauth2_authorized_applications:
+    index:
+      title: ߒ ߠߊ߫ ߟߥߊ߬ߟߌ߬ߟߊ߲߫ ߖߡߊ߬ߙߌ߬ߦߊ߬ߣߍ߲ ߠߎ߬
+      application: ߟߥߊ߬ߟߌ߬ߟߊ߲
+      permissions: ߘߌ߬ߢߍ߬ߟߊ߬ߢߌߣߌ߲
+      no_applications_html: ߌ ߡߊ߫ %{oauth2} ߟߥߊ߬ߟߌ߬ߟߊ߲߫ ߛߌ߫ ߖߡߊ߬ߙߌ߬ߦߊ߫ ߡߎߣߎ߲߬.
   users:
     new:
+      title: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
       email address: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
       confirm email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߟߊߛߙߋߦߊ߫:'
       display name: 'ߟߊ߬ߓߊ߰ߙߊ߬ ߕߐ߮:'
@@ -1417,5 +1459,50 @@ nqo:
       heading_ct: ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬
       read_ct: ߒ ߓߘߊ߫ ߛߊ߲ߝߍ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬ ߘߐߞߊ߬ߙߊ߲߬ ߊ߬ ߣߌ߫ ߞߊ߬ ߘߌ߬ߢߍ߬
         ߊ߬ ߡߊ߬ ߝߣߊ߫.
+      read_tou: ߒ ߓߘߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߛߙߊߕߌ ߘߐߞߊ߬ߙߊ߲߬ ߊ߬ ߣߌ߫ ߞߊ߬ ߘߌ߬ߢߍ߬ ߊ߬ ߡߊ߬
+      consider_pd: ߛߊ߲ߝߍߟߊ ߏ߬ ߡߊߞߊ߬ߝߏ߬ߟߌ ߘߐ߫ ߌ ߞߐ߫߸ ߒ ߧߋ߫ ߒ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߖߊ߬ߕߋ߬ ߟߴߊ߬
+        ߞߍ ߘߐ߫ ߖߊ߬ߡߊ ߘߍ߬ߒ߬ߡߊ߬ߝߋ߲ ߘߌ߫
+      consider_pd_why: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
       consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      guidance_html: 'ߞߎ߲߬ߠߊ߬ߝߏߣߌ߲ ߡߍ߲ ߦߋ߫ ߦߋ߲߬ ߞߊ߬ ߛߋ߫ ߛߙߊߕߌ ߏ߬ ߝߊ߰ߡߎ߲߬ ߠߊ߫: <a href="%{summary}">ߡߐ߱
+        ߟߊ߫ ߛߟߊ߫ ߘߐߞߊ߬ߙߊ߲߬ߕߊ</a> ߣߌ߫ <a href="%{translations}">ߞߎ߲߬ߠߊ߬ߝߏߣߌ߲ ߘߟߊߡߌߘߊߟߌ</a>
+        ߘߏ߫ ߟߎ߫'
+      continue: ߊ߬ ߘߊߓߊ߲߫
+      declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+      legale_select: 'ߌ ߛߌ߰ߣߍ߲߬ ߦߋ߫ ߖߡߊ߬ߣߊ ߡߍ߲ ߘߐ߫:'
+      legale_names:
+        france: ߝߊ߬ߙߊ߲߬ߛߌ߫
+        italy: ߌߕߊߟߌ߫
+        rest_of_world: ߘߎߢߊ߫ ߕߐ߬ ߕߏߣߍ߲
+    terms_declined_flash:
+      terms_declined_html: ߊ߲ ߓߘߊ߫ ߖߌ߰ߡߊߖߊ߲߬ߝߊ߫ ߞߊ߬ ߓߍ߲߬ ߌ ߓߊ߲߭ ߡߊ߬ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߞߎߘߊ
+        ߞߎߘߊ ߛߙߊߕߌ ߟߊߡߌ߬ߣߊ߫ ߟߊ߫. ߛߴߌ ߘߌ߫ ߞߎ߲߬ߠߊ߬ߝߏ߬ߣߌ߲߫ ߛߌߦߊߡߊ߲߫ ߞߏ ߘߐ߫߸ %{terms_declined_link}
+        ߘߐߜߍ߫ ߖߊ߰ߣߌ߲߫.
+      terms_declined_link: ߥߞߌ߫ ߞߐߜߍ ߣߌ߲߬
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+    no_such_user:
+      title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߛߎ߮ ߏ߬ ߕߍ߫ ߦߋ߲߬
+      heading: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %{user} ߕߍ߫ ߦߋ߲߬
+      body: ߤߊߞߍ߬ߕߏ߫߸ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߛߌ߫ ߕߍ߫ ߦߋ߲߬ %{user} ߕߐ߮ ߘߌ߫. ߌ ߟߊ߫ ߛߓߍߢߊ ߝߛߍ߬ߝߛߍ߫
+        ߖߊ߰ߣߌ߲߫߸ ߤߊߡߊ߲ߕߍ߫ ߌ ߣߐ߬ ߦߋ߫ ߞߍ߫ ߟߊ߫ ߛߘߌ߬ߜߋ߲߬ ߕߌߢߍߣߍ߲ ߠߋ߬ ߛߐ߲߬ߞߌ߲߫ ߠߊ߫.
+      deleted: ߖߏ߬ߛߌ߬ߣߍ߲
+    show:
+      my diary: ߒ ߕߋ߬ߟߋ߲
+      new diary entry: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ
+      my edits: ߒ ߠߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬
+      my traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
+      my notes: ߒ ߠߊ߫ ߦߟߌߣߐ ߟߎ߫
+      my messages: ߒ ߠߊ߫ ߗߋߛߓߍ ߟߎ߬
+      send message: ߗߋߛߓߍ߫ ߗߋߣߍ߲
+      diary: ߕߋ߬ߟߋ߲
+      edits: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬
+      traces: ߝߏ߲߬ߝߏ߲ ߠߎ߬
+      notes: ߡߊߔ ߦߟߌߣߐ ߟߎ߬
+      remove as friend: ߕߋߙߌߦߊ ߝߘߊ߫
+      add as friend: ߕߋߙߌ ߝߙߊ߬
+      mapper since: 'ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߌ߫ ߞߊ߬ߦߌ߯:'
+    account:
+      public editing:
+        enabled link text: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
+        disabled link text: ߡߎ߲߬ߠߊ߫ ߒߠߋ ߕߍ߫ ߛߋ߫ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߍ߫ ߟߊ߫؟
 ...
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index e45d935e8..c6cf8ab56 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1981,13 +1981,11 @@ pt-PT:
           (por exemplo, obras impressas) sugerimos que direcione os leitores para
           www.openstreetmap.org (talvez expandindo &lsquo;OpenStreetMap&rsquo; para
           o endereço completo) e para www.opendatacommons.org.
-        credit_3_1_html: |-
-          Os mosaicos de mapa no &ldquo;estilo padrão&rdquo; em www.openstreetmap.org são um
-          trabalho produzido pela Fundação OpenStreetMap com recurso a
-          dados do OpenStreetMap
-          sob Licença Open Database. Se estiver a usar estes mosaicos, por favor, use
-          a seguinte atribuição:
-          &ldquo;Mapa base e dados de OpenStreetMap e Fundação OpenStreetMap&rdquo;.
+        credit_3_1_html: Os mosaicos do mapa no &ldquo;estilo padrão&rdquo; em www.openstreetmap.org
+          são um trabalho produzido pela Fundação OpenStreetMap utilizando dados do
+          OpenStreetMap sob a Licença Open Database. Quando se utiliza este estilo
+          de mapa, é necessária a mesma atribuição, tal como acontece para os dados
+          do mapa.
         credit_4_html: |-
           Num mapa eletrónico navegável, os créditos devem aparecer no canto do mapa.
           Por exemplo:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d8cfae2e9..c10bb0447 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -22,6 +22,7 @@
 # Author: D1g
 # Author: DCamer
 # Author: DDPAT
+# Author: Danieldegroot2
 # Author: Diralik
 # Author: Dmitry-s93
 # Author: Dr&mx
@@ -52,9 +53,11 @@
 # Author: Macofe
 # Author: Mavl
 # Author: MaxSem
+# Author: McDutchie
 # Author: Mechano
 # Author: Meerrahtar
 # Author: Megakott
+# Author: Merrahtar
 # Author: Mike like0708
 # Author: Mike140
 # Author: Mixaill
@@ -1559,7 +1562,7 @@ ru:
       failed_to_import: 'сбой импорта. Произошла ошибка:'
       more_info_html: Более подробную информацию об ошибках импорта GPX и о том, как
         их избежать, можно найти на %{url}.
-      import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
+      import_failures_url: https://wiki.openstreetmap.org/wiki/RU:GPX_Import_Failures
       subject: '[OpenStreetMap] Сбой импорта GPX'
     gpx_success:
       hi: Здравствуйте, %{to_user},
@@ -1834,7 +1837,7 @@ ru:
       email or username: 'Эл. почта или имя пользователя:'
       password: 'Пароль:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Запомнить меня:'
+      remember: Запомнить меня
       lost password link: Забыли пароль?
       login_button: Представиться
       register now: Зарегистрируйтесь
@@ -2341,7 +2344,7 @@ ru:
     new:
       upload_trace: Передать GPS-трек на сервер
       visibility_help: Что это значит?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%92%D0%B8%D0%B4%D0%B8%D0%BC%D0%BE%D1%81%D1%82%D1%8C_GPS-%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/RU:%D0%92%D0%B8%D0%B4%D0%B8%D0%BC%D0%BE%D1%81%D1%82%D1%8C_GPS-%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
       help: Справка
       help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%97%D0%B0%D0%B3%D1%80%D1%83%D0%B7%D0%BA%D0%B0_%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
     create:
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index f7fa6ded1..2e0ac5b63 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -13,12 +13,16 @@ scn:
     formats:
       friendly: '%e %B %Y ê %H:%M'
   helpers:
+    file:
+      prompt: Scegghi file
     submit:
       diary_comment:
         create: Sarva
       diary_entry:
         create: Pùbblica
         update: Agghiorna
+      issue_comment:
+        create: Agghiunci cummentu
       message:
         create: Manna
       client_application:
@@ -72,6 +76,7 @@ scn:
       client_application:
         callback_url: URL di callback
         support_url: URL di l'assistenza
+        allow_write_notes: cancia li noti
       diary_comment:
         body: Corpu
       diary_entry:
@@ -110,11 +115,12 @@ scn:
         new_email: Nnirizzu di posta elittrònica novu
         active: Attivu
         display_name: Nomu ammustratu
-        description: Discrizzioni
+        description: Discrizzioni dû prufilu
         home_lat: Latitùdini
         home_lon: Luncitùdini
         languages: Lingui
         pass_crypt: Palora d'òrdini
+        pass_crypt_confirmation: Cunferma password
     help:
       trace:
         tagstring: spartuti câ vìrgula
@@ -122,6 +128,20 @@ scn:
         needs_view: Havi a tràsiri l'utenti avanti chi stu bloccu veni livatu?
       user:
         new_email: (nun veni ammustratu mai pubblicamenti)
+  datetime:
+    distance_in_words_ago:
+      x_minutes:
+        one: 1 minutu fa
+        other: '%{count} minuti fa'
+      x_days:
+        one: 1 jornu fa
+        other: '%{count} jorna fa'
+      x_months:
+        one: 1 misi fa
+        other: '%{count} misi fa'
+      x_years:
+        one: 1 annu fa
+        other: '%{count} anni fa'
   editor:
     default: Pridifinutu (com'a ora %{name})
     id:
@@ -129,13 +149,14 @@ scn:
       description: iD (editor ntô browser)
     remote:
       name: Telecumannu
-      description: Telecumannu (JOSM o Merkaartor)
+      description: Telecumannu (JOSM, Potlatch, Merkaartor)
   auth:
     providers:
       none: Nuddu
       openid: OpenID
       google: Google
       facebook: Facebook
+      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -333,6 +354,7 @@ scn:
       nearby mapper: Mappaturi vicinu
       friend: Amicu
     show:
+      edit_your_profile: Cancia lu tò prufilu
       no friends: Ancora nun agghiuncisti nuddu amicu.
       nearby users: Àutri utenti vicinu
       no nearby users: Ancora nun ci sunnu àutri utenti chi si dichiàranu mappatura
@@ -928,6 +950,14 @@ scn:
     results:
       no_results: Nuddu risurtatu attruvatu
       more_results: Àutri risurtati
+  reports:
+    new:
+      categories:
+        user:
+          other_label: Àutru
+        note:
+          spam_label: Sta nota è spam
+          other_label: Àutru
   layouts:
     logo:
       alt_text: Logu d'OpenStreetMap
@@ -989,6 +1019,7 @@ scn:
       footer_html: Poi lèggiri lu missaggiu macari nta %{readurl} e ci poi arrispùnniri
         di %{replyurl}
     friendship_notification:
+      hi: Salutamu %{to_user},
       subject: '[OpenStreetMap] %{user} t''agghiuncìu comu amicu'
       had_added_you: '%{user} t''agghiuncìu comu amicu nta OpenStreetMap.'
       see_their_profile: Poi taliari lu sò prufilu nta %{userurl}.
@@ -998,6 +1029,7 @@ scn:
       failed_to_import: 'nun arriniscìu a èssiri mpurtatu. Ccà c''è l''erruri:'
       subject: '[OpenStreetMap] Mpurtazzioni GPX nun arrinisciuta'
     gpx_success:
+      hi: Salutamu %{to_user},
       loaded_successfully: fu carricatu bonu cu %{trace_points} dî %{possible_points}
         punti pussìbbili.
       subject: '[OpenStreetMap] Mpurtazzioni GPX arrinisciuta'
@@ -1055,6 +1087,7 @@ scn:
           tu cummintasti. La nota s''attrova vicinu a %{place}.'
       details: Poi attruvari àutri dittagghî di sta nota nta %{url}.
     changeset_comment_notification:
+      hi: Salutamu %{to_user},
       greeting: Salutamu,
       commented:
         subject_own: '[OpenStreetMap] %{commenter} cummintau unu dî tò gruppa di canciamenti'
@@ -1188,6 +1221,7 @@ scn:
       image: 'Mmàggini:'
       gravatar:
         gravatar: Adòpira Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
       new image: Agghiunci na mmàggini
       keep image: Manteni la mmàggini attuali
       delete image: Leva la mmàggini attuali
@@ -1250,6 +1284,9 @@ scn:
       logout_button: Nesci
   shared:
     markdown_help:
+      heading: Ntistazzioni
+      subheading: Suttantistazzioni
+      link: Culligamentu
       text: Testu
       image: Mmàggini
       url: URL
@@ -1526,6 +1563,8 @@ scn:
         title: switch2osm
         description: Aiutu pi mprisi e assuciazzioni chi vannu a passari ê cartini
           e a l'àutri sirvizzi basati supra a OpenStreetMap.
+      welcomemat:
+        url: https://welcome.openstreetmap.org/
       wiki:
         url: http://wiki.openstreetmap.org/
         title: wiki.openstreetmap.org
@@ -1878,11 +1917,15 @@ scn:
         france: Francia
         italy: Italia
         rest_of_world: Restu dû munnu
+    terms_declined_flash:
+      terms_declined_link: sta pàggina wiki
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     no_such_user:
       title: St'utenti nun c'è
       heading: L’utenti %{user} nun esisti
       body: Purtroppu nun c'è nuddu utenti chi si chiama %{user}. Pi favuri cuntrolla
         chi scrivisti bonu, o puru pò èssiri chi lu culligamentu chi cliccasti è sbagghiatu.
+      deleted: cancillatu
     show:
       my diary: Lu mè diariu
       new diary entry: vuci nova dû diariu
@@ -1893,8 +1936,10 @@ scn:
       my profile: Lu mè prufilu
       my settings: Li mè mpustazzioni
       my comments: Li mè cummenti
+      my_preferences: Li mè prifirenzi
       blocks on me: Cu blocca a mìa
       blocks by me: A cu bloccu iu
+      edit_profile: Cancia prufilu
       send message: Manna nu missaggiu
       diary: Diariu
       edits: Canciamenti
@@ -2158,9 +2203,11 @@ scn:
         title: Ammustra unni sugnu
       base:
         standard: Standard
+        cyclosm: CyclOSM
         cycle_map: Cartina pî bicicletti
         transport_map: Mappa dî trasporti
         hot: Umanitaria
+        opnvkarte: ÖPNVKarte
       layers:
         header: Strati dâ cartina
         notes: Noti dâ cartina
@@ -2234,6 +2281,17 @@ scn:
         roundabout_with_exit: Â rutunna pigghiari la nisciuta %{exit} pi %{name}
         unnamed: strata senza nomu
         courtesy: Nnicazzioni pi cuncissioni gintili di %{link}
+        exit_counts:
+          first: 1ª
+          second: 2ª
+          third: 3ª
+          fourth: 4ª
+          fifth: 5ª
+          sixth: 6ª
+          seventh: 7ª
+          eighth: 8ª
+          ninth: 9ª
+          tenth: 10ª
       time: Tempu
     query:
       node: Gruppu
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 3b5bce6a9..773a2faa7 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -919,7 +919,7 @@ sr-Latn:
       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Zapamti me:'
+      remember: Zapamti me
       lost password link: Zaboravili ste lozinku?
       login_button: Prijavi me
       register now: Otvorite nalog
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index b92044e54..29a00d496 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -90,7 +90,7 @@ sv:
         email_address_not_routable: kan inte ruttas
     models:
       acl: Tillgångskontrollista (ACL)
-      changeset: Ändringsset
+      changeset: Ändringsuppsättning
       changeset_tag: Ändringssettagg
       country: Land
       diary_comment: Dagbokskommentar
@@ -131,7 +131,7 @@ sv:
         callback_url: Återkopplingsadress
         support_url: Supportadress
         allow_read_prefs: läs deras användaralternativ
-        allow_write_prefs: ändra deras användarinställningar
+        allow_write_prefs: ändra deras användaralternativ
         allow_write_diary: skapa dagboksinlägg, kommentarer och hitta vänner.
         allow_write_api: ändra kartan
         allow_read_gpx: läs deras privata GPS-spår
@@ -197,8 +197,8 @@ sv:
       user_block:
         reason: Anledning till varför användaren blockerats. Var så lugn och resonabel
           som möjligt och ge så så många detaljer som du kan om situationen. Men ha
-          i bakhuvudet att meddelandet kommer vara offentligt. Tänk på att inte alla
-          användare förstår gemenskapsjargongen, så försök att använda lekmannatermer.
+          i bakhuvudet att meddelandet kommer att vara publikt synliga. Tänk på att
+          inte alla användare förstår gemenskapsjargongen, så försök att använda lekmannatermer.
         needs_view: Behöver användaren logga in innan blockeringen upphör?
       user:
         email_confirmation: Din adress visas inte offentligt, se vår <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
@@ -297,7 +297,7 @@ sv:
     edited_by_html: Redigerades för <abbr title='%{title}'>%{time}</abbr> av %{user}
     closed_by_html: Stängdes för <abbr title='%{title}'>%{time}</abbr> av %{user}
     version: Version
-    in_changeset: Ändringsset
+    in_changeset: Ändringsuppsättning
     anonymous: anonym
     no_comment: (inga kommentarer)
     part_of: Del av
@@ -314,7 +314,7 @@ sv:
     common_details:
       coordinates_html: '%{latitude}, %{longitude}'
     changeset:
-      title: 'Ändringsset: %{id}'
+      title: 'Ändringsuppsättning: %{id}'
       belongs_to: Författare
       node: Noder (%{count})
       node_paginated: Noder (%{x}-%{y} av %{count})
@@ -325,15 +325,15 @@ sv:
       comment: Kommentarer (%{count})
       hidden_commented_by_html: Dold kommentar från %{user} för <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by_html: Kommentar från %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      changesetxml: XML för ändringsset
+      changesetxml: XML för ändringsuppsättning
       osmchangexml: osmChange XML
       feed:
-        title: Ändringsset %{id}
+        title: Ändringsuppsättning %{id}
         title_comment: Ändringsset %{id} - %{comment}
       join_discussion: Logga in för att delta i diskussionen
       discussion: Diskussion
-      still_open: Ändringsset är fortfarande öppet - diskussionen kommer att öppnas
-        när ändringsset har stängts.
+      still_open: Ändringsuppsättning är fortfarande öppet - diskussionen kommer att
+        öppnas när ändringsuppsättning har stängts.
     node:
       title_html: 'Nod: %{name}'
       history_title_html: 'Nodhistorik: %{name}'
@@ -371,7 +371,7 @@ sv:
         node: nod
         way: sträcka
         relation: relation
-        changeset: ändringsset
+        changeset: ändringsuppsättning
         note: not
     timeout:
       title: Timeout-fel
@@ -380,7 +380,7 @@ sv:
         node: nod
         way: sträcka
         relation: relation
-        changeset: ändringsset
+        changeset: ändringsuppsättning
         note: not
     redacted:
       redaction: Omarbetning %{id}
@@ -466,13 +466,13 @@ sv:
       comment: Ny kommentar på ändringsuppsättning nummer %{changeset_id} av %{author}
       commented_at_by_html: Uppdaterades för %{when} av %{user}
     comments:
-      comment: 'Ny kommentar på ändringssätt #%{changeset_id} av %{author}'
+      comment: 'Ny kommentar på ändringsuppsättning #%{changeset_id} av %{author}'
     index:
       title_all: Diskussion om OpenStreetMaps ändringsset
-      title_particular: Diskussions om OpenStreetMaps ändringsset nummer %{changeset_id}
+      title_particular: Diskussions om OpenStreetMaps ändringsuppsättning nummer %{changeset_id}
     timeout:
-      sorry: Tyvärr, listan med ändringssetskommentar du begärde kunde inte hämtas
-        då begäran tog för lång tid.
+      sorry: Tyvärr, listan med ändringsuppsättningskommentarer du begärde kunde inte
+        hämtas då begäran tog för lång tid.
   dashboards:
     contact:
       km away: '%{count}km bort'
@@ -489,9 +489,9 @@ sv:
       nearby users: Andra användare nära dig
       no nearby users: Det är ännu inga andra användare som uppgett att de kartlägger
         nära dig.
-      friends_changesets: vänners ändringsset
+      friends_changesets: vänners ändringsuppsättningar
       friends_diaries: vänners dagboksinlägg
-      nearby_changesets: närbelägna användares ändringsset
+      nearby_changesets: närbelägna användares ändringsuppsättningar
       nearby_diaries: närbelägna användares dagboksinlägg
   diary_entries:
     new:
@@ -1199,7 +1199,9 @@ sv:
           baby_goods: Babyvaror
           bag: Väskbutik
           bakery: Bageri
+          bathroom_furnishing: Badrumsinredning
           beauty: Skönhetssalong
+          bed: Sängklädesbutik
           beverages: Dryckesbutik
           bicycle: Cykelaffär
           bookmaker: Vadförmedlare
@@ -1218,17 +1220,22 @@ sv:
           coffee: Kaffebutik
           computer: Datorbutik
           confectionery: Godisbutik
-          convenience: Närköp
+          convenience: Närbutik
           copyshop: Kopieringsfirma
           cosmetics: Parfymeri
+          craft: Hobbybutik
+          curtain: Gardinbutik
+          dairy: Mejeriaffär
           deli: Delikatessbutik
           department_store: Varuhus
           discount: LÃ¥gprisbutik
           doityourself: Gör-det-själv
           dry_cleaning: Kemtvätt
+          e-cigarette: E-cigarettbutik
           electronics: Elektronikbutik
           erotic: Sexbutik
           estate_agent: Egendomsmäklare
+          fabric: Tygaffär
           farm: GÃ¥rdsbutik
           fashion: Modebutik
           fishing: Fiskebutik
@@ -1238,12 +1245,13 @@ sv:
           funeral_directors: Begravningsentreprenör
           furniture: Möbler
           garden_centre: Trädgårdshandel
+          gas: Gasbutik
           general: Lanthandel
           gift: Presentaffär
           greengrocer: Grönsakshandlare
           grocery: Livsmedelsbutik
           hairdresser: Frisör
-          hardware: Järnhandel
+          hardware: Järnaffär
           health_food: Hälsokostbutik
           hearing_aids: Hörapparater
           herbalist: Örthandel
@@ -1259,6 +1267,7 @@ sv:
           lottery: Lotteri
           mall: Köpcentrum
           massage: Massage
+          medical_supply: Medicinsk utrustning
           mobile_phone: Mobiltelefonbutik
           money_lender: Pengautlånare
           motorcycle: Motorcykelhandlare
@@ -1273,7 +1282,7 @@ sv:
           paint: Färgbutik
           pastry: Kafeteria
           pawnbroker: Pantlånare
-          perfumery: Parfymaffär
+          perfumery: Parfymbutik
           pet: Djuraffär
           pet_grooming: Husdjursfrisör
           photo: Fotoaffär
@@ -1294,7 +1303,7 @@ sv:
           travel_agency: Resebyrå
           tyres: Däckaffär
           vacant: Ledig butik
-          variety_store: Varuhus
+          variety_store: Fyndbutik
           video: Videobutik
           video_games: TV-spelsbutik
           wholesale: Grosshandel
@@ -1475,7 +1484,7 @@ sv:
     logout: Logga ut
     log_in: Logga in
     log_in_tooltip: Logga in med ditt konto
-    sign_up: Skapa ett konto
+    sign_up: Registrera
     start_mapping: Börja kartläggning
     sign_up_tooltip: Skapa ett konto för kartering
     edit: Redigera
@@ -1888,7 +1897,7 @@ sv:
   site:
     about:
       next: Nästa
-      copyright_html: <span>&copy;</span>OpenStreetMap<br>bidragsgivare
+      copyright_html: <span>&copy;</span>OpenStreetMaps<br>bidragsgivare
       used_by_html: '%{name} förser tusentals webbsidor, mobilappar, appar och fysiska
         apparater med kartdata'
       lede_text: OpenStreetMap är byggt av en gemenskap av kartografer som bidrar
@@ -1974,7 +1983,7 @@ sv:
           Till exempel:
         attribution_example:
           alt: Exempel på hur en webbsida kan ange OpenStreetMap som källa
-          title: Exempel på källhänvisning.
+          title: Exempel på attribuering.
         more_title_html: Mer information
         more_1_html: |-
           Läs mer om användning av vår data och hur du anger oss som källa på <a
@@ -2191,7 +2200,7 @@ sv:
         Adobe Flash Player har dragits tillbaka, kan inte Potlatch längre användas
         i webbläsaren.
       desktop_html: Du kan fortfarande använda Potlatch genom att <a href="https://www.systemed.net/potlatch/">ladda
-        ner datorprogrammet för Mac och Windows</a>.
+        ner datorapplikationen för Mac och Windows</a>.
       id_html: Eller så kan du ange din standardredigerare som iD, vilket kör din
         webbläsare som Potlatch tidigare gjort. <a href="%{settings_url}">Ändra dina
         alternativ här</a>.
@@ -2297,7 +2306,7 @@ sv:
         title: Grundläggande termer för kartering
         paragraph_1_html: OpenStreetMap har en del egen jargong. Här är några begrepp
           som kan vara bra att förstå.
-        editor_html: En <strong>redigerare</strong> är ett program eller en webbsida
+        editor_html: En <strong>redigerare</strong> är ett applikation eller en webbsida
           du kan använda för att ändra i kartan.
         node_html: En <strong>nod</strong> är en punkt på kartan, till exempel en
           ensam restaurang eller ett träd.
@@ -2455,14 +2464,14 @@ sv:
   oauth:
     authorize:
       title: Auktorisera tillgång till ditt konto
-      request_access_html: Programmet %{app_name} har begärt tillgång till ditt konto,
-        %{user}. Var god kontrollera om du vill att programmet ska ha dessa möjligheter.
-        Du kan välja eller ta bort hur många val du vill.
+      request_access_html: Applikationen %{app_name} har begärt tillgång till ditt
+        konto, %{user}. Var god kontrollera om du vill att applikationen ska ha dessa
+        möjligheter. Du kan välja eller ta bort hur många val du vill.
       allow_to: 'Tillåt klientapplikation att:'
       allow_read_prefs: läs dina användaralternativ.
-      allow_write_prefs: ändra på dina användarinställningar.
+      allow_write_prefs: ändra dina användaralternativ.
       allow_write_diary: skapa dagboksinlägg, kommentarer och hitta vänner.
-      allow_write_api: ändra på kartan.
+      allow_write_api: ändra kartan.
       allow_read_gpx: läs dina privata GPS-spår.
       allow_write_gpx: ladda upp GPS-spår
       allow_write_notes: ändra anteckningar.
@@ -2483,9 +2492,9 @@ sv:
       missing: Du har inte gett applikationen åtkomst till den här faciliteten
     scopes:
       read_prefs: Läs användaralternativ
-      write_prefs: Ändra användarinställningar
+      write_prefs: Ändra användaralternativ
       write_diary: Skapa dagboksinlägg, kommentarer och hitta vänner.
-      write_api: Ändra på kartan
+      write_api: Ändra kartan
       read_gpx: Läs privata GPS-spår
       write_gpx: Ladda upp GPS-spår
       write_notes: Ändra anteckningar
@@ -2493,7 +2502,7 @@ sv:
       skip_authorization: Godkänn applikation automatiskt
   oauth_clients:
     new:
-      title: Registrera ett nytt program
+      title: Registrera ett nytt applikation
     edit:
       title: Redigera ditt tillägg
     show:
@@ -2511,13 +2520,13 @@ sv:
     index:
       title: Mina OAuth-detaljer
       my_tokens: Mina auktoriserade applikationer
-      list_tokens: 'Följande nycklar har utfärdats till program i ditt namn:'
+      list_tokens: 'Följande nycklar har utfärdats till applikationer i ditt namn:'
       application: Applikationsnamn
       issued_at: Utfärdad den
       revoke: Återkalla!
       my_apps: Mina klientapplikationer
-      no_apps_html: Har du ett program som du vill registrera för användning hos oss
-        med hjälp av %{oauth}-standarden? Du måste registrera din webbapplikation
+      no_apps_html: Har du ett applikation som du vill registrera för användning hos
+        oss med hjälp av %{oauth}-standarden? Du måste registrera din webbapplikation
         innan du kan göra OAuth-anropp till den här tjänsten.
       oauth: OAuth
       registered_apps: 'Du har följande klientapplikationer registrerade:'
@@ -2554,6 +2563,8 @@ sv:
       client_secret: Klienthemlighet
       permissions: Behörigheter
       redirect_uris: Omdirigerings-URI:er
+    not_found:
+      sorry: Tyvärr kunde inte applikation hittas.
   oauth2_authorizations:
     new:
       title: Auktorisering krävs
@@ -2595,7 +2606,7 @@ sv:
       use external auth: Alternativt kan du använda en tredje part för att logga in
       auth no password: Med autentisering av tredje part krävs inte lösenord, men
         en del extra verktyg eller server kan fortfarande behöva det.
-      continue: Skapa ett konto
+      continue: Registrera
       terms accepted: Tack för att du accepterat de nya villkoren för bidrag till
         kartan!
     terms:
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 4de30371a..e08c61a7b 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -5,6 +5,7 @@
 # Author: Chaduvari
 # Author: Gayatri
 # Author: Kiranmayee
+# Author: McDutchie
 # Author: Ravichandra
 # Author: Veeven
 # Author: రహ్మానుద్దీన్
@@ -583,7 +584,7 @@ te:
       heading: ప్రవేశం
       email or username: 'ఈమెయిల్ చిరునామా లేదా వాడుకరిపేరు:'
       password: 'సంకేతపదం:'
-      remember: 'నన్ను గుర్తుంచుకో:'
+      remember: నన్ను గుర్తుంచుకో
       lost password link: మీ సంకేతపదం పోయిందా?
       login_button: ప్రవేశించు
       register now: ఇప్పుడే నమోదవ్వండి
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 3b86fd4ef..0ddf400da 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -12,6 +12,7 @@
 # Author: LR Guanzon
 # Author: Leeheonjin
 # Author: Macofe
+# Author: McDutchie
 # Author: 아라
 ---
 tl:
@@ -1174,7 +1175,7 @@ tl:
       email or username: 'Tirahan ng E-liham o Pangalan ng Tagagamit:'
       password: 'Password:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Tandaan ako:'
+      remember: Tandaan ako
       lost password link: Nawala ang hudyat mo?
       login_button: Lumagda
       register now: Magpatala na ngayon
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 589a93177..5a03f49f2 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -68,8 +68,10 @@
 # Author: 沈澄心
 # Author: 神樂坂秀吉
 # Author: 羊羊32521
+# Author: 落花有意12138
 # Author: 铁桶
 # Author: 阿pp
+# Author: 魔琴
 # Author: 아라
 ---
 zh-CN:
@@ -812,6 +814,7 @@ zh-CN:
           warehouse: 仓库
           "yes": 建筑物
         club:
+          scout: 童子军营地
           sport: 体育俱乐部
           "yes": 俱乐部
         craft:
@@ -842,6 +845,7 @@ zh-CN:
           "yes": 工艺品店
         crossing: 十字路口
         emergency:
+          access_point: 存储点
           ambulance_station: 救护站
           assembly_point: 集合地点
           defibrillator: 除颤仪
@@ -913,6 +917,7 @@ zh-CN:
           bunker: 地堡
           cannon: 古炮
           castle: 城堡
+          charcoal_pile: 史上又名的碳堆
           church: 教堂
           city_gate: 城门
           citywalls: 城墙
@@ -1373,6 +1378,7 @@ zh-CN:
         level4: 州界(省界)
         level5: 地区界(地级行政区界)
         level6: 县界
+        level7: 市边界
         level8: 市界(乡级行政区界)
         level9: 村界
         level10: 郊区界(村级行政区界)
@@ -1514,7 +1520,7 @@ zh-CN:
     intro_2_create_account: 创建用户账户
     hosting_partners_html: 主机由%{ucl}、%{fastly}、%{bytemark}，以及其他%{partners}所支持。
     partners_ucl: 伦敦大学学院
-    partners_fastly: 快速的
+    partners_fastly: Fastly
     partners_bytemark: Bytemark主机
     partners_partners: 合作伙伴
     tou: 使用条款
@@ -2311,6 +2317,8 @@ zh-CN:
       read_gpx: 读取私人GPS轨迹
       write_gpx: 上传GPS轨迹
       write_notes: 修改备注
+      read_email: 查看用户邮箱地址
+      skip_authorization: 自动核准应用
   oauth_clients:
     new:
       title: 注册新应用程序
diff --git a/test/controllers/dashboards_controller_test.rb b/test/controllers/dashboards_controller_test.rb
index 5073df8cc..84f9610e5 100644
--- a/test/controllers/dashboards_controller_test.rb
+++ b/test/controllers/dashboards_controller_test.rb
@@ -28,7 +28,9 @@ class DashboardsControllerTest < ActionDispatch::IntegrationTest
 
     # Friends should be visible as we're now logged in
     assert_select "div#friends-container" do
-      assert_select "div.contact-activity", :count => 1
+      assert_select "div" do
+        assert_select "a[href='/user/#{ERB::Util.u(friend_user.display_name)}']", :count => 1
+      end
     end
   end
 end
diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 142363b60..33e483652 100644
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -273,7 +273,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     get edit_diary_entry_path(:display_name => entry.user.display_name, :id => 9999)
     assert_response :not_found
     assert_select "div.content-heading", :count => 1 do
-      assert_select "h2", :text => "No entry with the id: 9999", :count => 1
+      assert_select "h1", :text => "No entry with the id: 9999", :count => 1
     end
 
     # Now pass the id, and check that you can edit it, when using the same
@@ -316,7 +316,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     assert_template "show"
     assert_select "title", :text => /Users' Diaries | /, :count => 1
     assert_select "div.content-heading", :count => 1 do
-      assert_select "h2", :text => /#{entry.user.display_name}'s Diary/, :count => 1
+      assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1
     end
     assert_select "div#content", :count => 1 do
       assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
@@ -336,7 +336,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     assert_template "show"
     assert_select "title", :text => /Users' Diaries | /, :count => 1
     assert_select "div.content-heading", :count => 1 do
-      assert_select "h2", :text => /#{entry.user.display_name}'s Diary/, :count => 1
+      assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1
     end
     assert_select "div#content", :count => 1 do
       assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
@@ -374,7 +374,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     post comment_diary_entry_path(:display_name => entry.user.display_name, :id => 9999)
     assert_response :not_found
     assert_select "div.content-heading", :count => 1 do
-      assert_select "h2", :text => "No entry with the id: 9999", :count => 1
+      assert_select "h1", :text => "No entry with the id: 9999", :count => 1
     end
 
     # Now try an invalid comment with an empty body
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 6e156375b..23c67794a 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -560,7 +560,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     get user_path(user)
     assert_response :success
-    assert_select "div#userinformation" do
+    assert_select "div.content-heading" do
       assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
@@ -579,7 +579,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     create(:user_block, :user => blocked_user)
     get user_path(blocked_user)
     assert_response :success
-    assert_select "div#userinformation" do
+    assert_select "div.content-heading" do
       assert_select "a[href^='/user/#{ERB::Util.u(blocked_user.display_name)}/history']", 1
       assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/traces']", 1
       assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary']", 1
@@ -595,7 +595,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     create(:user_block, :creator => moderator_user)
     get user_path(moderator_user)
     assert_response :success
-    assert_select "div#userinformation" do
+    assert_select "div.content-heading" do
       assert_select "a[href^='/user/#{ERB::Util.u(moderator_user.display_name)}/history']", 1
       assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/traces']", 1
       assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary']", 1
@@ -612,7 +612,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # Test the normal user
     get user_path(user)
     assert_response :success
-    assert_select "div#userinformation" do
+    assert_select "div.content-heading" do
       assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
       assert_select "a[href='/traces/mine']", 1
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
@@ -629,7 +629,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # Test the normal user
     get user_path(user)
     assert_response :success
-    assert_select "div#userinformation" do
+    assert_select "div.content-heading" do
       assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
@@ -649,21 +649,21 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     get user_path(agreed_user)
     assert_response :success
-    assert_select "div#userinformation" do
+    assert_select "div.content-heading" do
       assert_select "dt", :count => 0, :text => /Contributor terms/
     end
 
     get user_path(seen_user)
     assert_response :success
     # put @response.body
-    assert_select "div#userinformation" do
+    assert_select "div.content-heading" do
       assert_select "dt", :count => 1, :text => /Contributor terms/
       assert_select "dd", /Declined/
     end
 
     get user_path(not_seen_user)
     assert_response :success
-    assert_select "div#userinformation" do
+    assert_select "div.content-heading" do
       assert_select "dt", :count => 1, :text => /Contributor terms/
       assert_select "dd", /Undecided/
     end
diff --git a/test/integration/user_changeset_comments_test.rb b/test/integration/user_changeset_comments_test.rb
index a9bd468ce..2b95094fe 100644
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -12,7 +12,7 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
       assert_select "div#sidebar" do
         assert_select "div#sidebar_content" do
           assert_select "div" do
-            assert_select "div.notice" do
+            assert_select "p.notice" do
               assert_select "a[href='/login?referer=%2Fchangeset%2F#{changeset.id}']", :text => I18n.t("browse.changeset.join_discussion"), :count => 1
             end
           end
diff --git a/yarn.lock b/yarn.lock
index 1b70946e7..e707d5c44 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@eslint/eslintrc@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.3.tgz#41f08c597025605f672251dcc4e8be66b5ed7366"
-  integrity sha512-DHI1wDPoKCBPoLZA3qDR91+3te/wDSc1YhKg3jR8NxKKRJq2hwHwcWv31cSwSYvIBrmbENoYMWcenW8uproQqg==
+"@eslint/eslintrc@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.4.tgz#dfe0ff7ba270848d10c5add0715e04964c034b31"
+  integrity sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -13,7 +13,7 @@
     globals "^13.9.0"
     ignore "^4.0.6"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
+    js-yaml "^4.1.0"
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
@@ -61,7 +61,7 @@ ansi-colors@^3.2.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-regex@^5.0.0:
+ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -74,13 +74,6 @@ ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -208,11 +201,11 @@ eslint-visitor-keys@^3.0.0:
   integrity sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==
 
 eslint@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.1.0.tgz#00f1f7dbf4134f26588e6c9f2efe970760f64664"
-  integrity sha512-JZvNneArGSUsluHWJ8g8MMs3CfIEzwaLx9KyH4tZ2i+R2/rPWzL8c0zg3rHdwYVpN/1sB9gqnjHwz9HoeJpGHw==
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.2.0.tgz#44d3fb506d0f866a506d97a0fc0e90ee6d06a815"
+  integrity sha512-erw7XmM+CLxTOickrimJ1SiF55jiNlVSp2qqm0NuBWPtHYQCegD5ZMaW0c3i5ytPqL+SSLaCxdvQXFPLJn+ABw==
   dependencies:
-    "@eslint/eslintrc" "^1.0.3"
+    "@eslint/eslintrc" "^1.0.4"
     "@humanwhocodes/config-array" "^0.6.0"
     ajv "^6.10.0"
     chalk "^4.0.0"
@@ -246,7 +239,7 @@ eslint@^8.0.0:
     progress "^2.0.0"
     regexpp "^3.2.0"
     semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
@@ -260,11 +253,6 @@ espree@^9.0.0:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^3.0.0"
 
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esquery@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
@@ -459,14 +447,6 @@ js-cookie@^3.0.0:
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
   integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
 
-js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -630,17 +610,12 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    ansi-regex "^5.0.0"
+    ansi-regex "^5.0.1"
 
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"