From: Tom Hughes <tom@compton.nu>
Date: Thu, 16 Jul 2020 18:30:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2695'
X-Git-Tag: live~3051
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a9b00e16e70707e398d475352d68ed9da86dec3b?hp=85cb71702e663d0588e6e4db86f10cec0eeaf993

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 799b2d95a..89263a417 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,10 +71,10 @@ GEM
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.1)
-    autoprefixer-rails (9.8.4)
+    autoprefixer-rails (9.8.5)
       execjs
     aws-eventstream (1.1.0)
-    aws-partitions (1.338.0)
+    aws-partitions (1.340.0)
     aws-sdk-core (3.103.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -83,7 +83,7 @@ GEM
     aws-sdk-kms (1.36.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.73.0)
+    aws-sdk-s3 (1.74.0)
       aws-sdk-core (~> 3, >= 3.102.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -200,10 +200,10 @@ GEM
     erubi (1.9.0)
     execjs (2.7.0)
     exifr (1.3.6)
-    factory_bot (6.0.2)
+    factory_bot (6.1.0)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.0.0)
-      factory_bot (~> 6.0.0)
+    factory_bot_rails (6.1.0)
+      factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
@@ -276,7 +276,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.2)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index e72b4e85b..d91b7a2e7 100644
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -17,7 +17,7 @@ class Ability
       can [:index, :feed], Changeset
       can :index, ChangesetComment
       can [:index, :rss, :show, :comments], DiaryEntry
-      can [:mine], Note
+      can [:index], Note
       can [:index, :show], Redaction
       can [:index, :show, :data, :georss, :picture, :icon], Trace
       can [:terms, :login, :logout, :new, :create, :save, :confirm, :confirm_resend, :confirm_email, :lost_password, :reset_password, :show, :auth_success, :auth_failure], User
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e455f297b..36b560fde 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -81,11 +81,11 @@ $(document).ready(function () {
     var windowWidth = $(window).width();
 
     if (windowWidth < compactWidth) {
-      $("body").removeClass("compact").addClass("small");
+      $("body").removeClass("compact-nav").addClass("small-nav");
     } else if (windowWidth < headerWidth) {
-      $("body").addClass("compact").removeClass("small");
+      $("body").addClass("compact-nav").removeClass("small-nav");
     } else {
-      $("body").removeClass("compact").removeClass("small");
+      $("body").removeClass("compact-nav").removeClass("small-nav");
     }
   }
 
@@ -100,13 +100,13 @@ $(document).ready(function () {
       headerWidth = headerWidth + $(e).outerWidth();
     });
 
-    $("body").addClass("compact");
+    $("body").addClass("compact-nav");
 
     $("header").children(":visible").each(function (i, e) {
       compactWidth = compactWidth + $(e).outerWidth();
     });
 
-    $("body").removeClass("compact");
+    $("body").removeClass("compact-nav");
 
     updateHeader();
 
diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb
index ceb488f98..858b31302 100644
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -35,6 +35,8 @@ window.onload = function () {
     new L.OSM.CycleMap(thunderforestOptions).addTo(map);
   } else if (args.layer === "transportmap") {
     new L.OSM.TransportMap(thunderforestOptions).addTo(map);
+  } else if (args.layer === "opnvkarte") {
+    new L.OSM.OPNVKarte().addTo(map);
   } else if (args.layer === "hot") {
     new L.OSM.HOT().addTo(map);
   }
diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 630944411..07ad64def 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -49,15 +49,20 @@ OSM.initializeBrowse = function (map) {
 
   function displayFeatureWarning(count, limit, add, cancel) {
     $("#browse_status").html(
-      $("<p class='warning'></p>")
-        .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))
-        .prepend(
-          $("<span class='icon close'></span>")
-            .click(cancel))
+      $("<div>")
         .append(
-          $("<input type='submit'>")
-            .val(I18n.t("browse.start_rjs.load_data"))
-            .click(add)));
+          $("<h2>")
+            .text(I18n.t("browse.start_rjs.load_data"))
+            .prepend($("<span class='icon close'></span>").click(cancel)))
+        .append(
+          $("<div class='inner12'>")
+            .append(
+              $("<p class='alert alert-warning clearfix'></p>")
+                .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })))
+            .append(
+              $("<input type='submit'>")
+                .val(I18n.t("browse.start_rjs.load_data"))
+                .click(add))));
   }
 
   var dataLoader;
diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 87ff87370..ddcce195d 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -116,7 +116,7 @@ L.OSM.layers = function (options) {
 
       $("<p>")
         .text(I18n.t("javascripts.map.layers.overlays"))
-        .attr("class", "deemphasize")
+        .attr("class", "text-muted")
         .appendTo(overlaySection);
 
       var overlays = $("<ul class='list-unstyled'>")
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index a139b6dcd..3e37ccb42 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -19,6 +19,7 @@ L.OSM.Map = L.Map.extend({
     var donate = I18n.t("javascripts.map.donate_link_text", { donate_url: "https://donate.openstreetmap.org" });
     var terms = I18n.t("javascripts.map.terms", { terms_url: "https://wiki.osmfoundation.org/wiki/Terms_of_Use" });
     var thunderforest = I18n.t("javascripts.map.thunderforest", { thunderforest_url: "https://www.thunderforest.com/" });
+    var memomaps = I18n.t("javascripts.map.opnvkarte", { memomaps_url: "https://memomaps.de/" });
     var hotosm = I18n.t("javascripts.map.hotosm", { hotosm_url: "https://www.hotosm.org/", osmfrance_url: "https://openstreetmap.fr/" });
 
     this.baseLayers = [];
@@ -48,6 +49,13 @@ L.OSM.Map = L.Map.extend({
       }));
     }
 
+    this.baseLayers.push(new L.OSM.OPNVKarte({
+      attribution: copyright + ". " + memomaps + ". " + terms,
+      code: "O",
+      keyid: "opnvkarte",
+      name: I18n.t("javascripts.map.base.opnvkarte")
+    }));
+
     this.baseLayers.push(new L.OSM.HOT({
       attribution: copyright + ". " + hotosm + ". " + terms,
       code: "H",
diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 8b1446ff8..c4a5d0265 100644
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -116,7 +116,7 @@ L.OSM.share = function (options) {
           .on("click", select))
       .append(
         $("<p>")
-          .attr("class", "deemphasize")
+          .attr("class", "text-muted")
           .text(I18n.t("javascripts.share.paste_html"))
           .appendTo($linkSection));
 
@@ -147,7 +147,7 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("id", "export-warning")
-      .attr("class", "deemphasize")
+      .attr("class", "text-muted")
       .text(I18n.t("javascripts.share.only_standard_layer"))
       .appendTo($imageSection);
 
@@ -223,7 +223,7 @@ L.OSM.share = function (options) {
       .appendTo($form);
 
     $("<p>")
-      .attr("class", "deemphasize")
+      .attr("class", "text-muted")
       .html(I18n.t("javascripts.share.image_size") + " <span id=\"mapnik_image_width\"></span> x <span id=\"mapnik_image_height\"></span>")
       .appendTo($form);
 
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 39cdaa47a..50bcf9be7 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -30,20 +30,11 @@ small, aside {
 
 #container { position: relative; }
 
-.column-1 {
-  width: 50%;
-  margin: 0 0 $lineheight/2 0;
-}
-
 .small_icon {
   vertical-align: middle;
   margin-right: $lineheight/4;
 }
 
-.red { color: $red; }
-
-.piwik { border: 0; }
-
 [dir=rtl] { /* no-r2 */ text-align: right; }
 
 [dir=ltr] { /* no-r2 */ text-align: left; }
@@ -85,7 +76,6 @@ small, aside {
 a {
   color: #24d;
   text-decoration: none;
-  -webkit-appearance: none;
   outline: 0;
   &:hover {
     text-decoration: underline;
@@ -101,6 +91,10 @@ a {
   }
 }
 
+.text-muted a {
+  color: $blue;
+}
+
 /* Rules for the header */
 
 #menu-icon {
@@ -272,7 +266,7 @@ nav.primary, nav.secondary {
   display: none;
 }
 
-body.compact {
+body.compact-nav {
   #compact-secondary-nav {
     display: inline-block;
   }
@@ -700,10 +694,6 @@ body.compact {
 }
 
 #browse_status {
-  p {
-    padding: $lineheight;
-  }
-
   input {
     display: block;
     margin-left: auto;
@@ -1045,11 +1035,6 @@ tr.turn:hover {
     }
   }
 
-  .warning {
-    margin: 0 0 $lineheight/2 0;
-    padding: 0 $lineheight/2;
-  }
-
   .note-comments li, .changeset-comments li {
     margin: $lineheight/2 0;
 
@@ -1196,16 +1181,6 @@ tr.turn:hover {
   background: $lightgrey;
 }
 
-.content-body {
-  h1, h2, h3, p, ul, ol {
-    margin-bottom: $lineheight;
-  }
-
-  h1, h2, h3 {
-    margin-top: $lineheight/2;
-  }
-}
-
 .content-inner {
   position: relative;
   max-width: 900px;
@@ -1271,12 +1246,15 @@ tr.turn:hover {
 /* Rules for small maps in content areas */
 
 .content_map {
-  position: relative;
-  width: 45%;
-  height: 400px;
+  height: 200px;
   border: 1px solid $grey;
   margin-bottom: $lineheight;
-  float: right;
+}
+
+@include media-breakpoint-up(md) {
+  .content_map {
+    height: 400px;
+  }
 }
 
 /* Rules for the new trace form */
@@ -1306,21 +1284,14 @@ tr.turn:hover {
 /* Rules for the user profile page */
 
 #userinformation {
-
   min-height: 100px;
   .userinformation-inner {
     float: left;
   }
-  h2 {
-    margin-top: 0;
-  }
   .user-description {
     width: 100%;
     clear: both;
   }
-  .deemphasize {
-    margin: 0;
-  }
 }
 
 .admin-user-info small {
@@ -1329,16 +1300,6 @@ tr.turn:hover {
   margin-right: $lineheight;
 }
 
-.activity-block {
-  clear: left;
-  border-bottom: 1px solid $grey;
-  padding-bottom: $lineheight;
-  float: left;
-  h3 {
-    margin-bottom: $lineheight/2;
-  }
-}
-
 .contact-activity {
   margin-top: $lineheight;
   width: 100%;
@@ -1417,7 +1378,7 @@ tr.turn:hover {
     margin-top: $lineheight/2;
   }
 
-  &.deemphasize {
+  &.deleted {
     background-color: #fee;
   }
 
@@ -1472,7 +1433,7 @@ tr.turn:hover {
       padding-top: $lineheight;
       border-top: 1px solid $grey;
     }
-    &.deemphasize {
+    &.deleted {
       background-color: #fee;
     }
     p {
@@ -1536,13 +1497,6 @@ tr.turn:hover {
 
 /* Rules for the account settings page */
 
-#accountForm .user_map {
-  position: relative;
-  width: 500px;
-  height: 400px;
-  border: 1px solid $grey;
-}
-
 #accountForm .user_image {
   margin-bottom: 0;
 }
@@ -1567,11 +1521,6 @@ tr.turn:hover {
   display: inline !important;
 }
 
-.content_map.settings_map {
-  width: 50%;
-  float: none;
-}
-
 /* Rules for the oauth settings page */
 
 .oauth_clients .buttons .oauth-edit {
@@ -2248,12 +2197,18 @@ input.richtext_title[type="text"] {
       display: block;
       color: white;
       font-weight: 300;
-      font-size: 34px;
+      font-size: 28px;
       span {
         color: $vibrant-green;
       }
     }
 
+    @include media-breakpoint-up(sm) {
+      h1 {
+        font-size: 34px;
+      }
+    }
+
     .user-image {
       position: absolute;
       top: 0px;
@@ -2329,8 +2284,3 @@ input.richtext_title[type="text"] {
     display: none;
   }
 }
-
-.read-reports {
-  background: $lightgrey;
-  opacity: 0.7;
-}
diff --git a/app/assets/stylesheets/small.scss b/app/assets/stylesheets/small.scss
index 83b112ce7..808b8caa6 100644
--- a/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@ -2,17 +2,7 @@
 
 /* Styles specific to a small screen, such as iPhone, Android, etc... */
 
-body.small {
-
-  input[type="submit"],
-  input[type="text"] {
-    -webkit-appearance: none;
-  }
-
-  .column-1 {
-    width: 100%;
-  }
-
+body.small-nav {
   #menu-icon {
     display: inline-block !important;
   }
@@ -91,7 +81,6 @@ body.small {
   .compact-hide {
     display: inline-block;
   }
-  
 
   .overlay-sidebar #sidebar .welcome.visible {
     display: none;
@@ -104,55 +93,6 @@ body.small {
   .leaflet-top.leaflet-right {
     top: 10px !important;
   }
-
-  .content_map {
-    width: 100%;
-    border: none;
-    float: none;
-    height: 200px;
-    max-height: none;
-    min-height: auto;
-  }
-
-  /* Rules for the login form */
-
-  #login_login input#user_email {
-    width: 100%;
-    max-width: 18em;
-  }
-
-  #login_login input#user_password {
-    width: 100%;
-    max-width: 18em;
-  }
-
-  #login_login input#openid_url {
-    width: 100%;
-    max-width: 18em;
-  }
-
-  #login_openid_buttons td {
-    padding: 2px;
-  }
-
-  /* Rules for the user view */
-
-  .user_map {
-    width: 100% !important;
-    height: 300px !important;
-  }
-
-  #userinformation .deemphasize {
-    position: relative;
-    right: auto; left: auto;
-    margin-top: 10px;
-    top: auto;
-  }
-
-  &.site-about #content .attr h1 {
-    font-size: 28px;
-  }
-
 }
 
 @media (max-width: 767.98px) {
@@ -184,3 +124,26 @@ body.small {
     }
   }
 }
+
+@media (max-width: 575.98px) {
+  /* Rules for the login form */
+
+  #login_login input#user_email {
+    width: 100%;
+    max-width: 18em;
+  }
+
+  #login_login input#user_password {
+    width: 100%;
+    max-width: 18em;
+  }
+
+  #login_login input#openid_url {
+    width: 100%;
+    max-width: 18em;
+  }
+
+  #login_openid_buttons td {
+    padding: 2px;
+  }
+}
diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb
index 316015228..a5a37b485 100644
--- a/app/controllers/api/changesets_controller.rb
+++ b/app/controllers/api/changesets_controller.rb
@@ -2,7 +2,6 @@
 
 module Api
   class ChangesetsController < ApiController
-    layout "site"
     require "xml/libxml"
 
     before_action :authorize, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe]
diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index a73240e5f..cd71b4374 100644
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -1,7 +1,5 @@
 module Api
   class NotesController < ApiController
-    layout "site", :only => [:mine]
-
     before_action :check_api_readable
     before_action :setup_user_auth, :only => [:create, :comment, :show]
     before_action :authorize, :only => [:close, :reopen, :destroy, :comment]
diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb
index 0b441bef9..6c77f9dc4 100644
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -1,7 +1,5 @@
 module Api
   class TracesController < ApiController
-    layout "site", :except => :georss
-
     before_action :authorize_web
     before_action :set_locale
     before_action :authorize
diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index d3387bd5f..d97e8774e 100644
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,7 +1,5 @@
 module Api
   class UsersController < ApiController
-    layout "site", :except => [:api_details]
-
     before_action :disable_terms_redirect, :only => [:details]
     before_action :authorize, :only => [:details, :gpx_files]
 
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 7c6b033ca..9f2fdb7e2 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,5 +1,5 @@
 class NotesController < ApplicationController
-  layout "site", :only => [:mine]
+  layout "site"
 
   before_action :check_api_readable
   before_action :authorize_web
@@ -11,11 +11,11 @@ class NotesController < ApplicationController
 
   ##
   # Display a list of notes by a specified user
-  def mine
+  def index
     if params[:display_name]
       if @user = User.active.find_by(:display_name => params[:display_name])
         @params = params.permit(:display_name)
-        @title = t "notes.mine.title", :user => @user.display_name
+        @title = t ".title", :user => @user.display_name
         @page = (params[:page] || 1).to_i
         @page_size = 10
         @notes = @user.notes
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index afe3f8322..5a50aa91f 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -34,7 +34,7 @@
           <% @comments.each do |comment| %>
             <% if comment.visible %>
               <li id="c<%= comment.id %>">
-                <small class='deemphasize'>
+                <small class='text-muted'>
                   <%= t(".commented_by",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),
@@ -47,7 +47,7 @@
               </li>
             <% elsif current_user and current_user.moderator? %>
               <li id="c<%= comment.id %>">
-                <small class='deemphasize'>
+                <small class='text-muted'>
                   <%= t(".hidden_commented_by",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),
diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb
index 2929e610e..51633ffca 100644
--- a/app/views/browse/new_note.html.erb
+++ b/app/views/browse/new_note.html.erb
@@ -6,7 +6,7 @@
 </h2>
 
 <div class="note browse-section">
-  <p class="warning"><%= t("javascripts.notes.new.intro") %></p>
+  <p class="alert alert-info"><%= t("javascripts.notes.new.intro") %></p>
   <form action="#">
     <input type="hidden" name="lon">
     <input type="hidden" name="lat">
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index ffc198b0a..74d1223c7 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -12,19 +12,18 @@
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
-    <%= note_event("opened", @note.created_at, @note.author) %>
+    <p><%= note_event("opened", @note.created_at, @note.author) %></p>
     <% if @note.status == "closed" %>
-      <br />
-      <%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %>
+      <p><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></p>
     <% end %>
   </div>
 
   <% if @note_comments.find { |comment| comment.author.nil? } -%>
-    <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
+    <p class='alert alert-warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
   <% end -%>
 
   <% if current_user && current_user != @note.author %>
-    <p class="deemphasize"><%= report_link(t(".report"), @note) %></p>
+    <p class="text-muted"><%= report_link(t(".report"), @note) %></p>
   <% end %>
 
   <% if @note_comments.length > 1 %>
@@ -32,7 +31,7 @@
       <ul class="list-unstyled">
         <% @note_comments[1..-1].each do |comment| %>
           <li id="c<%= comment.id %>">
-            <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
+            <small class='text-muted'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
             <%= comment.body.to_html %>
           </li>
         <% end %>
diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb
index db4847826..9a3ff969d 100644
--- a/app/views/diary_entries/_diary_comment.html.erb
+++ b/app/views/diary_entries/_diary_comment.html.erb
@@ -1,6 +1,6 @@
-<div class="clearfix diary-comment<%= " deemphasize" unless diary_comment.visible? %>">
+<div class="clearfix diary-comment<%= " text-muted deleted" unless diary_comment.visible? %>">
   <%= user_thumbnail diary_comment.user %>
-  <p class="deemphasize 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}")) %>
+  <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 %>
diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index b0c464718..48df5d18e 100644
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -1,4 +1,4 @@
-<div class='diary_post<%= " deemphasize" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
+<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 %>
@@ -6,7 +6,7 @@
 
     <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
 
-    <small class='deemphasize'>
+    <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)) %>
     </small>
 
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 5efa6a1bb..65bd9ced3 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading do %>
 <h2><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h2>
 <p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
-<p class="deemphasize">
+<p class="text-muted">
   <small>
     <%= @issue.assigned_role %>
     | <%= t ".reports", :count => @issue.reports.count %>
@@ -24,14 +24,14 @@
     <h3><%= t ".reports_of_this_issue" %></h3>
 
     <% if @read_reports.present? %>
-    <div class="read-reports">
+    <div class="bg-light text-muted">
       <h4><%= t ".read_reports" %></h4>
       <%= render "reports", :reports => @read_reports %>
     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
-    <div class="unread-reports">
+    <div>
       <h4><%= t ".new_reports" %></h4>
       <%= render "reports", :reports => @unread_reports %>
     </div>
diff --git a/app/views/notes/mine.html.erb b/app/views/notes/index.html.erb
similarity index 85%
rename from app/views/notes/mine.html.erb
rename to app/views/notes/index.html.erb
index 2f68ba5c6..50059625d 100644
--- a/app/views/notes/mine.html.erb
+++ b/app/views/notes/index.html.erb
@@ -1,6 +1,6 @@
 <% content_for :heading do %>
-  <h2><%= t "notes.mine.heading", :user => @user.display_name %></h2>
-  <p><%= t "notes.mine.subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>
+  <h2><%= t ".heading", :user => @user.display_name %></h2>
+  <p><%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>
 <% end %>
 
 <%= render :partial => "notes_paging_nav" %>
diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index f1eed33cf..2eb23f755 100644
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -24,7 +24,7 @@
   <p><%= t ".export_details_html" %></p>
 
   <div id="export_osm_too_large">
-    <p class="warning">
+    <p class="alert alert-warning">
       <%= t ".too_large.body" %>
     </p>
   </div>
diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index 8980cb8f2..ff15836b7 100644
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -9,7 +9,7 @@
     <% end %>
   </td>
   <td><%= link_to trace.name, :controller => "traces", :action => "show", :display_name => trace.user.display_name, :id => trace.id %>
-    <span class="deemphasize" title="<%= trace.timestamp %>"> ...
+    <span class="text-muted" title="<%= trace.timestamp %>"> ...
       <% if trace.inserted %>
         (<%= t ".count_points", :count => trace.size %>)
       <% end %>
diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 86ac37f00..609dbcede 100644
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -26,12 +26,6 @@
   <%= render :partial => "trace_paging_nav" %>
 
   <table id="trace_list" class="table table-borderless table-striped">
-    <thead>
-      <tr>
-        <th></th>
-        <th></th>
-      </tr>
-    </thead>
     <tbody>
       <%= render @traces unless @traces.nil? %>
     </tbody>
diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index d067bd478..4446c519d 100644
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -7,7 +7,7 @@
 <%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %>
   <%= user_thumbnail contact %>
   <div class='activity-details'>
-    <p class='deemphasize'>
+    <p class='text-muted'>
       <%= link_to contact.display_name, user_path(contact) %>
       <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
         <% distance = @user.distance(contact) %>
@@ -31,7 +31,7 @@
       <% end %>
     </p>
 
-    <ul class='secondary-actions clearfix deemphasize'>
+    <ul class='secondary-actions clearfix text-muted'>
       <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
       <li>
         <% if current_user.is_friends_with?(contact) %>
diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb
index 0f2f3741f..ad6614c76 100644
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -166,7 +166,7 @@
       <input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
       <label class="standard-label" for="updatehome"><%= t ".update home location on click" %></label>
     </div>
-    <%= tag.div "", :id => "map", :class => "content_map settings_map set_location" %>
+    <%= tag.div "", :id => "map", :class => "content_map set_location" %>
   </fieldset>
 
   <%= submit_tag t(".save changes button") %>
diff --git a/app/views/users/confirm.html.erb b/app/views/users/confirm.html.erb
index 3a2e12578..a3902c0a9 100644
--- a/app/views/users/confirm.html.erb
+++ b/app/views/users/confirm.html.erb
@@ -20,11 +20,11 @@
 <% else %>
   <h1>
     <%= t ".introduction_1" %>
-    <span class="deemphasize">
+    <span class="text-muted">
       <%= t ".introduction_2" %>
     </span>
   </h1>
 
-  <p class='deemphasize'><%= t ".reconfirm_html",
-                               :reconfirm => url_for(:action => "confirm_resend") %></p>
+  <p class='text-muted'><%= t ".reconfirm_html",
+                              :reconfirm => url_for(:action => "confirm_resend") %></p>
 <% end %>
diff --git a/app/views/users/login.html.erb b/app/views/users/login.html.erb
index ac61d7df7..365245bf0 100644
--- a/app/views/users/login.html.erb
+++ b/app/views/users/login.html.erb
@@ -10,7 +10,7 @@
   <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
     <%= hidden_field_tag("referer", h(params[:referer])) %>
 
-    <p class='deemphasize'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>
+    <p class='text-muted'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>
 
     <div id="loginForm" class="standard-form">
 
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 1332ab6e2..440d68874 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -11,7 +11,7 @@
             <span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
           </li>
           <li>
-            <%= link_to t(".my notes"), :controller => "notes", :action => "mine" %>
+            <%= link_to t(".my notes"), user_notes_path(@user) %>
           </li>
           <li>
             <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %>
@@ -53,7 +53,7 @@
             <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
           </li>
           <li>
-            <%= link_to t(".notes"), :controller => "notes", :action => "mine" %>
+            <%= link_to t(".notes"), user_notes_path(@user) %>
           </li>
           <li>
             <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %>
@@ -147,7 +147,7 @@
 
         <% end %>
 
-      <p class='deemphasize'>
+      <p class='text-muted'>
         <small>
           <%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %>
           <% unless @user.terms_agreed %>
@@ -168,7 +168,7 @@
   </div>
 
   <% if current_user and current_user.administrator? -%>
-    <div class='admin-user-info deemphasize'>
+    <div class='admin-user-info text-muted'>
       <small><b><%= t ".email address" %></b> <%= @user.email %></small>
       <% unless @user.creation_ip.nil? -%>
         <small><b><%= t ".created from" %></b> <%= @user.creation_ip %></small>
@@ -180,56 +180,60 @@
 
 <% end %>
 
+<div class="row">
   <% if current_user and @user.id == current_user.id %>
-    <% if @user.home_lat.nil? or @user.home_lon.nil? %>
-      <div id="map" class="content_map">
-        <p id="no_home_location"><%= t(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %></p>
-      </div>
-    <% else %>
-      <% content_for :head do %>
-        <%= javascript_include_tag "user" %>
+    <div class="col-md order-md-last">
+      <% if @user.home_lat.nil? or @user.home_lon.nil? %>
+        <div id="map" class="content_map">
+          <p id="no_home_location"><%= t(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %></p>
+        </div>
+      <% else %>
+        <% content_for :head do %>
+          <%= javascript_include_tag "user" %>
+        <% end %>
+        <% user_data = {
+             :lon => current_user.home_lon,
+             :lat => current_user.home_lat,
+             :icon => image_path("marker-red.png"),
+             :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
+           } %>
+        <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
       <% end %>
-      <% user_data = {
-           :lon => current_user.home_lon,
-           :lat => current_user.home_lat,
-           :icon => image_path("marker-red.png"),
-           :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
-         } %>
-      <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
-    <% end %>
-
-    <% friends = @user.friends %>
-    <% nearby = @user.nearby - friends %>
-
-  <div class="activity-block column-1">
-    <h3><%= t ".my friends" %></h3>
-
-    <% if friends.empty? %>
-      <%= t ".no friends" %>
-    <% else %>
-      <ul class='secondary-actions clearfix'>
-        <li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
-        <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
-      </ul>
-      <div id="friends-container">
-        <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
-      </div>
-    <% end %>
-  </div>
 
-  <div class="activity-block column-1">
-    <h3><%= t ".nearby users" %></h3>
-
-    <% if nearby.empty? %>
-      <%= t ".no nearby users" %>
-    <% else %>
-      <ul class='secondary-actions clearfix'>
-        <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
-        <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
-      </ul>
-      <div id="nearbyusers">
-        <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
+      <% friends = @user.friends %>
+      <% nearby = @user.nearby - friends %>
+    </div>
+
+    <div class="col-md">
+      <h3><%= t ".my friends" %></h3>
+
+      <% if friends.empty? %>
+        <%= t ".no friends" %>
+      <% else %>
+        <ul class='secondary-actions clearfix'>
+          <li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
+          <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
+        </ul>
+        <div id="friends-container">
+          <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
+        </div>
+      <% end %>
+
+      <hr>
+
+      <h3><%= t ".nearby users" %></h3>
+
+      <% if nearby.empty? %>
+        <%= t ".no nearby users" %>
+      <% else %>
+        <ul class='secondary-actions clearfix'>
+          <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
+          <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
+        </ul>
+        <div id="nearbyusers">
+          <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index 33ca3a3e6..bc8b86ef2 100644
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -9,12 +9,12 @@
 
 <%= form_tag({ :action => "save" }, { :class => "standard-form fillL" }) do %>
   <!-- legale is <%= @legale %> -->
-  <p class="deemphasize"><%= t ".read and accept with tou" %></p>
+  <p class="text-muted"><%= t ".read and accept with tou" %></p>
   <h4>
     <%= t ".heading_ct" %>
   </h4>
   <div class='standard-form-row horizontal-list clearfix'>
-    <p class="deemphasize"><%= t ".contributor_terms_explain" %></p>
+    <p class="text-muted"><%= t ".contributor_terms_explain" %></p>
     <label class="standard-label">
       <%= t ".legale_select" %>
     </label>
@@ -34,7 +34,7 @@
   </div>
 
   <div>
-    <p id="contributorGuidance" class="deemphasize">
+    <p id="contributorGuidance" class="text-muted">
       <%= t ".guidance_html",
             :summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
             :translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>
@@ -50,7 +50,7 @@
   <h4>
     <%= t "layouts.tou" %>
   </h4>
-  <p class="deemphasize"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>
+  <p class="text-muted"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>
   <div class="standard-form-row">
     <label for="read_tou">
       <%= check_box_tag "read_tou" %>
diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index 78e9fee37..daf66bfc7 100644
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -7,7 +7,7 @@ csp_policy = {
   :form_action => %w['self'],
   :frame_ancestors => %w['self'],
   :frame_src => %w['self'],
-  :img_src => %w['self' data: www.gravatar.com *.wp.com tile.openstreetmap.org *.tile.openstreetmap.org *.tile.thunderforest.com *.openstreetmap.fr],
+  :img_src => %w['self' data: www.gravatar.com *.wp.com tile.openstreetmap.org *.tile.openstreetmap.org *.tile.thunderforest.com tileserver.memomaps.de *.openstreetmap.fr],
   :manifest_src => %w['self'],
   :media_src => %w['none'],
   :object_src => %w['self'],
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 20ba78a03..378ac1c41 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2558,7 +2558,7 @@ ar:
       next: التالي »
       previous: « السابق
   notes:
-    mine:
+    index:
       title: ملاحظات مقدمة أو علق عليها %{user}
       heading: ملاحظات %{user}
       subheading_html: تم إرسال الملاحظات أو التعليق عليها بواسطة %{user}
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 57946488d..97ed1e4fa 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1457,14 +1457,16 @@ ast:
           collaboradores. Si camudes o crees conteníu sobre los nuesos datos, namái
           podrás distribuir el resultáu baxo la mesma llicencia. El <a href="https://opendatacommons.org/licenses/odbl/1.0/">códigu
           llegal</a> completu t'esplica los tos drechos y obligaciones.
-        intro_3_1_html: La cartografía de los mosaicos del mapa y la nuesa documentación,
-          tán llicenciaos baxo la llicencia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Reconocimientu-CompartirIgual 2.0</a> (CC BY-SA).
+        intro_3_1_html: La nuesa documentación úfrese baxo la llicencia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Reconocimientu-CompartirIgual 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Cómo dar reconocimientu a OpenStreetMap
         credit_1_html: Riquimos qu'uses el créditu &ldquo;&copy; Collaboradores d'OpenStreetMap&rdquo;.
         credit_2_1_html: |-
           Tamién tienes de dexar claro que los datos tan disponibles baxo la llicencia Open Database License (ODbL), y si utilices los nuesos mosaicos de mapa, que la cartografía tien llicencia CC BY-SA. Puedes facelo enllazando a <a href="https://www.openstreetmap.org/copyright">esta páxina de drechos d'autor</a>.
           Alternativamente, y como requisitu si distribues OSM en forma de datos, pues nomar y enllazar direutamente a les llicencies. En medios onde los enllaces nun seyan posibles (por exemplu, obres imprentaes), suxerímoste dirixir a los llectores a openstreetmap.org (espandiendo 'OpenStreetMap' a esta dirección completa, seique), a opendatacommons.org y, si ye'l casu, a creativecommons.org.
+        credit_3_1_html: |-
+          Los mosaicos del mapa del &ldquo;estilu estándar&rdquo; de www.openstreetmap.org son una Obra Producida de la Fundación OpenStreetMap usando datos d'OpenStreetMap baxo llicencia Open Database License. Si tas usando estos mosaicos, usa la siguiente atribución:
+          &ldquo;Mapa base y datos d'OpenStreetMap y de la Fundación OpenStreetMap&rdquo;.
         credit_4_html: |-
           Nun mapa electrónicu navegable, los créditos tendríen d'apaecer na esquina del mapa.
           Por casu:
@@ -2552,7 +2554,7 @@ ast:
       next: Siguiente »
       previous: « Anterior
   notes:
-    mine:
+    index:
       title: Notes unviaes o comentaes por %{user}
       heading: notes de %{user}
       subheading_html: Notes unviaes o comentaes por %{user}
@@ -2606,6 +2608,7 @@ ast:
         cycle_map: Mapa ciclista
         transport_map: Mapa de tresportes
         hot: Humanitariu
+        opnvkarte: ÖPNVKarte
       layers:
         header: Capes del mapa
         notes: Notes de mapa
@@ -2619,6 +2622,7 @@ ast:
         la API</a>
       thunderforest: Mosaicu cortesía de <a href='%{thunderforest_url}' target='_blank'>Andy
         Allan</a>
+      opnvkarte: Mosaicos por cortesía de <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
       hotosm: Estilu del mosaicu por <a href='%{hotosm_url}' target='_blank'>Equipu
         Humanitariu d'OpenStreetMap</a> agospiáu por <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
         Francia</a>
diff --git a/config/locales/be.yml b/config/locales/be.yml
index c25121e27..01f229d17 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -411,6 +411,7 @@ be:
       in_language_title: Дзённік запісаў на %{language}
       new: Новы запіс дзённіку
       new_title: Напісаць у вашым дзённіку
+      my_diary: Мой дзённік
       no_entries: Няма запісаў
       recent_entries: Свежыя запісы ў дзённіку
       older_entries: Даўнейшыя запісы
@@ -1487,9 +1488,8 @@ be:
           ўдзельнікаў. Калі Вы змяняеце ці выкарыстоўваеце нашыя дадзеныя, Вы можаце
           распаўсюджваць вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны \n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">тэкст
           ліцэнзіі</a> растлумачыць Вам правы і абавязкі."
-        intro_3_1_html: "Карты ў графічным выглядзе, а таксама дакументацыя распаўсюджваюцца
-          на ўмовах <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Ліцэнзіі
-          Creative \nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
+        intro_3_1_html: "Наша дакументацыя распаўсюджваюцца на ўмовах <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Ліцэнзіі
+          Creative \nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA 2.0)."
         credit_title_html: Як спасылацца на OpenStreetMap
         credit_1_html: |-
           Мы патрабуем, каб выкарыстоўвалася спасылка &ldquo;&copy; OpenStreetMap
@@ -2595,7 +2595,7 @@ be:
       next: Далей »
       previous: « Назад
   notes:
-    mine:
+    index:
       title: Заўвагі, створаныя ці пракаментаваныя %{user}
       heading: Заўвагі %{user}'а
       subheading_html: Заўвагі, створаныя ці пракаментаваныя %{user}
@@ -2654,6 +2654,7 @@ be:
         cycle_map: Веласіпедная карта
         transport_map: Транспартная карта
         hot: Гуманітарная карта
+        opnvkarte: ÖPNVKarte
       layers:
         header: Слаі карты
         notes: Заўвагі на карце
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index b6605926c..3c8d2a066 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1640,7 +1640,7 @@ bg:
       next: Следваща »
       previous: « Предишна
   notes:
-    mine:
+    index:
       title: Бележки създадени или с коментар от %{user}
       heading: Бележките на %{user}
       subheading_html: Бележки създадени или с коментар от %{user}
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 0380c5544..8aef9e50a 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -2600,7 +2600,7 @@ br:
       next: ↓War-lerc'h »
       previous: ↓« Kent
   notes:
-    mine:
+    index:
       title: Notennoù kaset pe addispleget gant %{user}
       heading: notennoù %{user}
       subheading_html: Notennoù kaset pe addispleget gant %{user}
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index d703b5bb1..41bb1beef 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1843,7 +1843,7 @@ bs:
       next: Sljedeća »
       previous: « Prethodna
   notes:
-    mine:
+    index:
       id: Id
       creator: Izradio
       description: Opis
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 8505e53c8..fe635401a 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -2590,7 +2590,7 @@ ca:
       next: Endavant »
       previous: « Enrere
   notes:
-    mine:
+    index:
       title: Notes enviades o comentades per %{user}
       heading: notes de %{user}
       subheading_html: Notes enviades o comentades per %{user}
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 1ce058bd9..2b42c09e0 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -1063,7 +1063,7 @@ ce:
       next: ТӀехьа йогӀург →
       previous: ← Хьалхара
   notes:
-    mine:
+    index:
       heading: '%{user} декъашхочун билгалонаш'
       id: Идентификатор
       creator: Автор
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index c3d174ccb..27181800b 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2562,7 +2562,7 @@ cs:
       next: Následující »
       previous: « Předchozí
   notes:
-    mine:
+    index:
       title: Poznámky vytvořené nebo okomentované uživatelem %{user}
       heading: Poznámky uživatele %{user}
       subheading_html: Poznámky vytvořené nebo okomentované uživatelem %{user}
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 82724e909..9857e7c45 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1620,7 +1620,7 @@ cy:
       next: Nesaf »
       previous: « Blaenorol
   notes:
-    mine:
+    index:
       id: Id
   javascripts:
     close: Cau
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 6ea43be06..33c915bbe 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -73,6 +73,7 @@ da:
       diary_comment: Blogkommentar
       diary_entry: Blogindlæg
       friend: Ven
+      issue: Problem
       language: Sprog
       message: Meddelelse
       node: Punkt
@@ -89,6 +90,7 @@ da:
       relation: Relation
       relation_member: Relationsmedlem
       relation_tag: Relationsegenskab
+      report: Rapporter
       session: Session
       trace: Spor
       tracepoint: Sporpunkt
@@ -188,6 +190,7 @@ da:
   auth:
     providers:
       none: Ingen
+      openid: OpenID
       google: Google
       facebook: Facebook
       windowslive: Windows Live
@@ -303,8 +306,8 @@ da:
         way: vej
         relation: relation
     start_rjs:
-      feature_warning: Henter %{num_features} kortobjekter, som kan gøre din browser
-        langsom eller få den til at ikke at svare. Er du sikker på du ønsker at få
+      feature_warning: Henter %{num_features} kortobjekter, dette kan gøre din browser
+        langsom eller få den til ikke at svare. Er du sikker på at du ønsker at få
         vist disse data?
       load_data: Indlæs data
       loading: Indlæser...
@@ -1254,8 +1257,9 @@ da:
         more_info_2: 'dem kan findes på:'
       success:
         subject: '[OpenStreetMap] GPX-importering lykkedes'
-        loaded_successfully: indlæst med %{trace_points} ud af %{possible_points}
-          mulige punkter.
+        loaded_successfully:
+          one: indlæst med %{trace_points} ud af 1 muligt punkt.
+          other: indlæst med %{trace_points} ud af %{possible_points} mulige punkter.
     signup_confirm:
       subject: '[OpenStreetMap] Velkommen til OpenStreetMap'
       greeting: Halløj!
@@ -1415,8 +1419,8 @@ da:
     about:
       next: Næste
       copyright_html: <span>&copy;</span>OpenStreetMap<br>bidragsydere
-      used_by_html: '%{name} stiller kortdata til rådighed for tusindvis af websteder,
-        mobile apps og hardware-enheder'
+      used_by_html: '%{name} leverer kortdata til tusindvis af websteder, mobile apps
+        og hardware-enheder'
       lede_text: OpenStreetMap er bygget af et fællesskab af kortlæggere, der bidrager
         og vedligeholder data om veje, stier, caféer, jernbanestationer og meget mere,
         over hele verden.
@@ -1473,9 +1477,8 @@ da:
           Hvis du ændrer eller bygger på vores\ndata, må du kun distribuere resultatet
           under den samme licens. Den\nfulde <a\nhref=\"https://opendatacommons.org/licenses/odbl/1.0/\">juridiske
           tekst</a>\nforklarer dine rettigheder og pligter."
-        intro_3_1_html: Kartografien i vores kort-fliser, samt vores dokumentation
-          er licenseret under <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.da">Creative
-          Commons Navngivelse-DelPåSammeVilkår 2.0</a> (CC BY-SA).
+        intro_3_1_html: Vores dokumentation er licenseret under <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.da">Creative
+          Commons Kreditering-Deling på samme vilkår 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Kildeangivelse og OpenStreetMap
         credit_1_html: Vi kræver at din kildeangivelse mindst består af &ldquo;&copy;
           OpenStreetMap-bidragsydere&rdquo;.
@@ -1488,6 +1491,11 @@ da:
           vi, at du\n henviser dine læsere til openstreetmap.org (måske ved at udvide\n'OpenStreetMap'
           til denne fuld adresse), til opendatacommons.org, og\n hvis relevant, til
           creativecommons.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_4_html: |-
           For et navigerbart elektronisk kort, skal kildeangivelsen være i hjørnet af kortet.
           For eksempel:
@@ -1607,7 +1615,7 @@ da:
       potlatch2_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch
         2 skal du trykke på gem-knappen).
       id_not_configured: iD er ikke blevet konfigureret
-      no_iframe_support: Din browser understøtter ikke HTML-iframes som er nødvendige
+      no_iframe_support: Din browser understøtter ikke HTML-iframes, hvilket er nødvendigt
         for denne funktion.
     export:
       title: Eksportér
@@ -2573,7 +2581,7 @@ da:
       next: Næste »
       previous: « Forrige
   notes:
-    mine:
+    index:
       title: Bemærkninger indsendt eller kommenteret af %{user}
       heading: '%{user}s bemærkninger'
       subheading_html: Bemærkninger indsendt eller kommenteret af %{user}
@@ -2616,11 +2624,18 @@ da:
         out: Zoom ud
       locate:
         title: Vis min placering
+        metersPopup:
+          one: Du er indenfor en meter fra dette punkt
+          other: Du er indenfor %{count} meter fra dette punkt
+        feetPopup:
+          one: Du er indenfor en fod fra dette punkt
+          other: Du er indenfor %{count} fod fra dette punkt
       base:
         standard: Standard
         cycle_map: Cykelkort
         transport_map: Transportkort
         hot: Humanitær
+        opnvkarte: Offentlig transport
       layers:
         header: Kortlag
         notes: Kortbemærkninger
@@ -2631,6 +2646,12 @@ da:
       copyright: © <a href='%{copyright_url}'>OpenStreetMap-bidragsydere</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Lav en donation</a>
       terms: <a href='%{terms_url}' target='_blank'>Hjemmeside og API-vilkår</a>
+      thunderforest: Fliser venligst leveret af <a href='%{thunderforest_url}' target='_blank'>Andy
+        Allan</a>
+      opnvkarte: Fliser venligst leveret af <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
+      hotosm: Flise-stil af <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap
+        Team</a> hosted af <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+        Frankrig</a>
     site:
       edit_tooltip: Rediger kortet
       edit_disabled_tooltip: Zoom ind for at redigere kortet
@@ -2743,7 +2764,7 @@ da:
         roundabout_with_exit_ordinal: Ved rundkørslen, tag afkørsel %{exit} mod %{name}
         exit_roundabout: Forlad rundkørsel mod %{name}
         unnamed: unavngiven vej
-        courtesy: Anvisninger stillet til rådighed af %{link}
+        courtesy: Anvisninger venligst leveret af %{link}
         exit_counts:
           first: "1."
           second: "2."
diff --git a/config/locales/de.yml b/config/locales/de.yml
index e62f83525..3d8194a7d 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2671,7 +2671,7 @@ de:
       next: Nächste »
       previous: « Vorige
   notes:
-    mine:
+    index:
       title: Hinweise/Fehler erstellt oder kommentiert von %{user}
       heading: Hinweise von %{user}
       subheading_html: Hinweise/Fehler erstellt oder kommentiert von %{user}
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 643384987..cd6811797 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -1135,7 +1135,7 @@ diq:
       next: Peyên »
       previous: « Verên
   notes:
-    mine:
+    index:
       description: Şınasnayış
   javascripts:
     close: Kip ke
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 357e84c06..12bc3013b 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -2013,7 +2013,7 @@ dsb:
       next: Pśiducy »
       previous: « Pjerwjejšny
   notes:
-    mine:
+    index:
       title: Pokazki, kótarež su se wót %{user} dali abo komentěrowali
       heading: Pokazki wužywarja %{user}
       subheading_html: Pokazki, kótarež su se wót %{user} dali abo komentěrowali
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 0f4ff81c7..5f4ba2d72 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2641,7 +2641,7 @@ el:
       next: Επόμενη »
       previous: « Προηγούμενη
   notes:
-    mine:
+    index:
       title: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον %{user}
       heading: σημειώσεις του %{user}
       subheading_html: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον %{user}
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index d30dc8e77..9a8a66c70 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -2396,7 +2396,7 @@ en-GB:
       next: Next »
       previous: « Previous
   notes:
-    mine:
+    index:
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'
       subheading_html: Notes submitted or commented on by %{user}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2f2145b24..30e8f6e98 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -394,7 +394,7 @@ en:
     diary_entry:
       posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
       comment_link: Comment on this entry
-      reply_link: Reply to this entry
+      reply_link: Send a message to the author
       comment_count:
         zero: No comments
         one: "%{count} comment"
@@ -1197,12 +1197,12 @@ en:
       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
-      footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}"
+      footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
     message_notification:
       subject_header: "[OpenStreetMap] %{subject}"
       hi: "Hi %{to_user},"
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
-      footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
+      footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
     friendship_notification:
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} added you as a friend"
@@ -2448,7 +2448,7 @@ en:
       next: "Next »"
       previous: "« Previous"
   notes:
-    mine:
+    index:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"
       subheading_html: "Notes submitted or commented on by %{user}"
@@ -2502,6 +2502,7 @@ en:
         cycle_map: Cycle Map
         transport_map: Transport Map
         hot: Humanitarian
+        opnvkarte: ÖPNVKarte
       layers:
         header: Map Layers
         notes: Map Notes
@@ -2513,6 +2514,7 @@ en:
       donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
       terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
       thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
+      opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
       hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
     site:
       edit_tooltip: Edit the map
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 2613a10c2..4f19ae421 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1457,9 +1457,8 @@ eo:
           vi modifos aÅ­ uzos niajn datumojn, vi povos distribui la verkon laÅ­ la sama
           permesilo. La plena <a href="https://opendatacommons.org/licenses/odbl/1.0/">interkonsento
           de uzado</a> klarigas viajn rajtojn kaj devojn.
-        intro_3_1_html: La kartografio de niaj map-kaheloj kaj nia dokumentaro estas
-          disponeblaj laÅ­ la permesilo <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.eo">Krea
-          Komunaĵo Atribuite-Samkondiĉe 2.0</a> (CC BY-SA).
+        intro_3_1_html: Nia dokumentaro estas eldonita laÅ­ la permesilo <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.eo">Krea
+          Komunaĵo Atribuite-Samkondiĉe 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Kiel atribui aÅ­torecon
         credit_1_html: 'Ni postulas, ke vi markos: &ldquo;&copy; Kontribuintoj de
           OpenStreetMap&rdquo;.'
@@ -2536,7 +2535,7 @@ eo:
       next: Sekva »
       previous: « Antaŭa
   notes:
-    mine:
+    index:
       title: Rimarkoj kreitaj aÅ­ komentitaj de %{user}
       heading: Rimarkoj de %{user}
       subheading_html: Rimarkoj kreitaj aÅ­ komentitaj de %{user}
@@ -2590,6 +2589,7 @@ eo:
         cycle_map: Biciklada mapo
         transport_map: Transporta mapo
         hot: Hom-helpa mapo
+        opnvkarte: ÖPNVKarte
       layers:
         header: Tavoloj de mapo
         notes: Map-rimarkoj
@@ -2602,6 +2602,7 @@ eo:
       terms: <a href='%{terms_url}' target='_blank'>Kondiĉoj pri Retejo kaj API</a>
       thunderforest: Kaheloj danke al <a href='%{thunderforest_url}' target='_blank'>Andy
         ALLAN</a>
+      opnvkarte: Kaheloj danke al <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
       hotosm: Kahela stilo de <a href='%{hotosm_url}' target='_blank'>Humanitarian
         OpenStreetMap Team</a> gastigata de <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
         France</a>
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1299531f9..40c6ad934 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2635,7 +2635,7 @@ es:
       next: Siguiente »
       previous: « Anterior
   notes:
-    mine:
+    index:
       title: Notas remitidas o comentadas por %{user}
       heading: Notas de %{user}
       subheading_html: Notas remitidas o comentadas por %{user}
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 558102956..d3d5a0070 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -2197,7 +2197,7 @@ et:
       next: Järgmine »
       previous: « Eelmine
   notes:
-    mine:
+    index:
       title: Kasutaja %{user} loodud või kommenteeritud märkused
       heading: Kasutaja %{user} märkused
       subheading_html: Kasutaja %{user} loodud või kommenteeritud märkused
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 34e972618..9ef67f903 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -2478,7 +2478,7 @@ eu:
       next: Hurrengoa »
       previous: « Aurrekoa
   notes:
-    mine:
+    index:
       title: '%{user}k igotako edo iruzkinak utzitako oharrak'
       heading: '%{user} erabiltzailearen oharrak'
       subheading_html: '%{user}k igotako edo iruzkinak utzitako oharrak'
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index ffb8223d2..148722424 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -902,7 +902,7 @@ fa:
           state: ایالت
           subdivision: زیربخش
           suburb: حومه شهر
-          town: شهر کوچک
+          town: شهر
           unincorporated_area: منطقه گنجانده نشده
           village: روستا
           "yes": Siedlung
@@ -1074,7 +1074,7 @@ fa:
         geonames: مکان از <a href="http://www.geonames.org/">GeoNames</a>
       types:
         cities: شهرها
-        towns: شهرهای کوچک
+        towns: شهرها
         places: مکان‌ها
     results:
       no_results: نتیجه‌ای یافت نشد
@@ -1439,8 +1439,8 @@ fa:
     about:
       next: بعدی
       copyright_html: <span>&copy;</span>مشارکت‌کنندگان<br>OpenStreetMap
-      used_by_html: صدها وبسایت، برنامهٔ موبایل و دستگاه سخت‌افزاری از دادهٔ %{name}
-        نیرو گرفته‌اند.
+      used_by_html: '%{name} برای هزاران وبسایت، برنامهٔ موبایل و دستگاه سخت‌افزاری
+        دادهٔ نقشه فراهم می‌کند.'
       lede_text: OpenStreetMap را جامعه‌ای از نقشه‌کشان ساخته‌اند که در ایجاد و نگهداری
         داده‌های مربوط به جاده‌ها، مسیرهای تریل، کافه‌ها، ایستگاه‌های راه‌آهن و بسیاری
         موارد دیگر در سرتاسر جهان نقش ایفا می‌کنند.
@@ -1502,8 +1502,8 @@ fa:
           مجوز توزیع کنید. نسخهٔ کامل <a href="http://opendatacommons.org/licenses/odbl/1.0/">بایدونبایدهای
           قانونی</a> حقوق و وظایف شما را توضیح می‌دهد.
         intro_3_1_html: |-
-          نقشه‌نگاری‌های ارائه‌شده در کاشی‌های نقشهٔ ما و در مستنداتمان، همگی تحت پروانهٔ   <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA) هستند.
+          مستندات ما تحت پروانهٔ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0) است.
         credit_title_html: چگونه از OpenStreetMap یاد کنیم
         credit_1_html: |-
           بایسته است که این‌گونه از ما یاد کنید:
