From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 2 Aug 2023 15:57:26 +0000 (+0100)
Subject: Merge pull request #4106 from tomhughes/diary-paging
X-Git-Tag: live~678
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/aceef47cd8f39928d27df43e2fdfee339ddafdc9?hp=f29ba01eb90b1db5937aeaee3b625e8840715396

Merge pull request #4106 from tomhughes/diary-paging

Replace page numbers with ID based selection for diary indexes
---

diff --git a/Gemfile.lock b/Gemfile.lock
index d166be274..2cb6bf177 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,8 +86,8 @@ GEM
     autoprefixer-rails (10.4.13.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.792.0)
-    aws-sdk-core (3.179.0)
+    aws-partitions (1.795.0)
+    aws-sdk-core (3.180.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -300,11 +300,11 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
-    minitest (5.18.1)
+    minitest (5.19.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    net-imap (0.3.6)
+    net-imap (0.3.7)
       date
       net-protocol
     net-pop (0.1.2)
@@ -374,9 +374,9 @@ GEM
     puma (5.6.6)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
-    r2 (0.2.7)
+    r2 (0.2.8)
     racc (1.7.1)
-    rack (2.2.7)
+    rack (2.2.8)
     rack-cors (2.0.1)
       rack (>= 2.0.0)
     rack-openid (1.4.2)
@@ -430,11 +430,11 @@ GEM
     regexp_parser (2.8.1)
     request_store (1.5.1)
       rack (>= 1.4)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rinku (2.0.6)
     rotp (6.2.2)
-    rouge (4.1.2)
-    rubocop (1.54.2)
+    rouge (4.1.3)
+    rubocop (1.55.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -442,7 +442,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
@@ -480,7 +480,7 @@ GEM
       sprockets-rails
       tilt
     secure_headers (6.5.0)
-    selenium-webdriver (4.10.0)
+    selenium-webdriver (4.11.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -526,12 +526,12 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket (1.2.9)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.9)
+    zeitwerk (2.6.10)
 
 PLATFORMS
   ruby
diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index 5d196fa98..cdf28bd4f 100644
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -56,7 +56,7 @@ class Ability
         can [:account, :go_public], User
 
         if user.moderator?
-          can [:hide, :hidecomment], DiaryEntry
+          can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:new, :create, :edit, :update, :destroy], Redaction
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 38c498169..783c4da8d 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -192,11 +192,11 @@ $(document).ready(function () {
   });
 
   if (Cookies.get("_osm_welcome") !== "hide") {
-    $(".welcome").addClass("visible");
+    $(".welcome").removeAttr("hidden");
   }
 
   $(".welcome .btn-close").on("click", function () {
-    $(".welcome").removeClass("visible");
+    $(".welcome").hide();
     Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
   });
 
diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index b9c48f15a..7b1c995c2 100644
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -66,7 +66,6 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("class", "share-tab")
-      .css("display", "block")
       .appendTo($form)
       .append($("<input>")
         .attr("id", "long_input")
@@ -75,6 +74,7 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("class", "share-tab")
+      .hide()
       .appendTo($form)
       .append($("<input>")
         .attr("id", "short_input")
@@ -83,6 +83,7 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("class", "share-tab")
+      .hide()
       .appendTo($form)
       .append(
         $("<textarea>")
@@ -315,7 +316,7 @@ L.OSM.share = function (options) {
       }
 
       $("#embed_html").val(
-        "<iframe width=\"425\" height=\"350\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\" src=\"" +
+        "<iframe width=\"425\" height=\"350\" src=\"" +
           escapeHTML(OSM.SERVER_PROTOCOL + "://" + OSM.SERVER_URL + "/export/embed.html?" + $.param(params)) +
           "\" style=\"border: 1px solid black\"></iframe><br/>" +
           "<small><a href=\"" + escapeHTML(map.getUrl(marker)) + "\">" +
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 06f98cc57..d74ece45a 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -80,11 +80,10 @@ small, aside {
 /* Rules for the header */
 
 #menu-icon {
-  display: none !important;
+  display: none;
   float: right;
   background: image-url("menu-icon.png") no-repeat;
   background-size: 30px 30px;
-  display: block;
   width: 30px;
   height: 30px;
   margin: 14px 10px 0 0;
@@ -244,7 +243,7 @@ body.compact-nav {
 
 body.small-nav {
   #menu-icon {
-    display: inline-block !important;
+    display: block;
   }
 
   nav.primary,
@@ -318,7 +317,7 @@ body.small-nav {
     display: inline-block;
   }
 
-  .overlay-sidebar #sidebar .welcome.visible {
+  .overlay-sidebar #sidebar .welcome {
     display: none;
   }
 
@@ -423,9 +422,6 @@ body.small-nav {
 
     > div {
       position: relative;
-      float: left;
-      clear: both;
-      width: 100%;
     }
   }
 
@@ -440,11 +436,7 @@ body.small-nav {
     }
 
     .welcome {
-      display: none;
-
-      &.visible {
-        display: block;
-      }
+      display: block;
     }
 
     #sidebar_content {
@@ -534,13 +526,6 @@ body.small-nav {
   }
 }
 
-.layers-ui,
-.share-ui {
-  li:last-child {
-    margin-bottom: 0;
-  }
-}
-
 .layers-ui {
   .base-layers {
     .leaflet-container {
@@ -592,10 +577,6 @@ body.small-nav {
 }
 
 .share-ui {
-  .share-tab {
-    display: none;
-  }
-
   .share-link {
     input[type=text],
     textarea {
@@ -612,10 +593,6 @@ body.small-nav {
     }
   }
 
-  #embed_html {
-    resize: vertical;
-  }
-
   #mapnik_scale {
     width: 100px;
   }
@@ -643,19 +620,6 @@ body.small-nav {
 
 #attribution {
   display: none;
-
-  table {
-    width: 100%
-  }
-}
-
-.attribution_license,
-.attribution_project {
-  text-align: left;
-}
-
-.attribution_notice {
-  text-align: center;
 }
 
 .donate-attr { color: darken($green, 10%) !important; }
@@ -777,15 +741,6 @@ tr.turn:hover {
 
 .routing_marker { width: 15px; cursor: move; }
 
-/* Rules for entity history */
-
-#sidebar_content {
-  .browse_details {
-    position: relative;
-    border-bottom: $keyline;
-  }
-}
-
 .browse_status {
   display: none;
 }
diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 4b5daf4d0..e0082a26a 100644
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -11,10 +11,8 @@ $vibrant-green: #76c551;
 $grey: #CCC;
 $lightgrey: #EEE;
 $darkgrey: #888;
-$hovercolor: 20%;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
-$keyline: 1px solid $lightgrey;
 $list-highlight: #FFFFC0;
 $border: 1px solid $grey;
 
diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss
index fa04314b1..71fdf3978 100644
--- a/app/assets/stylesheets/print.scss
+++ b/app/assets/stylesheets/print.scss
@@ -18,6 +18,8 @@ html {
   border: 1px solid black;
 }
 
+/* Rules for attribution text under the main map shown on printouts */
+
 #attribution {
   position: absolute !important;
   bottom: 0;
@@ -26,4 +28,17 @@ html {
   height: 40px;
   font-size: 12px;
   text-align: center;
+
+  table {
+    width: 100%
+  }
+}
+
+.attribution_license,
+.attribution_project {
+  text-align: left;
+}
+
+.attribution_notice {
+  text-align: center;
 }
diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index f464cacd0..ea9aacb21 100644
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -70,7 +70,9 @@ class DiaryEntriesController < ApplicationController
   end
 
   def show
-    @entry = @user.diary_entries.visible.where(:id => params[:id]).first
+    entries = @user.diary_entries
+    entries = entries.visible unless can? :unhide, DiaryEntry
+    @entry = entries.where(:id => params[:id]).first
     if @entry
       @title = t ".title", :user => params[:display_name], :title => @entry.title
       @comments = can?(:unhidecomment, DiaryEntry) ? @entry.comments : @entry.visible_comments
diff --git a/app/models/oauth2_application.rb b/app/models/oauth2_application.rb
index 165761520..73a02417d 100644
--- a/app/models/oauth2_application.rb
+++ b/app/models/oauth2_application.rb
@@ -3,6 +3,10 @@ class Oauth2Application < Doorkeeper::Application
 
   validate :allowed_scopes
 
+  def authorized_scopes_for(user)
+    authorized_tokens.where(:resource_owner_id => user).sum(Doorkeeper::OAuth::Scopes.new, &:scopes)
+  end
+
   private
 
   def allowed_scopes
diff --git a/app/views/application/_sidebar_header.html.erb b/app/views/application/_sidebar_header.html.erb
index 88a1fff4a..9e7877f8a 100644
--- a/app/views/application/_sidebar_header.html.erb
+++ b/app/views/application/_sidebar_header.html.erb
@@ -1,4 +1,4 @@
-<div class="d-flex w-100">
+<div class="d-flex">
   <h2 class="flex-grow-1 text-break"><%= title %></h2>
   <div>
     <button type="button" class="btn-close" aria-label="<%= t("javascripts.close") %>"></button>
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index b3c85d918..6d983d30e 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -41,7 +41,7 @@
     </div>
 
     <% unless current_user %>
-      <div class="welcome p-3">
+      <div class="welcome p-3" hidden>
         <%= render "sidebar_header", :title => t("layouts.intro_header") %>
         <div>
           <p><%= t "layouts.intro_text" %></p>
diff --git a/app/views/oauth2_authorized_applications/_application.html.erb b/app/views/oauth2_authorized_applications/_application.html.erb
index f27a6f82e..8abbb26ed 100644
--- a/app/views/oauth2_authorized_applications/_application.html.erb
+++ b/app/views/oauth2_authorized_applications/_application.html.erb
@@ -1,10 +1,10 @@
 <tr>
   <td class="align-middle">
-    <%= link_to application.name, oauth_application_path(application) %>
+    <%= application.name %>
   </td>
   <td class="align-middle">
     <ul class="list-unstyled mb-0">
-      <% application.scopes.each do |scope| -%>
+      <% application.authorized_scopes_for(current_user).each do |scope| -%>
         <li><%= t "oauth.scopes.#{scope}" %></li>
       <% end -%>
     </ul>
diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index 277fb1384..f6f6ba137 100644
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -11,7 +11,7 @@
         </div>
       </div>
       <div class='row'>
-        <div class="w-100 px-5 py-4 bg-dark">
+        <div class="px-5 py-4 bg-dark">
           <h1 class="text-white fw-light"><%= t ".used_by_html", :name => tag.span("OpenStreetMap", :class => "user-name") %></h1>
         </div>
       </div>
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 5dffec908..73eebb406 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -211,7 +211,6 @@ af:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1796,8 +1795,6 @@ af:
       trace_not_found: Spoor onverkrygbaar!
       visibility: 'Sigbaarheid:'
       confirm_delete: Hierdie spoor verwyder?
-    trace_paging_nav:
-      showing_page: Bladsy %{page}
     trace:
       pending: HANGEND
       count_points: '%{count} punte'
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 835a78c24..58755787c 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -1002,8 +1002,6 @@ aln:
       delete_trace: Fshij kët gjurm
       trace_not_found: Gjurma nuk u gjet!
       visibility: 'Dukshmënia:'
-    trace_paging_nav:
-      showing_page: Duke shfaqun faqen %{page}
     trace:
       pending: NË PRITJE
       count_points: '%{count} pikët'
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 587035a1e..508a21f7d 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2320,7 +2320,6 @@ ar:
       visibility: 'الرؤية:'
       confirm_delete: احذف هذا الأثر
     trace_paging_nav:
-      showing_page: الصفحة %{page}
       older: الآثار القديمة
       newer: الآثار الحديثة
     trace:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 78cebc272..bb821a040 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -194,7 +194,6 @@ ast:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1830,7 +1829,6 @@ ast:
       visibility: 'Visibilidá:'
       confirm_delete: ¿Desaniciar esta traza?
     trace_paging_nav:
-      showing_page: Páxina %{page}
       older: Traces más antigües
       newer: Traces más nueves
     trace:
diff --git a/config/locales/az.yml b/config/locales/az.yml
index caeffb950..f339a41e1 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -142,7 +142,6 @@ az:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Vikipediya
   api:
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 8201827a5..db44ea36d 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -214,7 +214,6 @@ be-Tarask:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Вікіпэдыя
   api:
@@ -1267,8 +1266,6 @@ be-Tarask:
       delete_trace: Выдаліць гэты трэк
       trace_not_found: Трэк ня знойдзены!
       visibility: 'Бачнасьць:'
-    trace_paging_nav:
-      showing_page: Старонка %{page}
     trace:
       pending: ЧАКАЕ
       count_points:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index e15f001bf..5112e3988 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -254,7 +254,6 @@ be:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Вікіпедыя
   api:
@@ -1840,7 +1839,6 @@ be:
       visibility: 'Бачнасць:'
       confirm_delete: Выдаліць гэты след?
     trace_paging_nav:
-      showing_page: Старонка %{page}
       older: Даўнейшыя сляды
       newer: Свежыя сляды
     trace:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 399385932..1e305763e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -105,11 +105,15 @@ bg:
       diary_entry:
         user: Потребител
         title: Тема
+        body: Текст
         latitude: Географска ширина
         longitude: Географска дължина
         language_code: Език
       doorkeeper/application:
         name: Име
+        redirect_uri: Пренасочващи URI
+        confidential: Поверително приложение.
+        scopes: Разрешения
       friend:
         user: Потребител
         friend: Приятел
@@ -137,7 +141,9 @@ bg:
         category: Посочете причина за доклада
         details: Моля, опишете проблема в подробности (задължително).
       user:
+        auth_provider: Доставчик на автентикация
         email: Електронна поща
+        email_confirmation: Потвърждение по имейл
         new_email: Нова електронна поща
         active: Активен
         display_name: Видимо потребителско име
@@ -206,7 +212,7 @@ bg:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
+      windowslive: Майкрософт
       github: GitHub
       wikipedia: Уикипедия
   api:
@@ -473,7 +479,6 @@ bg:
       comment_link: Коментар към публикацията
       reply_link: Изпрати послание на автора
       comment_count:
-        zero: Няма коментари
         one: 1 коментар
         other: '%{count} коментара'
       edit_link: Променяне на публикацията
@@ -1436,8 +1441,8 @@ bg:
           title: Влизане с Facebook
           alt: Влизане със сметка на Facebook
         windowslive:
-          title: Влизане с Windows Live
-          alt: Влизане със сметка на Windows Live
+          title: Влизане с Майкрософт
+          alt: Влизане със сметка на Майкрософт
         github:
           title: Влизане с GitHub
           alt: Влизане със сметка в GitHub
@@ -1710,7 +1715,6 @@ bg:
       visibility: 'Видимост:'
       confirm_delete: Изтрий това трасе?
     trace_paging_nav:
-      showing_page: Страница %{page}
       older: По-стари следи
       newer: По-нови следи
     trace:
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 4f883da40..513a25091 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1815,8 +1815,6 @@ bn:
       delete_trace: এই অনুসরণটি মুছে ফেলুন
       trace_not_found: অনুসরণ পাওযা যায়নি।
       visibility: 'দৃষ্টিযোগ্যতা:'
-    trace_paging_nav:
-      showing_page: '%{page} পাতা'
     trace:
       pending: অমিমাংসিত
       count_points:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 18aa45a8c..7ef4346e3 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -256,7 +256,6 @@ br:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2326,7 +2325,6 @@ br:
       visibility: 'Gwelusted :'
       confirm_delete: Diverkañ ar roudenn-mañ
     trace_paging_nav:
-      showing_page: Pajenn %{page}
       older: ↓Roudoù kozh
       newer: ↓Roudoù nevez
     trace:
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 613f458ec..9390f7111 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1295,7 +1295,6 @@ bs:
       trace_not_found: Trasa nije pronađena!
       visibility: 'Vidljivost:'
     trace_paging_nav:
-      showing_page: Stranica %{page}
       older: Starije trase
       newer: Novije trase
     trace:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 65a9c3149..84a445cbe 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -257,7 +257,6 @@ ca:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Viquipèdia
   api:
@@ -2416,7 +2415,6 @@ ca:
       visibility: 'Visibilitat:'
       confirm_delete: Esborrar aquesta traça?
     trace_paging_nav:
-      showing_page: Pàgina %{page}
       older: Traces més antigues
       newer: Traces més recents
     trace:
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 4399db093..baa0c47f2 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -685,7 +685,7 @@ ce:
         other: '%{count} хаам'
       resolve: Кечйан
       ignore: Тергал ца дан
-      reopen: Йуха схьаелла
+      reopen: Йуха схьайелла
   reports:
     new:
       title_html: Хаам %{link}
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 168def4ff..57d641396 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -286,7 +286,6 @@ cs:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedie
   api:
@@ -2529,7 +2528,6 @@ cs:
       visibility: 'Viditelnost:'
       confirm_delete: Smazat tuto stopu?
     trace_paging_nav:
-      showing_page: Stránka %{page}
       older: Starší stopy
       newer: Novější stopy
     trace:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 1b8726862..be2390668 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -23,7 +23,7 @@ cy:
       issue_comment:
         create: Ychwanegu sylw
       message:
-        create: Danfon
+        create: Anfon
       client_application:
         create: Cofrestru
         update: Diweddaru
@@ -35,22 +35,23 @@ cy:
         update: Cadw golygiadau
       trace:
         create: Uwchlwytho
-        update: Cadw Newidiadau
+        update: Cadw newidiadau
       user_block:
         create: Creu bloc
-        update: Uwchraddio'r bloc
+        update: Diweddaru bloc
   activerecord:
     errors:
       messages:
         invalid_email_address: nid yw'n ymddangos ei fod yn gyfeiriad ebost dilys
     models:
       acl: Rhestr Rheoli Mynediad
-      changeset: Changeset
-      changeset_tag: Tag Changeset
+      changeset: Grŵp newidiadau
+      changeset_tag: Tag Grŵp newidiadau
       country: Gwlad
       diary_comment: Nodyn Dyddiadur
       diary_entry: Cofnod Dyddiadur
       friend: Ffrind
+      issue: Mater
       language: Iaith
       message: Neges
       node: Nod
@@ -66,6 +67,7 @@ cy:
       relation: Perthynas
       relation_member: Aelod Perthynol
       relation_tag: Tag Perthynas
+      report: Adrodd
       session: Sesiwn
       trace: Dargopïo
       tracepoint: Pwynt Dargopïo
@@ -79,33 +81,37 @@ cy:
     attributes:
       client_application:
         name: Enw (Angenrheidiol)
+        allow_write_api: olygu'r map
+        allow_write_notes: addasu nodiadau
       diary_comment:
         body: Corff
       diary_entry:
         user: Defnyddiwr
         title: Pwnc
+        body: Corff
         latitude: Lledred
         longitude: Hydred
         language_code: Iaith
       doorkeeper/application:
         name: Enw
+        scopes: Caniatâd
       friend:
         user: Defnyddiwr
         friend: Ffrind
       trace:
         user: Defnyddiwr
         visible: Gweladwy
-        name: Enw'r ffeil
+        name: Enw ffeil
         size: Maint
         latitude: Lledred
         longitude: Hydred
         public: Cyhoeddus
         description: Disgrifiad
-        gpx_file: 'Uwchlwytho Ffeil GPX:'
-        visibility: 'Gwelededd:'
+        gpx_file: Uwchlwytho Ffeil GPX
+        visibility: Gwelededd
         tagstring: Tagiau
       message:
-        sender: Danfonwr
+        sender: Anfonwr
         title: Pwnc
         body: Corff
         recipient: Derbyniwr
@@ -113,26 +119,34 @@ cy:
         title: Teitl
         description: Disgrifiad
       user:
-        email: Ebost
-        new_email: 'Cyfeiriad Ebost Newydd:'
+        email: E-bost
+        new_email: Cyfeiriad e-bost newydd
         active: Gweithredol
-        display_name: Enw Arddangos
-        description: Disgrifiad
-        home_lat: 'Lledred:'
-        home_lon: 'Hydred:'
+        display_name: Enw defnyddiwr
+        description: Disgrifiad proffil
+        home_lat: Lledred
+        home_lon: Hydred
         languages: Ieithoedd
         pass_crypt: Cyfrinair
-        pass_crypt_confirmation: Cadarnhau Cyfrinair
+        pass_crypt_confirmation: Cadarnhau cyfrinair
     help:
       user:
         new_email: (byth ei ddangos yn gyhoeddus)
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: tuag awr yn ôl
+        zero: '%{count} awr yn ôl'
+        one: tua %{count} awr yn ôl
+        two: tua %{count} awr yn ôl
+        few: tua %{count} awr yn ôl
+        many: tua %{count} awr yn ôl
         other: tua %{count} awr yn ôl
       about_x_months:
-        one: tuag un fis yn ôl
+        zero: tua %{count} mis yn ôl
+        one: tua %{count} mis yn ôl
+        two: tua %{count} fis yn ôl
+        few: tua %{count} mis yn ôl
+        many: tua %{count} mis yn ôl
         other: tua %{count} mis yn ôl
       about_x_years:
         one: tuag un blynedd yn ôl
@@ -158,7 +172,6 @@ cy:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wicipedia
   api:
@@ -167,7 +180,7 @@ cy:
         opened_at_html: Crëwyd %{when}
         opened_at_by_html: Crëwyd %{when} gan %{user}
         commented_at_html: Diweddarwyd %{when}
-        commented_at_by_html: Diweddarwyd %{when}gan %{user}
+        commented_at_by_html: Diweddarwyd %{when} gan %{user}
       rss:
         title: Nodiadau OpenStreetMap
       entry:
@@ -176,15 +189,17 @@ cy:
   account:
     deletions:
       show:
-        title: Dileu Fy Nghyfrif
-        delete_account: Dileu Cyfrif
+        title: Dileu fy nghyfrif
+        delete_account: Dileu cyfrif
+        retain_changeset_discussions: Bydd eich trafodaethau grŵp newidiadau, os ydynt
+          yn bodoli, yn cael eu cadw.
         confirm_delete: Ydych chi'n siŵr?
         cancel: Canslo
   accounts:
     edit:
-      title: Golygu'r cyfrif
+      title: Golygu cyfrif
       my settings: Fy ngosodiadau
-      current email address: 'Cyfeiriad Ebost Presenol:'
+      current email address: Cyfeiriad e-bost cyfredol
       openid:
         link text: beth yw hwn?
       public editing:
@@ -193,49 +208,56 @@ cy:
         enabled link text: beth yw hwn?
         disabled link text: pam na allaf olygu?
       contributor terms:
-        heading: 'Telerau Cyfranwyr:'
-        agreed: Rydych wedi derbyn y telerau cyfranwyr newydd.
-        not yet agreed: Nid ydych eto wedi cytuno i'r telerau cyfranwyr newydd.
-        review link text: Dilynwch y ddolen hon i adolygu a derbyn y telerau cyfranwyr
+        heading: Telerau Cyfranwyr
+        agreed: Rydych chi wedi cytuno â'r Telerau Cyfranwyr newydd.
+        not yet agreed: Nid ydych wedi cytuno â'r Telerau Cyfranwyr newydd eto.
+        review link text: Dilynwch y ddolen hon i adolygu a derbyn y Telerau Cyfranwyr
           newydd.
         link text: beth yw hwn?
-      save changes button: Cadw Newidiadau
-      delete_account: Dileu Cyfrif...
+      save changes button: Cadw newidiadau
+      delete_account: Dileu cyfrif...
     go_public:
-      heading: 'Golygu cyhoeddus:'
+      heading: Golygu cyhoeddus
+      only_public_can_edit: Ers y newid yn fersiwn 0.6 yr API, dim ond defnyddwyr
+        cyhoeddus all olygu data map.
+      find_out_why: dyma pam
       make_edits_public_button: Gwneud fy holl olygiadau yn gyhoeddus
+    destroy:
+      success: Cyfrif wedi'i ddileu.
   browse:
     created: Crëwyd
     closed: Wedi cau
     version: Fersiwn
-    in_changeset: Set-newid
+    in_changeset: Grŵp newidiadau
     anonymous: dienw
     no_comment: (dim sylw)
     part_of: Rhan o
     download_xml: Lawrlwytho XML
-    view_history: Gweld yr Hanes
-    view_details: Gweld Manylion
+    view_history: Gweld hanes
+    view_details: Gweld manylion
     location: Lleoliadː
     changeset:
-      title: '%{id}'
+      title: 'Grŵp newidiadau: %{id}'
       belongs_to: Awdur
-      node: Cygnau (%{count})
-      node_paginated: Cygnau (%{x}-%{y} o %{count})
+      node: Nodau (%{count})
+      node_paginated: Nodau (%{x}-%{y} o %{count})
       way: Llwybrau %{count}
       way_paginated: Llwybrau (%{x}-%{y} o %{count})
       relation: Perthynas %{count}
       relation_paginated: Perthynas (%{x}-%{y} o %{count})
       comment: Sylwadau (%{count})
-      changesetxml: Set-newid XML
-      osmchangexml: osmChange XML
+      changesetxml: XML grŵp newidiadau
+      osmchangexml: XML osmChange
       feed:
-        title: Set-newid %{id}
-        title_comment: Set-newid %{id} - %{comment}
-      join_discussion: Mewngofnodwch i ymuno yn y sgwrs
+        title: Grŵp newidiadau %{id}
+        title_comment: Grŵp newidiadau %{id} - %{comment}
+      join_discussion: Mewngofnodwch i ymuno â'r sgwrs
       discussion: Sgwrs
+      still_open: Mae'r grŵp newidiadau dal ar agor - bydd trafodaeth yn cychwyn unwaith
+        y bydd y grŵp newidiadau wedi cau.
     node:
       title_html: 'Nod: %{name}'
-      history_title_html: 'Hanes y Nod: %{name}'
+      history_title_html: 'Hanes y nod: %{name}'
     way:
       title_html: 'Llwybr: %{name}'
       history_title_html: 'Hanes Llwybr: %{name}'
@@ -262,7 +284,7 @@ cy:
         node: nod
         way: llwybr
         relation: perthynas
-        changeset: set-newid
+        changeset: grŵp newidiadau
         note: nod
     timeout:
       sorry: Cymerodd yn rhy hir i adalw data math %{type} (gydag ID %{id})!
@@ -270,7 +292,7 @@ cy:
         node: nod
         way: llwybr
         relation: perthynas
-        changeset: set-newid
+        changeset: grŵp newidiadau
         note: nodyn
     redacted:
       redaction: Golygiad %{id}
@@ -283,7 +305,7 @@ cy:
     start_rjs:
       feature_warning: Wrthi'n llwytho nodweddio %{num_features}, a all arafu eich
         porwr. Wyt ti'n sicr dy fod am weld y data?
-      load_data: Llwytho Data
+      load_data: Llwytho data
       loading: Wrthi'n llwytho...
     tag_details:
       tags: Tagiau
@@ -307,35 +329,39 @@ cy:
     changeset:
       anonymous: Dienw
       no_edits: (dim golygiadau)
-      view_changeset_details: Dangos y newidiadau
+      view_changeset_details: Gweld manylion y grŵp newidiadau
     changesets:
       id: ID
-      saved_at: Cyhoeddwyd
+      saved_at: Cadwyd am
       user: Defnyddiwr
       comment: Sylw
-      area: Maes
+      area: Ardal
     index:
-      title: Setiau-newid
-      title_user: Set-newid gan %{user}
-      title_friend: Setiau-newid eich cyfeillion
-      title_nearby: Setiau-newid defnyddwyr cyfagos
+      title: Grwpiau newidiadau
+      title_user: Grwpiau newidiadau gan %{user}
+      title_user_link_html: Grwpiau newidiadau gan %{user_link}
+      title_friend: Grwpiau newidiadau gan fy ffrindiau
+      title_nearby: Grwpiau newidiadau gan ddefnyddwyr cyfagos
       empty: Ni chanfuwyd setiau-newid.
-      empty_area: Dim setiau-newid yn yr ardal yma.
+      empty_area: Dim grwpiau newidiadau yn yr ardal yma.
       empty_user: Dim setiau-newid gan y defnyddiwr hwn.
-      no_more: Dim rhagor o setiau-newid.
+      no_more: Ni chanfuwyd unrhyw grwpiau newidiadau ychwanegol.
       no_more_area: Dim rhagor o setiau-newid yn yr ardal yma.
-      no_more_user: Dim newidiadau gan y Defnyddiwr hwn.
+      no_more_user: Ni chanfuwyd unrhyw grwpiau newidiadau ychwanegol gan y defnyddiwr
+        hwn.
       load_more: Llwytho mwy
     timeout:
-      sorry: Ymddiheurwn, cymerodd y newidiadau a wnaethoch gais i'w gweld ry hir
-        i'w cyrchu.
+      sorry: Mae'n ddrwg gennym, cymerodd y rhestr o grwpiau newidiadau y gwnaethoch
+        gais amdanynt ormod o amser i'w hadalw.
   changeset_comments:
     comment:
-      comment: Sylw newydd ar set-newid %{changeset_id} gan awdur %{author}
+      comment: Sylw newydd ar grwp newidiadau %{changeset_id} gan %{author}
       commented_at_by_html: Diweddarwyd %{when} yn ôl gan %{user}
+    comments:
+      comment: Sylw newydd ar grwp newidiadau %{changeset_id} gan %{author}
     index:
       title_all: Trafodaeth OpenStreetMa o'r setiau-newid
-      title_particular: 'Trafodaeth OpenStreetMap set-newid #%{changeset_id}'
+      title_particular: Trafodaeth grwp newidiadau OpenStreetMap %{changeset_id}
   dashboards:
     contact:
       km away: '%{count}km i ffwrdd'
@@ -343,23 +369,23 @@ cy:
     popup:
       your location: Eich lleoliad
       nearby mapper: Mapiwr gerllaw
-      friend: Cyfaill
+      friend: Ffrind
     show:
       edit_your_profile: Golygu eich proffil
       my friends: Fy ffrindiau
-      no friends: Nid ydych wedi ychwanegu cyfaill eto.
+      no friends: Nid ydych wedi ychwanegu unrhyw ffrindiau eto.
       nearby users: Defnyddwyr eraill gerllaw
       no nearby users: Nid oes defnyddwyr gerllaw sy'n datgelu eu bod yn mapio eto.
-      friends_changesets: setiau-newid eich cyfeillion
+      friends_changesets: Grwpiau newidiadau eich ffrindiau
       friends_diaries: cofnodion dyddiaduron cyfeillion
-      nearby_changesets: setiau-newid gerllaw
+      nearby_changesets: grwp newidiadau defnyddwyr gerllaw
       nearby_diaries: cofnodion dyddiaduron defnyddwyr gerllaw
   diary_entries:
     new:
       title: Cofnod Dyddiadur Newydd
     form:
-      location: 'Lleoliad:'
-      use_map_link: defnyddiwch y map
+      location: Lleoliad
+      use_map_link: Defnyddio Map
     index:
       title: Dyddiaduron defnyddwyr
       title_friends: Dyddiaduron ffrindiau
@@ -402,9 +428,10 @@ cy:
       comment_from_html: Sylwadau gan %{link_user} ar %{comment_created_at}
       hide_link: Cuddio'r sylw hwn
       confirm: Cadarnhau
+      report: Riportio'r sylw hwn
     location:
       location: 'Lleoliad:'
-      view: Dangos
+      view: Gweld
       edit: Golygu
     feed:
       user:
@@ -419,22 +446,22 @@ cy:
         description: Cofnodion dyddiadur diweddar gan ddefnyddwyr OpenStreetMap
     comments:
       post: Post
-      when: Pa bryd
+      when: Pryd
       comment: Sylw
       newer_comments: Sylwadau mwy diweddar
       older_comments: Hen Sylwadau
   friendships:
     make_friend:
-      heading: Ychwanegu %{user} fel cyfaill?
-      button: Ychwanegu fel cyfaill
-      success: Mae %{name} nawr yn gyfaill i chi!
-      failed: Ymddiheuriadau, methwyd ychwanegu %{name} fel cyfaill.
-      already_a_friend: Rydych eisoes yn gyfaill i %{name}
+      heading: Ychwanegu %{user} fel ffrind?
+      button: Ychwanegu fel ffrind
+      success: Mae %{name} nawr yn ffrind i chi!
+      failed: Ymddiheuriadau, methwyd ychwanegu %{name} fel ffrind.
+      already_a_friend: Rydych chi eisoes yn ffrindiau gyda %{name}.
     remove_friend:
-      heading: Peidio bod yn gyfaill i %{user}?
-      button: Peidio bod yn gyfaill
-      success: Tynnwyd %{name} o'ch cyfeillion.
-      not_a_friend: Nid yw %{name} yn un o'ch cyfeillion.
+      heading: Peidio bod yn ffrind i %{user}?
+      button: Dad-ffrindio
+      success: Tynnwyd %{name} o'ch ffrindiau.
+      not_a_friend: Nid yw %{name} yn un o'ch ffrindiau.
   geocoder:
     search_osm_nominatim:
       prefix:
@@ -506,7 +533,7 @@ cy:
           fuel: Gorsaf Betrol
           gambling: Gamblo
           grave_yard: Mynwent
-          grit_bin: Bin Gro Mân
+          grit_bin: Bin Graeanu
           hospital: Ysbyty
           hunting_stand: Llwyfan Hela
           ice_cream: Hufen Iâ
@@ -528,7 +555,7 @@ cy:
           pharmacy: Fferyllfa
           place_of_worship: Man addoli
           police: Heddlu
-          post_box: Blwch Llythyrau
+          post_box: Blwch Post
           post_office: Swyddfa Bost
           prison: Carchar
           pub: Tafarn
@@ -539,19 +566,19 @@ cy:
           shelter: Cysgod
           shower: Cawod
           social_centre: Canolfan Cymdeithasol
-          social_facility: Cyfleuster cymedithasol
+          social_facility: Cyfleuster Cymdeithasol
           studio: Stiwdio
           swimming_pool: Pwll Nofio
           taxi: Tacsi
           telephone: Ffôn Cyhoeddus
           theatre: Theatr
-          toilets: Tai bach
-          townhall: Neuadd Dref
+          toilets: Toiledau
+          townhall: Neuadd y Dref
           university: Prifysgol
           vending_machine: Peiriant Gwerthu
           veterinary: Milfeddygfa
           village_hall: Neuadd Bentref
-          waste_basket: Bin sbwriel
+          waste_basket: Bin Sbwriel
           waste_disposal: Gwaredu Sbwriel
           water_point: Cyflenwad Dŵr
         boundary:
@@ -590,14 +617,14 @@ cy:
           painter: Peintiwr
           photographer: Ffotograffydd
           plumber: Plymar
-          shoemaker: Crudd
+          shoemaker: Crydd
           tailor: Teiliwr
-          "yes": Siop Grefftau
+          "yes": Siop Grefft
         emergency:
           ambulance_station: Gorsaf Ambiwlans
           assembly_point: Man Ymgynull
           defibrillator: Diffibriliwr
-          landing_site: Man Glanio Mewn Argyfwng
+          landing_site: Man Glanio Argyfwng
           phone: Ffôn Argyfwng
           water_tank: Tanc Dŵr Argyfwng
         highway:
@@ -608,11 +635,11 @@ cy:
           construction: Priffordd yn cael ei Adeiladu
           corridor: Coridor
           cycleway: Llwybr Beicio
-          elevator: Codwr
+          elevator: Lifft
           emergency_access_point: Pwynt Mynediad Argyfwng
           footway: Llwybr Cerdded
           ford: Rhyd
-          give_way: Arwydd "Ildiwch!"
+          give_way: Arwydd Ildio
           living_street: Stryd Byw
           milestone: Carreg Filltir
           motorway: Traffordd
@@ -707,13 +734,13 @@ cy:
           "yes": Defnydd Tir
         leisure:
           beach_resort: Ardal Wyliau
-          bird_hide: Cuddle Adar
+          bird_hide: Cuddfan Adar
           common: Tir Comin
           dog_park: Parc Cwn
           firepit: Ardal Dân
           fishing: Man Pysgota
-          fitness_centre: Canolfan Gadw'n Heini
-          fitness_station: Lle Cadw'n Heini
+          fitness_centre: Canolfan Hamdden
+          fitness_station: Gorsaf Hamdden
           garden: Gardd
           golf_course: Cwrs Golff
           horse_riding: Llain Marchogaeth
@@ -792,7 +819,7 @@ cy:
           forest: Coedwig
           geyser: Geiser
           glacier: Rhewlif
-          grassland: Caeau
+          grassland: Glaswelltir
           heath: Rhos
           hill: Bryn
           island: Ynys
@@ -805,7 +832,7 @@ cy:
           reef: Riff
           ridge: Cefn
           rock: Craig
-          saddle: Cyfrwy
+          saddle: Adwy
           sand: Tywod
           scree: Sgri
           scrub: Llwyni
@@ -816,7 +843,7 @@ cy:
           valley: Dyffryn
           volcano: Llosgfynydd
           water: Dŵr
-          wetland: Gwlypdir
+          wetland: Gwlyptir
           wood: Coed
         office:
           accountant: Cyfrifydd
@@ -831,7 +858,7 @@ cy:
           insurance: Swyddfa Yswiriant
           it: Swyddfa TG
           lawyer: Cyfreithiwr
-          ngo: Swyddfa'r NGO
+          ngo: Swyddfa NGO
           telecommunication: Swyddfa Telegyfathrebu
           travel_agent: Asiantaeth Deithio
           "yes": Swyddfa
@@ -864,12 +891,12 @@ cy:
           "yes": Lle
         railway:
           abandoned: Hen Reilffordd
-          construction: Rheilffordd yn cael ei Osod
+          construction: Rheilffordd yn cael ei hadeiladu
           disused: Rheilffordd Segur
           funicular: Rheilffordd fynydd
           halt: Stop Trenau
           junction: Cyffordd Rheilffyrdd
-          level_crossing: Croesfan Wastad
+          level_crossing: Croesfan reilffordd
           light_rail: Rheilffordd Ysgafn
           miniature: Lein Fach
           monorail: Trên Un Gledren
@@ -937,16 +964,17 @@ cy:
           grocery: Siop y Groser
           hairdresser: Siop Drin Gwallt
           hardware: Siop Nwyddau Metel
-          hifi: Sain
+          hifi: Siop Hi-Fi
           houseware: Siop Offer TÅ·
+          ice_cream: Siop Hufen Iâ
           interior_decoration: Addurniadau'r Cartref
           jewelry: Siop Gemwaith
-          kiosk: Siop Fechan
-          kitchen: Siop Offer Cegin
+          kiosk: Siop Giosg
+          kitchen: Siop Gegin
           laundry: Golchdy
           lottery: Loteri
           mall: Canolfan Siopa
-          massage: Neges
+          massage: Tylino
           mobile_phone: Siop Ffonau Symudol
           motorcycle: Siop Beiciau Modur
           music: Siop Gerddoriaeth
@@ -957,7 +985,7 @@ cy:
           paint: Siop Baent
           pet: Siop Anifeiliaid Anwes
           photo: Siop Luniau
-          second_hand: Siol Ail-law
+          second_hand: Siop ail-law
           shoes: Siop Esgidiau
           sports: Siop Chwaraeon
           stationery: Siop Offer Swyddfa
@@ -996,8 +1024,8 @@ cy:
           viewpoint: Gwylfa
           zoo: Sw
         tunnel:
-          culvert: Twnel Ddŵr
-          "yes": Twnel
+          culvert: Cwlfer
+          "yes": Twnnel
         waterway:
           artificial: Dyfrffyrdd Artiffisial
           boatyard: Iard Gychod
@@ -1034,20 +1062,21 @@ cy:
       more_results: Mwy o ganlyniadau
   issues:
     index:
-      title: Pryderon
-      select_status: Statws a ddewisiwyd
-      select_type: Dewisiwch y Math
+      title: Materion
+      select_status: Dewis statws
+      select_type: Dewis math
       search: Chwilio
       user_not_found: Nid yw'r defnyddiwr yn bodoli
-      issues_not_found: Nid oes y fath broblemau
+      issues_not_found: Ni chanfuwyd unrhyw faterion o'r fath
       status: Statws
       reports: Adroddiadau
-      last_updated: Diweddariad Diwethaf
-      link_to_reports: Gweld yr Adroddiadau
+      last_updated: Diweddarwyd ddiwethaf
+      last_updated_time_ago_user_html: '%{time_ago} gan %{user}'
+      link_to_reports: Gweld adroddiadau
       reports_count:
         one: 1 Report
         other: '%{count} Adroddiadau'
-      reported_item: Eitem dan sylw
+      reported_item: Eitem ag adroddwyd
       states:
         open: Agor
         resolved: Datruswyd
@@ -1059,16 +1088,16 @@ cy:
   layouts:
     logo:
       alt_text: Logo OpenStreetMap
-    home: Ewch Adref
+    home: Ewch i Leoliad Cartref
     logout: Allgofnodi
     log_in: Mewngofnodi
     sign_up: Cofrestru
-    start_mapping: Dechrau Mapio
+    start_mapping: Dechrau mapio
     edit: Golygu
     history: Hanes
     export: Allforio
     data: Data
-    export_data: Allforio Data
+    export_data: Allforio data
     gps_traces: Dargopiadau GPS
     gps_traces_tooltip: Rheoli Amlinellau GPS
     user_diaries: Dyddiaduron Defnyddwyr
@@ -1080,7 +1109,7 @@ cy:
       sydd ar gael i'w ddefnyddio am ddim a dan drwydded rydd.
     intro_2_create_account: Creu cyfrif defnyddiwr
     partners_bytemark: Bytemark Hosting
-    partners_partners: Partneriaid
+    partners_partners: partneriaid
     tou: Telerau Gwasanaeth
     osm_offline: Mae cronfa ddata OpenStreetMap all-lein ar hyn o bryd er mwyn gwaith
       cynnal a chadw hanfodol.
@@ -1096,37 +1125,43 @@ cy:
     community_blogs_title: Blogiau gan aelodau cymuned OpenStreetMap
     make_a_donation:
       title: Cefnogwch OpenStreetMap gyda rhodd ariannol
-      text: Gwneud Cyfraniad
+      text: Rhoi arian
     learn_more: Dysgu Mwy
     more: Mwy
   user_mailer:
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'
-      hi: Pa hwyl %{to_user}?
+      hi: Helo %{to_user},
     friendship_notification:
-      hi: Henffych %{to_user}!
+      hi: Helo %{to_user},
     gpx_failure:
       failed_to_import: 'methwyd a mewnforio. Dyma''r gwall:'
       subject: Methwyd mewnforio GPX [OpenStreetMap]
     signup_confirm:
-      greeting: Pa hwyl!
+      greeting: Shwmae!
       created: Mae rhywun (chi gobeithio!) newydd greu cyfrif yn %{site_url}.
     email_confirm:
-      greeting: Pa hwyl,
+      greeting: Helo,
+      hopefully_you: Hoffai rhywun (chi, gobeithio) newid eu cyfeiriad e-bost ar %{server_url}
+        i %{new_address}.
+      click_the_link: Os mai chi yw hwn, cliciwch ar y ddolen isod i gadarnhau'r newid.
     lost_password:
       greeting: Helo,
     note_comment_notification:
-      anonymous: Defnyddiwr anhysbys
-      greeting: Pa hwyl?
+      anonymous: Defnyddiwr dienw
+      greeting: Helo,
     changeset_comment_notification:
       greeting: Helo,
+      commented:
+        partial_changeset_with_comment_html: gyda sylw '%{changeset_comment}'
   confirmations:
     confirm:
       button: Cadarnhau
     confirm_email:
+      heading: Cadarnhau newid cyfeiriad e-bost
       button: Cadarnhau
-      success: Cadarnhewch eich cyfeiriad ebost newydd!
-      failure: Mae cyfeiriad ebost eisoes wedi ei gadarnhau gyda'r tocyn hwn.
+      success: Wedi cadarnhau eich newid cyfeiriad e-bost!
+      failure: Mae cyfeiriad e-bost eisoes wedi'i gadarnhau gyda'r tocyn hwn.
   messages:
     inbox:
       title: Mewnflwch
@@ -1137,13 +1172,13 @@ cy:
       date: Dyddiad
       people_mapping_nearby: person yn mapio gerllaw
     message_summary:
-      unread_button: Nodi fel heb ei ddarllen
-      read_button: Nodi fel wedi'i ddarllen
+      unread_button: Marcio fel heb ei ddarllen
+      read_button: Marcio fel wedi'i ddarllen
       reply_button: Ateb
       destroy_button: Dileu
     new:
       title: Anfon neges
-      send_message_to_html: Anfon negese newydd at %{name}
+      send_message_to_html: Anfon neges newydd at %{name}
       back_to_inbox: Nôl i'r mewnflwch
     create:
       message_sent: Anfonwyd y neges
@@ -1152,7 +1187,7 @@ cy:
     no_such_message:
       title: Dim neges o'r fath
       heading: Dim neges o'r fath
-      body: Ymddiheuriad, nid oes neges gyda'r id yno.
+      body: Sori, nid oes neges gyda'r id yno.
     outbox:
       title: Allanflwch
       my_inbox: Fy Mewnflwch
@@ -1166,7 +1201,7 @@ cy:
     show:
       title: Darllen neges
       reply_button: Ateb
-      unread_button: Nodi nad yw wedi ei ddarllen
+      unread_button: Marcio fel heb ei ddarllen
       destroy_button: Dileu
       back: Yn ôl
     sent_message_summary:
@@ -1180,14 +1215,14 @@ cy:
     lost_password:
       title: Ailosod cyfrinair
       heading: Wedi anghofio'ch cyfrinair?
-      email address: 'Cyfeiriad Ebost:'
+      email address: 'Cyfeiriad e-bost:'
       new password button: Ailosod cyfrinair
       notice email cannot find: Methwyd dod o hyd i'r cyfeiriad ebost yno.
     reset_password:
       title: Ailosod cyfrinair
-      heading: Ailosod Cyfinair ar gyfer %{user}
-      reset: Ailosod Cyfrinair
-      flash changed: Mae'ch cyfrinair wedi'i newid.
+      heading: Ailosod cyfrinair ar gyfer %{user}
+      reset: Ailosod cyfrinair
+      flash changed: Mae eich cyfrinair wedi'i newid.
   preferences:
     show:
       title: Dewisiadau
@@ -1195,29 +1230,29 @@ cy:
       cancel: Canslo
   profiles:
     edit:
-      title: Golygu Proffil
-      save: Diweddaru Proffil
+      title: Golygu proffil
+      save: Diweddaru proffil
       cancel: Canslo
       image: Delwedd
       gravatar:
         gravatar: Defnyddio Gravatar
         what_is_gravatar: Beth yw Gravatar?
       new image: Ychwanegu delwedd
-      keep image: Cadw'r ddelwedd bresennol
-      delete image: Tynnu'r ddelwedd bresennol
-      replace image: Newid y ddelwedd bresennol
+      keep image: Cadw'r ddelwedd gyfredol
+      delete image: Tynnu'r ddelwedd gyfredol
+      replace image: Newid y ddelwedd gyfredol
       image size hint: (delweddau sgwâr o leiaf 100x100 yw'r gorau)
-      home location: 'Lleoliad Cartref:'
+      home location: Lleoliad Cartref
       no home location: Nid ydych wedi gosod eich lleoliad cartref.
   sessions:
     new:
       title: Mewngofnodi
       heading: Mewngofnodi
-      email or username: 'Cyfeiriad Ebost neu Enw Defnyddiwr:'
+      email or username: 'Cyfeiriad e-bost neu enw defnyddiwr:'
       password: 'Cyfrinair:'
       openid_html: '%{logo} OpenID:'
-      remember: Fy nghofio i
-      lost password link: Wedi anghofio'ch cyfrinair?
+      remember: Cofiwch fi
+      lost password link: Wedi anghofio eich cyfrinair?
       login_button: Mewngofnodi
       register now: Cofrestru nawr
       no account: Dim cyfrif gennych?
@@ -1251,12 +1286,12 @@ cy:
       partners_title: Partneriaid
     copyright:
       foreign:
-        title: Ynghylch y cyfieithiad hwn
-        html: Os oes gwrthgyferbyniad rhwng y cyfieithiad hwn a %{english_original_link},
-          bydd y dudalen Saesneg yn cael blaenoriaeth.
+        title: Ynglŷn â'r cyfieithiad hwn
+        html: Mewn achos o wrthdaro rhwng y dudalen hon a gyfieithwyd a %{english_original_link},
+          y dudalen Saesneg fydd yn cael blaenoriaeth
         english_link: y Saesneg gwreiddiol
       native:
-        title: Ynghylch y dudalen hon
+        title: Ynglŷn â'r dudalen hon
         native_link: Cymraeg
         mapping_link: dechrau mapio
       legal_babble:
@@ -1265,7 +1300,7 @@ cy:
         attribution_example:
           title: Enghraifft o gydnabyddiaeth
         more_title_html: Darganfod rhagor
-        contributors_title_html: Ein cyfrannwyr
+        contributors_title_html: Ein cyfranwyr
         contributors_at_cc_by: CC BY
         contributors_au_australia: Awstralia
         contributors_au_geoscape_australia: Geoscape Australia
@@ -1283,21 +1318,21 @@ cy:
         contributors_za_south_africa: De Affrica
         contributors_gb_united_kingdom: Deyrnas Unedig
         contributors_2_contributors_page: Tudalen gyfranwyr
-        infringement_title_html: Torrwyd yr hawlfraint
+        infringement_title_html: Torri hawlfraint
     index:
       permalink: Dolen barhaol
-      shortlink: Dolen Fyr
+      shortlink: Dolen fer
       createnote: Ychwanegu nodyn
       license:
         copyright: Hawlfraint OpenStreetMap a chyfranwyr, dan drwydded agored
     edit:
       not_public: Nid ydych wedi gosod eich golygiadau i fod yn gyhoeddus.
       user_page_link: tudalen defnyddiwr
-      anon_edits_link_text: Darganfyddwch achos hyn.
+      anon_edits_link_text: Gweld pam.
     export:
       title: Allforio
       area_to_export: Ardal i'w Hallforio
-      manually_select: Dewisiwch ardal wahanol
+      manually_select: Dewiswch ardal wahanol â llaw
       format_to_export: Fformatiwch i'w Hallforio
       osm_xml_data: Data XML OpenStreetMap
       map_image: Delwedd y Map (dangoser yr haen safonol)
@@ -1332,7 +1367,7 @@ cy:
     help:
       title: Cael Cymorth
       welcome:
-        url: /croeso
+        url: /welcome
         title: Croeso i OpenStreetMap
       beginners_guide:
         title: Llawlyfr Dechreuwyr
@@ -1346,7 +1381,7 @@ cy:
       switch2osm:
         title: switch2osm
     any_questions:
-      title: Unrhyw gwestiwn?
+      title: Unrhyw gwestiynau?
     sidebar:
       search_results: Canlyniadau Chwilio
       close: Cau
@@ -1425,9 +1460,9 @@ cy:
           private: Mynediad preifat
           destination: Mynediad cyrchfan
           construction: Ffyrdd wrthi'n cael eu hadeiladu
-          bicycle_shop: Siop feics
-          bicycle_parking: Man parcio beics
-          toilets: Lle chwech
+          bicycle_shop: Siop feiciau
+          bicycle_parking: Man parcio beiciau
+          toilets: Toiledau
     welcome:
       title: Croeso!
       whats_on_the_map:
@@ -1457,7 +1492,7 @@ cy:
       download: lawrlwytho
       uploaded: 'Uwchlwythwyd:'
       points: 'Pwyntiau:'
-      start_coordinates: 'Cyfesuryn dechrau:'
+      start_coordinates: 'Cyfesuryn cychwynnol:'
       map: map
       edit: golygu
       owner: 'Perchennog:'
@@ -1465,15 +1500,17 @@ cy:
       tags: 'Tagiau:'
       none: Dim
       visibility: 'Gwelededd:'
-    trace_paging_nav:
-      showing_page: Tudalen %{page}
     trace:
       count_points:
-        one: 1 point
+        zero: '%{count} pwynt'
+        one: '%{count} pwynt'
+        two: '%{count} bwynt'
+        few: '%{count} phwynt'
+        many: '%{count} pwynt'
         other: '%{count} pwynt'
       more: mwy
       view_map: Gweld Map
-      edit_map: Golygu'r Map
+      edit_map: Golygu Map
       public: CYHOEDDUS
       identifiable: CANFYDDADWY
       private: PREIFAT
@@ -1490,7 +1527,7 @@ cy:
       allow_to: 'Caniatáu''r rhaglen cleient i:'
       allow_read_prefs: ddarllen eich gosodiadau defnyddiwr.
       allow_write_prefs: addasu eich gosodiadau defnyddiwr.
-      allow_write_diary: creu cofnodion dyddiadur, sylwadau a gwneud ffrindiau.
+      allow_write_diary: greu cofnodion dyddiadur, sylwadau a gwneud ffrindiau.
       allow_write_api: addasu'r map.
       allow_read_gpx: ddarllen eich dargopiadau GPS.
       allow_write_gpx: uwchlwytho dargopiadau GPS.
@@ -1516,7 +1553,7 @@ cy:
       authorize_url: 'URL Awdurdodi:'
       edit: Golygu Manylion
       delete: Dileu Cleient
-      confirm: Ydych yn siŵr?
+      confirm: Ydych chi'n siŵr?
     index:
       oauth: OAuth
   oauth2_applications:
@@ -1529,6 +1566,8 @@ cy:
   users:
     new:
       title: Cofrestru
+      display name description: Eich enw defnyddiwr cyhoeddus. Gallwch newid hyn yn
+        nes ymlaen yn eich dewisiadau.
       continue: Cofrestru
       terms accepted: Diolch am dderbyn telerau newydd cyfranwyr!
     terms:
@@ -1561,9 +1600,9 @@ cy:
       edits: Golygiadau
       traces: Dargopiadau
       notes: Nodiadau Map
-      remove as friend: Peidio bod yn ffrind
-      add as friend: Ychwanegu Cyfaill
-      mapper since: 'Yn fapiwr ers:'
+      remove as friend: Dad-ffrindio
+      add as friend: Ychwanegu ffrind
+      mapper since: 'Yn mapio ers:'
       ct status: 'Telerau cyfrannwr:'
       ct undecided: Heb Benderfynu
       ct declined: Wedi Gwrthod
@@ -1597,7 +1636,7 @@ cy:
       time_future_html: Yn dod i ben mewn %{time}.
       time_past_html: Wedi dod i ben %{time} yn ôl.
     show:
-      status: Statws
+      status: 'Statws:'
       show: Dangos
       edit: Golygu
       confirm: Ydych chi'n siŵr?
@@ -1612,13 +1651,14 @@ cy:
   notes:
     index:
       id: Id
+      last_changed: Newidiwyd ddiwethaf
     show:
       title: 'Nodyn: %{id}'
       description: Disgrifiad
       open_title: '#%{note_name} heb ei ddatrus'
       closed_title: '#%{note_name} wedi''i ddatrus'
       hidden_title: Nodyn cudd %{note_name}
-      report: Adroddwch am y nodyn hwn
+      report: riportio'r nodyn hwn
       hide: Cuddio
       resolve: Datrys
       reactivate: Ail roi ar waith
@@ -1692,4 +1732,6 @@ cy:
       description: 'Disgrifiad:'
       user: 'Crëwr:'
       confirm: Ydych chi'n siŵr?
+    update:
+      flash: Newidiadau wedi'u cadw.
 ...
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 3efcb4596..502577aff 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -246,7 +246,6 @@ da:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2471,7 +2470,6 @@ da:
       visibility: 'Synlighed:'
       confirm_delete: Slet dette spor?
     trace_paging_nav:
-      showing_page: Side %{page}
       older: Ældre spor
       newer: Nyere spor
     trace:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index dfc076b12..0990c3d6d 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -316,7 +316,6 @@ de:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1976,7 +1975,7 @@ de:
           title: Mit Facebook anmelden
           alt: Mit einem Facebook-Konto anmelden
         windowslive:
-          title: Mit Windows Live anmelden
+          title: Mit Microsoft anmelden
           alt: Mit einem Microsoft-Konto anmelden
         github:
           title: Mit GitHub anmelden
@@ -2102,16 +2101,25 @@ de:
         introduction_2_legal_code: Lizenztext
         introduction_3_html: Unsere Dokumentation steht unter der %{creative_commons_link}-Lizenz
           (CC BY-SA 2.0).
+        introduction_3_creative_commons: Creative Commons Namensnennung – Weitergabe
+          unter gleichen Bedingungen 2.0
         credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen
           ist
         credit_1_html: 'Wenn du OpenStreetMap-Daten verwendest, musst du die folgenden
           zwei Bedingungen erfüllen:'
+        credit_2_1: Nennung von OpenStreetMap, indem du unseren Urheberrechts-Hinweis
+          anzeigst.
+        credit_2_2: Mache deutlich, dass die Daten unter der Open Database-Lizenz
+          verfügbar sind.
         credit_3_attribution_guidelines: Richtlinien für Namensnennungen
         attribution_example:
           alt: Beispiel, wie man auf OpenStreetMap auf einer Webseite hinweist
           title: Namensnennung-Beispiel
         more_title_html: Weitere Informationen
         more_1_1_osmf_licence_page: OSMF-Lizenzseite
+        more_2_1_html: |-
+          Obwohl es sich bei OpenStreetMap um offene Daten handelt, können wir keine kostenlose Karten-API für Dritte bereitstellen.
+          Siehe unsere %{api_usage_policy_link}, %{tile_usage_policy_link} und %{nominatim_usage_policy_link}.
         more_2_1_api_usage_policy: API-Nutzungsrichtlinie
         more_2_1_tile_usage_policy: Nutzungsrichtlinie für Kacheln
         more_2_1_nominatim_usage_policy: Nominatim-Nutzungsrichtlinie
@@ -2124,11 +2132,24 @@ de:
         contributors_at_cc_by: CC BY
         contributors_at_land_vorarlberg: Land Vorarlberg
         contributors_at_cc_by_at_with_amendments: CC BY AT mit Ergänzungen
+        contributors_au_credit_html: |-
+          %{australia}: Integriert oder entwickelt unter Verwendung administrativer Grenzen © %{geoscape_australia_link}
+          lizenziert vom Commonwealth of Australia unter %{cc_licence_link}.
         contributors_au_australia: Australien
         contributors_au_geoscape_australia: Geoscape Australien
         contributors_au_cc_licence: Creative Commons Namensnennung 4.0 Internationale
           Lizenz (CC BY 4.0)
+        contributors_ca_credit_html: |-
+          %{canada}: Enthält Daten von
+          GeoBase®, GeoGratis (© Department of Natural
+          Resources Canada), CanVec (© Department of Natural
+          Resources Canada) und StatCan (Geography Division,
+          Statistics). Kanada).
         contributors_ca_canada: Kanada
+        contributors_fi_credit_html: |-
+          %{finland}: Enthält Daten aus der
+          Nationalen Landvermessung der Topografischen Datenbank Finnlands
+          und anderen Datensätzen unter %{nlsfi_license_link}.
         contributors_fi_finland: Finnland
         contributors_fi_nlsfi_license: NLSFI-Lizenz
         contributors_fr_credit_html: |-
@@ -2148,7 +2169,13 @@ de:
           %{serbia}: Enthält Daten aus %{rgz_link} und %{open_data_portal}
           (öffentliche Informationen Serbiens), 2018.
         contributors_rs_serbia: Serbien
+        contributors_rs_rgz: Serbische Geodätische Behörde
+        contributors_rs_open_data_portal: Nationales Open-Data-Portal
+        contributors_si_credit_html: |-
+          %{slovenia}: Enthält Daten aus %{gu_link} und %{mkgp_link}
+          (öffentliche Informationen aus Slowenien).
         contributors_si_slovenia: Slowenien
+        contributors_si_gu: Vermessungs- und Kartierungsbehörde
         contributors_si_mkgp: Ministerium für Land- und Forstwirtschaft und Ernährung
         contributors_es_credit_html: |-
           %{spain}: Enthält Daten vom
@@ -2160,6 +2187,7 @@ de:
         contributors_za_credit_html: '%{south_africa}: Enthält Daten von %{ngi_link},
           staatliches Urheberrecht vorbehalten.'
         contributors_za_south_africa: Südafrika
+        contributors_za_ngi: 'Hauptdirektion: Nationale Geodaten'
         contributors_gb_credit_html: |-
           %{united_kingdom}: Enthält Ordnance
           Survey-Daten &copy; Crown Copyright und Datenbankrecht
@@ -2176,7 +2204,13 @@ de:
           hin, dass keinesfalls Daten aus urheberrechtlich geschützten Quellen verwendet
           werden dürfen (z. B. Google Maps oder gedruckte Kartenwerke), ohne vorher
           die ausdrückliche Erlaubnis des Rechteinhabers erhalten zu haben.
+        infringement_2_1_takedown_procedure: Takedown-Verfahren
+        infringement_2_1_online_filing_page: Online-Einreichungsseite
         trademarks_title: Warenzeichen
+        trademarks_1_1_html: |-
+          OpenStreetMap, das Lupenlogo und State of the Map sind eingetragene Marken der
+          OpenStreetMap Foundation. Wenn du Fragen zu der Verwendung der Marken hast, lies bitte unsere
+          %{trademark_policy_link}.
         trademarks_1_1_trademark_policy: Richtlinie für Warenzeichen
     index:
       js_1: Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert.
@@ -2208,6 +2242,8 @@ de:
       map_image: Karte (zeigt die Standardebene)
       embeddable_html: HTML zum Einbinden
       licence: Lizenz
+      licence_details_html: OpenStreetMap-Daten sind unter %{odbl_link} (ODbL) lizenziert.
+      odbl: Open Data Commons Open Database-Lizenz
       too_large:
         advice: 'Falls der obenstehende Export fehlschlägt, erwäge bitte, eine der
           unten aufgelisteten Quellen zu verwenden:'
@@ -2251,6 +2287,7 @@ de:
             ist der beste Weg zum Weitermachen der Beitritt zur OpenStreetMap-Gemeinschaft und das Beheben der Daten durch dich selbst.
       other_concerns:
         title: Andere Anliegen
+        working_group: OSMF-Arbeitsgruppe
     help:
       title: Hilfe erhalten
       introduction: |-
@@ -2295,6 +2332,8 @@ de:
       removed: Deine Standard OpenStreetMap Editor ist Potlatch. Da die Entwicklung
         des Adobe Flash Player eingestellt wurde, ist Potlatch nicht mehr für die
         Nutzung im Browser verfügbar.
+      desktop_application_html: Du kannst Potlatch von %{download_link} weiterhin
+        verwenden.
       change_preferences: Einstellungen hier ändern
     any_questions:
       title: Fragen?
@@ -2487,7 +2526,6 @@ de:
       visibility: 'Sichtbarkeit:'
       confirm_delete: Diesen Track löschen?
     trace_paging_nav:
-      showing_page: Seite %{page}
       older: Ältere Tracks
       newer: Neuere Tracks
     trace:
@@ -2696,6 +2734,11 @@ de:
       support: Support
       about:
         header: Frei und editierbar
+        paragraph_1: Im Gegensatz zu anderen Karten wird OpenStreetMap vollständig
+          von Leuten wie dir erstellt und kann von jedem kostenlos repariert, aktualisiert,
+          heruntergeladen und verwendet werden.
+        paragraph_2: Melde dich an, um mit der Mitarbeit zu beginnen. Wir senden dir
+          eine E-Mail zur Bestätigung deines Kontos.
       display name description: Dein öffentlich angezeigter Benutzername. Er kann
         später in den Einstellungen geändert werden.
       external auth: 'Drittparteiauthentifikation:'
@@ -2705,6 +2748,8 @@ de:
       continue: Registrieren
       terms accepted: Vielen Dank, dass du den neuen Bedingungen für Mitwirkende zugestimmt
         hast!
+      email_confirmation_help_html: Deine Adresse wird nicht öffentlich angezeigt.
+        Weitere Informationen findest du in unserer %{privacy_policy_link}.
       privacy_policy: Datenschutzrichtlinie
       privacy_policy_title: OSMF-Datenschutzrichtlinie einschließlich Abschnitt zu
         E-Mail-Adressen
@@ -2727,6 +2772,8 @@ de:
         Beiträge als gemeinfrei (Public Domain)
       consider_pd_why: Was bedeutet dies?
       consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain?uselang=de
+      guidance_info_html: 'Informationen zum Verständnis dieser Begriffe: ein %{readable_summary_link}
+        und einige %{informal_translations_link}'
       readable_summary: menschenlesbare Zusammenfassung
       informal_translations: informelle Übersetzung
       continue: Weiter
@@ -3077,9 +3124,13 @@ de:
       openstreetmap_contributors: OpenStreetMap Mitwirkende
       make_a_donation: Spenden
       website_and_api_terms: Website und API-Bedingungen
+      cyclosm_credit: Kachelstil von %{cyclosm_link}, gehostet von %{osm_france_link}
       osm_france: OpenStreetMap Frankreich
+      thunderforest_credit: Kacheln mit freundlicher Genehmigung von %{thunderforest_link}
       andy_allan: Andy Allan
+      opnvkarte_credit: Kacheln mit freundlicher Genehmigung von %{memomaps_link}
       memomaps: MeMoMaps
+      hotosm_credit: Kachelstil von %{hotosm_link}, gehostet von %{osm_france_link}
       hotosm_name: Humanitäres OpenStreetMap Team
     site:
       edit_tooltip: Karte bearbeiten
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 4ed01b297..cbfb12d70 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -150,7 +150,6 @@ diq:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -951,8 +950,6 @@ diq:
       description: 'Şınasnayış:'
       tags: 'Etiketi:'
       none: Çıniyo
-    trace_paging_nav:
-      showing_page: Pele %{page}
     trace:
       pending: PAWEDEYO
       count_points:
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 044224188..c1e12b7c1 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1377,7 +1377,6 @@ dsb:
       trace_not_found: Slěd njejo se namakał!
       visibility: 'Widobnosć:'
     trace_paging_nav:
-      showing_page: Bok %{page}
       older: Starše slědy
       newer: Nowše slědy
     trace:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 63e296239..4d9b62c59 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -254,7 +254,6 @@ el:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Βικιπαίδεια
   api:
@@ -2395,7 +2394,6 @@ el:
       visibility: 'Ορατότητα:'
       confirm_delete: Διαγραφή αυτού του ίχνους;
     trace_paging_nav:
-      showing_page: Σελίδα %{page}
       older: Παλαιότερα ίχνη
       newer: Νεότερα ίχνη
     trace:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 299402655..b192b0528 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -220,7 +220,6 @@ en-GB:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1703,7 +1702,6 @@ en-GB:
       trace_not_found: Trace not found!
       visibility: 'Visibility:'
     trace_paging_nav:
-      showing_page: Page %{page}
       older: Older Traces
       newer: Newer Traces
     trace:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 6c17fcdc8..88bf0a112 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -235,7 +235,6 @@ eo:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Vikipedio
   api:
@@ -2447,7 +2446,6 @@ eo:
       visibility: 'Videbleco:'
       confirm_delete: Ĉu forigi tiun ĉi spuron?
     trace_paging_nav:
-      showing_page: Paĝo %{page}
       older: AntaÅ­aj spuroj
       newer: Postaj spuroj
     trace:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3b7cecfbe..82403522c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -304,7 +304,6 @@ es:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2428,7 +2427,6 @@ es:
       visibility: 'Visibilidad:'
       confirm_delete: ¿Quiere eliminar esta traza?
     trace_paging_nav:
-      showing_page: Página %{page}
       older: Trazas más antiguas
       newer: Trazas más recientes
     trace:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index ddb593e26..263d70c8b 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1959,7 +1959,6 @@ et:
       trace_not_found: Rada ei leitud!
       visibility: 'Nähtavus:'
     trace_paging_nav:
-      showing_page: Leht %{page}
       older: Vanemad rajad
       newer: Uuemad rajad
     trace:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index abc3e8d4d..d17c5ca15 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -230,7 +230,6 @@ eu:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2222,7 +2221,6 @@ eu:
       visibility: 'Ikusgarritasuna:'
       confirm_delete: Aztarna hau ezabatu?
     trace_paging_nav:
-      showing_page: '%{page}. orria'
       older: Aztarna zaharragoak
       newer: Aztarna berriagoak
     trace:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 326d8ce5a..68d0de60b 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -2154,7 +2154,6 @@ fa:
       visibility: 'پدیداری:'
       confirm_delete: این رد حذف شود؟
     trace_paging_nav:
-      showing_page: صفحهٔ %{page}
       older: ردهای کهنه‌تر
       newer: ردهای تازه‌تر
     trace:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 822b3abf4..dcc183107 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -264,7 +264,6 @@ fi:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -403,7 +402,7 @@ fi:
       history_title_html: Viivan %{name} historia
       nodes: Pisteet
       nodes_count:
-        one: 1 piste
+        one: '%{count} piste'
         other: '%{count} pistettä'
       also_part_of_html:
         one: osana viivaa %{related_ways}
@@ -574,9 +573,9 @@ fi:
       comment_link: Kommentoi tätä kirjoitusta
       reply_link: Lähetä viesti tekijälle
       comment_count:
-        one: 1 kommentti
-        zero: Ei kommentteja
+        one: '%{count} kommentti'
         other: '%{count} kommenttia'
+      no_comments: Ei kommentteja
       edit_link: Muokkaa päiväkirjamerkintää
       hide_link: Piilota tämä merkintä
       unhide_link: Poista merkinnän piilottaminen
@@ -1446,9 +1445,9 @@ fi:
     show:
       title: '%{status} Tapaus #%{issue_id}'
       reports:
-        zero: Ei ilmiantoa
-        one: Yksi ilmianto
+        one: '%{count} ilmianto'
         other: '%{count} ilmiantoa'
+      no_reports: Ei ilmiantoja
       report_created_at: Ilmoitettu ensimmäisen kerran %{datetime}
       last_resolved_at: Ratkaistu %{datetime}
       last_updated_at: Viimeisin käsittelijä %{displayname} %{datetime}
@@ -2351,7 +2350,6 @@ fi:
       visibility: 'Näkyvyys:'
       confirm_delete: Poista tämä jälki?
     trace_paging_nav:
-      showing_page: Sivu %{page}
       older: Vanhat jäljet
       newer: Uudet jäljet
     trace:
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 321ba9193..2e0e8834d 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -850,8 +850,6 @@ fit:
       owner: 'Käyttäjä:'
       description: 'Kuvvaus:'
       edit_trace: Mookkaa jäljen tietoja
-    trace_paging_nav:
-      showing_page: Sivu %{page}
     trace:
       edit_map: Mookkaa karttaa
       public: JULKINEN
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 41e18f903..4022ba877 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -309,7 +309,6 @@ fr:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipédia
   api:
@@ -2621,7 +2620,6 @@ fr:
       visibility: 'Visibilité :'
       confirm_delete: Supprimer cette trace ?
     trace_paging_nav:
-      showing_page: Page %{page}
       older: Traces plus anciennes
       newer: Traces plus récentes
     trace:
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 137b7af4c..219c282f7 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -196,7 +196,6 @@ fur:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Vichipedie
   api:
@@ -1349,7 +1348,6 @@ fur:
       visibility: 'Visibilitât:'
       confirm_delete: Eliminâ chest percors?
     trace_paging_nav:
-      showing_page: Pagjine %{page}
       older: Percors plui vieris
       newer: Percors plui gnûfs
     trace:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index e61504c69..fc81f938d 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -213,7 +213,6 @@ fy:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedy
   api:
@@ -2164,7 +2163,6 @@ fy:
       visibility: 'Sichtberens:'
       confirm_delete: Dit trajekt fuortsmite?
     trace_paging_nav:
-      showing_page: Side %{page}
       older: Aldere trajekten
       newer: Nijere trajekten
     trace:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index ded06962b..34d7bd4d6 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -171,7 +171,6 @@ ga:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Vicipéid
   api:
@@ -1653,7 +1652,6 @@ ga:
       trace_not_found: Níor aimsíodh an rian!
       visibility: 'Infheictheacht:'
     trace_paging_nav:
-      showing_page: Leathanach %{page}
       older: Loirg Níos Sine
       newer: Loirg Níos Úire
     trace:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index b2436d54c..a2457bd6c 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1513,7 +1513,6 @@ gd:
       trace_not_found: Cha deach an lorgadh a lorg!
       visibility: 'Faicsinneachd:'
     trace_paging_nav:
-      showing_page: Duilleag %{page}
       older: Lorgaidhean nas sine
       newer: Lorgaidhean nas ùire
     trace:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 1fe2ebb39..460003de8 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -20,7 +20,8 @@
 gl:
   time:
     formats:
-      friendly: '%e de %B do %Y ás %H:%M'
+      friendly: '%e de %B de %Y ás %H:%M'
+      blog: '%e de %B de %Y'
   helpers:
     file:
       prompt: Escoller un ficheiro
@@ -146,7 +147,7 @@ gl:
         auth_provider: Fornecedor de autenticación
         auth_uid: UID de autenticación
         email: Enderezo de correo electrónico
-        email_confirmation: Email de confirmación
+        email_confirmation: Confirmación do correo
         new_email: Novo enderezo de correo electrónico
         active: Activo
         display_name: Nome público
@@ -228,7 +229,6 @@ gl:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -297,11 +297,11 @@ gl:
           son anónimas.
         disabled link text: por que non podo editar?
       contributor terms:
-        heading: Termos do contribuínte
-        agreed: Aceptaches os novos termos do contribuínte.
-        not yet agreed: Aínda non aceptaches os novos termos do contribuínte.
+        heading: Termos do colaborador
+        agreed: Aceptaches os novos termos do colaborador.
+        not yet agreed: Aínda non aceptaches os novos termos do colaborador.
         review link text: Siga esta ligazón para revisar e aceptar os novos termos
-          do contribuínte.
+          do colaborador.
         agreed_with_pd: Tamén declarou que coida que as súas edicións pertencen ó
           dominio público.
         link text: que é isto?
@@ -363,12 +363,12 @@ gl:
       comment: Comentarios (%{count})
       hidden_comment_by_html: Comentario de %{user} agochado %{time_ago}
       comment_by_html: Comentario de %{user} %{time_ago}
-      changesetxml: Conxunto de modificacións do XML
-      osmchangexml: osmChange XML
+      changesetxml: XML do conxunto de modificacións
+      osmchangexml: XML de osmChange
       feed:
         title: Conxunto de modificacións %{id}
         title_comment: Conxunto de modificacións %{id} - %{comment}
-      join_discussion: Iniciar a sesión para unirse á parola
+      join_discussion: Inicia a sesión para unirte á parola
       discussion: Parola
       still_open: O conxunto de modificacións segue aberto - Abrirase a parola cando
         o conxunto de modificacións estea pechado.
@@ -549,7 +549,7 @@ gl:
       body: Non existe ningunha entrada no diario ou comentario co ID %{id}. Comprobe
         a ortografía ou que a ligazón que seguiu estea ben.
     diary_entry:
-      posted_by_html: Publicado por %{link_user} no %{created} en %{language_link}.
+      posted_by_html: Publicado por %{link_user} o %{created} en %{language_link}.
       updated_at_html: Última actualización no %{updated}.
       comment_link: Comentar nesta entrada
       reply_link: Enviar unha mensaxe ó autor
@@ -619,7 +619,7 @@ gl:
         ese nome no servidor do OpenStreetMap (HTTP 404)
   friendships:
     make_friend:
-      heading: Quere engadir a %{user} coma amizade?
+      heading: Queres engadir a %{user} coma amizade?
       button: Engadir coma amizade
       success: '%{name} xa é a túa amizade!'
       failed: Houbo un erro ó engadir a %{name} coma amizade.
@@ -1535,7 +1535,7 @@ gl:
     intro_header: Dámosche a benvida ó OpenStreetMap!
     intro_text: O OpenStreetMap é un mapa do mundo, creado por xente coma ti e de
       libre uso baixo unha licenza aberta.
-    intro_2_create_account: Cree unha conta de usuario
+    intro_2_create_account: Crea unha conta de usuario
     hosting_partners_html: O aloxamento está fornecido por %{ucl}, %{fastly}, %{bytemark}
       e outros %{partners}.
     partners_ucl: UCL
@@ -1629,7 +1629,7 @@ gl:
       greeting: 'Ola:'
       hopefully_you: Alguén (se cadra ti) pediu o restabelecemento do contrasinal
         desta conta de correo electrónico en openstreetmap.org.
-      click_the_link: Se este es ti, preme na seguinte ligazón para restabelecer o
+      click_the_link: Se este es ti, preme na seguinte ligazón para restablecer o
         teu contrasinal.
     note_comment_notification:
       anonymous: Un usuario anónimo
@@ -1754,7 +1754,7 @@ gl:
     new:
       title: Enviar unha mensaxe
       send_message_to_html: Enviarlle unha nova mensaxe a %{name}
-      back_to_inbox: Voltar á caixa de entrada
+      back_to_inbox: Volver á caixa de entrada
     create:
       message_sent: Mensaxe enviada
       limit_exceeded: Estivo enviando unha morea de mensaxes recentemente. Agarde
@@ -1784,7 +1784,7 @@ gl:
       reply_button: Responder
       unread_button: Marcar como non lida
       destroy_button: Eliminar
-      back: Voltar
+      back: Volver
       wrong_user: Accedeches ó sistema coma "%{user}", pero a mensaxe que pregaches
         ler non a enviaches a ese usuario ou el non a enviou a ti. Accede co usuario
         correcto para ler a resposta.
@@ -1798,19 +1798,19 @@ gl:
   passwords:
     lost_password:
       title: Contrasinal perdido
-      heading: Esqueceu o contrasinal?
+      heading: Esqueciches o contrasinal?
       email address: 'Enderezo de correo electrónico:'
-      new password button: Restabelecer o contrasinal
-      help_text: Escribe o enderezo de correo electrónico que empregaches para se
-        rexistrar. Enviarémosche unha ligazón que poderás empregar para restabelecer
+      new password button: Restablecer o contrasinal
+      help_text: Escribe o enderezo de correo electrónico que empregaches para te
+        rexistrares. Enviarémosche unha ligazón que poderás empregar para restablecer
         o teu contrasinal.
       notice email on way: Por desgraza perdeuno, pero hai en camiño unha mensaxe
         de correo electrónico ca que o poderá restabelecelo axiña.
       notice email cannot find: Non se puido atopar o enderezo de correo electrónico.
     reset_password:
-      title: Restabelecer o contrasinal
-      heading: Restabelecer o contrasinal de %{user}
-      reset: Restabelecer o contrasinal
+      title: Restablecer o contrasinal
+      heading: Restablecer o contrasinal de %{user}
+      reset: Restablecer o contrasinal
       flash changed: Mudouse o teu contrasinal.
       flash token bad: Non se atopou o pase. Quizabes tería que comprobar o enderezo
         URL.
@@ -1859,11 +1859,11 @@ gl:
       password: 'Contrasinal:'
       openid_html: '%{logo} OpenID:'
       remember: Lembrádeme
-      lost password link: Perdeches o teu contrasinal?
+      lost password link: Perdiches o teu contrasinal?
       login_button: Iniciar a sesión
-      register now: Rexístrese agora
+      register now: Rexístrate agora
       with external: 'Ou ben, emprega un servizo de terceiros para acceder:'
-      no account: Non está rexistrado?
+      no account: Non estás rexistrado?
       auth failure: Sentímolo, non puido acceder ó sistema con eses datos.
       openid_logo_alt: Acceder ó sistema cun OpenID
       auth_providers:
@@ -1929,7 +1929,7 @@ gl:
         de todo o mundo sobre camiños, vías, cafetarías, estacións e moitas máis cousas.
       local_knowledge_title: Coñecemento local
       local_knowledge_html: |-
-        O OpenStreetMap fai fincapé nos coñecementos locais. Os contribuíntes axúdanse
+        O OpenStreetMap fai fincapé nos coñecementos locais. Os colaboradores axúdanse
         de imaxes aéreas, dispositivos GPS e mapas de campo rudimentarios para asegurarse de que os datos do OSM
         son correctos e están actualizados.
       community_driven_title: Dirixido pola comunidade
@@ -1948,7 +1948,7 @@ gl:
       open_data_title: Datos libres
       open_data_1_html: |-
         Os datos do OpenStreetMap son %{open_data}: podes empregalos libremente e para calquera finalidade
-        sempre que recoñezas ó OpenStreetMap e mailos seus contribuíntes coma os autores dos datos. Se modificas os datos
+        sempre que recoñezas ó OpenStreetMap e mailos seus colaboradores coma os autores dos datos. Se modificas os datos
         ou os empregas dalgún xeito para outros fins, podes distribuír o resultado sempre e cando o fagas empregando
         a mesma licenza. Atoparás información máis detallada na %{copyright_license_link}.
       open_data_open_data: datos libres
@@ -1973,14 +1973,14 @@ gl:
     copyright:
       foreign:
         title: Acerca desta tradución
-        html: No caso de conflito entre esta páxina traducida e %{english_original_link},
-          a páxina ficará en inglés
+        html: En caso de conflito entre esta páxina traducida e %{english_original_link},
+          a páxina en inglés prevalecerá
         english_link: a orixinal en inglés
       native:
         title: Acerca desta páxina
-        html: Estás ollando a versión en inglés da páxina de dereitos de autor. Pode
-          voltar á %{native_link} desta páxina ou pode deixar de ler sobre os dereitos
-          de autor e %{mapping_link}.
+        html: Estás ollando a versión en inglés da páxina de dereitos de autoría.
+          Pode volver á %{native_link} desta páxina ou pode deixar de ler sobre os
+          dereitos de autoría e %{mapping_link}.
         native_link: versión en galego
         mapping_link: comezar a contribuír
       legal_babble:
@@ -2038,9 +2038,9 @@ gl:
         more_2_1_api_usage_policy: política de uso da API
         more_2_1_tile_usage_policy: política de uso de mosaicos
         more_2_1_nominatim_usage_policy: política de uso de Nominatim
-        contributors_title_html: Os nosos contribuíntes
+        contributors_title_html: Os nosos colaboradores
         contributors_intro_html: |-
-          Os nosos contribuíntes son milleiros de persoas. Tamén incluímos
+          Os nosos colaboradores son milleiros de persoas. Tamén incluímos
           datos baixo licenzas abertas de axencias nacionais de cartografía
           e outras fontes, entre elas:
         contributors_at_credit_html: |-
@@ -2146,7 +2146,7 @@ gl:
       shortlink: Atallo
       createnote: Engadir unha nota
       license:
-        copyright: Dereitos de autor do OpenStreetMap e os seus contribuíntes, baixo
+        copyright: Dereitos de autoría do OpenStreetMap e os seus colaboradores, baixo
           unha licenza aberta
       remote_failed: Falla na edición; comprobe que ou ben o JOSM ou ben o Merkaartor
         estea cargado e que a opción do control remoto estea activada
@@ -2190,7 +2190,7 @@ gl:
             países e cidades seleccionados
         other:
           title: Outras fontes
-          description: Fontes adicionais listadas na wiki do OpenStreetMap
+          description: Fontes adicionais listadas no wiki do OpenStreetMap
       options: Opcións
       format: Formato
       scale: Escala
@@ -2216,7 +2216,7 @@ gl:
           instructions_1_html: |-
             Preme na %{note_icon} ou na mesma icona na visualización do mapa.
             Isto ha engadir unha marcaxe ó mapa que podes mover
-            arrastrándoa. Engade a túa mensaxe, preme en "Gardar" e outras persoas pescudarán iso.
+            arrastrando. Engade a túa mensaxe, preme en "Gardar" e outras persoas pescudarán iso.
       other_concerns:
         title: Outras preocupacións
         concerns_html: |-
@@ -2411,8 +2411,8 @@ gl:
         para_1: Se soamente queres corrixir unha pequena cousa e non tes tempo de
           te rexistrares e aprenderes a editar, engadir unha nota é moi doado.
         para_2_html: |-
-          Vai %{map_link} ou preme na icona das notas: %{note_icon}.
-          Isto ha engadir unha marcaxe ó mapa que podes mover arrastrándoa.
+          Vai %{map_link} e preme na icona das notas: %{note_icon}.
+          Isto ha engadir unha marcaxe ó mapa que podes mover arrastrando.
           Engade a túa mensaxe, preme en "Gardar" e outras persoas pescudarán iso.
         the_map: ó mapa
     communities:
@@ -2493,7 +2493,6 @@ gl:
       visibility: 'Visibilidade:'
       confirm_delete: Eliminar esta pista?
     trace_paging_nav:
-      showing_page: Páxina %{page}
       older: Pistas máis antigas
       newer: Pistas máis novas
     trace:
@@ -2556,7 +2555,7 @@ gl:
       blocked: O teu acceso á API foi bloqueado. Accede ó sistema para atopar máis
         información na interface web.
       need_to_see_terms: O teu acceso á API está suspendido de xeito temporal. Accede
-        ó sistema para ollar os termos do contribuínte. Non tes que aceptalos, pero
+        ó sistema para ollar os termos do colaborador. Non tes que aceptalos, pero
         debes coñecelos.
     settings_menu:
       account_settings: Axustes da conta
@@ -2712,7 +2711,7 @@ gl:
       auth no password: Coa autenticación de terceiros non se precisa un contrasinal,
         aínda que hai algunhas ferramentas e servidores que aínda a solicitan.
       continue: Rexistrarse
-      terms accepted: Grazas por aceptar os novos termos do contribuínte!
+      terms accepted: Grazas por aceptar os novos termos do colaborador!
       email_confirmation_help_html: O teu enderezo non se mostra publicamente; consulta
         a nosa %{privacy_policy_link} para obter máis información.
       privacy_policy: política de protección de datos
@@ -2727,7 +2726,7 @@ gl:
         "Continuar".
       contributor_terms_explain: Este acordo regula as condicións para as túas contribucións
         actuais e futuras.
-      read_ct: Lin e acepto os termos do contribuínte anteriores
+      read_ct: Lin e acepto os termos do colaborador anteriores
       tou_explain_html: Estes %{tou_link} rexen o uso da páxina/sitio web e outras
         infraestruturas fornecidas pola OSMF.  Preme na ligazón, le e acepta o texto.
       read_tou: Lin e acepto os Termos de uso
@@ -2741,8 +2740,8 @@ gl:
       informal_translations: traducións informais
       continue: Continuar
       decline: Rexeitar
-      you need to accept or decline: Lea e, deseguido, acepte ou rexeite os novos
-        Termos do contribuínte para proseguer.
+      you need to accept or decline: Le e, deseguido, acepta ou rexeita os novos termos
+        do colaborador para continuar.
       legale_select: 'Escolle o teu país de residencia:'
       legale_names:
         france: Francia
@@ -2780,7 +2779,7 @@ gl:
       remove as friend: Eliminar coma amizade
       add as friend: Engadir coma amizade
       mapper since: 'Cartógrafo dende:'
-      ct status: 'Termos do contribuínte:'
+      ct status: 'Termos do colaborador:'
       ct undecided: Indeciso
       ct declined: Rexeitou
       latest edit: 'Última edición (%{ago}):'
@@ -2806,7 +2805,7 @@ gl:
       unconfirm_user: Desconfirmar este usuario
       unsuspend_user: Anular a suspensión deste usuario
       hide_user: Agochar este usuario
-      unhide_user: Descobrir este usuario
+      unhide_user: Descubrir este usuario
       delete_user: Eliminar este usuario
       confirm: Confirmar
       report: Denunciar este usuario
@@ -2873,7 +2872,7 @@ gl:
       non_moderator_revoke: Cómpre ser moderador para revogar un bloqueo.
     not_found:
       sorry: Non se puido atopar o bloqueo de usuario número %{id}.
-      back: Voltar ó índice
+      back: Volver ó índice
     new:
       title: Creando un bloqueo a %{name}
       heading_html: Creando un bloqueo a %{name}
@@ -3009,17 +3008,17 @@ gl:
       disappear_date_html: Esta nota resolta desaparecerá do mapa en %{disappear_in}.
     new:
       title: Nova nota
-      intro: Atopou un erro ou descobriu que falla algún dato? Informe ós outros cartógrafos
+      intro: Atopou un erro ou descubriu que falla algún dato? Informe ós outros cartógrafos
         para que poidamos solucionalo. Mova o marcador á posición correcta e escriba
         unha nota expoñendo o problema.
-      advice: A túa nota será pública e poderás empregarse para actualizar o mapa,
-        por conseguinte, non insira información persoal, nin datos de mapas protexidos
+      advice: A túa nota será pública e poderá empregarse para actualizar o mapa;
+        por conseguinte, non insiras información persoal, nin datos de mapas protexidos
         por dereitos de autoría ou listaxes de directorios.
       add: Engadir a nota
   javascripts:
     close: Pechar
     share:
-      title: Compartillar
+      title: Compartir
       cancel: Desbotar
       image: Imaxe
       link: Ligazón ou HTML
@@ -3079,8 +3078,8 @@ gl:
       andy_allan: Andy Allan
       opnvkarte_credit: Mosaicos cortesía de %{memomaps_link}
       memomaps: MeMoMaps
-      hotosm_credit: Estilo de mosaicos de %{hotosm_link} aloxado por %{osm_france_link}
-      hotosm_name: Equipo humanitario do OpenStreetMap
+      hotosm_credit: Estilo de mosaicos do %{hotosm_link} aloxado por %{osm_france_link}
+      hotosm_name: equipo humanitario do OpenStreetMap
     site:
       edit_tooltip: Editar o mapa
       edit_disabled_tooltip: Achegue para editar o mapa
diff --git a/config/locales/he.yml b/config/locales/he.yml
index f24e1f46e..879546575 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2485,7 +2485,6 @@ he:
       visibility: 'נראוּת:'
       confirm_delete: למחוק את הנתיב הזה?
     trace_paging_nav:
-      showing_page: הדף %{page}
       older: מסלולים ישנים יותר
       newer: מסלולים חדשים יותר
     trace:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 22061d55b..a397b32b7 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -211,7 +211,6 @@ hr:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1535,7 +1534,6 @@ hr:
       trace_not_found: Trag nije pronađen!
       visibility: 'Vidljivost:'
     trace_paging_nav:
-      showing_page: Stranica %{page}
       older: Stariji tragovi
       newer: Noviji tragovi
     trace:
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index cbcdd9b8a..79052ed54 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -237,7 +237,6 @@ hsb:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedija
   api:
@@ -2135,7 +2134,6 @@ hsb:
       visibility: 'Widźomnosć:'
       confirm_delete: Tutu ćěr zhašeć?
     trace_paging_nav:
-      showing_page: Strona %{page}
       older: Starše ćěrje
       newer: Nowše ćěrje
     trace:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 8cf4d9958..5e3ac71ab 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -246,7 +246,6 @@ hu:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipédia
   api:
@@ -2315,7 +2314,6 @@ hu:
       visibility: 'Láthatóság:'
       confirm_delete: Nyomvonal törlése?
     trace_paging_nav:
-      showing_page: '%{page}. oldal'
       older: Régebbi nyomvonalak
       newer: Újabb nyomvonalak
     trace:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 88cf6b5b5..3ac1f4a33 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -218,7 +218,6 @@ ia:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -368,7 +367,7 @@ ia:
       history_title_html: 'Historia del via: %{name}'
       nodes: Nodos
       nodes_count:
-        one: 1 nodo
+        one: '%{count} nodo'
         other: '%{count} nodos'
       also_part_of_html:
         one: parte del via %{related_ways}
@@ -2473,7 +2472,6 @@ ia:
       visibility: 'Visibilitate:'
       confirm_delete: Deler iste tracia?
     trace_paging_nav:
-      showing_page: Pagina %{page}
       older: Tracias plus ancian
       newer: Tracias plus nove
     trace:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 461a31467..00943412a 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -249,7 +249,6 @@ id:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2474,7 +2473,6 @@ id:
       visibility: Visibilitas
       confirm_delete: Hapus jejak ini?
     trace_paging_nav:
-      showing_page: Halaman %{page}
       older: Jejak-jejak Lama
       newer: Trek-trek terbaru
     trace:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index c561c763f..297191f9d 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -230,7 +230,6 @@ is:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -387,7 +386,7 @@ is:
       history_title_html: 'Saga leiðar: %{name}'
       nodes: Liðir
       nodes_count:
-        one: liður
+        one: '%{count} liður'
         other: '%{count} liðir'
       also_part_of_html:
         one: hluti leiðar %{related_ways}
@@ -562,9 +561,9 @@ is:
       comment_link: Bæta athugasemd við þessa færslu
       reply_link: Senda skilaboð til höfundar
       comment_count:
-        zero: Engar athugasemdir
         one: '%{count} athugasemd'
         other: '%{count} athugasemdir'
+      no_comments: Engar athugasemdir
       edit_link: Breyta þessari færslu
       hide_link: Fela þessa færslu
       unhide_link: Af-fela þessa færslu
@@ -1456,9 +1455,9 @@ is:
     show:
       title: '%{status} vandamál #%{issue_id}'
       reports:
-        zero: Engar skýrslur
         one: '%{count} skýrsla'
         other: '%{count} skýrslur'
+      no_reports: Engar skýrslur
       report_created_at: Fyrst tilkynnt %{datetime}
       last_resolved_at: Síðast leyst %{datetime}
       last_updated_at: Síðast uppfært %{datetime} af %{displayname}
@@ -2553,7 +2552,6 @@ is:
       visibility: 'Sýnileiki:'
       confirm_delete: Eyða þessum ferli?
     trace_paging_nav:
-      showing_page: Síða %{page}
       older: Eldri ferlar
       newer: Nýrri ferlar
     trace:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 3396fdb05..f19773d34 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -272,7 +272,6 @@ it:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2530,7 +2529,6 @@ it:
       visibility: 'Visibilità:'
       confirm_delete: Cancellare questo tracciato?
     trace_paging_nav:
-      showing_page: Pagina %{page}
       older: Tracce più vecchie
       newer: Tracce più recenti
     trace:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d5f7a8f88..9c945b806 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -683,7 +683,7 @@ ja:
           cinema: 映画館
           clinic: 診療所
           clock: 時計
-          college: 大学
+          college: 短期大学・専門学校
           community_centre: コミュニティ センター
           conference_centre: 会議施設
           courthouse: 裁判所
@@ -1304,7 +1304,7 @@ ja:
           motorcycle: バイクショップ
           motorcycle_repair: バイク修理工場
           music: 音楽ショップ
-          musical_instrument: 楽器
+          musical_instrument: 楽器店
           newsagent: 新聞販売店
           nutrition_supplements: サプリ
           optician: メガネ店
@@ -2167,7 +2167,6 @@ ja:
       visibility: '可視性:'
       confirm_delete: この位置情報を削除しますか？
     trace_paging_nav:
-      showing_page: ページ %{page}
       older: 以前のトレース
       newer: 以降のトレース
     trace:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index e04f8c5ad..747ff26f0 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -991,8 +991,6 @@ ka:
       description: 'აღწერა:'
       none: არა
       visibility: 'ხილვადობა:'
-    trace_paging_nav:
-      showing_page: გვერდი %{page}
     trace:
       pending: დამუშავება
       count_points: '%{count} წერტილი'
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index c83a7427a..d2cb1a0d7 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -187,7 +187,6 @@ kab:
       none: Ulac
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipidya
   api:
@@ -1154,7 +1153,6 @@ kab:
       delete_trace: Kkes lǧerra-agi
       trace_not_found: Ulac lǧeṛṛa!
     trace_paging_nav:
-      showing_page: Asebter %{page}
       newer: LÉ£errat timaynutin
     trace:
       pending: YETTRAǦU
diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 54827d18b..9a7569784 100644
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -192,7 +192,6 @@ kk-cyrl:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Уикипедия
   api:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 7cc8e6feb..457735b7f 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -229,7 +229,6 @@ ko:
       openid: OpenID
       google: 구글
       facebook: 페이스북
-      windowslive: Windows Live
       github: 깃허브
       wikipedia: 위키백과
   api:
@@ -2088,7 +2087,6 @@ ko:
       visibility: '공개 여부:'
       confirm_delete: 이 궤적을 삭제할까요?
     trace_paging_nav:
-      showing_page: '%{page}쪽'
       older: 이전 궤적
       newer: 다음 궤적
     trace:
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 4a739d40d..5f245f4f8 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -221,7 +221,6 @@ ku-Latn:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wîkîpediya
   api:
@@ -2241,7 +2240,6 @@ ku-Latn:
       visibility: Kî dikare bibîneː
       confirm_delete: Vê şopê dixwazî jê bibî?
     trace_paging_nav:
-      showing_page: Rûpel %{page}
       older: Şopên kevintir
       newer: Şopên nûtir
     trace:
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 700c5ae04..18f7b6bc3 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -221,7 +221,6 @@ lb:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2131,7 +2130,6 @@ lb:
       visibility: 'Visibilitéit:'
       confirm_delete: Dës Spuer läschen?
     trace_paging_nav:
-      showing_page: Säit %{page}
       older: Eeler Spueren
       newer: Méi nei Spueren
     trace:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index f21b45ba7..6a9af3096 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -259,7 +259,6 @@ lt:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2195,7 +2194,6 @@ lt:
       visibility: 'Matomumas:'
       confirm_delete: Trinti šį pėdsaką?
     trace_paging_nav:
-      showing_page: Puslapis %{page}
       older: Senesni pėdsakai
       newer: Naujesni pėdsakai
     trace:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 733b8816b..3c78c0c8a 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -170,7 +170,6 @@ lv:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Vikipēdija
   api:
@@ -1818,7 +1817,6 @@ lv:
       trace_not_found: Trase nav atrasta!
       visibility: 'Redzamība:'
     trace_paging_nav:
-      showing_page: Rāda lapu %{page}
       older: Vecākas trases
       newer: Jaunākas Trases
     trace:
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 253e7fc40..84c971af5 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -220,7 +220,6 @@ mk:
       openid: OpenID
       google: Google
       facebook: Фејсбук
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Википедија
   api:
@@ -367,7 +366,7 @@ mk:
       history_title_html: 'Историја на патот: %{name}'
       nodes: Јазли
       nodes_count:
-        one: 1 јазол
+        one: '%{count} јазол'
         other: '%{count} јазли'
       also_part_of_html:
         one: дел од патот %{related_ways}
@@ -2460,7 +2459,6 @@ mk:
       visibility: 'Видливост:'
       confirm_delete: Да ја избришам трагава?
     trace_paging_nav:
-      showing_page: Страница %{page}
       older: Постари траги
       newer: Понови траги
     trace:
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index c64c82961..c3b0736e2 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1281,7 +1281,6 @@ mr:
       trace_not_found: अनुरेख आढळला नाही!
       visibility: 'दृश्यता:'
     trace_paging_nav:
-      showing_page: पान %{page}
       older: जुने अनुरेख
       newer: नवे अनुरेख
     trace:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index c2b7ca605..129e0d1a1 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -200,7 +200,6 @@ ms:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1039,8 +1038,10 @@ ms:
           mall: Medan Beli-Belah
           massage: Urut
           mobile_phone: Kedai Telefon Bimbit
+          money_lender: Peminjam Wang
           motorcycle: Kedai Motosikal
           music: Kedai Muzik
+          musical_instrument: Alat Muzik
           newsagent: Gerai Surat Khabar
           optician: Kedai Optik
           organic: Kedai Makanan Organik
@@ -1144,6 +1145,7 @@ ms:
         ignored: Diabaikan
         open: Buka
     show:
+      no_reports: Tiada laporan
       ignore: Abaikan
       reopen: Buka semula
       read_reports: Baca Laporan
@@ -1513,7 +1515,10 @@ ms:
         menggunakan imejan udara, peranti GPS, dan peta lapangan berteknologi rendah
         untuk mengesahkan bahawa OSM adalah tepat dan mutakhir.
       community_driven_title: Didorong oleh Komuniti
+      community_driven_osm_foundation: Yayasan OSM
       open_data_title: Data Terbuka
+      open_data_open_data: data terbuka
+      open_data_copyright_license: Laman Hak Cipta dan Lesen
       partners_title: Rakan Kongsi
     copyright:
       foreign:
@@ -1538,12 +1543,14 @@ ms:
           alt: Contoh mengatribusikan OpenStreetMap pada halaman sesawang
           title: Contoh atribusi
         more_title_html: Mengetahui lebih lanjut
+        more_1_1_osmf_licence_page: Laman Lesen OSMF
         contributors_title_html: Penyumbang kami
         contributors_intro_html: 'Penyumbang kami merupakan ribuan individu. Kami
           turut menyertakan data yang dilesenkan secara terbuka daripada lembaga-lembaga
           pemetaan kebangsaan dan sumber-sumber yang lain, antaranya:'
         contributors_at_austria: Austria
         contributors_at_cc_by: CC BY
+        contributors_au_australia: Australia
         contributors_ca_canada: Kanada
         contributors_fi_finland: Finland
         contributors_fi_nlsfi_license: Lesen NLSFI
@@ -1557,6 +1564,7 @@ ms:
         contributors_si_slovenia: Slovenia
         contributors_si_mkgp: Kementerian Pertanian, Perhutanan dan Makanan
         contributors_es_spain: Sepanyol
+        contributors_za_south_africa: Afrika Selatan
         contributors_gb_united_kingdom: United Kingdom
         contributors_footer_2_html: '  Penyertaan data dalam OpenStreetMap tidak bermaksud
           bahawa pembekal data asal menyokong OpenStreetMap, menyediakan sebarang
@@ -1839,7 +1847,6 @@ ms:
       visibility: 'Keterlihatan:'
       confirm_delete: Hapuskan jejak ini?
     trace_paging_nav:
-      showing_page: Halaman %{page}
       older: Jejak Lama
       newer: Jejak Baru
     trace:
@@ -1953,6 +1960,7 @@ ms:
         digunakan dengan kami yang menggunakan piawaian %{oauth}? Anda mesti mendaftarkan
         aplikasi web anda sebelum ia boleh membuat permintaan OAuth kepada perkhidmatan
         ini.
+      oauth: OAuth
       registered_apps: 'Anda telah mendaftarkan aplikasi-alikasi klien yang berikut:'
       register_new: Daftarkan aplikasi anda
     form:
@@ -2270,6 +2278,7 @@ ms:
         overlays: Bolehkan tindihan untuk mencari masalah dalam peta
         title: Lapisan
       openstreetmap_contributors: Penyumbang OpenStreetMap
+      andy_allan: Andy Allan
     site:
       edit_tooltip: Sunting peta
       edit_disabled_tooltip: Zum dekat untuk menyunting peta
@@ -2288,6 +2297,7 @@ ms:
       klik di sini.
     directions:
       engines:
+        fossgis_osrm_bike: Basikal (OSRM)
         fossgis_osrm_car: Kereta (OSRM)
         graphhopper_bicycle: Basikal (GraphHopper)
         graphhopper_foot: Jalan kaki (GraphHopper)
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 1dab15dd3..4e978e7c9 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -722,8 +722,6 @@ my:
       edit: ပြင်ဆင်
       owner: 'ပိုင်ဆိုင်သူ:'
       description: 'ဖော်ပြချက်:'
-    trace_paging_nav:
-      showing_page: စာမျက်နှာ %{page}
     trace:
       more: ပို၍
       view_map: မြေပုံကို ကြည့်ရန်
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 59a6b12ea..9a5fb3a94 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -236,7 +236,6 @@ nb:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1952,7 +1951,6 @@ nb:
       visibility: 'Synlighet:'
       confirm_delete: Slett dette sporet?
     trace_paging_nav:
-      showing_page: Side %{page}
       older: Eldre spor
       newer: Nyere spor
     trace:
diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 9cf60dff9..0a465ab79 100644
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -73,7 +73,6 @@ nds:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   accounts:
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index f1c37f278..68536eaf8 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -1049,8 +1049,6 @@ ne:
       delete_trace: यो ट्रेस मेट्ने
       trace_not_found: ट्रेस भेटिएन!
       visibility: 'दृश्यक्षमता:'
-    trace_paging_nav:
-      showing_page: पृष्ठ %{page}
     trace:
       pending: बाँकी रहेको
       count_points: पोइन्टहरु %{count}
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e898125f7..058ada96c 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -272,7 +272,6 @@ nl:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -424,7 +423,7 @@ nl:
       history_title_html: 'Weggeschiedenis: %{name}'
       nodes: Knooppunten
       nodes_count:
-        one: 1 knooppunt
+        one: ${count} knooppunt
         other: '%{count} knooppunten'
       also_part_of_html:
         one: onderdeel van weg %{related_ways}
@@ -2545,7 +2544,6 @@ nl:
       visibility: 'Zichtbaarheid:'
       confirm_delete: Dit traject verwijderen?
     trace_paging_nav:
-      showing_page: Pagina %{page}
       older: Oudere trajecten
       newer: Nieuwere trajecten
     trace:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 6d510e703..e5cda0b9c 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -191,7 +191,6 @@ nn:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1488,7 +1487,6 @@ nn:
       trace_not_found: Sporet vart ikkje funne!
       visibility: 'Synligheit:'
     trace_paging_nav:
-      showing_page: Side %{page}
       older: Eldre spor
       newer: Nyare spor
     trace:
diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index a4b751841..d40120227 100644
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -1594,7 +1594,6 @@ nqo:
       visibility: 'ߦߋߟߌ:'
       confirm_delete: ߞߊ߬ ߜߋ߬ߙߋ ߣߌ߲߬ ߖߏ߰ߛߌ߫؟
     trace_paging_nav:
-      showing_page: ߞߐߜߍ %{page}
       older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
       newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
     trace:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 357d434e0..7f709f6b6 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -221,7 +221,6 @@ oc:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipèdia
   api:
@@ -2143,7 +2142,6 @@ oc:
       visibility: 'Visibilitat :'
       confirm_delete: Suprimir aquesta traça ?
     trace_paging_nav:
-      showing_page: Afichatge de la pagina %{page}
       older: Ancianas traças
       newer: Traças novèlas
     trace:
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 6e3ddc178..50a2e90cf 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -1011,7 +1011,6 @@ pa:
       trace_not_found: ਖੁਰ-ਖੋਜ ਨਹੀਂ ਲੱਭਿਆ!
       visibility: 'ਦਿੱਸਣਯੋਗਤਾ:'
     trace_paging_nav:
-      showing_page: ਸਫ਼ਾ %{page}
       older: ਪੁਰਾਣੇ ਖੁਰਾ-ਖੋਜ
       newer: ਨਵੇਂ ਖੁਰਾ-ਖੋਜ
     trace:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index df7bc4555..f248db1c1 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -303,7 +303,6 @@ pl:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2477,7 +2476,6 @@ pl:
       visibility: 'Widoczność:'
       confirm_delete: Usunąć ten ślad?
     trace_paging_nav:
-      showing_page: Strona %{page}
       older: Starsze ślady
       newer: Nowsze ślady
     trace:
diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 1a25c462d..1ce103fea 100644
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -1764,7 +1764,6 @@ pnb:
       visibility: 'دِکھ:'
       confirm_delete: ایہہ کھر کھوج مٹاؤ؟
     trace_paging_nav:
-      showing_page: صفحہ نمبر %{page}
       older: پراݨے کھر کھوجاں
       newer: نویں کھر کھوجاں
     trace:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index a154a76f0..5b3c3bdd5 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -252,7 +252,6 @@ pt-PT:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipédia
   api:
@@ -2495,7 +2494,6 @@ pt-PT:
       visibility: 'Visibilidade:'
       confirm_delete: Eliminar esta rota?
     trace_paging_nav:
-      showing_page: Página %{page}
       older: Rotas GPS mais antigas
       newer: Rotas GPS mais recentes
     trace:
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 2fd61dcdd..fe8160327 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -270,7 +270,6 @@ pt:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipédia
   api:
@@ -2514,7 +2513,6 @@ pt:
       visibility: 'Visibilidade:'
       confirm_delete: Eliminar esta trilha?
     trace_paging_nav:
-      showing_page: Página %{page}
       older: Trilhas mais antigas
       newer: Trilhas mais recentes
     trace:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index b2e708d2a..f60c4cffb 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -232,7 +232,6 @@ ro:
       openid: OpenID
       google: OpenID
       facebook: OpenID
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2122,7 +2121,6 @@ ro:
       visibility: 'Vizibilitate:'
       confirm_delete: Șterge această urmă?
     trace_paging_nav:
-      showing_page: Pagina %{page}
       older: Urme mai vechi
       newer: Urme mai noi
     trace:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b4b1cba9b..555ea01e4 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -331,7 +331,6 @@ ru:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Википедия
   api:
@@ -2426,7 +2425,6 @@ ru:
       visibility: 'Видимость:'
       confirm_delete: Удалить этот трек?
     trace_paging_nav:
-      showing_page: Страница %{page}
       older: Более старые треки
       newer: Более новые треки
     trace:
diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 7f26b8be0..c48c8e850 100644
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -116,7 +116,6 @@ sat:
       openid: OpenID
       google: ᱜᱩᱜᱟᱹᱞ
       facebook: ᱯᱷᱮᱥᱵᱩᱠ
-      windowslive: Windows Live
       github: ᱜᱤᱴᱦᱚᱵ
       wikipedia: ᱣᱤᱠᱤᱯᱤᱰᱤᱭᱟ
   api:
@@ -616,8 +615,6 @@ sat:
       edit: ᱥᱟᱯᱲᱟᱣ
       owner: 'ᱢᱟᱹᱞᱤᱠ:'
       description: 'ᱵᱤᱵᱨᱚᱱ:'
-    trace_paging_nav:
-      showing_page: ᱥᱟᱦᱴᱟ %{page}
     trace:
       more: ᱵᱟᱹᱲᱛᱤ
       view_map: ᱱᱚᱠᱥᱟ ᱧᱮᱞ ᱢᱮ
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 1be3f8dc4..5660a99aa 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -221,7 +221,6 @@ sc:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2507,7 +2506,6 @@ sc:
       visibility: 'Visibilidade:'
       confirm_delete: Iscantzellare custa rasta?
     trace_paging_nav:
-      showing_page: Pàgina %{page}
       older: Rastas prus betzas
       newer: Rastas prus noas
     trace:
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index de38e15f1..cb4aa3f5b 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -163,7 +163,6 @@ scn:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1633,7 +1632,6 @@ scn:
       trace_not_found: Tracciatu nun attruvatu!
       visibility: 'Visibbilità:'
     trace_paging_nav:
-      showing_page: Pàggina %{page}
       older: Tracciati cchiù vecchî
       newer: Tracciati cchiù novi
     trace:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 3fc4cfad4..7bd8b6e87 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -259,7 +259,6 @@ sk:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipédia
   api:
@@ -2265,7 +2264,6 @@ sk:
       trace_not_found: Stopa nenájdená!
       visibility: 'Viditeľnosť:'
     trace_paging_nav:
-      showing_page: Stránka %{page}
       older: Staršie stopy
       newer: Novšie stopy
     trace:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index afffbbf01..bc4c08c21 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -255,7 +255,6 @@ sl:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedija
   api:
@@ -2530,7 +2529,6 @@ sl:
       visibility: 'Vidnost:'
       confirm_delete: Izbriši to sled?
     trace_paging_nav:
-      showing_page: Stran %{page}
       older: Starejše sledi
       newer: Novejše sledi
     trace:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 510b63fbb..b85cfc647 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1246,8 +1246,6 @@ sq:
       delete_trace: Fshi këtë gjurmë
       trace_not_found: Gjurma nuk u gjet!
       visibility: 'Dukshmëria:'
-    trace_paging_nav:
-      showing_page: Duke shfaqun faqen %{page}
     trace:
       pending: NE PRITJE
       count_points: '%{count} pikë'
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index c7bc31f96..470019435 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1124,7 +1124,6 @@ sr-Latn:
       trace_not_found: Trag nije pronađen.
       visibility: 'Vidljivost:'
     trace_paging_nav:
-      showing_page: Prikaz stranice %{page}
       older: Stariji tragovi
       newer: Noviji tragovi
     trace:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index e5923d2bc..f980de83b 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -192,7 +192,6 @@ sr:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Википедија
   api:
@@ -1789,7 +1788,6 @@ sr:
       visibility: 'Видљивост:'
       confirm_delete: Избрисати овај траг?
     trace_paging_nav:
-      showing_page: Страница %{page}
       older: Старији трагови
       newer: Новији трагови
     trace:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index da7f717f2..847d18f50 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -259,7 +259,6 @@ sv:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2273,7 +2272,6 @@ sv:
       visibility: 'Synlighet:'
       confirm_delete: Radera detta spår?
     trace_paging_nav:
-      showing_page: Sida %{page}
       older: Äldre GPS-spår
       newer: Nyare GPS-spår
     trace:
diff --git a/config/locales/te.yml b/config/locales/te.yml
index ce8104b5b..095c11d2f 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -220,7 +220,6 @@ te:
       openid: ఓపెన్‌ఐడీ
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: వికీపీడియా
   api:
@@ -2118,7 +2117,6 @@ te:
       visibility: 'దృశ్యత:'
       confirm_delete: ఈ ట్రేసును తొలగించాలా?
     trace_paging_nav:
-      showing_page: '%{page} పేజీ'
       older: పాత ట్రేసులు
       newer: కొత్త ట్రేసులు
     trace:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 3f2b900a0..c11f31ee2 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -211,7 +211,6 @@ th:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: วิกิพีเดีย
   api:
@@ -1756,7 +1755,6 @@ th:
       trace_not_found: ไม่พบรอยทางนี้!
       visibility: 'สถานะการแสดง:'
     trace_paging_nav:
-      showing_page: หน้า %{page}
       older: รอยทางที่เก่ากว่า
       newer: รอยทางที่ใหม่กว่า
     trace:
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 3d564dcbd..41a18baf6 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -202,7 +202,6 @@ tl:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1803,7 +1802,6 @@ tl:
       visibility: 'Pagkanakikita:'
       confirm_delete: Burahin ang bakas na ito?
     trace_paging_nav:
-      showing_page: Ika-%{page} na pahina
       older: Mas Lumang mga Bakas
       newer: Mas Bagong mga Bakas
     trace:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 706111db0..a70142f75 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -262,7 +262,6 @@ tr:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Vikipedi
   api:
@@ -2400,7 +2399,6 @@ tr:
       visibility: 'Görünürlük:'
       confirm_delete: Bu izi sil?
     trace_paging_nav:
-      showing_page: '%{page}. sayfa'
       older: Daha Eski Ä°zler
       newer: En Yeni Ä°zler
     trace:
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index e9797e8b2..f153a7d96 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -218,7 +218,6 @@ tt:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Википедия
   api:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 93ec94a79..0b51488b7 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -283,7 +283,6 @@ uk:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
       github: GitHub
       wikipedia: Вікіпедія
   api:
@@ -2552,7 +2551,6 @@ uk:
       visibility: 'Видимість:'
       confirm_delete: Вилучити цей трек?
     trace_paging_nav:
-      showing_page: Сторінка %{page}
       older: Старіші треки
       newer: Новіші треки
     trace:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 9a4e5cfb9..530ebb705 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -221,7 +221,6 @@ vi:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -2172,7 +2171,6 @@ vi:
       visibility: 'Mức độ truy cập:'
       confirm_delete: Xóa tuyến đường này?
     trace_paging_nav:
-      showing_page: Trang %{page}
       older: Tuyến đường Cũ hơn
       newer: Tuyến đường Mới hơn
     trace:
diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index be16d423b..86c4e27bc 100644
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -209,7 +209,6 @@ xmf:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows
       github: GitHub
       wikipedia: ვიკიპედია
   api:
diff --git a/config/locales/yi.yml b/config/locales/yi.yml
index 1f6ded06a..d93073817 100644
--- a/config/locales/yi.yml
+++ b/config/locales/yi.yml
@@ -140,8 +140,6 @@ yi:
       help: הילף
     edit:
       cancel: אַנולירן
-    trace_paging_nav:
-      showing_page: בלאַט %{page}
     trace:
       public: עפֿנטלעך
   users:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 91f0aab89..d07cacfeb 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -287,7 +287,6 @@ zh-CN:
       openid: 开放式身份验证
       google: 谷歌
       facebook: 脸书
-      windowslive: Microsoft
       github: GitHub
       wikipedia: 维基百科
   api:
@@ -2314,7 +2313,6 @@ zh-CN:
       visibility: 可见性：
       confirm_delete: 删除这条轨迹？
     trace_paging_nav:
-      showing_page: 第%{page}页
       older: 较旧轨迹
       newer: 较新轨迹
     trace:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index de6282c10..5662aa6f8 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -210,7 +210,6 @@ zh-HK:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: 維基百科
   api:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 9fe6e90a0..4d74ecd41 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -255,7 +255,6 @@ zh-TW:
       openid: OpenID
       google: Google
       facebook: 臉書
-      windowslive: Microsoft
       github: GitHub
       wikipedia: 維基百科
   api:
@@ -387,6 +386,7 @@ zh-TW:
       history_title_html: 路徑歷史：%{name}
       nodes: 節點
       nodes_count:
+        one: '%{count} 個節點'
         other: '%{count} 個節點'
       also_part_of_html:
         one: 路徑 %{related_ways} 的部份
@@ -2301,7 +2301,6 @@ zh-TW:
       visibility: 能見度
       confirm_delete: 刪除這個軌跡？
     trace_paging_nav:
-      showing_page: 第 %{page} 頁
       older: 較舊軌跡
       newer: 較新軌跡
     trace:
diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 2bc6516bc..c9464ffed 100644
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -705,14 +705,26 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     assert_response :not_found
 
     # Try an entry by a suspended user
-    diary_entry_suspended = create(:diary_entry, :user => suspended_user)
-    get diary_entry_path(:display_name => suspended_user.display_name, :id => diary_entry_suspended)
+    diary_entry_suspended_user = create(:diary_entry, :user => suspended_user)
+    get diary_entry_path(:display_name => suspended_user.display_name, :id => diary_entry_suspended_user)
     assert_response :not_found
 
     # Try an entry by a deleted user
-    diary_entry_deleted = create(:diary_entry, :user => deleted_user)
-    get diary_entry_path(:display_name => deleted_user.display_name, :id => diary_entry_deleted)
+    diary_entry_deleted_user = create(:diary_entry, :user => deleted_user)
+    get diary_entry_path(:display_name => deleted_user.display_name, :id => diary_entry_deleted_user)
     assert_response :not_found
+
+    # Now try as a moderator
+    session_for(create(:moderator_user))
+    get diary_entry_path(:display_name => user.display_name, :id => diary_entry_deleted)
+    assert_response :success
+    assert_template :show
+
+    # Finally try as an administrator
+    session_for(create(:administrator_user))
+    get diary_entry_path(:display_name => user.display_name, :id => diary_entry_deleted)
+    assert_response :success
+    assert_template :show
   end
 
   def test_show_hidden_comments
@@ -789,8 +801,11 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:moderator_user))
     post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
     assert_response :redirect
-    assert_redirected_to :controller => :errors, :action => :forbidden
-    assert_not DiaryEntry.find(diary_entry.id).visible
+    assert_redirected_to :action => :index, :display_name => user.display_name
+    assert DiaryEntry.find(diary_entry.id).visible
+
+    # Reset
+    diary_entry.reload.update(:visible => true)
 
     # Finally try as an administrator
     session_for(create(:administrator_user))
@@ -856,8 +871,11 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:moderator_user))
     post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
     assert_response :redirect
-    assert_redirected_to :controller => :errors, :action => :forbidden
-    assert_not DiaryComment.find(diary_comment.id).visible
+    assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
+    assert DiaryComment.find(diary_comment.id).visible
+
+    # Reset
+    diary_comment.reload.update(:visible => true)
 
     # Finally try as an administrator
     session_for(create(:administrator_user))
diff --git a/test/controllers/oauth2_authorized_applications_controller_test.rb b/test/controllers/oauth2_authorized_applications_controller_test.rb
index 347d3e40e..c01f7d6f3 100644
--- a/test/controllers/oauth2_authorized_applications_controller_test.rb
+++ b/test/controllers/oauth2_authorized_applications_controller_test.rb
@@ -36,6 +36,32 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe
     assert_select "tbody tr", 2
   end
 
+  def test_index_scopes
+    user = create(:user)
+    application1 = create(:oauth_application, :scopes => %w[read_prefs write_prefs write_diary read_gpx write_gpx])
+    create(:oauth_access_grant, :resource_owner_id => user.id, :application => application1, :scopes => %w[read_prefs write_prefs])
+    create(:oauth_access_token, :resource_owner_id => user.id, :application => application1, :scopes => %w[read_prefs write_prefs])
+    create(:oauth_access_grant, :resource_owner_id => user.id, :application => application1, :scopes => %w[read_prefs write_diary])
+    create(:oauth_access_token, :resource_owner_id => user.id, :application => application1, :scopes => %w[read_prefs write_diary])
+
+    get oauth_authorized_applications_path
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => oauth_authorized_applications_path)
+
+    session_for(user)
+
+    get oauth_authorized_applications_path
+    assert_response :success
+    assert_template "oauth2_authorized_applications/index"
+    assert_select "tbody tr", 1
+    assert_select "tbody tr td ul" do
+      assert_select "li", :count => 3
+      assert_select "li", :text => "Read user preferences"
+      assert_select "li", :text => "Modify user preferences"
+      assert_select "li", :text => "Create diary entries, comments and make friends"
+    end
+  end
+
   def test_destroy
     user = create(:user)
     application1 = create(:oauth_application)
diff --git a/yarn.lock b/yarn.lock
index ac47f3d5a..2be69e654 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14,15 +14,15 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.4.0.tgz#3e61c564fcd6b921cb789838631c5ee44df09403"
-  integrity sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==
+"@eslint-community/regexpp@^4.6.1":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8"
+  integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==
 
-"@eslint/eslintrc@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.0.tgz#82256f164cc9e0b59669efc19d57f8092706841d"
-  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==
+"@eslint/eslintrc@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.1.tgz#18d635e24ad35f7276e8a49d135c7d3ca6a46f93"
+  integrity sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -34,10 +34,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.44.0":
-  version "8.44.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af"
-  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
+"@eslint/js@^8.46.0":
+  version "8.46.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.46.0.tgz#3f7802972e8b6fe3f88ed1aabc74ec596c456db6"
+  integrity sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==
 
 "@humanwhocodes/config-array@^0.11.10":
   version "0.11.10"
@@ -89,7 +89,7 @@ acorn@^8.9.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59"
   integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
 
-ajv@^6.10.0, ajv@^6.12.4:
+ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -210,40 +210,40 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-scope@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b"
-  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
-  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f"
+  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==
 
 eslint@^8.0.0:
-  version "8.45.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78"
-  integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==
+  version "8.46.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.46.0.tgz#a06a0ff6974e53e643acc42d1dcf2e7f797b3552"
+  integrity sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.1.0"
-    "@eslint/js" "8.44.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.1"
+    "@eslint/js" "^8.46.0"
     "@humanwhocodes/config-array" "^0.11.10"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.0"
-    eslint-visitor-keys "^3.4.1"
-    espree "^9.6.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.2"
+    espree "^9.6.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -266,10 +266,10 @@ eslint@^8.0.0:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-espree@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.0.tgz#80869754b1c6560f32e3b6929194a3fe07c5b82f"
-  integrity sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
     acorn "^8.9.0"
     acorn-jsx "^5.3.2"