@@ -1518,6 +1518,9 @@ fa:
           چاپی)، توصیه می‌کنیم که خوانندگان خود را به  openstreetmap.org (شاید با
           گسترش OpenStreetMap به این نشانی کامل)، به opendatacommons.org و در صورت
           تناسب به creativecommons.org هدایت کنید.
+        credit_3_1_html: |-
+          کاشی‌های نقشهٔ www.openstreetmap.org در «سبک استاندارد»، کار تولیدی (Produced Work) محسوب می‌شوند که بنیاد اوپن‌استریت‌مپ با استفاده از دادهٔ اوپن‌استریت‌مپ تحت پروانهٔ پایگاه‌دادهٔ باز (ODbL) ساخته‌است. اگر از این کاشی‌ها استفاده می‌کنید لطفاً این انتساب را به کار ببرید:
+          «نقشه و دادهٔ پایه از OpenStreetMap و بنیاد OpenStreetMap»
         credit_4_html: |-
           در یک نقشهٔ الکترونیکی قابل مرور، یادکرد باید در گوشهٔ نقشه ظاهر شود.
           برای مثال:
@@ -1660,7 +1663,7 @@ fa:
             روزآمد می‌شود
         metro:
           title: خلاصه های مترو
-          description: گزیده‌هایی برای شهرهای بزرگ جهان و مناطق اطرافشان
+          description: گزیده‌هایی از شهرهای بزرگ جهان و مناطق اطرافشان
         other:
           title: سایر منابع
           description: منابع بیشتر در ویکی OpenStreetMap ذکر شده است
@@ -2577,7 +2580,7 @@ fa:
       next: بعدی »
       previous: « قبلی
   notes:
-    mine:
+    index:
       title: یادداشت‌هایی که %{user} ارسال کرده یا روی آن‌ها نظر داده
       heading: یادداشت‌های %{user}
       subheading_html: یادداشت‌هایی که %{user} ارسال کرده یا روی آن‌ها نظر داده
@@ -2643,6 +2646,7 @@ fa:
       terms: <a href='%{terms_url}' target='_blank'>شرایط وبسایت و API</a>
       thunderforest: کاشی‌ها با لطف <a href='%{thunderforest_url}' target='_blank'>Andy
         Allan</a>
+      opnvkarte: کاشی‌ها با لطف <a href='%{memomaps_url}' target='_blank'></a>
       hotosm: سبک کاشی‌ها از <a href='%{hotosm_url}' target='_blank'>Humanitarian
         OpenStreetMap Team</a> میزبانی با <a href='%{osmfrance_url}' target='_blank'>اوپن‌استریت‌مپ
         فرانسه </a>
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 8306c821f..ec5c0bfe6 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1483,8 +1483,8 @@ fi:
           samalla lisenssillä.\n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">Lakitekstissä</a>
           mainitaan levittäjän oikeudet ja velvollisuudet."
         intro_3_1_html: |-
-          Kartta-aineisto ja dokumentaatio on lisensoitu <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.fi">Creative
-          Commons Nimeä-Jaa samoin 2.0</a> -lisenssillä (CC-BY-SA).
+          Dokumentaatio on lisensoitu <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.fi">Creative
+          Commons Nimeä-JaaSamoin 2.0</a> -lisenssillä (CC-BY-SA 2.0).
         credit_title_html: OpenStreetMapin mainitseminen
         credit_1_html: OpenStreetMapin sisältöä levitettäessä on mainittava teksti
           &quot;&copy; OpenStreetMapin tekijät&quot; tai sen englanninkielinen vastine
@@ -2561,7 +2561,7 @@ fi:
       next: Seuraava »
       previous: « Edellinen
   notes:
-    mine:
+    index:
       title: Käyttäjän %{user} kommentoimat ja luomat huomautukset
       heading: Käyttäjän %{user} karttailmoitukset
       subheading_html: Käyttäjän %{user} kommentoimat ja luomat karttailmoitukset
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 2f57a9a0e..ff0308108 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -1062,7 +1062,7 @@ fit:
       next: Seuraava »
       previous: « Eelinen
   notes:
-    mine:
+    index:
       description: Kuvvaus
   javascripts:
     close: Sulje
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 54918958b..d84da1035 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1552,8 +1552,8 @@ fr:
         credit_3_1_html: "Les carrés de la carte dans le &ldquo;style standard&rdquo;
           sur www.openstreetmap.org sont un travail produit par la fondation OpenStreetMap
           en utilisant les données de OpenStreetMap sous la licence Open Database.
-          Si vous utilisez ces briques, veuillez utiliser l’attribution suivante :
-          \n&ldquo;Carte de base et données de OpenStreetMap et la fondation OpenStreetMap&rdquo;."
+          Si vous utilisez ces carrés, veuillez utiliser l’attribution suivante :
+          \n&ldquo;Carte de base et données de OpenStreetMap et de la Fondation OpenStreetMap&rdquo;."
         credit_4_html: |-
           Pour une carte électronique navigable, le crédit devrait apparaître dans un coin de la carte.
           Par exemple :
@@ -2673,7 +2673,7 @@ fr:
       next: Suivant »
       previous: « Précédent
   notes:
-    mine:
+    index:
       title: Notes soumises ou commentées par « %{user} »
       heading: Notes de « %{user} »
       subheading_html: Notes soumises ou commentées par « %{user} »
@@ -2727,6 +2727,7 @@ fr:
         cycle_map: Carte cyclable
         transport_map: Carte de transport
         hot: Humanitaire
+        opnvkarte: ÖPNVKarte
       layers:
         header: Couches de carte
         notes: Notes de carte
@@ -2739,6 +2740,8 @@ fr:
       terms: <a href='%{terms_url}' target='_blank'>Conditions du site web et de l’API</a>
       thunderforest: Priorité des carreaux de <a href='%{thunderforest_url}' target='_blank'>Andy
         Allan</a>
+      opnvkarte: Tuiles obtenues grâce à l'amabilité de <a href='%{memomaps_url}'
+        target='_blank'>MeMoMaps</a>
       hotosm: Style des carreaux de <a href='%{hotosm_url}' target='_blank'>l’équipe
         humanitaire de OpenStreetMap</a> hébergé par <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
         France</a>
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 6180fd5c4..a9aa1678a 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1391,7 +1391,7 @@ fur:
       next: Sucessîf »
       previous: « Precedent
   notes:
-    mine:
+    index:
       title: Note inseride o comentade di %{user}
       heading: Lis notis di %{user}
       subheading_html: Lis notis inseridis o comentadis di %{user}
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 560c3331f..bd26fbf29 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -2095,7 +2095,7 @@ ga:
       next: Ar aghaidh »
       previous: « Roimhe
   notes:
-    mine:
+    index:
       id: ID
       last_changed: Athrú deireanach
   javascripts:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 9d9f65d36..351405cda 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -2283,7 +2283,7 @@ gd:
       next: Air adhart »
       previous: « Air ais
   notes:
-    mine:
+    index:
       title: Nòtaichean a chuir %{user} a-null no a thug %{user} beachd dhaibh
       heading: nòtaichean aig %{user}
       subheading_html: Nòtaichean a chuir %{user} a-null no a thug %{user} beachd
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 4c93bb0a2..d02ff1528 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2594,7 +2594,7 @@ gl:
       next: Seguinte »
       previous: « Anterior
   notes:
-    mine:
+    index:
       title: Notas enviadas ou comentadas por %{user}
       heading: Notas de %{user}
       subheading_html: Notas enviadas ou comentadas por %{user}
diff --git a/config/locales/he.yml b/config/locales/he.yml
index a6da03aca..396d98108 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1410,7 +1410,7 @@ he:
     about:
       next: הבא
       copyright_html: <span>&copy;</span>תורמי<br>OpenStreetMap
-      used_by_html: '%{name} מפעילה נתוני המפה באלפי אתרי אינטרנט, יישומים ומכשירים
+      used_by_html: '%{name} מספקת נתוני מפות לאלפי אתרי אינטרנט, יישומים ומכשירים
         שונים'
       lede_text: את OpenStreetMap בונה קהילת ממפים שתורמים ומתחזקים נתונים על דרכים,
         שבילים, בתי־קפה, תחנות רכבת ועוד הרבה יותר, מסביב לעולם.
@@ -2521,7 +2521,7 @@ he:
       next: הבא »
       previous: « הקודם
   notes:
-    mine:
+    index:
       title: הערות ותגובות של %{user}
       heading: הערות של %{user}
       subheading_html: הערות ותגובות של %{user}
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index d93b08d33..6ebafbc12 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -715,7 +715,7 @@ hi:
       not_revoke_admin_current_user: वर्तमान उपयोगकर्ता के द्वारा व्यवस्थापक भूमिका
         को रद्द नहीं कर सकता है|
   notes:
-    mine:
+    index:
       created_at: 'निर्माण का समय:'
       last_changed: अंतिम परिवर्तन
   javascripts:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 970b97823..8fda051c8 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1123,9 +1123,8 @@ hr:
           izvor. Ako izmijenite ili nadogradite naše podatke, možete distribuirati
           rezultate samo pod istom licencom. Puni <a href="http://opendatacommons.org/licenses/odbl/1.0/">pravni
           tekst</a> objašnjava vaša prava i odgovornosti.
-        intro_3_1_html: Kartografija koja je prisutna u našim sličicama karte i naša
-          dokumentacija je pod <a href="http://creativecommons.org/licenses/by-sa/2.0/">Imenovanje-Dijeli
-          pod istim uvjetima 2.0</a> licencijom (CC BY-SA).
+        intro_3_1_html: Naša dokumentacija licencirana je pod <a href="http://creativecommons.org/licenses/by-sa/2.0/">Imenovanje-Dijeli
+          pod istim uvjetima 2.0</a> licencijom (CC BY-SA 2.0).
         credit_title_html: Kako navoditi OpenStreetMap kao izvor
         credit_1_html: |-
           Zahtjevamo da istaknete zasluge &ldquo;&copy; OpenStreetMap
@@ -1952,7 +1951,7 @@ hr:
       next: Sljedeća »
       previous: « Prethodna
   notes:
-    mine:
+    index:
       title: Bilješke stvorio ili komentirao %{user}
       heading: Bilješke korisnika %{user}
       subheading_html: Bilješke stvorio ili komentirao %{user}
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 2a5c3ee66..506524d09 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -2425,7 +2425,7 @@ hsb:
       next: Přichodny »
       previous: « Předchadny
   notes:
-    mine:
+    index:
       title: Pokazki, kotrež su so wot %{user} dali abo komentowali
       heading: Pokazki wužiwarja %{user}
       subheading_html: Pokazki, kotrež su so wot %{user} dali abo komentowali
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index cae8f52b3..4d020de0d 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -2552,7 +2552,7 @@ hu:
       next: Következő »
       previous: « Előző
   notes:
-    mine:
+    index:
       title: '%{user} által beküldött vagy kommentált jegyzetek'
       heading: '%{user} jegyzetei'
       subheading_html: '%{user} által beküldött vagy kommentált jegyzetek'
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 12ba34299..1c76d8854 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -2555,7 +2555,7 @@ ia:
       next: Sequente »
       previous: « Precedente
   notes:
-    mine:
+    index:
       title: Notas submittite o commentate per %{user}
       heading: Notas de %{user}
       subheading_html: Notas submittite o commentate per %{user}
diff --git a/config/locales/id.yml b/config/locales/id.yml
index cbafa89ba..51e760c09 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -2527,7 +2527,7 @@ id:
       next: Berikutnya »
       previous: « Sebelumnya
   notes:
-    mine:
+    index:
       title: Catatan dimasukkan atau dikomentari oleh %{user}
       heading: catatan oleh %{user}
       subheading_html: Catatan dimasukkan atau dikomentari oleh %{user}
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 8a473306c..f406af999 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2591,7 +2591,7 @@ is:
       next: Næsta »
       previous: « Fyrri
   notes:
-    mine:
+    index:
       title: Minnispunktar sem hafa verið sendir inn eða gerðar athugasemdir við af
         %{user}
       heading: Minnispunktar frá %{user}
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 5a3e5ae98..45ff199f2 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1448,7 +1448,7 @@ it:
     about:
       next: Successivo
       copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-      used_by_html: '%{name} fornisce dati geografici su migliaia di siti web, applicazioni
+      used_by_html: '%{name} fornisce dati geografici per migliaia di siti web, applicazioni
         mobili e dispositivi hardware'
       lede_text: OpenStreetMap è costruito da una comunità di mappatori che contribuiscono
         e mantengono i dati sulle strade, sentieri, caffè, stazioni ferroviarie e
@@ -1509,15 +1509,20 @@ it:
           Se alteri o ti basi sui nostri dati,\npuoi distribuire il risultato solo
           sotto la stessa licenza. Il \n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">codice\nlegale
           completo</a> illustra i tuoi diritti e le tue responsabilità."
-        intro_3_1_html: "La cartografia contenuta nelle nostre tavole, e la nostra
-          documentazione, sono rilasciate sotto licenza <a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative
-          \nCommons Attribuzione - Condividi allo stesso modo 2.0</a> (CC BY-SA)."
+        intro_3_1_html: "La nostra documentazione è rilasciata in base alla licenza
+          <a href=\"https://creativecommons.org/licenses/by-sa/2.0/deed.it\">Creative
+          \nCommons Attribuzione - Condividi allo stesso modo 2.0</a> (CC BY-SA 2.0)."
         credit_title_html: Come si attribuisce a OpenStreetMap
         credit_1_html: Si richiede che l'attribuzione sia &ldquo;&copy; OpenStreetMap
           contributors &rdquo;.
         credit_2_1_html: |-
           Inoltre devi specificare chiaramente che i dati sono disponibili sotto la Open Database Licese e, se usi le nostre tavole, che la cartografia è pubblicata con licenza CC BY-SA. Puoi fare ciò mettendo un collegamento URL a <a href="https://www.openstreetmap.org/copyright">questa pagina di copyright</a>.
           In alternativa, e necessariamente se stai distribuendo OSM sotto forma di dati, puoi citare e creare un collegamento diretto alle licenze. In mezzi di comunicazione dove i collegamenti URL non sono possibili (per esempio un'opera stampata), ti suggeriamo di indirizzare i lettori verso openstreetmap.org (magari esplicitando 'OpenStreetMap' come nome completo), verso opendatacommons.org e, se necessario, verso creativecommons.org.
+        credit_3_1_html: 'I tasselli della mappa nello &ldquo;stile predefinito&rdquo;
+          su www.openstreetmap.org sono frutto del lavoro della fondazione OpenStreetMap
+          a partire da dati OpenStreetMap rilasciati con licenza Open Database. Se
+          utilizzi questi tasselli, inserisci la seguente attribuzione: &ldquo;Mappa
+          di base e dati da OpenStreetMap e dalla fondazione OpenStreetMap&rdquo;.'
         credit_4_html: |-
           In una mappa elettronica navigabile, i crediti devono essere mostrati nell'angolo della mappa.
           Ad esempio:
@@ -2619,7 +2624,7 @@ it:
       next: Successivo »
       previous: « Precedente
   notes:
-    mine:
+    index:
       title: Note inserite o commentate da %{user}
       heading: Note dell'utente %{user}
       subheading_html: Note inserite o commentate da %{user}
@@ -2673,6 +2678,7 @@ it:
         cycle_map: Mappa ciclabile
         transport_map: Mappa dei trasporti
         hot: Umanitario
+        opnvkarte: ÖPNVKarte
       layers:
         header: Livelli mappa
         notes: Note sulla mappa
@@ -2686,6 +2692,7 @@ it:
         API</a>
       thunderforest: Tasselli forniti da <a href='%{thunderforest_url}' target='_blank'>Andy
         Allan</a>
+      opnvkarte: Tasselli forniti da <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
       hotosm: Stile dei tasselli di <a href='%{hotosm_url}' target='_blank'>Humanitarian
         OpenStreetMap Team</a> ospitato da <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
         France</a>
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 5c44ba5e4..1a7849420 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -36,6 +36,7 @@
 # Author: Vigorous action
 # Author: Wrightbus
 # Author: Yusuke1109
+# Author: はまのまさと
 # Author: ネイ
 # Author: 沈澄心
 # Author: 神樂坂秀吉
@@ -2368,7 +2369,7 @@ ja:
       next: 次へ »
       previous: « 前へ
   notes:
-    mine:
+    index:
       title: '%{user} さんが投稿またはコメントしたメモ'
       heading: '%{user}さんのメモ'
       subheading_html: '%{user}さんが投稿またはコメントしたメモ'
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 292debe2b..7f290860d 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -1213,7 +1213,7 @@ ka:
       next: შემდეგი »
       previous: « წინა
   notes:
-    mine:
+    index:
       creator: შემქმნელი
       description: აღწერა
   javascripts:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 9f2f63086..97cc7328d 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -1501,7 +1501,7 @@ kab:
       next: Ar zdat»
       previous: « ar deffir
   notes:
-    mine:
+    index:
       heading: Tizmilin n %{user}
       id: Asulay
       creator: Amernay
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index c5aee2f39..0b1b31401 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -2440,7 +2440,7 @@ ko:
       next: 다음 »
       previous: « 이전
   notes:
-    mine:
+    index:
       title: '%{user} 님이 제출했거나 덧글을 남긴 참고'
       heading: '%{user}의 참고'
       subheading_html: '%{user} 님이 제출했거나 덧글을 남긴 참고'
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 700273f0e..40c5e2824 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -1430,7 +1430,7 @@ ku-Latn:
       next: Pêşve
       copyright_html: <span>&copy;</span>Beşdarên<br> OpenStreetMapê
       used_by_html: '%{name} li ser bi hezaran malper, sepanên mobîl û cîhazên hişkalavan,
-        daneyên nexşeyê li hev tîne'
+        daneyên nexşeyê pêşkêş dike'
       lede_text: OpenStreetMap ji alî civata nexşesazên ku ji seransera dinyayê der
         barê kolanan, kafeyan, stasyonên trênan û zêdetirê wan de daneyan tevlî vir
         dike û diparêze.
@@ -1489,8 +1489,8 @@ ku-Latn:
           di bin eynî lîsansê de dikarin belav bikin. Temamiya <a href="https://opendatacommons.org/licenses/odbl/1.0/">koda
           qanûnî</a>, maf û berpirsiyariyên we îzah dike.
         intro_3_1_html: |-
-          Nexşesazî û belgekirinên di nexşeya me de, di bin lîsansa <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA) de hatiye lîsanskirin.
+          Belgekirinên di nexşeya me de, di bin lîsansa <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0) de hatiye lîsanskirin.
         credit_title_html: Em çawan wekî çavkaniyekê behsa OpenStreetMapê bikin
         credit_1_html: Ji bo referansgirtinê divê tu wisa binivîsîː &ldquo;&copy;
           beşarên OpenStreetMapê &rdquo;.
@@ -1504,6 +1504,11 @@ ku-Latn:
           ne mimkun bin de (wekî mînak. xebatên çapkirî), em ji we re pêşniyar dikin
           ku hûn xwînerên xwe tewcîhê openstreetmap.org'ê, opendatacommons.org'ê,
           û heke minasib be creativecommons.org'ê bikin.
+        credit_3_1_html: 'Karoyên nexşeyê yên di &ldquo;stîla standard&rdquo; de yên
+          li www.openstreetmap.org-ê Xebateke Çêkirî yê Weqfa OpenStreetMapê ye ku
+          bi bikaranîna daneyên OpenStreetMapê di bin lîsansa Open Database de çêbûye.
+          Ger van karoyan bi kar bînî ji kerema xwe van sifetan bi kar bînin: &ldquo;Nexşeya
+          esasî û dane ji OpenStreetMap û Weqfa OpenStreetMapê ne&rdquo;.'
         credit_4_html: "Ji bo nexşeyekî elektronîk yê gerrînbar, çavkanî divê li jêra
           goşeya alî rastê were xuyan. \nWek nimûne:"
         attribution_example:
@@ -2604,7 +2609,7 @@ ku-Latn:
       next: Pêşve »
       previous: « Paşve
   notes:
-    mine:
+    index:
       title: Notên ku ji aliyê %{user} ve hatine şandin an jî şirovekirin
       heading: Notên %{user}
       subheading_html: Notên ku ji aliyê %{user} ve hatine şandin an jî şirovekirin
@@ -2658,6 +2663,7 @@ ku-Latn:
         cycle_map: Nexşeya bisiklête
         transport_map: Nexşeya transportê
         hot: Mirovatî
+        opnvkarte: ÖPNVKarte
       layers:
         header: Tebeqeyên nexşeyê
         notes: Notên nexşeyê
@@ -2670,6 +2676,7 @@ ku-Latn:
       terms: <a href='%{terms_url}' target='_blank'>Mercên malper û APIyê</a>
       thunderforest: Kiremît bi destûra <a href='%{thunderforest_url}' target='_blank'>Andy
         Allan</a>
+      opnvkarte: Kiremît bi xêra <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
       hotosm: Şêweya kiremîtan ji aliyê <a href='%{hotosm_url}' target='_blank'>Tîma
         Mirovayî ya OpenStreetMapê</a> ve, hewandin ji aliyê <a href='%{osmfrance_url}'
         target='_blank'>OpenStreetMap Fransa</a> ve
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 3b7916ffb..99db1dc62 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -1312,7 +1312,7 @@ lb:
       next: Nächst »
       previous: « Vireg
   notes:
-    mine:
+    index:
       description: Beschreiwung
       last_changed: Lescht Ännerung
   javascripts:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 9fdc753ec..7a32ccfab 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -59,6 +59,7 @@ lt:
       diary_comment: Dienoraščio komentaras
       diary_entry: Dienoraščio įrašas
       friend: Draugas
+      issue: Problema
       language: Kalba
       message: Žinutė
       node: Taškas
@@ -173,7 +174,12 @@ lt:
       description: nuotolinį valdymą (JOSM arba Merkaartor)
   auth:
     providers:
+      openid: OpenID
       google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       comment:
@@ -296,6 +302,7 @@ lt:
         tag: Žymos %{key}=%{value} wiki aprašymo puslapis
       wikidata_link: '%{page} elementas Wikidata svetainėje'
       wikipedia_link: '%{page} straipsnis Vikipedijoje'
+      wikimedia_commons_link: '%{page} Wikimedia Commons elementas'
       telephone_link: Skambinti %{phone_number}
       colour_preview: Spalvos %{colour_value} peržiūra
     note:
@@ -380,6 +387,7 @@ lt:
       in_language_title: 'Dienoraščio įrašai: %{language}'
       new: Naujas dienoraščio įrašas
       new_title: Sukurti naują mano dienoraščio įrašą
+      my_diary: Mano dienoraštis
       no_entries: Nėra dienoraščio įrašų
       recent_entries: Paskutiniai dienoraščio įrašai
       older_entries: Senesni įrašai
@@ -1020,6 +1028,7 @@ lt:
       search: Ieškoti
       status: BÅ«sena
       last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> %{user}
       link_to_reports: Žiūrėti pranešimus
       reports_count:
         one: 1 Report
@@ -1057,8 +1066,14 @@ lt:
       ignored: Problemos būsena pakeista į „Ignoruota“
     reopen:
       reopened: Problemos būsena pakeista į „Atvira“
+    comments:
+      comment_from_html: '%{user_link} komentavo %{comment_created_at}'
+      reassign_param: Iš naujo priskirti problemą?
+    reports:
+      reported_by_html: Pranešta kaip %{category} naudotojo %{user} %{updated_at}
     helper:
       reportable_title:
+        diary_comment: '%{entry_title}, komentaras #%{comment_id}'
         note: 'Pastaba #%{note_id}'
   issue_comments:
     create:
@@ -1067,6 +1082,7 @@ lt:
     new:
       title_html: Pranešimas %{link}
       missing_params: Negalima sukurti naujo pranešimo
+      details: Prašoma pateikti daugiau informacijos apie problemą (privaloma).
       select: 'Parinktie jūsų pranešimo priežastį:'
       disclaimer:
         intro: 'Prieš siųsdami jūsų pranešimą svetainės moderatoriams, įsitikinkite,
@@ -1081,7 +1097,15 @@ lt:
           offensive_label: Dienoraššio įrašas yra įžeidžiantis
           threat_label: Dienoraščio įraše yra grasinimų
           other_label: Kita
+        diary_comment:
+          spam_label: Šiame/šis dienoraščio komentare yra reklama
+          offensive_label: Šis dienoraščio komentaras yra įžeidžiantis
+          threat_label: Šiame dienoraščio įraše yra grasinimas
+          other_label: Kita
         user:
+          spam_label: Å is naudotojo profilis yra/turi reklamos
+          offensive_label: Šis naudotojo profilis yra įžeidžiantis
+          threat_label: Å iame naudotojo profilyje yra grasinimas
           vandal_label: Å is naudotojas yra vandalas
           other_label: Kita
         note:
@@ -1385,7 +1409,7 @@ lt:
           Jūs galite laisvai platinti ir pritaikyti mūsų duomenis tol, kol paminite OpenStreetMap ir jo kūrėjus. Jei naudodamiesi mūsų duomenimis sukursite savo duomenis, jūsų duomenys irgi turi būti licencijuoti pagal tą pačią licenziją.
           <a href="http://opendatacommons.org/licenses/odbl/1.0/">Pilnas teisinis aprašymas</a> paaiškins jūsų teises ir atsakomybes.
         intro_3_1_html: |-
-          Mūsų žemėlapio duomenys ir mūsų dokumentacija yra licencijuoti pagal <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Mūsų dokumentacija yra licencijuoti pagal <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> licenciją (CC-BY-SA).
         credit_title_html: Kaip paminėti OpenStreetMap
         credit_1_html: |-
@@ -2473,7 +2497,7 @@ lt:
       next: Kitas »
       previous: « Ankstesnis
   notes:
-    mine:
+    index:
       title: Pastabas pateikė arba komentavo %{user}
       heading: '%{user} pastabos'
       subheading_html: Pastabas pateikė arba komentavo %{user}
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 78acb49b9..0cce5551f 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -2290,7 +2290,7 @@ lv:
       next: Nākamais »
       previous: « Iepriekšējais
   notes:
-    mine:
+    index:
       title: Piezīmes, kuras veidojis vai komentējis %{user}
       heading: '%{user} piezīmes'
       subheading_html: Piezīmes, kuras veidojis vai komentējis %{user}
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index e4c06497f..077f0e221 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1463,9 +1463,8 @@ mk:
           Доколку ги измените или дополните податоците,\nдобиеното можете да го распространувате
           само под истата лиценца. Вашите права и одговорност ќе ги најдете\nво целосниот
           <a\nhref=\"https://opendatacommons.org/licenses/odbl/1.0/\">правен текст</a>."
-        intro_3_1_html: |-
-          Картографијата во нашите полиња на картите и нашата документација
-          се нудат под лиценцата <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.mk">Криејтив комонс Наведи извор-Сподели под исти услови 2.0</a> (CC-BY-SA).
+        intro_3_1_html: "Нашата документација се нуди под лиценцата \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/deed.mk\">Криејтив
+          комонс Наведи извор-Сподели под исти услови 2.0</a> (CC BY-SA 2.0)."
         credit_title_html: Како да ја наведете OpenStreetMap
         credit_1_html: |-
           Задолжително наведувајте нè со &ldquo;&copy; Учесници на
@@ -2571,7 +2570,7 @@ mk:
       next: Следна »
       previous: « Претходна
   notes:
-    mine:
+    index:
       title: Белешки создадени или коментирани од %{user}
       heading: Белешки на %{user}
       subheading_html: Белешки создадени или коментирани од %{user}
@@ -2625,6 +2624,7 @@ mk:
         cycle_map: Велосипедска
         transport_map: Сообраќајна
         hot: Хуманитарна
+        opnvkarte: ÖPNVKarte
       layers:
         header: Слоеви на картата
         notes: Белешки на картата
@@ -2637,6 +2637,7 @@ mk:
       terms: <a href='%{terms_url}' target='_blank'>Услови за мреж. место и приложникот</a>
       thunderforest: 'Полиња: <a href=''%{thunderforest_url}'' target=''_blank''>Енди
         Алан</a>'
+      opnvkarte: Полињата ги достави <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
       hotosm: 'Стил на полињата: <a href=''%{hotosm_url}'' target=''_blank''>Хуманитарна
         екипа на OpenStreetMap</a> вдомена од <a href=''%{osmfrance_url}'' target=''_blank''>OpenStreetMap
         Франција</a>'
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index aaec0a916..a9f2c332d 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -2277,7 +2277,7 @@ ms:
       next: Berikutnya »
       previous: « Sebelumnya
   notes:
-    mine:
+    index:
       title: Nota yang dikemukakan atau diulas oleh %{user}
       heading: nota-nota %{user}
       subheading_html: Nota yang dikemukakan atau diulas oleh %{user}
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 2776502a3..fb97ebcc5 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -853,7 +853,7 @@ my:
       next: ရှေ့ »
       previous: « ယခင်က
   notes:
-    mine:
+    index:
       creator: ဖန်တီးသူ
       description: ဖော်ပြချက်
   javascripts:
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 37a49ff7e..d8f118fc5 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -2471,7 +2471,7 @@ nb:
       next: Neste »
       previous: « Forrige
   notes:
-    mine:
+    index:
       title: Merknader sendt inn eller kommentert på av %{user}
       heading: '%{user} sine merknader'
       subheading_html: Merknader sendt inn eller kommentert på av %{user}
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 4d1b2ea55..34f26d803 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -1283,7 +1283,7 @@ ne:
       next: अर्को »
       previous: « अघिल्लो
   notes:
-    mine:
+    index:
       id: आईडी
       creator: सर्जक
       description: वर्णन
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 7fdccfdf5..63bbf8f53 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -10,6 +10,8 @@
 # Author: Carsrac
 # Author: Donarreiskoffer
 # Author: Duckson32
+# Author: Dutchy45
+# Author: Eebie
 # Author: Elroy
 # Author: Esketti
 # Author: Freek
@@ -23,6 +25,7 @@
 # Author: Jochempluim
 # Author: Joost schouppe
 # Author: Jouke
+# Author: Kars
 # Author: Ldp
 # Author: Lemondoge
 # Author: M!dgard
@@ -62,7 +65,7 @@ nl:
         create: Opslaan
       diary_entry:
         create: Publiceren
-        update: Updaten
+        update: Bijwerken
       issue_comment:
         create: Opmerking toevoegen
       message:
@@ -82,7 +85,7 @@ nl:
   activerecord:
     errors:
       messages:
-        invalid_email_address: '"%s" lijkt geen geldig e-mailadres te zijn.'
+        invalid_email_address: lijkt geen geldig e-mailadres te zijn.
         email_address_not_routable: is niet routeerbaar
     models:
       acl: Rechtenoverzicht
@@ -108,6 +111,7 @@ nl:
       relation: Relatie
       relation_member: Relatielid
       relation_tag: Relatietag
+      report: Rapport
       session: Sessie
       trace: Track
       tracepoint: Trackpunt
@@ -204,6 +208,14 @@ nl:
     remote:
       name: Afstandsbediening
       description: Afstandsbediening (JOSM of Merkaartor)
+  auth:
+    providers:
+      none: Geen
+      openid: OpenID
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       comment:
@@ -418,6 +430,7 @@ nl:
       in_language_title: Dagboekberichten in het %{language}
       new: Nieuw dagboekbericht
       new_title: Nieuw bericht in mijn dagboek schrijven
+      my_diary: Mijn dagboek
       no_entries: Het dagboek is leeg
       recent_entries: Recente dagboekberichten
       older_entries: Oudere berichten
@@ -759,7 +772,7 @@ nl:
           "yes": Landgebruik
         leisure:
           beach_resort: Badplaats
-          bird_hide: Nestplaats
+          bird_hide: Vogelkijkplek
           common: Meent
           dog_park: Hondenpark
           firepit: Vuurplaats
@@ -1272,8 +1285,8 @@ nl:
         more_info_2: 'te vermijden is te vinden op:'
       success:
         subject: '[OpenStreetMap] GPX-import afgerond'
-        loaded_successfully: geladen met %{trace_points} punten van de mogelijke %{possible_points}
-          punten.
+        loaded_successfully: '{{PLURAL|one=geladen met %{trace_points} punt.|geladen
+          met %{trace_points} van de %{possible_points} mogelijke punten.'
     signup_confirm:
       subject: '[OpenStreetMap] Welkom bij OpenStreetMap'
       greeting: Hallo!
@@ -1437,8 +1450,8 @@ nl:
     about:
       next: Volgende
       copyright_html: <span>&copy;</span>OpenStreetMap-<br />bijdragers
-      used_by_html: '%{name} levert gegevens voor duizenden websites, mobiele apps
-        en hardwareimplementaties'
+      used_by_html: '%{name} levert kaart gegevens voor duizenden websites, mobiele
+        apps en hardware implementaties'
       lede_text: OpenStreetMap wordt gemaakt door een gemeenschap van kaartenmakers
         die gegevens over wegen, paden, cafés, treinstations en nog veel meer, over
         de hele wereld bijdragen en onderhouden.
@@ -1501,9 +1514,8 @@ nl:
           volledige <a href="https://opendatacommons.org/licenses/odbl/1.0/">juridische
           tekst</a> worden uw rechten en verantwoordelijkheden uitgelegd.
         intro_3_1_html: |-
-          De cartografie in onze kaarttegels en onze documentatie zijn
-          vrijgegeven onder de licentie <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Naamsvermelding-Gelijk delen 2.0</a> (CC BY-SA).
+          Onze documentatie is vrijgegeven onder de licentie <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Naamsvermelding-Gelijk delen 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Hoe OpenStreetMap te vermelden
         credit_1_html: |-
           We vereisen dat u het volgende vermeldt bij gebruik:
@@ -2605,7 +2617,7 @@ nl:
       next: Volgende »
       previous: « Vorige
   notes:
-    mine:
+    index:
       title: Opmerkingen gemaakt door %{user}
       heading: Opmerkingen van %{user}
       subheading_html: Opmerkingen gemaakt door %{user}
@@ -2648,11 +2660,18 @@ nl:
         out: Uitzoomen
       locate:
         title: Uw locatie weergeven
+        metersPopup:
+          one: U bevindt zich binnen één meter van dit punt
+          other: U bevindt zich binnen %{count} meter van dit punt
+        feetPopup:
+          one: U bevindt zich binnen één voet van dit punt
+          other: U bevindt zich binnen %{count} voet van dit punt
       base:
         standard: Standaard
         cycle_map: Fietskaart
         transport_map: Transportkaart
         hot: Humanitarian
+        opnvkarte: ÖPNVKarte
       layers:
         header: Kaartlagen
         notes: Opmerkingen bij kaart
@@ -2663,6 +2682,12 @@ nl:
       copyright: © <a href='%{copyright_url}'>bijdragers OpenStreetMap</a>
       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>
+      thunderforest: Rasterkaart met dank aan <a href='%{thunderforest_url}' target='_blank'>Andy
+        Allan</a>
+      opnvkarte: Tegels 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
+        Frankrijk</a>
     site:
       edit_tooltip: Kaart bewerken
       edit_disabled_tooltip: Zoom in om de kaart te bewerken
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 789368b99..60b75482e 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -2039,7 +2039,7 @@ nn:
       next: Neste »
       previous: « Forrige
   notes:
-    mine:
+    index:
       heading: '%{user} sine merknadar'
       subheading_html: Merknadar sendt inn eller kommentert av %{user}
       id: ID
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 49a3add9d..872796b1d 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -2376,7 +2376,7 @@ oc:
       next: Seguent »
       previous: « Precedent
   notes:
-    mine:
+    index:
       title: Nòtas somesas o comentadas per %{user}
       heading: Nòtas de %{user}
       subheading_html: Nòtas somesas o comentadas per %{user}
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 09820ee02..212ef496a 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -1246,7 +1246,7 @@ pa:
       next: ਅਗਲਾ »
       previous: « ਪਿਛਲਾ
   notes:
-    mine:
+    index:
       creator: ਸਿਰਜਣਹਾਰ
       description: ਵੇਰਵਾ
       created_at: ਕਦੋਂ ਸਿਰਜਿਆ ਗਿਆ
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 7df264f47..5ebb99095 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1540,8 +1540,8 @@ pl:
           wynik swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji.
           <a href="https://opendatacommons.org/licenses/odbl/1.0/">Pełny tekst licencji</a>
           dokładnie opisuje twoje prawa i obowiązki.
-        intro_3_1_html: Mapy w postaci graficznej, a także dokumentacja rozpowszechniane
-          na warunkach licencji <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.pl">Uznanie
+        intro_3_1_html: Nasza dokumentacja rozpowszechniana jest na warunkach licencji
+          <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.pl">Uznanie
           autorstwa na tych samych warunkach 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Jak podać źródło
         credit_1_html: Wymagamy podania źródła w postaci „&copy; autorzy OpenStreetMap”.
@@ -2648,7 +2648,7 @@ pl:
       next: Następna »
       previous: « Poprzednia
   notes:
-    mine:
+    index:
       title: Uwagi utworzone lub skomentowane przez %{user}
       heading: Uwagi użytkownika %{user}
       subheading_html: Uwagi utworzone lub skomentowane przez %{user}
@@ -2718,6 +2718,7 @@ pl:
       terms: <a href='%{terms_url}' target='_blank'>Warunki użytkowania</a>
       thunderforest: Kafelki dzięki uprzejmości <a href='%{thunderforest_url}' target='_blank'>Andy'ego
         Allana</a>
+      opnvkarte: Kafelki dzięki uprzejmości <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
       hotosm: 'Styl kafelków: <a href=''%{hotosm_url}'' target=''_blank''>Humanitarian
         OpenStreetMap Team</a>. Hosting: <a href=''%{osmfrance_url}'' target=''_blank''>OpenStreetMap
         France</a>'
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 9dc8b392a..0caa93849 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1451,8 +1451,8 @@ pt-BR:
     about:
       next: Próximo
       copyright_html: <span>&copy;</span>contribuidores<br>do OpenStreetMap
-      used_by_html: O %{name} fornece dados a centenas de sites na internet, aplicações
-        de celular e outros dispositivos
+      used_by_html: O %{name} ffornece dados de mapa para milhares de sites, aplicativos
+        móveis e dispositivos de hardware
       lede_text: O OpenStreetMap é desenvolvido por uma comunidade voluntária de mapeadores
         que contribuem e mantêm atualizados os dados sobre estradas, trilhos, cafés,
         estações ferroviárias e muito mais por todo o mundo.
@@ -1514,9 +1514,8 @@ pt-BR:
           Se alterar ou adicionar conteúdo dos nossos dados, pode distribuir o resultado
           apenas com a mesma licença. O <a href="https://opendatacommons.org/licenses/odbl/1.0/">texto
           legal completo</a> explica os seus direitos e responsabilidades.
-        intro_3_1_html: A cartografia nas nossas telas de mapas (imagens dos mapas)
-          e a nossa documentação são disponibilizadas sob a licença <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.pt">Creative
-          Commons Atribuição - Partilha nos Mesmos Termos 2.0 (CC BY-SA)</a>.
+        intro_3_1_html: "Nossa documentação é licenciada sob a \nlicença <a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
+          Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0)."
         credit_title_html: Como fazer atribuição ao OpenStreetMap
         credit_1_html: Requeremos que você faça atribuição citando “© contribuidores
           do OpenStreetMap”.
@@ -2621,7 +2620,7 @@ pt-BR:
       next: Próximo »
       previous: « Anterior
   notes:
-    mine:
+    index:
       title: Notas postadas ou comentadas por %{user}
       heading: Notas de %{user}
       subheading_html: Notas postadas ou comentadas por %{user}
@@ -2675,6 +2674,7 @@ pt-BR:
         cycle_map: Ciclístico
         transport_map: Transporte Público
         hot: Humanitário
+        opnvkarte: ÖPNVKarte
       layers:
         header: Camadas do mapa
         notes: Notas de mapa
@@ -2687,6 +2687,7 @@ pt-BR:
       terms: <a href='%{terms_url}' target='_blank'>Termos do site e da API</a>
       thunderforest: Mosaicos cortesia de <a href='%{thunderforest_url}' target='_blank'>Andy
         Allan</a>
+      opnvkarte: A camada cortesia por <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
       hotosm: Estilo de ladrilhos por <a href='%{hotosm_url}' target='_blank'>Equipe
         de Humanitarian OpenStreetMap</a> hospedado por <a href='%{osmfrance_url}'
         target='_blank'>OpenStreetMap França</a>
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index b0cb35e54..224f5a32f 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -2603,7 +2603,7 @@ pt-PT:
       next: Seguinte »
       previous: « Anterior
   notes:
-    mine:
+    index:
       title: Notas submetidas ou comentadas por %{user}
       heading: Notas de %{user}
       subheading_html: Notas submetidas ou comentadas por %{user}
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 67a9af69b..4fb834f3f 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -2599,7 +2599,7 @@ ro:
       next: Următoarea »
       previous: « Precedenta
   notes:
-    mine:
+    index:
       title: Notele trimise sau comentate de %{user}
       heading: Notele %{user}
       subheading_html: Notele trimise sau comentate de %{user}
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index c53caf23c..3d763a7be 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -49,6 +49,7 @@
 # Author: MaxSem
 # Author: Mechano
 # Author: Meerrahtar
+# Author: Mike like0708
 # Author: Mixaill
 # Author: Movses
 # Author: Nemo bis
@@ -1558,9 +1559,8 @@ ru:
           вы должны распространять результат только по такой же лицензии. Полный <a
           href="https://opendatacommons.org/licenses/odbl/1.0/">юридический текст
           лицензии</a> разъясняет ваши права и обязанности.
-        intro_3_1_html: Изготовленные нами изображения карты, также как и наша документация
-          распространяются по лицензии <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
+        intro_3_1_html: Наша документация распространяются по лицензии <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Как сослаться на OpenStreetMap
         credit_1_html: Мы требуем, чтобы вы указывали «© Участники OpenStreetMap».
         credit_2_1_html: Вы должны также ясно обозначить, что по лицензии Open Database
@@ -2666,7 +2666,7 @@ ru:
       next: Следующая →
       previous: ← Предыдущая
   notes:
-    mine:
+    index:
       title: Заметки, созданные или прокомментированный участником %{user}
       heading: Заметки участника %{user}
       subheading_html: Заметки, созданные или прокомментированные участником %{user}
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 5b755279f..355951d00 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -999,7 +999,7 @@ sc:
       next: Imbeniente »
       previous: « Pretzedente
   notes:
-    mine:
+    index:
       creator: Creadore
       description: Descritzione
   javascripts:
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 31e14475a..3153ddece 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -2218,7 +2218,7 @@ scn:
       next: Appressu »
       previous: « Arreri
   notes:
-    mine:
+    index:
       title: Noti scritti o cummintati di l'utenti %{user}
       heading: Noti di %{user}
       subheading_html: Noti scritti o cummintati di l'utenti %{user}
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index c6150259f..e8f79a2b7 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -2089,7 +2089,7 @@ sk:
       next: Ďalšia stránka »
       previous: « Predchádzajúca stránka
   notes:
-    mine:
+    index:
       id: ID
       creator: Autor
       description: Popis
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index b3ae07f83..e92ed4d18 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -2205,7 +2205,7 @@ sl:
       next: Naslednja »
       previous: « Prejšnja
   notes:
-    mine:
+    index:
       title: Opombe, ki jih je posredoval/-a ali komentiral/-a %{user}
       heading: Opombe uporabnika %{user}
       subheading_html: Opombe, ki jih je posredoval/-a ali komentiral/-a %{user}
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 3715b7e86..c74810a36 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -2384,7 +2384,7 @@ sr:
       next: Следеће »
       previous: « Претходно
   notes:
-    mine:
+    index:
       title: Белешке послао или коментарисао %{user}
       heading: Белешке корисника %{user}
       subheading_html: Белешке послао или коментарисао %{user}
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d6362491e..fa5c601eb 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -32,6 +32,7 @@
 # Author: Pyscowicz
 # Author: Rockyfelle
 # Author: Ruila
+# Author: Sabelöga
 # Author: Sannab
 # Author: Sendelbach
 # Author: Sertion
@@ -1443,8 +1444,8 @@ sv:
     about:
       next: Nästa
       copyright_html: <span>&copy;</span>OpenStreetMap<br>bidragsgivare
-      used_by_html: '%{name} förser tusentals webbsidor, mobilappar och fysiska apparater
-        med kartdata'
+      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
         och underhåller data om vägar, stigar, caféer, järnvägsstationer och mycket
         mer, över hela världen.
@@ -1504,10 +1505,8 @@ sv:
           endast distribuera resultatet under samma licens. Den
           fullständiga <a href="https://opendatacommons.org/licenses/odbl/1.0/">juridiska
           texten</a> förklarar dina rättigheter och skyldigheter.
-        intro_3_1_html: |-
-          Kartografin i våra kartrutor, och vår dokumentation, är
-          tillgängliga under licensen <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Erkännande-DelaLika 2.0</a> (CC BY-SA).
+        intro_3_1_html: "Vår dokumentation är tillgänglig under licensen \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
+          Erkännande-DelaLika 2.0</a> (CC BY-SA 2.0)."
         credit_title_html: Hur du anger OpenStreetMap som källa
         credit_1_html: |-
           Vi kräver att din källhänvisning består av &ldquo;&copy; OpenStreetMaps
@@ -2606,7 +2605,7 @@ sv:
       next: Nästa »
       previous: « Föregående
   notes:
-    mine:
+    index:
       title: Anteckningar skapade eller kommenterade av %{user}
       heading: '%{user}s anteckningar'
       subheading_html: Anteckningar skapade eller kommenterade av %{user}
@@ -2660,6 +2659,7 @@ sv:
         cycle_map: Cykelkarta
         transport_map: Transportkarta
         hot: Humanitärt
+        opnvkarte: ÖPNVKarte
       layers:
         header: Kartskikt
         notes: Kartanteckningar
diff --git a/config/locales/te.yml b/config/locales/te.yml
index ae7688748..5c8fa1bc8 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -861,7 +861,7 @@ te:
       next: తదుపరి »
       previous: « మునుపటి
   notes:
-    mine:
+    index:
       heading: '%{user} గమనికలు'
       description: వివరణ
       last_changed: చివరి మార్పు
diff --git a/config/locales/th.yml b/config/locales/th.yml
index a2a0b5eaa..b9972a265 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -2111,7 +2111,7 @@ th:
       next: ถัดไป »
       previous: « ก่อนหน้า
   notes:
-    mine:
+    index:
       heading: หมายเหตุของ %{user}
       creator: ผู้สร้าง
   javascripts:
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 6ab18cdd1..aa79d27b1 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1967,7 +1967,7 @@ tl:
       next: Susunod »
       previous: « Nakaraan
   notes:
-    mine:
+    index:
       heading: mga tala ni %{user}
       id: Id
       description: Paglalarawan
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 8f1767be3..b7b0bf243 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -2000,7 +2000,7 @@ tr:
       count_points:
         one: 1 puan
         other: '%{count} puan'
-      more: ayrıntı
+      more: daha fazla
       trace_details: İz Ayrıntılarını Görüntüle
       view_map: Haritayı Görüntüle
       edit: düzenle
@@ -2626,7 +2626,7 @@ tr:
       next: Sonraki »
       previous: « Önceki
   notes:
-    mine:
+    index:
       title: '%{user} tarafından gönderilen veya yorumlanan notlar'
       heading: '%{user} kullanıcıya ait notlar'
       subheading_html: '%{user} tarafından gönderilen veya yorumlanan notlar'
@@ -2680,6 +2680,7 @@ tr:
         cycle_map: Bisiklet Haritası
         transport_map: Ulaşım Haritası
         hot: İnsancıl
+        opnvkarte: ÖPNVKarte
       layers:
         header: Harita Katmanları
         notes: Harita Notları
@@ -2692,6 +2693,8 @@ tr:
       terms: <a href='%{terms_url}' target='_blank'>Web sitesi ve API şartları</a>
       thunderforest: Fayans <a href='%{thunderforest_url} 'target='_blank'>Andy Allan</a>'ın
         izniyle
+      opnvkarte: Fayanslar <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>'in
+        izniyle
       hotosm: <a href='%{hotosm_url}' target='_blank'>Ä°nsani OpenStreetMap Ekibi</a>
         tarafından <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap Fransa</a>
         tarafından sunulan karo tarzı
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 8f50fcc84..b7d00919d 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -805,7 +805,7 @@ tt:
       next: Киләсе »
       previous: « Алдагы
   notes:
-    mine:
+    index:
       creator: Төзүче
       description: Тасвирлама
       created_at: Төзелде
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 7a259589f..5b54bc6b6 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1277,7 +1277,7 @@ uk:
       befriend_them: Ви також можете додати їх у якості друзів %{befriendurl}.
     gpx_notification:
       greeting: Привіт,
-      your_gpx_file: Схоже, що це ваш файл GPX
+      your_gpx_file: Схоже, що ваш файл GPX
       with_description: з описом
       and_the_tags: 'та наступними теґами:'
       and_no_tags: та без теґів.
@@ -1454,7 +1454,7 @@ uk:
     about:
       next: Далі
       copyright_html: <span>&copy;</span>Учасники<br>OpenStreetMap
-      used_by_html: '%{name} надає картографічні дані для тисяч веб-сайтів, мобільних
+      used_by_html: '%{name} надає картографічні дані для тисяч вебсайтів, мобільних
         застосунків та різних пристроїв'
       lede_text: OpenStreetMap створений спільнотою маперів, які вносять і підтримують
         дані про дороги, стежки, кав’ярні, вокзали і багато чого іншого по всьому
@@ -1598,8 +1598,8 @@ uk:
           дозволу правовласників.
         infringement_2_html: Якщо ви вважаєте, що захищений авторським правом матеріал
           був недоречно доданий до бази даних OpenStreetMap або до цього сайту, ознайомтесь
-          із нашим <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">порядком
-          з вилучення таких даних</a> або скористуйтесь безпосередньо нашою <a href="https://dmca.openstreetmap.org/">сторінкою
+          з нашим <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">порядком
+          з вилучення таких даних</a> або скористайтесь безпосередньо <a href="https://dmca.openstreetmap.org/">сторінкою
           для онлайн звернень</a>.
         trademarks_title_html: <span id="trademarks"></span>Торгові марки
         trademarks_1_html: OpenStreetMap і логотип з лупою є зареєстрованими торговими
@@ -2616,7 +2616,7 @@ uk:
       next: Наступна →
       previous: ← Попередня
   notes:
-    mine:
+    index:
       title: Нотатки створені чи прокоментовані користувачем %{user}
       heading: Нотатки користувача %{user}
       subheading_html: Нотатки, створені чи прокоментовані користувачем %{user}
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index d9026ce06..83984c04f 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -389,6 +389,7 @@ vi:
       in_language_title: Các mục nhật ký bằng %{language}
       new: Mục nhật ký mới
       new_title: Soạn thảo mục mới trong nhật ký của tôi
+      my_diary: Nhật ký của Tôi
       no_entries: Chưa có mục nhật ký
       recent_entries: Mục nhật ký gần đây
       older_entries: Mục cũ hơn
@@ -1242,9 +1243,10 @@ vi:
         import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=vi
       success:
         subject: '[OpenStreetMap] Nhập GPX thành công'
-        loaded_successfully: |-
-          %{trace_points} điểm được tải thành công trên tổng số
-          %{possible_points} điểm.
+        loaded_successfully:
+          one: '%{trace_points} điểm được tải thành công trên tổng số 1 điểm.'
+          other: '%{trace_points} điểm được tải thành công trên tổng số %{possible_points}
+            điểm.'
     signup_confirm:
       subject: '[OpenStreetMap] Chào mừng bạn đã tham gia OpenStreetMap'
       greeting: Chào bạn!
@@ -1398,7 +1400,7 @@ vi:
     about:
       next: Tiếp
       copyright_html: <span>&copy;</span>những người<br>đóng góp vào<br>OpenStreetMap
-      used_by_html: '%{name} là nguồn dữ liệu bản đồ của hàng ngàn trang Web, ứng
+      used_by_html: '%{name} cung cấp dữ liệu bản đồ cho hàng ngàn trang Web, ứng
         dụng di động, và thiết bị phần cứng'
       lede_text: OpenStreetMap được xây dựng bởi cộng đồng những người đóng góp và
         bảo quản dữ liệu về đường sá, tòa nhà, quán cà phê, nhà ga, và đủ mọi thứ
@@ -1457,8 +1459,7 @@ vi:
           các dữ liệu của chúng tôi, bạn chỉ được phép phân phối kết quả theo cùng
           giấy phép. <a href="https://opendatacommons.org/licenses/odbl/1.0/">Mã pháp
           lý</a> đầy đủ giải thích các quyền và trách nhiệm của bạn.
-        intro_3_1_html: "Các hình ảnh bản đồ và tài liệu của chúng tôi được phát hành
-          theo giấy phép <a href=\"https://creativecommons.org/licenses/by-sa/2.0/deed.vi\">Creative
+        intro_3_1_html: "Tài liệu của chúng tôi được phát hành theo giấy phép <a href=\"https://creativecommons.org/licenses/by-sa/2.0/deed.vi\">Creative
           \nCommons Ghi công–Chia sẻ tương tự 2.0</a> (CC BY-SA)."
         credit_title_html: Cách ghi công OpenStreetMap
         credit_1_html: Chúng tôi bắt bạn phải sử dụng lời ghi công “© những người
@@ -1474,6 +1475,11 @@ vi:
           gợi ý chỉ các độc giả đến openstreetmap.org (có lẽ bằng cách mở rộng “OpenStreetMap”
           trở thành địa chỉ đầy đủ này), đến opendatacommons.org, và nếu hợp lý, đến
           creativecommons.org.
+        credit_3_1_html: "Các hình ảnh bản đồ lớp “Chuẩn” tại www.openstreetmap.org
+          là một Tác phẩm được Sản xuất bởi Quỹ OpenStreetMap dùng dữ liệu OpenStreetMap
+          theo Giấy phép Cơ sở dữ liệu Mở. Nếu bạn đang sử dụng các hình ảnh này,
+          xin vui lòng ghi công như sau: \n“Bản đồ gốc và dữ liệu từ OpenStreetMap
+          và Quỹ OpenStreetMap”."
         credit_4_html: |-
           Đối với một bản đồ điện tử tương tác, lời ghi công nên xuất hiện ở góc bản đồ.
           Ví dụ:
@@ -2533,7 +2539,7 @@ vi:
       next: Sau »
       previous: « Trước
   notes:
-    mine:
+    index:
       title: Các ghi chú do %{user} lưu hoặc bình luận
       heading: Ghi chú của %{user}
       subheading_html: Các ghi chú do %{user} lưu hoặc bình luận
@@ -2576,6 +2582,12 @@ vi:
         out: Thu nhỏ
       locate:
         title: Bay tới Vị trí của Tôi
+        metersPopup:
+          one: Bạn đang cách địa điểm này trong vòng 1 mét
+          other: Bạn đang cách địa điểm này trong vòng %{count} mét
+        feetPopup:
+          one: Bạn đang cách địa điểm này trong vòng 1 foot
+          other: Bạn đang cách địa điểm này trong vòng %{count} foot
       base:
         standard: Chuẩn
         cycle_map: Bản đồ Xe đạp
@@ -2591,6 +2603,11 @@ vi:
       copyright: © <a href='%{copyright_url}'>những người đóng góp vào OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Quyên góp</a>
       terms: <a href='%{terms_url}' target='_blank'>Điều khoản trang Web và API</a>
+      thunderforest: Các hình ảnh bản đồ do <a href='%{thunderforest_url}' target='_blank'>Andy
+        Allan</a> cung cấp
+      hotosm: Kiểu hình ảnh bản đồ do <a href='%{hotosm_url}' target='_blank'>Tổ chức
+        Nhân đạo OpenStreetMap</a> do <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+        Pháp</a> phục vụ
     site:
       edit_tooltip: Sửa đổi bản đồ
       edit_disabled_tooltip: Phóng to để sửa đổi bản đồ
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index a99a553b4..e39f52a03 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1402,7 +1402,7 @@ zh-CN:
     about:
       next: 下一页
       copyright_html: <span>&copy;</span>OpenStreetMap<br> 贡献者
-      used_by_html: '%{name} 驱动了数以千计的网站，移动应用，以及硬件设备的地图数据。'
+      used_by_html: '%{name} 为数以千计的网站、移动应用以及硬件设备提供地图数据'
       lede_text: OpenStreetMap 是一个由地图制作爱好者组成的社区。这些爱好者提供并维护世界各地关于道路、小道、咖啡馆、铁路车站等各种各样的数据。
       local_knowledge_title: 本地知识库
       local_knowledge_html: OpenStreetMap 强调使用本地知识。贡献者们使用航空图像、GPS 设备与传统的地区地图来确保 OSM
@@ -1442,8 +1442,8 @@ zh-CN:
           href="https://opendatacommons.org/licenses/odbl/">开放数据共享开放数据库许可协议</a>（ODbL）授权。
         intro_2_html: 只要您表明来源为 OpenStreetMap 及其贡献者，您就可以自由地复制、分发、传送和改编我们的数据。如果您想转换或者以我们的数据为基础进行创作，您只能采用相同的许可协议发表您的作品。完整的<a
           href="https://opendatacommons.org/licenses/odbl/1.0/">法律文本</a>阐明了您的权利和义务。
-        intro_3_1_html: 我们的地图图块中的绘图数据以及我们的文档采用<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh">知识共享“署名-相同方式共享
-          2.0”</a>许可协议授权。
+        intro_3_1_html: 我们的文档采用<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh">知识共享
+          署名-相同方式共享 2.0 （CC BY-SA 2.0）</a>许可协议授权。
         credit_title_html: 如何表明作者是 OpenStreetMap
         credit_1_html: 我们需要您署名&ldquo;&copy; OpenStreetMap 贡献者&rdquo;。
         credit_2_1_html: 您必须明确注明，我们的数据使用开放式数据库协议，若使用我们的地图图块，其协议须为 CC-BY-SA。您可以链接<a
@@ -2374,7 +2374,7 @@ zh-CN:
       next: 下一页 »
       previous: « 上一页
   notes:
-    mine:
+    index:
       title: '%{user} 提交或评论的笔记'
       heading: '%{user} 的笔记'
       subheading_html: '%{user} 提交或评论的笔记'
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index b33d899b2..e9aa36ff6 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1398,7 +1398,7 @@ zh-TW:
     about:
       next: 下一頁
       copyright_html: <span>&copy;</span>OpenStreetMap<br>貢獻者
-      used_by_html: '%{name} 為數以千計的網站、app 與硬體裝置提供地圖資料'
+      used_by_html: '%{name} 為數以千計的網站、行動應用程式和硬件提供地圖資料'
       lede_text: OpenStreetMap 是由製圖者社群所建立，他們提供及不斷更新包括有關世界各地的道路、路徑、咖啡館、火車站等等的資料。
       local_knowledge_title: 地方知識
       local_knowledge_html: |-
@@ -1441,8 +1441,8 @@ zh-TW:
         intro_2_html: |-
           您可以自由地複製、散布、傳輸及修改我們的資料，前提是您須標明作者為 OpenStreetMap 及其貢獻者。若您在我們的資料上作修改或據之衍生其他資料
           ，則只可依相同授權條款散佈有關成果。授權的<a href="https://opendatacommons.org/licenses/odbl/1.0/">法律原文</a>詳述您的權責。
-        intro_3_1_html: 我們地圖影像塊的製圖法以及我們的文件，以<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh_TW">創用CC
-          姓名標示-相同方式分享 (CC BY-SA) 2.0版</a>條款授權。
+        intro_3_1_html: 我們的文件以<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh_TW">創用
+          CC 姓名標示-相同方式分享（CC BY-SA 2.0版）</a>條款授權。
         credit_title_html: 如何標明作者是 OpenStreetMap
         credit_1_html: 我們要求您以&ldquo;&copy; OpenStreetMap 貢獻者&rdquo;標明作者。
         credit_2_1_html: 您亦須清晰註明，有關資料可透過開放資料庫授權條款取得。若使用我們的影像塊，則須註明其製圖法是按 CC-BY-SA
@@ -2398,7 +2398,7 @@ zh-TW:
       next: 下一頁 »
       previous: « 上一頁
   notes:
-    mine:
+    index:
       title: 由 %{user} 送出或評論的註記
       heading: '%{user} 的註記'
       subheading_html: '%{user} 送出或評論的註記'
@@ -2452,6 +2452,7 @@ zh-TW:
         cycle_map: 自行車地圖
         transport_map: 交通運輸地圖
         hot: 人道救援
+        opnvkarte: ÖPNVKarte
       layers:
         header: 地圖圖層
         notes: 地圖註記
@@ -2464,6 +2465,7 @@ zh-TW:
       terms: <a href='%{terms_url}' target='_blank'>網站與 API 項目</a>
       thunderforest: 由 <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>
         提供的影像塊
+      opnvkarte: 由 <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a> 提供的影像塊
       hotosm: 由 <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap 法國</a>主持的<a
         href='%{hotosm_url}' target='_blank'>人道 OpenStreetMap 團隊</a>提供的影像塊樣式
     site:
diff --git a/config/routes.rb b/config/routes.rb
index a98a11430..41dc7cfc5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -117,7 +117,7 @@ OpenStreetMap::Application.routes.draw do
   get "/note/new" => "browse#new_note"
   get "/user/:display_name/history" => "changesets#index"
   get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom }
-  get "/user/:display_name/notes" => "notes#mine", :as => :my_notes
+  get "/user/:display_name/notes" => "notes#index", :as => :user_notes
   get "/history/friends" => "changesets#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html }
   get "/history/nearby" => "changesets#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html }
 
diff --git a/test/abilities/abilities_test.rb b/test/abilities/abilities_test.rb
index 99154b4b7..c27f75833 100644
--- a/test/abilities/abilities_test.rb
+++ b/test/abilities/abilities_test.rb
@@ -29,7 +29,7 @@ class GuestAbilityTest < AbilityTest
   test "note permissions for a guest" do
     ability = Ability.new nil
 
-    [:mine].each do |action|
+    [:index].each do |action|
       assert ability.can?(action, Note), "should be able to #{action} Notes"
     end
   end
diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 6eda7d3a3..1450aced8 100644
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -13,11 +13,11 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
   def test_routes
     assert_routing(
       { :path => "/user/username/notes", :method => :get },
-      { :controller => "notes", :action => "mine", :display_name => "username" }
+      { :controller => "notes", :action => "index", :display_name => "username" }
     )
   end
 
-  def test_mine_success
+  def test_index_success
     first_user = create(:user)
     second_user = create(:user)
     moderator_user = create(:moderator_user)
@@ -33,43 +33,43 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
     end
 
     # Note that the table rows include a header row
-    get my_notes_path(:display_name => first_user.display_name)
+    get user_notes_path(:display_name => first_user.display_name)
     assert_response :success
     assert_select "table.note_list tr", :count => 2
 
-    get my_notes_path(:display_name => second_user.display_name)
+    get user_notes_path(:display_name => second_user.display_name)
     assert_response :success
     assert_select "table.note_list tr", :count => 2
 
-    get my_notes_path(:display_name => "non-existent")
+    get user_notes_path(:display_name => "non-existent")
     assert_response :not_found
 
     session_for(moderator_user)
 
-    get my_notes_path(:display_name => first_user.display_name)
+    get user_notes_path(:display_name => first_user.display_name)
     assert_response :success
     assert_select "table.note_list tr", :count => 2
 
-    get my_notes_path(:display_name => second_user.display_name)
+    get user_notes_path(:display_name => second_user.display_name)
     assert_response :success
     assert_select "table.note_list tr", :count => 3
 
-    get my_notes_path(:display_name => "non-existent")
+    get user_notes_path(:display_name => "non-existent")
     assert_response :not_found
   end
 
-  def test_mine_paged
+  def test_index_paged
     user = create(:user)
 
     create_list(:note, 50) do |note|
       create(:note_comment, :note => note, :author => user)
     end
 
-    get my_notes_path(:display_name => user.display_name)
+    get user_notes_path(:display_name => user.display_name)
     assert_response :success
     assert_select "table.note_list tr", :count => 11
 
-    get my_notes_path(:display_name => user.display_name, :page => 2)
+    get user_notes_path(:display_name => user.display_name, :page => 2)
     assert_response :success
     assert_select "table.note_list tr", :count => 11
   end
diff --git a/test/system/diary_entry_test.rb b/test/system/diary_entry_test.rb
index 38e2a1847..d60812e4c 100644
--- a/test/system/diary_entry_test.rb
+++ b/test/system/diary_entry_test.rb
@@ -10,7 +10,7 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit diary_entries_path
 
-    click_on "Reply to this entry"
+    click_on "Send a message to the author"
 
     assert page.has_content? "Send a new message"
     assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value
diff --git a/vendor/assets/leaflet/leaflet.osm.js b/vendor/assets/leaflet/leaflet.osm.js
index 0bde8f8a1..ad712e3a2 100644
--- a/vendor/assets/leaflet/leaflet.osm.js
+++ b/vendor/assets/leaflet/leaflet.osm.js
@@ -35,6 +35,14 @@ L.OSM.TransportMap = L.OSM.TileLayer.extend({
   }
 });
 
+L.OSM.OPNVKarte = L.OSM.TileLayer.extend({
+  options: {
+    url: 'https://tileserver.memomaps.de/tilegen/{z}/{x}/{y}.png',
+    maxZoom: 18,
+    attribution: '© <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors. Tiles courtesy of <a href="http://memomaps.de/" target="_blank">MeMoMaps</a>'
+  }
+});
+
 L.OSM.HOT = L.OSM.TileLayer.extend({
   options: {
     url: 'https://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png',