Rebase to current master

Merge openstreetmap/openstreetmap-website into hikemaniac/openstreetmap-website

.rubocop.yml

@@ -1,26 +1,5 @@
 inherit_from: .rubocop_todo.yml
 
-AllCops:
-  Include:
-    - '**/*.gemspec'
-    - '**/*.podspec'
-    - '**/*.jbuilder'
-    - '**/*.rake'
-    - '**/*.opal'
-    - '**/config.ru'
-    - '**/Gemfile'
-    - '**/Rakefile'
-    - '**/Capfile'
-    - '**/Guardfile'
-    - '**/Podfile'
-    - '**/Thorfile'
-    - '**/Vagrantfile'
-    - '**/Berksfile'
-    - '**/Cheffile'
-    - '**/Vagabondfile'
-    - '**/Fastfile'
-    - '**/*.builder'
-
 Rails:
   Enabled: true
 

Gemfile.lock

@@ -43,23 +43,23 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    annotate (2.7.2)
+    annotate (2.7.3)
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)
     arel (8.0.0)
     ast (2.4.0)
-    autoprefixer-rails (8.2.0)
+    autoprefixer-rails (8.5.0)
       execjs
     better_errors (2.4.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bigdecimal (1.1.0)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    canonical-rails (0.2.2)
-      rails (>= 4.1, < 5.2)
+    canonical-rails (0.2.3)
+      rails (>= 4.1, < 5.3)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -88,14 +88,14 @@ GEM
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.3)
-    dalli (2.7.6)
-    debug_inspector (0.0.2)
+    crass (1.0.4)
+    dalli (2.7.8)
+    debug_inspector (0.0.3)
     docile (1.1.5)
     dynamic_form (1.1.4)
     erubi (1.7.1)
     execjs (2.7.0)
-    exifr (1.3.3)
+    exifr (1.3.4)
     factory_bot (4.8.2)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.8.2)
@@ -128,7 +128,7 @@ GEM
       sprockets
     image_size (1.5.0)
     in_threads (1.5.0)
-    jquery-rails (4.3.1)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -147,9 +147,7 @@ GEM
     libv8 (3.16.14.19)
     libxml-ruby (3.1.0)
     listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
     logstash-event (1.2.02)
     logstasher (1.2.2)
       activesupport (>= 4.0)
@@ -171,7 +169,7 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nio4r (2.3.0)
+    nio4r (2.3.1)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     nokogumbo (1.5.0)
@@ -191,7 +189,7 @@ GEM
     omniauth (1.8.1)
       hashie (>= 3.4.6, < 3.6.0)
       rack (>= 1.6.2, < 3)
-    omniauth-facebook (4.0.0)
+    omniauth-facebook (5.0.0)
       omniauth-oauth2 (~> 1.2)
     omniauth-github (1.3.0)
       omniauth (~> 1.5)
@@ -223,25 +221,25 @@ GEM
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
     parallel (1.12.1)
-    parser (2.5.0.5)
+    parser (2.5.1.0)
       ast (~> 2.4.0)
     pg (0.21.0)
-    poltergeist (1.17.0)
-      capybara (~> 2.1)
+    poltergeist (1.18.0)
+      capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
     progress (3.4.0)
     psych (3.0.2)
     public_suffix (3.0.2)
-    puma (3.11.3)
+    puma (3.11.4)
     r2 (0.2.7)
-    rack (2.0.4)
+    rack (2.0.5)
     rack-cors (1.0.2)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-test (0.8.3)
+    rack-test (1.0.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rails (5.1.5)
@@ -287,7 +285,7 @@ GEM
       rack (>= 1.4)
     rinku (2.0.4)
     rotp (3.3.1)
-    rubocop (0.54.0)
+    rubocop (0.56.0)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -296,9 +294,8 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-openid (2.7.0)
     ruby-progressbar (1.9.0)
-    ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sanitize (4.6.4)
+    sanitize (4.6.5)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
@@ -313,8 +310,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    secure_headers (5.0.5)
-      useragent (>= 0.15.0)
+    secure_headers (6.0.0)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -340,14 +336,13 @@ GEM
     tins (1.16.3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.8)
+    uglifier (4.1.10)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.3.0)
-    useragent (0.16.10)
+    unicode-display_width (1.3.2)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.1.16)
-    webmock (3.3.0)
+    webmock (3.4.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -425,4 +420,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

app/assets/javascripts/index/directions/graphhopper.js

@@ -27,13 +27,12 @@ function GraphHopperEngine(id, vehicleType) {
           locale: I18n.currentLocale(),
           key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn",
           "ch.disable": vehicleType === "car",
-          type: "jsonp",
           elevation: false,
           instructions: true,
           point: points.map(function (p) { return p.lat + "," + p.lng; })
         },
         traditional: true,
-        dataType: "jsonp",
+        dataType: "json",
         success: function (data) {
           if (!data.paths || data.paths.length === 0)
             return callback(true);

app/assets/stylesheets/common.scss

@@ -1028,7 +1028,7 @@ header .search_forms,
 
 /* Rules for search sidebar */
 
-.search_results_entry {
+#sidebar .search_results_entry {
   ul li {
     border-bottom: $keyline;
     cursor: pointer;
@@ -1036,12 +1036,9 @@ header .search_forms,
     &.selected { background: $list-highlight; }
   }
 
-  .search_details {
-    display: block;
-    float: right;
-    text-align: right;
-    margin-top: 0.2em;
-    margin-left: 0.5em;
+  .search_more .loader {
+    display: none;
+    width: 100%;
   }
 }
 
@@ -1131,6 +1128,11 @@ tr.turn:hover {
   .comments-0 {
     opacity: 0.5;
   }
+
+  .changeset_more .loader {
+    display: none;
+    width: 100%;
+  }
 }
 
 /* Rules for the browse sidebar */
@@ -1668,10 +1670,6 @@ tr.turn:hover {
   }
 }
 
-.content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div
-  display: inline;
-}
-
 .pagination {
   padding-top: $lineheight;
 }

app/controllers/application_controller.rb

@@ -411,9 +411,9 @@ class ApplicationController < ActionController::Base
     append_content_security_policy_directives(
       :child_src => %w[http://127.0.0.1:8111 https://127.0.0.1:8112],
       :frame_src => %w[http://127.0.0.1:8111 https://127.0.0.1:8112],
-      :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org],
+      :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org graphhopper.com],
       :form_action => %w[render.openstreetmap.org],
-      :script_src => %w[graphhopper.com open.mapquestapi.com],
+      :script_src => %w[open.mapquestapi.com],
       :img_src => %w[developer.mapquest.com]
     )
 

app/controllers/messages_controller.rb

@@ -6,8 +6,8 @@ class MessagesController < ApplicationController
   before_action :require_user
   before_action :lookup_user, :only => [:new]
   before_action :check_database_readable
-  before_action :check_database_writable, :only => [:new, :reply, :mark]
-  before_action :allow_thirdparty_images, :only => [:new, :read]
+  before_action :check_database_writable, :only => [:new, :reply, :mark, :destroy]
+  before_action :allow_thirdparty_images, :only => [:new, :show]
 
   # Allow the user to write a new message to another user. This action also
   # deals with the sending of that message to the other user when the user
@@ -61,7 +61,7 @@ class MessagesController < ApplicationController
   end
 
   # Show a message
-  def read
+  def show
     @title = t ".title"
     @message = Message.find(params[:message_id])
 
@@ -115,13 +115,13 @@ class MessagesController < ApplicationController
     render :action => "no_such_message", :status => :not_found
   end
 
-  # Delete the message.
-  def delete
+  # Destroy the message.
+  def destroy
     @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:message_id])
     @message.from_user_visible = false if @message.sender == current_user
     @message.to_user_visible = false if @message.recipient == current_user
     if @message.save && !request.xhr?
-      flash[:notice] = t ".deleted"
+      flash[:notice] = t ".destroyed"
 
       if params[:referer]
         redirect_to params[:referer]

app/controllers/site_controller.rb

@@ -120,7 +120,7 @@ class SiteController < ApplicationController
     append_content_security_policy_directives(
       :connect_src => %w[*],
       :img_src => %w[* blob:],
-      :script_src => %w[dev.virtualearth.net 'unsafe-eval']
+      :script_src => %w[dev.virtualearth.net *.wikipedia.org www.wikidata.org 'unsafe-eval']
     )
 
     render "id", :layout => false

app/helpers/application_helper.rb

@@ -17,44 +17,6 @@ module ApplicationHelper
     link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall")
   end
 
-  def style_rules
-    css = ""
-
-    css << ".hidden { display: none !important }"
-    css << ".hide_unless_logged_in { display: none !important }" unless current_user
-    css << ".hide_if_logged_in { display: none !important }" if current_user
-    css << ".hide_if_user_#{current_user.id} { display: none !important }" if current_user
-    css << ".show_if_user_#{current_user.id} { display: inline !important }" if current_user
-    css << ".hide_unless_administrator { display: none !important }" unless current_user && current_user.administrator?
-    css << ".hide_unless_moderator { display: none !important }" unless current_user && current_user.moderator?
-
-    content_tag(:style, css, :type => "text/css")
-  end
-
-  def if_logged_in(tag = :div, &block)
-    content_tag(tag, capture(&block), :class => "hide_unless_logged_in")
-  end
-
-  def if_not_logged_in(tag = :div, &block)
-    content_tag(tag, capture(&block), :class => "hide_if_logged_in")
-  end
-
-  def if_user(user, tag = :div, &block)
-    content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") if user
-  end
-
-  def unless_user(user, tag = :div, &block)
-    if user
-      content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}")
-    else
-      content_tag(tag, capture(&block))
-    end
-  end
-
-  def if_administrator(tag = :div, &block)
-    content_tag(tag, capture(&block), :class => "hide_unless_administrator")
-  end
-
   def richtext_area(object_name, method, options = {})
     id = "#{object_name}_#{method}"
     type = options.delete(:format) || "markdown"

app/models/notifier.rb

@@ -69,7 +69,7 @@ class Notifier < ActionMailer::Base
       @from_user = message.sender.display_name
       @text = message.body
       @title = message.title
-      @readurl = read_message_url(message)
+      @readurl = message_url(message)
       @replyurl = reply_message_url(message)
       @author = @from_user
 

app/views/browse/changeset.html.erb

@@ -13,15 +13,17 @@
 
   <h4 class="comments-header"><%= t('.discussion') %></h4>
 
-  <div class="buttons clearfix subscribe-buttons">
-    <form action="#" class="hide_unless_logged_in">
-      <% if current_user and @changeset.subscribers.exists?(current_user.id) %>
-        <input class="action-button" type="submit" name="unsubscribe" value="<%= t('javascripts.changesets.show.unsubscribe') %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
-      <% else %>
-        <input class="action-button" type="submit" name="subscribe" value="<%= t('javascripts.changesets.show.subscribe') %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
-      <% end %>
-    </form>
-  </div>
+  <% if current_user %>
+    <div class="buttons clearfix subscribe-buttons">
+      <form action="#">
+        <% if @changeset.subscribers.exists?(current_user.id) %>
+          <input class="action-button" type="submit" name="unsubscribe" value="<%= t('javascripts.changesets.show.unsubscribe') %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
+        <% else %>
+          <input class="action-button" type="submit" name="subscribe" value="<%= t('javascripts.changesets.show.subscribe') %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
+        <% end %>
+      </form>
+    </div>
+  <% end %>
 
   <div class="clearfix"></div>
 
@@ -59,23 +61,27 @@
     </div>
   <% end %>
 
-  <div class="notice hide_if_logged_in">
-    <%= link_to(t(".join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %>
-  </div>
-
-  <% unless @changeset.is_open? %>
-    <form action="#" class="hide_unless_logged_in">
-      <textarea class="comment" name="text" cols="40" rows="5"></textarea>
-      <div class="buttons clearfix">
-        <input type="submit" name="comment" value="<%= t('javascripts.changesets.show.comment') %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1"/>
-      </div>
-    </form>
-  <% else %>
-    <div class="notice hide_unless_logged_in">
-    <%= t('.still_open') %>
+  <% unless current_user %>
+    <div class="notice">
+      <%= link_to(t(".join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %>
     </div>
   <% end %>
 
+  <% if current_user %>
+    <% unless @changeset.is_open? %>
+      <form action="#">
+        <textarea class="comment" name="text" cols="40" rows="5"></textarea>
+        <div class="buttons clearfix">
+          <input type="submit" name="comment" value="<%= t('javascripts.changesets.show.comment') %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1"/>
+        </div>
+      </form>
+    <% else %>
+      <div class="notice">
+      <%= t('.still_open') %>
+      </div>
+    <% end %>
+  <% end %>
+
   <% unless @ways.empty? %>
     <h4>
       <%= type_and_paginated_count('way', @way_pages) %>

app/views/browse/note.html.erb

@@ -40,8 +40,12 @@
     <form action="#">
       <textarea class="comment" name="text" cols="40" rows="5"></textarea>
       <div class="buttons clearfix">
-        <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
-        <input type="submit" name="close" value="<%= t('javascripts.notes.show.resolve') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, 'json') %>">
+        <% if current_user and current_user.moderator? -%>
+          <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
+        <% end -%>
+        <% if current_user -%>
+          <input type="submit" name="close" value="<%= t('javascripts.notes.show.resolve') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, 'json') %>">
+        <% end -%>
         <input type="submit" name="comment" value="<%= t('javascripts.notes.show.comment') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, 'json') %>" disabled="1">
       </div>
     </form>
@@ -49,8 +53,12 @@
     <form action="#">
       <input type="hidden" name="text" value="">
       <div class="buttons clearfix">
-        <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
-        <input type="submit" name="reopen" value="<%= t('javascripts.notes.show.reactivate') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, 'json') %>">
+        <% if current_user and current_user.moderator? -%>
+          <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
+        <% end -%>
+        <% if current_user -%>
+          <input type="submit" name="reopen" value="<%= t('javascripts.notes.show.reactivate') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, 'json') %>">
+        <% end -%>
       </div>
     </form>
   <% end %>

app/views/changeset/list.html.erb

@@ -5,7 +5,7 @@
 <% if @edits.size == 20 -%>
   <div class="changeset_more">
     <%= link_to t('.load_more'), url_for(@params.merge(:max_id => @edits.last.id - 1)), :class => "button load_more" %>
-    <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>
+    <div class="loader"><%= image_tag "searching.gif" %></div>
   </div>
 <% end -%>
 <% elsif params[:bbox] %>

app/views/diary_entry/_diary_comment.html.erb

@@ -2,7 +2,9 @@
   <%= user_thumbnail diary_comment.user %>
   <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= raw(t('.comment_from', :link_user => (link_to h(diary_comment.user.display_name), user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}"))) %></p>
   <div class="richtext"><%= diary_comment.body.to_html %></div>
-  <%= if_administrator(:span) do %>
-    <%= link_to t('.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('.confirm') } %>
+  <% if current_user && current_user.administrator? %>
+    <span>
+      <%= link_to t('.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('.confirm') } %>
+    </span>
   <% end %>
 </div>

app/views/diary_entry/_diary_entry.html.erb

@@ -27,12 +27,12 @@
       <li><%= link_to t('.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %></li>
     <% end %>
 
-    <%= if_user(diary_entry.user, :li) do %>
-      <%= link_to t('.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
+    <% if current_user && current_user == diary_entry.user %>
+      <li><%= link_to t('.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></li>
     <% end %>
 
-    <%= if_administrator(:li) do %>
-      <%= link_to t('.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('.confirm') } %>
+    <% if current_user && current_user.administrator? %>
+      <li><%= link_to t('.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('.confirm') } %></li>
     <% end %>
   </ul>
 </div>

app/views/diary_entry/list.html.erb

@@ -11,12 +11,16 @@
       <% end -%>
 
       <% if @user %>
-        <%= if_user(@user) do %>
-          <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %></li>
+        <% if @user == current_user %>
+          <div>
+            <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %></li>
+          </div>
         <% end %>
       <% else %>
-        <%= if_logged_in do %>
-          <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %></li>
+        <% if current_user %>
+          <div>
+            <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %></li>
+          </div>
         <% end %>
       <% end %>
     </ul>

app/views/diary_entry/view.html.erb

@@ -12,25 +12,27 @@
 <div class='comments'>
 <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
 </div>
-<%= if_logged_in(:div) do %>
-  <h3 id="newcomment"><%= t '.leave_a_comment' %></h3>
 
-  <%= error_messages_for 'diary_comment' %>
 
-  <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %>
-    <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
-    <%= submit_tag t('.save_button') %>
+<div>
+  <% if current_user %>
+    <h3 id="newcomment"><%= t '.leave_a_comment' %></h3>
+
+    <%= error_messages_for 'diary_comment' %>
+
+    <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %>
+      <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
+      <%= submit_tag t('.save_button') %>
+    <% end %>
+    <% if @entry.subscribers.exists?(current_user.id) %>
+      <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
+    <% else %>
+      <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
+    <% end %>
+  <% else %>
+    <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h3>
   <% end %>
-  <% if current_user and @entry.subscribers.exists?(current_user.id) %>
-    <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
-  <% elsif current_user %>
-    <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
-  <% end %>
-<% end %>
-
-<%= if_not_logged_in(:div) do %>
-  <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h3>
-<% end %>
+</div>
 
 <% content_for :auto_discovery_link_tag do -%>
 <%= auto_discovery_link_tag :rss, :action => :rss, :display_name => @entry.user.display_name %>

app/views/geocoder/results.html.erb

@@ -9,7 +9,7 @@
   <% if @more_params %>
     <div class="search_more">
       <%= link_to t('.more_results'), url_for(@more_params), :class => "button load_more" %>
-      <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>
+      <div class="loader"><%= image_tag "searching.gif" %></div>
     </div>
   <% end %>
 <% end %>

app/views/layouts/_head.html.erb

@@ -33,7 +33,6 @@
   <% if flash[:piwik_goal] -%>
   <%= tag("meta", :name => "piwik-goal", :content => flash[:piwik_goal]) %>
   <% end -%>
-  <%= style_rules %>
   <%= yield :head %>
   <%= yield :auto_discovery_link_tag %>
   <%= csrf_meta_tag %>

app/views/messages/_message_summary.html.erb

@@ -1,8 +1,8 @@
 <tr id="inbox-<%= message_summary.id %>" class="inbox-row<%= "-unread" if not message_summary.message_read? %>">
   <td class="inbox-sender"><%= link_to h(message_summary.sender.display_name), user_path(message_summary.sender) %></td>
-  <td class="inbox-subject"><%= link_to h(message_summary.title), read_message_path(message_summary) %></td>
+  <td class="inbox-subject"><%= link_to h(message_summary.title), message_path(message_summary) %></td>
   <td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td>
   <td class="inbox-mark-unread"><%= button_to t('.unread_button'), mark_message_path(message_summary, :mark => 'unread'), { :remote => true } %></td>
   <td class="inbox-mark-read"><%= button_to t('.read_button'), mark_message_path(message_summary, :mark => 'read'), { :remote => true } %></td>
-  <td class="inbox-delete"><%= button_to t('.delete_button'), delete_message_path(message_summary, :referer => request.fullpath), { :remote => true } %></td>
+  <td class="inbox-destroy"><%= button_to t('.destroy_button'), destroy_message_path(message_summary, :referer => request.fullpath), { :remote => true } %></td>
 </tr>

app/views/messages/_sent_message_summary.html.erb

@@ -1,6 +1,6 @@
 <tr class="inbox-row">
   <td class="inbox-sender"><%= link_to h(sent_message_summary.recipient.display_name), user_path(sent_message_summary.recipient) %></td>
-  <td class="inbox-subject"><%= link_to h(sent_message_summary.title), read_message_path(sent_message_summary) %></td>
+  <td class="inbox-subject"><%= link_to h(sent_message_summary.title), message_path(sent_message_summary) %></td>
   <td class="inbox-sent"><%= l sent_message_summary.sent_on, :format => :friendly %></td>
-  <td class="inbox-delete"><%= button_to t('.delete_button'), delete_message_path(sent_message_summary, :referer => request.fullpath) %></td>
+  <td class="inbox-destroy"><%= button_to t('.destroy_button'), destroy_message_path(sent_message_summary, :referer => request.fullpath) %></td>
 </tr>

app/views/messages/show.html.erb

@@ -16,7 +16,7 @@
   <div class='message-buttons buttons'>
     <%= button_to t('.reply_button'), reply_message_path(@message), :class => 'reply-button' %>
     <%= button_to t('.unread_button'), mark_message_path(@message, :mark => 'unread'), :class => 'mark-unread-button' %>
-    <%= button_to t('.delete_button'), delete_message_path(@message), :class => 'delete-button' %>
+    <%= button_to t('.destroy_button'), destroy_message_path(@message), :class => 'destroy-button' %>
 
 <% else %>
 

app/views/traces/list.html.erb

@@ -11,8 +11,8 @@
       <% if @display_name %>
         <li><%= link_to t('.see_all_traces'), :controller => 'traces', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
       <% end %>
-      <%= unless_user(@target_user, :li) do %>
-        <%= link_to t('.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %>
+      <% if current_user && current_user != @target_user %>
+        <li><%= link_to t('.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
       <% end %>
     <% end %>
   </ul>

app/views/traces/view.html.erb

@@ -56,8 +56,10 @@
 
 <% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?)%>
   <div class="buttons">
-    <%= if_user(@trace.user) do %>
-      <%= button_to t('.edit_track'), trace_edit_path(@trace) %>
+    <% if current_user == @trace.user %>
+      <div>
+        <%= button_to t('.edit_track'), trace_edit_path(@trace) %>
+      </div>
     <% end %>
     <%= button_to t('.delete_track'), { :controller => 'traces', :action => 'delete', :id => @trace.id }, :data => { :confirm => t('.confirm_delete') } %>
   </div>

config/initializers/secure_headers.rb

@@ -1,5 +1,6 @@
 if defined?(CSP_REPORT_URL)
   csp_policy = {
+    :preserve_schemes => true,
     :default_src => %w['self'],
     :child_src => %w['self'],
     :connect_src => %w['self'],
@@ -8,14 +9,17 @@ if defined?(CSP_REPORT_URL)
     :frame_ancestors => %w['self'],
     :frame_src => %w['self'],
     :img_src => %w['self' data: www.gravatar.com *.wp.com *.tile.openstreetmap.org *.tile.thunderforest.com *.openstreetmap.fr],
+    :manifest_src => %w['none'],
     :media_src => %w['none'],
     :object_src => %w['self'],
     :plugin_types => %w[],
     :script_src => %w['self'],
-    :style_src => %w['self' 'unsafe-inline'],
+    :style_src => %w['self'],
+    :worker_src => %w['none'],
     :report_uri => [CSP_REPORT_URL]
   }
 
+  csp_policy[:connect_src] << PIWIK["location"] if defined?(PIWIK)
   csp_policy[:img_src] << PIWIK["location"] if defined?(PIWIK)
   csp_policy[:script_src] << PIWIK["location"] if defined?(PIWIK)
 else

config/locales/af.yml

@@ -901,7 +901,7 @@ af:
     changeset_comment_notification:
       hi: Hallo %{to_user},
       greeting: Hallo,
-  message:
+  messages:
     inbox:
       title: In-vakkie
       my_inbox: My in-vakkie
@@ -916,7 +916,7 @@ af:
       unread_button: Merk as ongelees
       read_button: Merk as gelees
       reply_button: Beantwoord
-      delete_button: Verwyder
+      destroy_button: Verwyder
     new:
       title: Stuur boodskap
       send_message_to: Stuur 'n nuwe boodskap aan %{name}
@@ -939,23 +939,23 @@ af:
       no_sent_messages: U het nog geen boodskappe gestuur nie. Waarom tree u nie met
         sommige van die %{people_mapping_nearby_link} in verbinding nie?
       people_mapping_nearby: nabygeleë karteerders
-    read:
+    show:
       title: Lees boodskap
       from: Van
       subject: Onderwerp
       date: Datum
       reply_button: Beantwoord
       unread_button: Merk as ongelees
-      delete_button: Skrap
+      destroy_button: Skrap
       back: Terug
       to: Aan
     sent_message_summary:
-      delete_button: Verwyder
+      destroy_button: Verwyder
     mark:
       as_read: Boodskap as gelees gemerk
       as_unread: Boodskap as ongelees gemerk
-    delete:
-      deleted: Boodskap is verwyder
+    destroy:
+      destroyed: Boodskap is verwyder
   site:
     about:
       next: Volgende
@@ -1138,7 +1138,7 @@ af:
       start_mapping: Begin Karteer
       add_a_note:
         title: Geen tyd om te redigeer? Voeg 'n opmerking by!
-  trace:
+  traces:
     create:
       upload_trace: Laai GPS-spore op
       upload_gpx: 'Laai GPX-lêer op:'

config/locales/aln.yml

@@ -665,7 +665,7 @@ aln:
         në llogarinë openstreetmap.org këtë adresë email-i.
       click_the_link: Nëse kjo është që ju, ju lutemi klikoni lidhjen më poshtë për
         të rivendosni fjalëkalimin tuaj.
-  message:
+  messages:
     inbox:
       title: Inbox
       my_inbox: postë e mia
@@ -680,7 +680,7 @@ aln:
       unread_button: Bone si të palexume
       read_button: Bone si të lexume
       reply_button: Ktheje
-      delete_button: Fshije
+      destroy_button: Fshije
     new:
       title: Qo mesazh
       send_message_to: Qoje një mesazh të ri te %{name}
@@ -710,7 +710,7 @@ aln:
       wrong_user: Ju keni hy si `%{user}' por mesazhi që po doni me ju përgjigj nuk
         u dërgu për at anëtar. Ju lutem hyni si anëtari korrekt nëse doni me ju përgjigj
         atij mesazhi.
-    read:
+    show:
       title: Lexo mesazhin
       from: Prej
       subject: Titulli
@@ -722,12 +722,12 @@ aln:
         për ose nga ai anëtar. Ju lutem hyni si anëtari korrekt nëse doni me lexu
         atë mesazh.
     sent_message_summary:
-      delete_button: Fshij
+      destroy_button: Fshij
     mark:
       as_read: Mesazhi u bo si i lexum
       as_unread: Mesazhi u bo si i palexum
-    delete:
-      deleted: Mesazhi u fshi
+    destroy:
+      destroyed: Mesazhi u fshi
   site:
     copyright:
       foreign:
@@ -924,7 +924,7 @@ aln:
           private: qasje privat
           destination: qasje Destinacioni
           construction: Rrugët në ndërtim e sipër
-  trace:
+  traces:
     visibility:
       private: Private (ndahen vetem si pika anonime të rendituna)
       public: Publike (shfaqet ne listen e të dhanave si e padukshme, pikat e rendituna)

config/locales/ar.yml

@@ -1037,7 +1037,7 @@ ar:
         subject_own: '[OpenStreetMap] علق %{commenter} على على إحدى تغييراتك'
         partial_changeset_with_comment: مع تعليق '%{changeset_comment}'
         partial_changeset_without_comment: بدون تعليق
-  message:
+  messages:
     inbox:
       title: الوارد
       my_inbox: الوارد
@@ -1058,7 +1058,7 @@ ar:
       unread_button: علّم كغير مقروءة
       read_button: علّم كمقروءة
       reply_button: رد
-      delete_button: حذف
+      destroy_button: حذف
     new:
       title: أرسل رسالة
       send_message_to: أرسل رسالة جديدة إلى %{name}
@@ -1090,25 +1090,25 @@ ar:
     reply:
       wrong_user: "\uFEFFأنت مسجل دخول باسم '%{user}' ولكن الرسالة التي طلبت الرد
         عليها لم تكن مرسلة لذلك المستخدم. يرجى تسجيل الدخول كمستخدم صحيح للرد."
-    read:
+    show:
       title: اقرأ الرسالة
       from: من
       subject: الموضوع
       date: التاريخ
       reply_button: رد
       unread_button: علّم كغير مقروءة
-      delete_button: احذف
+      destroy_button: احذف
       back: رجوع
       to: إلى
       wrong_user: "\uFEFFأنت مسجل دخول باسم '%{user}' ولكن الرسالة التي طلبت قراءتها
         لم تكن من أو إلى ذلك المستخدم. يرجى تسجيل الدخول كمستخدم صحيح للرد."
     sent_message_summary:
-      delete_button: حذف
+      destroy_button: حذف
     mark:
       as_read: عُلّمت الرسالة مقروءة
       as_unread: عُلّمت الرسالة كغير مقروءة
-    delete:
-      deleted: حُذفت الرسالة
+    destroy:
+      destroyed: حُذفت الرسالة
   site:
     about:
       next: التالي
@@ -1394,7 +1394,7 @@ ar:
         title: لا وقت للتعديل؟ أضف ملاحظة!
         paragraph_1_html: إذا كنت تريد إصلاح مجرد شيء صغير وليس لديك الوقت للتسجيل
           ومعرفة كيفية التحرير، فإنه من السهل أن تضيف ملاحظة.
-  trace:
+  traces:
     visibility:
       private: خصوصي (يظهر كمجهول الهوية ونقاط غير مرتبة)
       public: عمومي (يظهر في قائمة الآثار مجهول الهوية ونقاط غير مرتبة)

config/locales/arz.yml

@@ -604,7 +604,7 @@ arz:
         عنوان البريد الإلكترونى هذا.
       click_the_link: إذا كان هذا هو أنت، يرجى الضغط على الرابط أدناه لإعاده تعيين
         كلمه المرور.
-  message:
+  messages:
     inbox:
       title: الوارد
       my_inbox: الوارد
@@ -618,7 +618,7 @@ arz:
       unread_button: علّم كغير مقروءة
       read_button: علّم كمقروءة
       reply_button: رد
-      delete_button: احذف
+      destroy_button: احذف
     new:
       title: أرسل رسالة
       send_message_to: أرسل رساله جديده إلى %{name}
@@ -640,7 +640,7 @@ arz:
       no_sent_messages: لا يوجد لديك رسائل مرسله بعد. لماذا لا تقوم بالاتصال مع بعض
         %{people_mapping_nearby_link}؟
       people_mapping_nearby: مخططون فى جواري
-    read:
+    show:
       title: اقرأ الرسالة
       from: من
       subject: الموضوع
@@ -649,12 +649,12 @@ arz:
       unread_button: علّم كغير مقروءة
       to: إلى
     sent_message_summary:
-      delete_button: احذف
+      destroy_button: احذف
     mark:
       as_read: عُلّمت الرساله مقروءة
       as_unread: عُلّمت الرساله كغير مقروءة
-    delete:
-      deleted: حُذفت الرسالة
+    destroy:
+      destroyed: حُذفت الرسالة
   site:
     index:
       js_1: أنت إما تستخدم متصفح لا يدعم جافا سكريبت، أو أنك عطلت استعمال جافا سكريبت.
@@ -758,7 +758,7 @@ arz:
           - ذروة
           private: استخدام خصوصي
           construction: الطرق تحت الإنشاء
-  trace:
+  traces:
     visibility:
       private: خصوصى (يظهر كمجهول الهويه ونقاط غير مرتبة)
       public: عمومى (يظهر فى قائمه الآثار مجهول الهويه ونقاط غير مرتبة)

config/locales/ast.yml

@@ -1085,7 +1085,7 @@ ast:
       details: Puen alcontrase más detalles del conxuntu de cambios en %{url}
       unsubscribe: Pa date de baxa de les actualizaciones d'esti conxuntu de cambeos,
         visita %{url} y fai clic en «dase de baxa».
-  message:
+  messages:
     inbox:
       title: Buzón
       my_inbox: El mio buzón
@@ -1106,7 +1106,7 @@ ast:
       unread_button: Marcar como non lleíu
       read_button: Marcar como lleíu
       reply_button: Contestar
-      delete_button: Desaniciar
+      destroy_button: Desaniciar
     new:
       title: Unviar mensaxe
       send_message_to: Unviar un mensaxe nuevu a %{name}
@@ -1138,25 +1138,25 @@ ast:
     reply:
       wrong_user: Tas coneutáu como `%{user}' pero'l mensaxe que quies contestar nun
         s'unvió a esi usuariu. Anicia sesión col usuariu correchu pa contestar.
-    read:
+    show:
       title: Lleer el mensaxe
       from: De
       subject: Asuntu
       date: Data
       reply_button: Contestar
       unread_button: Marcar como non lleíu
-      delete_button: Desaniciar
+      destroy_button: Desaniciar
       back: Anterior
       to: Pa
       wrong_user: Tas coneutáu como `%{user}' pero'l mensaxe que quies lleer nun s'unvió
         por o a esi usuariu. Anicia sesión col usuariu correchu pa contestar.
     sent_message_summary:
-      delete_button: Desaniciar
+      destroy_button: Desaniciar
     mark:
       as_read: Mensaxe marcáu como lleíu
       as_unread: Mensaxe marcáu como non lleíu
-    delete:
-      deleted: Mensaxe desaniciáu
+    destroy:
+      destroyed: Mensaxe desaniciáu
   site:
     about:
       next: Siguiente
@@ -1421,22 +1421,18 @@ ast:
         description: Entrugar o buscar respuestes nel sitiu d'entrugues y respuestes
           d'OSM.
       mailing_lists:
-        url: https://lists.openstreetmap.org/
         title: Llistes de corréu
         description: Fai una entruga o alderica sobro asuntos interesantes nun ampliu
           abanicu de llistes de corréu temátiques o rexonales.
       forums:
-        url: https://forum.openstreetmap.org/
         title: Foros
         description: Entrugues y alderiques pa los que prefieren una interfaz pol
           estilu d'un tablón d'anuncios.
       irc:
-        url: https://irc.openstreetmap.org/
         title: IRC
         description: Charra interactiva en munchos idiomes diferentes y sobro munchos
           asuntos.
       switch2osm:
-        url: https://switch2osm.org/
         title: Migrar a OSM
         description: Ayuda pa les empreses y organizaciones que cambien a mapes y
           otros servicios, basaos n'OpenStreetMap.
@@ -1595,7 +1591,7 @@ ast:
           Namái entre <a href='%{map_url}'>nel mapa</a> y calque nel iconu nota:
           <span class='icon note'></span>. Esto amestará un marcador al mapa, que pue mover
           abasnando. Añada'l mensaxe, calque guardar, y otros mapeadores investigarán.
-  trace:
+  traces:
     visibility:
       private: Priváu (compartíu sólo como anónimu, puntos ensin axeitar)
       public: Públicu (amosar na llista de traces y como anónimu, puntos ensin axeitar)
@@ -2485,8 +2481,21 @@ ast:
         against_oneway_without_exit: Dir escontra direición per %{name}
         end_oneway_without_exit: Final de sentíu únicu en %{name}
         roundabout_with_exit: Na rotonda coyer la salida %{exit} haza %{name}
+        roundabout_with_exit_ordinal: Na rotonda toma la salida %{exit} haza %{name}
+        exit_roundabout: Salir de la rotonda escontra %{name}
         unnamed: ensin nome
         courtesy: Direiciones cortesía de %{link}
+        exit_counts:
+          first: 1ª
+          second: 2ª
+          third: 3ª
+          fourth: 4ª
+          fifth: 5ª
+          sixth: 6ª
+          seventh: 7ª
+          eighth: 8ª
+          ninth: 9ª
+          tenth: 10ª
       time: Tiempu
     query:
       node: Nuedu

config/locales/az.yml

@@ -86,6 +86,9 @@ az:
     potlatch:
       name: Potlatch 1
       description: Potlatch 1 (brauzer üzərindən redaktə)
+    id:
+      name: iD
+      description: iD (brauzerdaxili redaktə)
     potlatch2:
       name: Potlatch 2
       description: Potlatch 2 (brauzer üzərindən redaktə)
@@ -93,15 +96,34 @@ az:
       name: Uzaqdan idarəetmə
       description: Uzaqdan idarəetmə (JOSM və ya Merkaartor)
   browse:
+    created: Yaradılıb
+    closed: Bağlanıb
+    created_html: <abbr title='%{title}'>%{time} əvvəl</abbr> yaradılıb
+    closed_html: <abbr title='%{title}'>%{time} əvvəl</abbr> bağlanılıb
+    created_by_html: <abbr title='%{title}'>%{time} əvvəl</abbr> %{user} tərəfindən
+      yaradılıb
+    deleted_by_html: <abbr title='%{title}'>%{time} əvvəl</abbr>  %{user} tərəfindən
+      silinib
+    edited_by_html: <abbr title='%{title}'>%{time} əvvəl </abbr> %{user} tərəfindən
+      dəyişdirilib
+    closed_by_html: <abbr title='%{title}'>%{time} əvvəl </abbr> %{user} tərəfindən
+      bağlanılıb
+    version: Versiya
+    in_changeset: Dəyişikliklər
+    anonymous: anonim
+    no_comment: (şərhsiz)
     download_xml: XML endir
+    location: 'Yerləşməsi:'
     changeset:
-      title: Dəyişikliklər dəsti
+      title: 'Dəyişikliklər dəsti: %{id}'
       belongs_to: Müəllif
       changesetxml: XML dəyişikliklər dəsti
       osmchangexml: osmChange XML
       feed:
         title: Dəyişikliklər dəsti  %{id}
         title_comment: Dəyişikliklər dəsti %{id} - %{comment}
+    relation:
+      members: İştirakçılar
     relation_member:
       entry_role: '%{role} kimi %{type} %{name}'
       type:
@@ -748,7 +770,7 @@ az:
       greeting: Salam,
       click_the_link: Əgər bu sizsinizsə, zəhmət olmasa, parolunuzu əvəzləmək üçün
         aşağı göstərilmiş istinaddakı ünvana keçin.
-  message:
+  messages:
     inbox:
       title: Gələnlər
       my_inbox: Mənim gələnlər
@@ -770,7 +792,7 @@ az:
       unread_button: Oxunulmamış kimi işarələ
       read_button: Oxunulmuş kimi işarələ
       reply_button: Geri göndər
-      delete_button: Sil
+      destroy_button: Sil
     new:
       title: Mesaj göndər
       send_message_to: '%{name} yeni mesaj göndər'
@@ -794,7 +816,7 @@ az:
       subject: Mövzu
       date: Tarix
       people_mapping_nearby: yaxınlıqdakı istifadəçilərlə
-    read:
+    show:
       title: Mesajı oxu
       from: Kimdən
       subject: Mövzu
@@ -803,12 +825,12 @@ az:
       unread_button: Oxunulmamış kimi işarələ
       to: Kimə
     sent_message_summary:
-      delete_button: Sil
+      destroy_button: Sil
     mark:
       as_read: Mesaj oxunulmuş kimi işarələndi
       as_unread: Mesaj oxunulmamış kimi işarələndi
-    delete:
-      deleted: Mesaj silindi
+    destroy:
+      destroyed: Mesaj silindi
   site:
     copyright:
       foreign:
@@ -930,7 +952,7 @@ az:
       image: Şəkil
       alt: Alternativ mətn
       url: URL
-  trace:
+  traces:
     create:
       description: 'İzah:'
       help: Kömək

config/locales/be-Tarask.yml

@@ -741,7 +741,7 @@ be-Tarask:
         пошты openstreetmap.org.
       click_the_link: Калі гэта Вы, калі ласка, націсьніце на спасылку ніжэй, каб
         скінуць Ваш пароль.
-  message:
+  messages:
     inbox:
       title: Уваходзячыя
       my_inbox: Мае ўваходзячыя
@@ -764,7 +764,7 @@ be-Tarask:
       unread_button: Пазначыць як непрачытанае
       read_button: Пазначыць як прачытанае
       reply_button: Адказаць
-      delete_button: Выдаліць
+      destroy_button: Выдаліць
     new:
       title: Даслаць паведамленьне
       send_message_to: Даслаць новае паведамленьне да %{name}
@@ -797,7 +797,7 @@ be-Tarask:
       wrong_user: Вы ўвайшлі ў сыстэму як `%{user}', але паведамленьне, на якое Вы
         жадаеце адказаць, не было дасланае гэтаму карыстальніку. Калі ласка, увайдзіце
         як карыстальнік, адпаведна запыту, каб адказаць.
-    read:
+    show:
       title: Чытаць паведамленьне
       from: Ад
       subject: Тэма
@@ -809,12 +809,12 @@ be-Tarask:
         прачытаць, было дасланае не гэтым ці гэтаму карыстальніку. Калі ласка, увайдзіце
         як карыстальнік, адпаведна запыту, каб прачытаць.
     sent_message_summary:
-      delete_button: Выдаліць
+      destroy_button: Выдаліць
     mark:
       as_read: Паведамленьне пазначанае як прачытанае
       as_unread: Паведамленьне пазначанае як непрачытанае
-    delete:
-      deleted: Паведамленьне выдаленае
+    destroy:
+      destroyed: Паведамленьне выдаленае
   site:
     copyright:
       foreign:
@@ -1026,7 +1026,7 @@ be-Tarask:
       unordered: Неўпарадкаваны сьпіс
       ordered: Упарадкаваны сьпіс
       first: Першы элемэнт
-  trace:
+  traces:
     visibility:
       private: Прыватны (даступны толькі ананімна, неўладкаваныя пункты)
       public: Публічны (паказаны ў сьпісе трэкаў і як ананімны, неўладкаваныя пункты)

config/locales/be.yml

@@ -1021,7 +1021,7 @@ be:
       details: Дадатковыя звесткі аб наборы зьменаў можна знайсці ў %{url}.
       unsubscribe: Каб адпісацца ад абнаўленняў гэтага пакета правак наведайце %{url}
         і націсніце кнопку "Адпісацца".
-  message:
+  messages:
     inbox:
       title: Уваходныя
       my_inbox: Мае уваходныя
@@ -1042,7 +1042,7 @@ be:
       unread_button: Адзначыць як нечытанае
       read_button: Адзначыць як прачытанае
       reply_button: Адказаць
-      delete_button: Выдаліць
+      destroy_button: Выдаліць
     new:
       title: Даслаць паведамленне
       send_message_to: Даслаць новае паведамленне %{name}
@@ -1075,26 +1075,26 @@ be:
       wrong_user: Вы ўвайшлі ў сістэму як `%{user}', але паведамленне, на якое Вы
         жадаеце адказаць, не было дасланае гэтаму карыстальніку. Калі ласка, увайдзіце
         як карыстальнік, адпаведна запыту, каб адказаць.
-    read:
+    show:
       title: Прачытаць паведамленне
       from: Ад
       subject: Тэма
       date: Дата
       reply_button: Адказаць
       unread_button: Адзначыць, як непрачытанае
-      delete_button: Выдаліць
+      destroy_button: Выдаліць
       back: Назад
       to: Каму
       wrong_user: Вы ўвайшлі ў сістэму як `%{user}', але паведамленне, якое Вы жадаеце
         прачытаць, было дасланае не гэтым ці гэтаму карыстальніку. Калі ласка, увайдзіце
         як карыстальнік, адпаведна запыту, каб прачытаць.
     sent_message_summary:
-      delete_button: Выдаліць
+      destroy_button: Выдаліць
     mark:
       as_read: Паведамленне адмечана прачытаным
       as_unread: Паведамленне адмечана нечытаным
-    delete:
-      deleted: Паведамленне выдалена
+    destroy:
+      destroyed: Паведамленне выдалена
   site:
     about:
       next: Далей
@@ -1362,21 +1362,17 @@ be:
         description: Задаць пытанне або знайсці адказы на сайце пытанняў і адказаў
           OSM.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Рассылкі
         description: Задайце пытанне ці далучыцеся да абмеркавання цікавых тэм на
           шырокім коле тэматычных або рэгіянальных спісаў рассылкі.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Форумы
         description: Пытанні і абмеркаванні для тых, хто аддае перавагу інтэрфейсу
           ў стылі дошкі аб'яў.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Інтэрактыўны чат на розных мовах і на розныя тэмы.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Дапамога кампаніям і арганізацыям у пераходзе на карты OpenStreetMap
           і іншыя паслугі.
@@ -1535,7 +1531,7 @@ be:
           дадаць маркер на карту, які вы зможаце перацягнуць мышшу. Дадайце ваша паведамленне,
           націсніце \"захаваць\", і іншыя ўдзельнікі ўбачаць яго і, у выпадку неабходнасці,
           будуць унесены змены ў карту."
-  trace:
+  traces:
     visibility:
       private: Прыватны (ананімны з неспарадкаванымі кропкамі)
       public: Агульны (паказваецца ў сьпісе слядоў як ананімны з неспарадкаванымі

config/locales/bg.yml

@@ -751,7 +751,7 @@ bg:
       greeting: Здравейте,
       commented:
         partial_changeset_without_comment: без коментари
-  message:
+  messages:
     inbox:
       title: Входящи
       my_inbox: Входяща кутия
@@ -772,7 +772,7 @@ bg:
       unread_button: Отбелязване като непрочетено
       read_button: Отбелязване като прочетено
       reply_button: Отговор
-      delete_button: Изтриване
+      destroy_button: Изтриване
     new:
       title: Изпращане на съобщение
       send_message_to: Изпращане ново съобщение на %{name}
@@ -793,20 +793,20 @@ bg:
       to: До
       subject: Тема
       date: Дата
-    read:
+    show:
       title: Прочетете съобщението
       from: От
       subject: Тема
       date: Дата
       reply_button: Отговор
       unread_button: Отбелязване като непрочетено
-      delete_button: Изтриване
+      destroy_button: Изтриване
       back: Назад
       to: До
     sent_message_summary:
-      delete_button: Изтриване
-    delete:
-      deleted: Съобщението беше изтрито
+      destroy_button: Изтриване
+    destroy:
+      destroyed: Съобщението беше изтрито
   site:
     about:
       next: Следващ
@@ -983,7 +983,7 @@ bg:
         title: Въпроси?
       add_a_note:
         title: Нямате време за редактиране? Добавете бележка!
-  trace:
+  traces:
     create:
       upload_gpx: 'Качване на GPX файл:'
       description: 'Описание:'

config/locales/bn.yml

@@ -887,7 +887,7 @@ bn:
     changeset_comment_notification:
       greeting: হাই,
       details: পরিবর্তনধার্য সম্পর্কে আরও বিস্তারিত %{url} এ পাওয়া যাবে।
-  message:
+  messages:
     inbox:
       title: ইনবক্স
       my_inbox: আমার ইনবক্স
@@ -905,7 +905,7 @@ bn:
       unread_button: অপঠিত হিসেবে চিহ্নিত করুন
       read_button: পঠিত হিসেবে চিহ্নিত করুন
       reply_button: প্রত্যুত্তর
-      delete_button: মুছুন
+      destroy_button: মুছুন
     new:
       title: বার্তা পাঠান
       send_message_to: '%{name}কে একটি নতুন বার্তা পাঠান'
@@ -928,22 +928,22 @@ bn:
       subject: বিষয়
       date: তারিখ
       people_mapping_nearby: কাছাকাছি মানচিত্রকার
-    read:
+    show:
       title: বার্তা পড়ুন
       subject: বিষয়
       date: তারিখ
       reply_button: প্রত্যুত্তর
       unread_button: অপঠিত হিসেবে চিহ্নিত করুন
-      delete_button: অপসারণ
+      destroy_button: অপসারণ
       back: পিছনে
       to: প্রাপক
     sent_message_summary:
-      delete_button: অপসারণ
+      destroy_button: অপসারণ
     mark:
       as_read: বার্তা পঠিত হিসেবে চিহ্নিত করুন
       as_unread: বার্তা অপঠিত হিসেবে চিহ্নিত করুন
-    delete:
-      deleted: বার্তা মোছা হয়েছে
+    destroy:
+      destroyed: বার্তা মোছা হয়েছে
   site:
     about:
       next: পরবর্তী
@@ -1132,7 +1132,7 @@ bn:
       start_mapping: মানচিত্রকরণ শুরু করুন
       add_a_note:
         title: সম্পাদনার সময় নেই? একটি টীকা যোগ করুন!
-  trace:
+  traces:
     create:
       upload_trace: জিপিএস অনুসরণ আপলোড
       trace_uploaded: আপনার জিপিএক্স ফাইলটি আপলোড হয়েছে এবং ডাটাবেইজ এ অন্তর্ভুক্তির

config/locales/br.yml

@@ -1105,7 +1105,7 @@ br:
       details: Muioc'h a ditouroù war an holl cheñchamantoù e %{url}.
       unsubscribe: Evit digoumanantiñ diouzh hizivadurioù an holl gemmoù, gweladennit
         %{url} ha klikit war « Digoumanantiñ ».
-  message:
+  messages:
     inbox:
       title: Boest resev
       my_inbox: Ma boest resev
@@ -1127,7 +1127,7 @@ br:
       unread_button: Merkañ evel anlennet
       read_button: Merkañ evel lennet
       reply_button: Respont
-      delete_button: Dilemel
+      destroy_button: Dilemel
     new:
       title: Kas ur gemennadenn
       send_message_to: Kas ur gemennadenn nevez da %{name}
@@ -1160,26 +1160,26 @@ br:
       wrong_user: Kevreet oc'h evel "%{user}", met ar gemennadenn a fell deoc'h respont
         outi n'eo ket bet kaset d'an implijer-se. Mar plij kevreit gant ar gont reizh
         evit gellout respont.
-    read:
+    show:
       title: Lenn ar gemennadenn
       from: A-berzh
       subject: Danvez
       date: Deiziad
       reply_button: Respont
       unread_button: Merkañ evel anlennet
-      delete_button: Diverkañ
+      destroy_button: Diverkañ
       back: Distreiñ
       to: Da
       wrong_user: Kevreet oc'h evel "%{user}", met ar gemennadenn a fell deoc'h lenn
         n'eo ket bet kaset na gant na d'an implijer-se. Mar plij kevreit gant ar gont
         reizh evit gellout lenn anezhi.
     sent_message_summary:
-      delete_button: Dilemel
+      destroy_button: Dilemel
     mark:
       as_read: Kemennadenn merket evel lennet
       as_unread: Merkañ evel anlennet
-    delete:
-      deleted: Kemennadenn dilamet
+    destroy:
+      destroyed: Kemennadenn dilamet
   site:
     about:
       next: War-lerc'h
@@ -1616,7 +1616,7 @@ br:
         paragraph_2_html: |-
           Kit <a href='%{map_url}'>d'ar gartenn</a> ha klikit war an arlun notenn :
           <span class='icon note'></span>. Evel-se e vo ouzhpennet ur merker d'ar gartenn a c'halloc'h riklañ. Skrivit ho kemennadenn, ha neuze klikit war enrollañ, ha gallout a ray ar gartennaouerien klask gouzout hiroc'h.
-  trace:
+  traces:
     visibility:
       private: Prevez (rannet ent dizanv hepken, poentoù hep urzh)
       public: Foran (diskouezet e roll ar roudoù hag ent dizanv, poentoù hep urzh)

config/locales/bs.yml

@@ -901,7 +901,7 @@ bs:
           bilješki.'
     changeset_comment_notification:
       greeting: Zdravo,
-  message:
+  messages:
     inbox:
       title: Dolazna pošta
       my_inbox: Moja dolazna pošta
@@ -923,7 +923,7 @@ bs:
       unread_button: Označiti kao nepročitano
       read_button: Označiti kao pročitano
       reply_button: Odgovoriti
-      delete_button: Izbrisati
+      destroy_button: Izbrisati
     new:
       title: Poslati poruku
       send_message_to: Poslati novu poruku za %{name}
@@ -956,7 +956,7 @@ bs:
       wrong_user: 'Prijavljeni ste kao: `%{user}'', ali poruka za koju ste zamoljeni
         da odgovorite nije poslana tom korisniku. Molimo, prijavite se kao ispravan
         korisnik kako bi odgovorili.'
-    read:
+    show:
       title: Pročitati poruku
       from: Od
       subject: Predmet
@@ -969,12 +969,12 @@ bs:
         da pročitate nije poslana od strane ili tom korisniku. Molimo, prijavite se
         kao ispravan korisnik kako bi ste je pročitali.'
     sent_message_summary:
-      delete_button: Izbrisati
+      destroy_button: Izbrisati
     mark:
       as_read: Poruka označena kao pročitana
       as_unread: Poruka označena kao nepročitana
-    delete:
-      deleted: Poruka izbrisana
+    destroy:
+      destroyed: Poruka izbrisana
   site:
     about:
       next: Slijedeće
@@ -1246,7 +1246,7 @@ bs:
         title: Osnovni pojmovi za mapiranje
       questions:
         title: Pitanja?
-  trace:
+  traces:
     visibility:
       private: Privatni (prikazuje se kao anoniman, neuređene tačke)
       public: Javni (prikazan u listi trasa i kao anoniman, neuređene tačke)

config/locales/ca.yml

@@ -1058,7 +1058,7 @@ ca:
         partial_changeset_with_comment: amb comentari '%{changeset_comment}'
         partial_changeset_without_comment: sense comentari
       details: Més detalls del conjunt de canvis es poden trobar a %{url}
-  message:
+  messages:
     inbox:
       title: Safata d'entrada
       my_inbox: La meva safata d'entrada
@@ -1079,7 +1079,7 @@ ca:
       unread_button: Marca com a no llegit
       read_button: Marca com a llegit
       reply_button: Respon
-      delete_button: Suprimeix
+      destroy_button: Suprimeix
     new:
       title: Envia un missatge
       send_message_to: Envia un missatge nou per a %{name}
@@ -1112,26 +1112,26 @@ ca:
       wrong_user: Heu iniciat la sessió com "%{user}", però el missatge que han demanat
         de respondre a no s'ha enviat a aquest usuari. Si us plau connecti's com l'usuari
         correcte per a respondre.
-    read:
+    show:
       title: Llegeix el missatge
       from: De
       subject: Assumpte
       date: Data
       reply_button: Respon
       unread_button: Marca com a no llegit
-      delete_button: Suprimeix
+      destroy_button: Suprimeix
       back: Enrere
       to: Per a
       wrong_user: Heu iniciat la sessió com a "%{user}", però el missatge que voleu
         llegir no va ser enviat per o adreçat a aquest usuari. Connecteu-vos com l'usuari
         correcte per a poder llegir-lo.
     sent_message_summary:
-      delete_button: Suprimeix
+      destroy_button: Suprimeix
     mark:
       as_read: Missatge marcat com a llegit
       as_unread: Missatge marcat com a no llegit
-    delete:
-      deleted: Missatge suprimit
+    destroy:
+      destroyed: Missatge suprimit
   site:
     about:
       next: Següent
@@ -1575,7 +1575,7 @@ ca:
           i cliqueu l''icona de la nota: <span class=''icon note''></span>. Això afegirà
           un marcador al mapa que podeu moure arrossegant-lo. Afegiu el vostre missatge,
           cliqueu el botó de desat, i altres usuaris ho investigaran.'
-  trace:
+  traces:
     visibility:
       private: Privat (només compartit com anònim, el punts són desordenats)
       public: Públic (mostrat en llista de traça i com anònims, desordenada punts)

config/locales/cs.yml

@@ -1128,7 +1128,7 @@ cs:
       details: Více informací o této sadě změn lze nalézt na %{url}.
       unsubscribe: Pro odhlášení z aktualizací této sady změn jděte na %{url} a klikněte
         na „Zrušit odebírání“.
-  message:
+  messages:
     inbox:
       title: Doručená pošta
       my_inbox: Má doručená pošta
@@ -1151,7 +1151,7 @@ cs:
       unread_button: Označit jako nepřečtené
       read_button: Označit jako přečtené
       reply_button: Odpovědět
-      delete_button: Smazat
+      destroy_button: Smazat
     new:
       title: Odeslat zprávu
       send_message_to: Poslat novou zprávu uživateli %{name}
@@ -1185,26 +1185,26 @@ cs:
       wrong_user: Jste přihlášeni jako „%{user}“, ale zpráva, na kterou chcete odpovědět,
         nebyla poslána tomuto uživateli. Pokud na ni chcete odpovědět, přihlaste se
         pod správným účtem.
-    read:
+    show:
       title: Čtení zprávy
       from: Od
       subject: Předmět
       date: Datum
       reply_button: Odpovědět
       unread_button: Označit jako nepřečtené
-      delete_button: Smazat
+      destroy_button: Smazat
       back: Zpět
       to: Komu
       wrong_user: Jste přihlášeni jako „%{user}“, ale zpráva, kterou si chcete přečíst,
         není ani od, ani pro tohoto uživatele. Pokud si ji chcete přečíst, přihlaste
         se pod správným účtem.
     sent_message_summary:
-      delete_button: Smazat
+      destroy_button: Smazat
     mark:
       as_read: Zpráva označena jako přečtená
       as_unread: Zpráva označena jako nepřečtená
-    delete:
-      deleted: Zpráva smazána
+    destroy:
+      destroyed: Zpráva smazána
   site:
     about:
       next: Další
@@ -1444,21 +1444,17 @@ cs:
         description: Položte dotaz nebo vyhledejte odpovědi na stránce otázek a odpovědí
           týkajících se OSM.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: E-mailové konference
         description: Položte dotaz nebo diskutujte o zajímavých věcech na některé
           ze široké nabídky tematických či regionálních e-mailových konferencí.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Diskusní fóra
         description: Otázky a diskuse pro ty, kteří preferují rozhraní v nástěnkovém
           stylu.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Interaktivní chat v mnoha jazycích a na mnoho témat.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Pomoc společnostem a organizacím s přechodem na mapy a další
           služby založené na OpenStreetMap.
@@ -1613,7 +1609,7 @@ cs:
           Stačí jít <a href='%{map_url}'>na mapu</a> a kliknout na ikonku poznámky:
           <span class='icon note'></span>. Tím do mapy přidáte značku, kterou můžete přetáhnout.
           Napište svou zprávu, klikněte na Přidat a ostatní tvůrci mapy se na to podívají.
-  trace:
+  traces:
     visibility:
       private: Soukromá (veřejně dostupná jedině jako anonymní, neuspořádané body)
       public: Veřejná (zobrazuje se v seznamu i jako anonymní, neuspořádané body)

config/locales/cy.yml

@@ -982,7 +982,7 @@ cy:
     note_comment_notification:
       anonymous: Defnyddiwr anhysbys
       greeting: Pa hwyl?
-  message:
+  messages:
     inbox:
       title: Mewnflwch
       my_inbox: Fy Mewnflwch
@@ -996,7 +996,7 @@ cy:
       unread_button: Nodi fel heb ei ddarllen
       read_button: Nodi fel wedi'i ddarllen
       reply_button: Ateb
-      delete_button: Dileu
+      destroy_button: Dileu
     new:
       title: Anfon neges
       send_message_to: Anfon negese newydd at %{name}
@@ -1022,23 +1022,23 @@ cy:
       to: I
       subject: Pwnc
       date: Dyddiad
-    read:
+    show:
       title: Darllen neges
       from: Gan
       subject: Pwnc
       date: Dyddiad
       reply_button: Ateb
       unread_button: Nodi nad yw wedi ei ddarllen
-      delete_button: Dileu
+      destroy_button: Dileu
       back: Yn ôl
       to: At
     sent_message_summary:
-      delete_button: Dileu
+      destroy_button: Dileu
     mark:
       as_read: Nodwyd fod y neges wedi ei ddarllen
       as_unread: Nodwyd nad yw'r neges wedi ei ddarllen
-    delete:
-      deleted: Dileuwyd y neges
+    destroy:
+      destroyed: Dileuwyd y neges
   site:
     about:
       next: Nesaf
@@ -1225,7 +1225,7 @@ cy:
       start_mapping: Dechrau Mapio
       add_a_note:
         title: Dim amser i olygu? Ychwanegwch nodyn!
-  trace:
+  traces:
     create:
       upload_gpx: 'Uwchlwytho Ffeil GPX:'
       description: 'Disgrifiad:'

config/locales/da.yml

@@ -1115,7 +1115,7 @@ da:
       details: Flere oplysninger om ændringssættet kan findes på %{url}.
       unsubscribe: For at afmelde opdateringer til dette ændringssæt, kan du besøge
         %{url} og klikke "Afmeld".
-  message:
+  messages:
     inbox:
       title: Indbakke
       my_inbox: Min indbakke
@@ -1137,7 +1137,7 @@ da:
       unread_button: Marker som ulæst
       read_button: Marker som læst
       reply_button: Svar
-      delete_button: Slet
+      destroy_button: Slet
     new:
       title: Send besked
       send_message_to: Send en ny besked til %{name}
@@ -1170,26 +1170,26 @@ da:
       wrong_user: Du er logget på som '%{user}', men den besked du har bedt om at
         svare på blev ikke sendt til den bruger. Log venligst på som den korrekte
         bruger for at svare.
-    read:
+    show:
       title: Læs besked
       from: Fra
       subject: Emne
       date: Dato
       reply_button: Svar
       unread_button: Marker som ulæst
-      delete_button: Slet
+      destroy_button: Slet
       back: Tilbage
       to: Til
       wrong_user: Du er logget på som '%{user}', men den besked du har bedt om at
         læse er ikke sendt af eller til den pågældende bruger. Log venligst på som
         den korrekte bruger for at svare.
     sent_message_summary:
-      delete_button: Slet
+      destroy_button: Slet
     mark:
       as_read: Besked markeret som læst
       as_unread: Besked markeret som ulæst
-    delete:
-      deleted: Besked slettet
+    destroy:
+      destroyed: Besked slettet
   site:
     about:
       next: Næste
@@ -1636,7 +1636,7 @@ da:
           Bare gå ind på <a href='%{map_url}'>kortet</a> og klik på bemærknings-ikonet:
           <span class='icon note'></span>. Dette vil tilføje en markør som du kan trække rundt på kortet. Tilføj din besked,
           klik på gem og andre brugere vil undersøge sagen.
-  trace:
+  traces:
     visibility:
       private: Privat (kun delt som anonyme punkter uden rækkefølge og tidsstempler)
       public: Offentlig (vist i sporliste, men punkterne er anonym og er ikke i rækkefølge)

config/locales/de.yml

@@ -1156,7 +1156,7 @@ de:
         %{url}.
       unsubscribe: Um die Aktualisierungen an diesem Änderungssatz abzubestellen,
         besuche %{url} und klicke auf „Abmelden“.
-  message:
+  messages:
     inbox:
       title: Posteingang
       my_inbox: Posteingang
@@ -1178,7 +1178,7 @@ de:
       unread_button: Als ungelesen markieren
       read_button: Als gelesen markieren
       reply_button: Antworten
-      delete_button: Löschen
+      destroy_button: Löschen
     new:
       title: Nachricht senden
       send_message_to: Eine Nachricht an %{name} senden
@@ -1211,26 +1211,26 @@ de:
       wrong_user: Du bist angemeldet als '%{user}', aber die Nachricht, auf die du
         antworten wolltest, wurde an einen anderen Benutzer geschickt. Bitte melde
         dich zum Beantworten mit dem richtigen Benutzer an.
-    read:
+    show:
       title: Nachricht lesen
       from: Absender
       subject: Betreff
       date: Datum
       reply_button: Antworten
       unread_button: Als ungelesen markieren
-      delete_button: Löschen
+      destroy_button: Löschen
       back: Zurück
       to: An
       wrong_user: Du bist angemeldet als '%{user}', aber die Nachricht, die du lesen
         wolltest, wurde an einen anderen Benutzer geschickt. Bitte melde dich zum
         Lesen mit dem richtigen Benutzer an.
     sent_message_summary:
-      delete_button: Löschen
+      destroy_button: Löschen
     mark:
       as_read: Nachricht als gelesen markiert
       as_unread: Nachricht als ungelesen markiert
-    delete:
-      deleted: Nachricht gelöscht
+    destroy:
+      destroyed: Nachricht gelöscht
   site:
     about:
       next: Nächste
@@ -1513,22 +1513,18 @@ de:
         title: help.openstreetmap.org
         description: Stelle eine Frage oder suche nach Antworten auf der OSM-Fragen-und-Antworten-Seite.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Mailinglisten
         description: Stelle eine Frage und diskutiere interessante Sachen zu einem
           weiten Bereich von thematischen oder regionalen Mailinglisten.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Foren
         description: Fragen und Diskussionen für diejenigen, die eine Oberfläche in
           der Art einer Anschlagstafel bevorzugen.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Interaktiver Chat in vielen unterschiedlichen Sprachen und zu
           vielen Themen.
       switch2osm:
-        url: https://switch2osm.org/
         title: Zu OSM wechseln
         description: Hilfe für auf Karten und anderen Diensten gegründeten Unternehmen
           und Organisationen, die zu OpenStreetMap wechseln.
@@ -1688,7 +1684,7 @@ de:
         paragraph_2_html: |-
           Gehe einfach auf <a href='%{map_url}'>die Karte</a> und klicke auf das Sprechblasen-Symbol:
           <span class='icon note'></span>. Dies fügt einen Marker auf der Karte hinzu, diesen verschiebe bitte möglichst genau auf die Problemstelle und schreibe einen Hinweis. Der Hinweis sollte den Sachverhalt möglichst genau beschreiben, damit ein anderer Mapper die Erklärung dann verwenden kann, um den Fehler zu beheben.
-  trace:
+  traces:
     visibility:
       private: Privat (werden nur als anonyme, unsortierte Punkte ohne Zeitangaben
         gezeigt)

config/locales/diq.yml

@@ -682,7 +682,7 @@ diq:
       greeting: Merheba,
     changeset_comment_notification:
       greeting: Merheba,
-  message:
+  messages:
     inbox:
       title: Ameyan
       my_inbox: Amayenê mı
@@ -692,7 +692,7 @@ diq:
       date: Dem
     message_summary:
       reply_button: Cewab bıde
-      delete_button: Bestere
+      destroy_button: Bestere
     new:
       title: Mesac bırışê
       subject: Mewzu
@@ -705,16 +705,16 @@ diq:
       to: Kêrê
       subject: Mewzu
       date: Dem
-    read:
+    show:
       title: Mesaci bıwanê
       subject: Mewzu
       date: Dem
       reply_button: Cewab bıde
-      delete_button: Bestere
+      destroy_button: Bestere
       back: Peyser
       to: Kêrê
     sent_message_summary:
-      delete_button: Bestere
+      destroy_button: Bestere
   site:
     copyright:
       native:
@@ -797,7 +797,7 @@ diq:
       url: GRE
     welcome:
       title: Xeyr amey!
-  trace:
+  traces:
     create:
       tags: 'Etiketi:'
       visibility: Vinayîşî

config/locales/dsb.yml

@@ -924,7 +924,7 @@ dsb:
         commented_note: '%{commenter} jo kórtowu pokazku reaktiwěrował,  kótaruž sy
           komentěrował. Pokazka jo blisko %{place}.'
       details: Dalšne drobnosći wó pokazce móžoš pód %{url} namakaś.
-  message:
+  messages:
     inbox:
       title: Post
       my_inbox: Mój post
@@ -950,7 +950,7 @@ dsb:
       unread_button: Ako njepśecytany markěrowaś
       read_button: Ako pśecytany markěrowaś
       reply_button: Wótegroniś
-      delete_button: Lašowaś
+      destroy_button: Lašowaś
     new:
       title: Powěsć pósłaś
       send_message_to: '%{name} nowu powěsć pósłaś'
@@ -985,7 +985,7 @@ dsb:
       wrong_user: |-
         Sy ako `%{user}' pśizjawjony, ale powěsć, na kótaruž sy kśěł wótegroniś, njejo se pósłała k tomu wužywarjeju.
         Pšosym pśizjaw se ako korektny wužywaŕ, aby wótegronił.
-    read:
+    show:
       title: Powěsć cytaś
       from: Wót
       subject: Temowe nadpismo
@@ -998,12 +998,12 @@ dsb:
         njejo se pósłała wót togo wužywarja abo k tomu wužywarjeju. Pšosym pśizjaw
         se ako korektny wužywaŕ, aby ju cytał.
     sent_message_summary:
-      delete_button: Lašowaś
+      destroy_button: Lašowaś
     mark:
       as_read: Powěsć jo se markěrowała ako pśecytana
       as_unread: Powěsć jo se markěrowała ako njepśecytana
-    delete:
-      deleted: Powěsć wulašowana
+    destroy:
+      destroyed: Powěsć wulašowana
   site:
     about:
       next: Pśiducy
@@ -1368,7 +1368,7 @@ dsb:
         paragraph_2_html: |-
           Źi jadnorje na <a href='%{map_url}'>kórtu</a> a klikni na symbol pokazki:
           <span class='icon note'></span>. Ten pśida kórśe marku, kótaruž móžoš pśesunuś. Pśidaj swóju powěźeńku, klikni pótom na Składowaś a druge kartěrowarje budu se wěcy wěnowaś.
-  trace:
+  traces:
     visibility:
       private: Priwatny (jano źělony ako anonymne, njezrědowane dypki)
       public: Zjawny (pokazujo se w lisćinje slědow ako anonymne, njezrědowane dypki)

config/locales/el.yml

@@ -1145,7 +1145,7 @@ el:
         στο %{url}.
       unsubscribe: Για να διαγραφείτε από τις ενημερώσεις αυτής της ομάδας αλλαγών,
         επισκεφθείτε το %{url} και πατήστε "Διαγραφή".
-  message:
+  messages:
     inbox:
       title: Εισερχόμενα
       my_inbox: Τα Εισερχόμενά Μου
@@ -1167,7 +1167,7 @@ el:
       unread_button: Σήμανση ως αδιάβαστο
       read_button: Σήμανση ως διαβασμένο
       reply_button: Απάντηση
-      delete_button: Διαγραφή
+      destroy_button: Διαγραφή
     new:
       title: Αποστολή μηνύματος
       send_message_to: Αποστολή νέου μηνύματος προς %{name}
@@ -1200,26 +1200,26 @@ el:
       wrong_user: Έχετε συνδεθεί ως «%{user}» αλλά το μήνυμα που ζητάτε να απαντήσετε
         δεν έχει σταλεί σε αυτόν το χρήστη. Παρακαλώ συνδεθείτε με το σωστό όνομα
         χρήστη ώστε να μπορέσετε να απαντήσετε.
-    read:
+    show:
       title: Ανάγνωση μηνύματος
       from: Από
       subject: Θέμα
       date: Ημ/νία
       reply_button: Απάντηση
       unread_button: Σήμανση ως αδιάβαστο
-      delete_button: Διαγραφή
+      destroy_button: Διαγραφή
       back: Επιστροφή
       to: Προς
       wrong_user: Έχετε συνδεθεί ως «%{user}» αλλά το μήνυμα που ζητάτε να διαβάσετε
         δεν έχει σταλεί σε εσάς ούτε από εσάς. Παρακαλώ συνδεθείτε με το σωστό όνομα
         χρήστη ώστε να μπορέσετε να το διαβάσετε.
     sent_message_summary:
-      delete_button: Διαγραφή
+      destroy_button: Διαγραφή
     mark:
       as_read: Το μήνυμα σημειώθηκε ως διαβασμένο
       as_unread: Το μήνυμα σημειώθηκε ως αδιάβαστο
-    delete:
-      deleted: Το μήνυμα διαγράφηκε
+    destroy:
+      destroyed: Το μήνυμα διαγράφηκε
   site:
     about:
       next: Επόμενη
@@ -1490,22 +1490,18 @@ el:
         description: Κάντε μία ερώτηση ή αναζητήσετε απαντήσεις στην ιστοσελίδα ερωτήσεων
           και απαντήσεων του OSM.
       mailing_lists:
-        url: https://lists.openstreetmap.org/
         title: Λίστες Αλληλογραφίας
         description: Κάντε μία ερώτηση ή συζητήστε ενδιαφέροντα θέματα σε ένα ευρύ
           φάσμα τοπικών ή περιφερειακών λιστών αλληλογραφίας.
       forums:
-        url: https://forum.openstreetmap.org/
         title: Φόρουμ
         description: Ερωτήσεις και συζητήσεις για όσους προτιμούν μία διεπαφή με στιλ
           διάρθρωσης κουκκίδων.
       irc:
-        url: https://irc.openstreetmap.org/
         title: IRC
         description: Διαδραστική συνομιλία σε πολλές διαφορετικές γλώσσες και για
           πολλά θέματα.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Βοήθεια για εταιρείες και οργανισμούς για μετάβαση σε χάρτες
           που βασίζονται στο OpenStreetMap και άλλες υπηρεσίες.
@@ -1665,7 +1661,7 @@ el:
         paragraph_2_html: |-
           Απλά επισκεφτείτε <a href='%{map_url}'>τον χάρτη</a> και πατήστε το εικονίδιο σημείωσης:
           <span class='icon note'></span>. Αυτό θα προσθέσει έναν δείκτη στο χάρτη, τον οποίο μπορείτε να μετακινήσετε τραβώντας τον. Προσθέστε το μήνυμά σας, κατόπιν πατήστε αποθήκευση, και άλλοι χαρτογράφοι θα το διερευνήσουν.
-  trace:
+  traces:
     visibility:
       private: Προσωπικό (διαμοιρασμός μόνο σαν ανώνυμος)
       public: Δημόσιο (εμφανίζεστε στη λίστα ιχνών σαν ανώνυμος, μη χρονοσημασμένα
@@ -1691,8 +1687,10 @@ el:
       tags_help: διαχωρισμένο με κόμματα
       visibility: 'Ορατότητα:'
       visibility_help: τι σημαίνει αυτό;
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       upload_button: Αποστολή
       help: Βοήθεια
+      help_url: https://wiki.openstreetmap.org/wiki/Upload?uselang=el
     edit:
       title: Επεξεργασία ίχνους %{name}
       heading: Επεξεργασία ίχνους %{name}

config/locales/en-GB.yml

@@ -1038,7 +1038,7 @@ en-GB:
       details: More details about the changeset can be found at %{url}.
       unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and
         click "Unsubscribe".
-  message:
+  messages:
     inbox:
       title: Inbox
       my_inbox: My Inbox
@@ -1060,7 +1060,7 @@ en-GB:
       unread_button: Mark as unread
       read_button: Mark as read
       reply_button: Reply
-      delete_button: Delete
+      destroy_button: Delete
     new:
       title: Send message
       send_message_to: Send a new message to %{name}
@@ -1093,26 +1093,26 @@ en-GB:
       wrong_user: You are logged in as `%{user}' but the message you have asked to
         reply to was not sent to that user. Please login as the correct user in order
         to reply.
-    read:
+    show:
       title: Read message
       from: From
       subject: Subject
       date: Date
       reply_button: Reply
       unread_button: Mark as unread
-      delete_button: Delete
+      destroy_button: Delete
       back: Back
       to: To
       wrong_user: You are logged in as `%{user}' but the message you have asked to
         read was not sent by or to that user. Please login as the correct user in
         order to read it.
     sent_message_summary:
-      delete_button: Delete
+      destroy_button: Delete
     mark:
       as_read: Message marked as read
       as_unread: Message marked as unread
-    delete:
-      deleted: Message deleted
+    destroy:
+      destroyed: Message deleted
   site:
     about:
       next: Next
@@ -1552,7 +1552,7 @@ en-GB:
           the note icon: <span class=''icon note''></span>. This will add a marker
           to the map, which you can move by dragging. Add your message, then click
           save, and other mappers will investigate.'
-  trace:
+  traces:
     visibility:
       private: Private (only shared as anonymous, unordered points)
       public: Public (shown in trace list and as anonymous, unordered points)

config/locales/en.yml

@@ -1078,7 +1078,7 @@ en:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
       reply_button: "Reply"
-      delete_button: "Delete"
+      destroy_button: "Delete"
     new:
       title: "Send message"
       send_message_to: "Send a new message to %{name}"
@@ -1107,24 +1107,24 @@ en:
       people_mapping_nearby: "people mapping nearby"
     reply:
       wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
-    read:
+    show:
       title: "Read message"
       from: "From"
       subject: "Subject"
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"
-      delete_button: "Delete"
+      destroy_button: "Delete"
       back: "Back"
       to: "To"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
     sent_message_summary:
-      delete_button: "Delete"
+      destroy_button: "Delete"
     mark:
       as_read: "Message marked as read"
       as_unread: "Message marked as unread"
-    delete:
-      deleted: "Message deleted"
+    destroy:
+      destroyed: "Message deleted"
   site:
     about:
       next: Next

config/locales/eo.yml

@@ -1096,7 +1096,7 @@ eo:
       details: Pli da detaloj pri la ŝanĝaro povas esti trovita ĉe %{url}.
       unsubscribe: Por malaboni el ĝisdatigoj pri ĉi tiu ŝanĝaro, vizitu %{url} kaj
         klaku "Malobservi".
-  message:
+  messages:
     inbox:
       title: Alvenkesto
       my_inbox: Mia alvenkesto
@@ -1117,7 +1117,7 @@ eo:
       unread_button: Marki kiel nelegitan
       read_button: Marki kiel legitan
       reply_button: Respondi
-      delete_button: Forigi
+      destroy_button: Forigi
     new:
       title: Sendi mesaĝon
       send_message_to: Sendi novan mesaĝon al %{name}
@@ -1150,26 +1150,26 @@ eo:
       wrong_user: Vi estas ensalutinta kiel '%{user}', sed la mesaĝo, kiun vi volas
         respondi, ne estas sendita al tiu uzanto. Bonvolu ensaluti kiel propra uzanto
         por respondi ĝin.
-    read:
+    show:
       title: Legi mesaĝon
       from: De
       subject: Temo
       date: Dato
       reply_button: Respondi
       unread_button: Marki kiel nelegitan
-      delete_button: Forigi
+      destroy_button: Forigi
       back: Reen
       to: Al
       wrong_user: Vi estas ensalutinta kiel '%{user}', sed la mesaĝo, kiun vi volas
         legi estas sendita al tiu uzanto. Bonvolu ensaluti kiel propra uzanto por
         legi ĝin.
     sent_message_summary:
-      delete_button: Forigi
+      destroy_button: Forigi
     mark:
       as_read: Mesaĝo markita kiel legitan
       as_unread: Mesaĝo markita kiel nelegitan
-    delete:
-      deleted: Mesaĝo forigita
+    destroy:
+      destroyed: Mesaĝo forigita
   site:
     about:
       next: Sekva
@@ -1420,20 +1420,16 @@ eo:
         description: Demandu aŭ serĉu respondojn je retpaĝo de demandoj-kaj-respondoj
           pri OSM.
       mailing_lists:
-        url: https://lists.openstreetmap.org/
         title: Dissendolistoj
         description: Demandu aŭ diskutu pri interesaj temoj en multaj pritemaj aŭ
           regionaj dissendolistoj.
       forums:
-        url: https://forum.openstreetmap.org/
         title: Forumoj
         description: Demandoj kaj diskutoj por tiuj, kiuj preferas kutimaj diskutforumoj.
       irc:
-        url: https://irc.openstreetmap.org/
         title: IRC
         description: Interaga babilejo en multaj diversaj lingvoj kaj pri multaj temoj.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Helpi al firmaoj kaj organizaĵoj transiĝi al mapoj kaj aliaj
           servoj de OpenStreetMap.
@@ -1589,7 +1585,7 @@ eo:
           la piktogramon <span class='icon note'></span>. Tio aldonos treneblan markon
           al la mapo. Entajpu vian mesaĝon, konservu ĝin kaj aliaj mapigistoj okupiĝos
           pri via rimarko.
-  trace:
+  traces:
     visibility:
       private: Privata (kunhavigita nur kiel sennomaj, malordigitaj punktoj)
       public: Publika (montrata en spurlisto kaj kiel sennomaj, neordigitaj punktoj)

config/locales/es.yml

@@ -1131,7 +1131,7 @@ es:
       details: Más detalles acerca del conjunto de cambios pueden encontrarse en %{url}.
       unsubscribe: Para darte de baja de las actualizaciones de este conjunto de cambios,
         visita %{url} y haz clic en "darse de baja".
-  message:
+  messages:
     inbox:
       title: Buzón de entrada
       my_inbox: Mi buzón
@@ -1153,7 +1153,7 @@ es:
       unread_button: Marcar como no leído
       read_button: Marcar como leí­do
       reply_button: Responder
-      delete_button: Borrar
+      destroy_button: Borrar
     new:
       title: Enviar mensaje
       send_message_to: Enviar un mensaje nuevo a %{name}
@@ -1186,26 +1186,26 @@ es:
       wrong_user: Está conectado como `%{user}' pero el mensaje que quiere responder
         no se ha enviado a dicho usuario. Por favor, ingrese con el usuario correcto
         para responder.
-    read:
+    show:
       title: Leer mensaje
       from: De
       subject: Asunto
       date: Fecha
       reply_button: Responder
       unread_button: Marcar como no leído
-      delete_button: Eliminar
+      destroy_button: Eliminar
       back: Volver
       to: A
       wrong_user: Está conectado como `%{user}' pero el mensaje que quiere leer no
         se ha enviado por o a dicho usuario. Por favor, ingrese con el usuario correcto
         para ver el mensaje.
     sent_message_summary:
-      delete_button: Borrar
+      destroy_button: Borrar
     mark:
       as_read: Mensaje marcado como leído
       as_unread: Mensaje marcado como no leído
-    delete:
-      deleted: Mensaje borrado
+    destroy:
+      destroyed: Mensaje borrado
   site:
     about:
       next: Siguiente
@@ -1470,22 +1470,18 @@ es:
         description: Hacer una pregunta o buscar respuestas en el sitio de preguntas
           y respuestas de OSM.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Listas de correo
         description: Pregunta o discute temas interesantes de un amplio abanico de
           listas de correo temáticas o regionales.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Foros
         description: Preguntas y discusiones para aquellos que prefieren una interfaz
           del estilo cartelera de anuncios.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Chat interactivo en muchos idiomas diferentes y sobre muchos
           temas.
       switch2osm:
-        url: https://switch2osm.org/
         title: Migra a OSM
         description: Ayuda para las empresas y organizaciones que migran a mapas y
           a otros servicios, basados en OpenStreetMap.
@@ -1644,7 +1640,7 @@ es:
           y hacer clic en el icono de nota: <span class=''icon note''> </span>. Esto
           añadirá un marcador en el mapa, que se puede mover arrastrando. Agregue
           su mensaje, haga clic en guardar y otros mapeadores investigarán.'
-  trace:
+  traces:
     visibility:
       private: Privado (solo compartido como anónimo, puntos no ordenados)
       public: Público (mostrado en la lista de trazas y como anónimo, puntos no ordenados)

config/locales/et.yml

@@ -911,7 +911,7 @@ et:
       details: Üksikasjad muudatuskogumi kohta leiad aadressilt %{url}.
       unsubscribe: Et selle muudatuskogumi uuendusteadetest ära ütelda, mine aadressile
         %{url} ja klõpsa nuppu "Lõpeta tellimus".
-  message:
+  messages:
     inbox:
       title: Saabunud kirjad
       my_inbox: Minu postkast
@@ -932,7 +932,7 @@ et:
       unread_button: Märgi mitteloetuks
       read_button: Märgi loetuks
       reply_button: Vasta
-      delete_button: Kustuta
+      destroy_button: Kustuta
     new:
       title: Saada sõnum
       send_message_to: Sõnumi saatmine kasutajale %{name}
@@ -964,7 +964,7 @@ et:
     reply:
       wrong_user: Oled sisse loginud kui "%{user}" aga sõnum, millele soovid vastata
         ei olnud sellele kasutajale saadetud. Vastamiseks palun logi sisse õige kasutajana.
-    read:
+    show:
       title: Loe sõnumit
       from: Kellelt
       subject: Teema
@@ -977,12 +977,12 @@ et:
         ole sellele kasutajale saadetud ega selle kasutaja poolt saadetud. Lugemiseks
         palun logi sisse õige kasutajana.
     sent_message_summary:
-      delete_button: Kustuta
+      destroy_button: Kustuta
     mark:
       as_read: Sõnum on märgitud loetuks
       as_unread: Sõnum on märgitud kui lugemata
-    delete:
-      deleted: Sõnum kustutatud
+    destroy:
+      destroyed: Sõnum kustutatud
   site:
     about:
       next: Edasi
@@ -1260,21 +1260,17 @@ et:
         title: help.openstreetmap.org
         description: Esita küsimus või otsi vastuseid OSMi küsimuste ja vastuste veebilehel.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Postiloendid
         description: Esita küsimusi või arutle huvipakkuvatel teemadel paljudes temaatilistes
           või piirkondlikes postiloendites.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Foorumid
         description: Küsimused ja arutelud nendele, kes eelistavad teadetetahvlile
           sarnanevat kasutajaliidest.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Interaktiivne suhtluskanal paljudes keeltes ja paljudel teemadel.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Abi ettevõtetele ja organisatsioonidele, kes plaanivad kasutusele
           võtta OpenStreetMapil põhinevad kaardid ja muud teenused.
@@ -1421,7 +1417,7 @@ et:
         paragraph_2_html: |-
           See on lihtne! Mine <a href='%{map_url}'>kaardile</a> ja kliki märkuse ikoonile:
           <span class='icon note'></span>. See lisab kaardile markeri, mida sa saad liigutada seda hiirega lohistades. Lisa oma sõnum, seejärel kliki "Salvesta" ja teised kaardistajad näevad seda.
-  trace:
+  traces:
     visibility:
       private: Privaatne (jagatud ainult anonüümselt, järjestamata punktid)
       public: Avalik (nähtav rajaloendis ja anonüümsena, järjestamata punktid)

config/locales/eu.yml

@@ -1032,7 +1032,7 @@ eu:
       details: Aldaketari buruzko xehetasun gehiago %{url}n aurki daitezke.
       unsubscribe: Aldaketaren aldaketa eguneratzeak ezeztatzeko, bisitatu %{url}
         eta sakatu "Ezabatu harpidetza".
-  message:
+  messages:
     inbox:
       title: Sarrera-ontzia
       my_inbox: Nire sarrera-ontzia
@@ -1054,7 +1054,7 @@ eu:
       unread_button: Markatu irakurri gabekotzat
       read_button: Markatu irakurritzat
       reply_button: Erantzun
-      delete_button: Ezabatu
+      destroy_button: Ezabatu
     new:
       title: Bidali mezua
       send_message_to: '%{name}ri mezu berri bat bidali'
@@ -1087,26 +1087,26 @@ eu:
       wrong_user: '''%{user}'' bezala saioa hasi duzu baina erantzuteko eskatu duzun
         mezua ez da erabiltzaile horri bidali. Hasi saioa erabiltzaile zuzenarekin
         erantzuteko.'
-    read:
+    show:
       title: Irakurri mezua
       from: Igorlea
       subject: Gaia
       date: Data
       reply_button: Erantzun
       unread_button: Markatu irakurri gabekotzat
-      delete_button: Ezabatu
+      destroy_button: Ezabatu
       back: Atzera
       to: Hartzailea
       wrong_user: '''%{user}'' bezala saioa hasi duzu baina irakurtzeko eskatu duzun
         mezua ez da erabiltzaile horri bidali edo berak ez du bidali. Hasi saioa erabiltzaile
         zuzenarekin irakurtzeko.'
     sent_message_summary:
-      delete_button: Ezabatu
+      destroy_button: Ezabatu
     mark:
       as_read: Mezua irakurrita gisa markatu da
       as_unread: Mezua irakurri gabe gisa markatu da
-    delete:
-      deleted: Mezua ezabatuta
+    destroy:
+      destroyed: Mezua ezabatuta
   site:
     about:
       next: Hurrengoa
@@ -1535,7 +1535,7 @@ eu:
         paragraph_2_html: |-
           Joan besterik gabe <a href='%{map_url}'> mapara </a> eta egin klik oharraren ikonoan:
           <span class='icon note'></span>. Honek markatzailea gehituko dio mapari, arrastatuz mugitu ahal izateko. Gehitu zure mezua, ondoren sakatu gorde eta beste erabiltzaileek ikertu egingo dute.
-  trace:
+  traces:
     visibility:
       private: Pribatua (puntu anonimo eta desordenatu gisa soilik partekatzen da)
       public: Publikoa (arrasto-zerrendan eta anonimoki, ordenatu gabeko puntuetan)

config/locales/fa.yml

@@ -1075,7 +1075,7 @@ fa:
         partial_changeset_with_comment: دارای نظر %{changeset_comment}
         partial_changeset_without_comment: بدون نظر
       details: اطلاعات بیشتر درباره جعبه تغییر را میتوان در %{url} دید.
-  message:
+  messages:
     inbox:
       title: صندوق دریافت
       my_inbox: صندوق دریافت من
@@ -1097,7 +1097,7 @@ fa:
       unread_button: علامت‌گذاری به عنوان خوانده‌شده
       read_button: علامت‌گذاری به عنوان خوانده‌شده
       reply_button: پاسخ
-      delete_button: حذف
+      destroy_button: حذف
     new:
       title: فرستادن پیام
       send_message_to: فرستادن پیام تازه به %{name}
@@ -1130,26 +1130,26 @@ fa:
       wrong_user: شما به عنوان %{user} وارد سامانه شده‌اید اما پیامی که درخواست پاسخش
         را داده‌اید به این شناسه ارسال نشده‌است. برای امکان پاسخ‌دادن لطفاً بعنوان
         کاربر صحیح وارد سامانه شوید.
-    read:
+    show:
       title: خواندن پیام
       from: از
       subject: عنوان
       date: تاریخ
       reply_button: پاسخ
       unread_button: علامت‌گذاری به عنوان خوانده‌شده
-      delete_button: حذف
+      destroy_button: حذف
       back: عقب
       to: به
       wrong_user: شما بعنوان `%{user}' وارد سامانه شده‌اید اما پیامی که درخواست خواندنش
         را داده‌اید توسط کاربر ارسال نشده یا به او ارسال نشده‌است. برای امکان خواندن
         لطفاً به عنوان کاربر صحیح وارد سامانه شوید.
     sent_message_summary:
-      delete_button: حذف
+      destroy_button: حذف
     mark:
       as_read: پیام به عنوان خوانده شده علامت گذاری شد
       as_unread: پیام به عنوان خوانده نشده علامتگذاری شد
-    delete:
-      deleted: پیام حذف شد
+    destroy:
+      destroyed: پیام حذف شد
   site:
     about:
       next: بعدی
@@ -1555,7 +1555,7 @@ fa:
         paragraph_2_html: |-
           فقط بروید به <a href='%{map_url}'>نقشه</a> و روی آیکون یادداشت کلیک کنید:
           <span class='icon note'></span>. اینجوری یک علامت گذار به نقشه اضافه می‌شود، که می‌توانید با کشیدن جابجایش کنید. پیامتان را اضافه کنید، بعد روی ذخیره کلیک کنید، و سایر نقشه کشان بررسی خواهند کرد.
-  trace:
+  traces:
     visibility:
       private: خصوصی (فقط به عنوان ناشناس ، نقاط نامشخص)
       public: عمومی (نمایش نقاط نامرتب در فهرست پیگیری ها بعنوان ناشناس)

config/locales/fi.yml

@@ -13,6 +13,7 @@
 # Author: Markosu
 # Author: McSalama
 # Author: Mikahama
+# Author: Moiman
 # Author: MrTapsa
 # Author: Nedergard
 # Author: Nelg
@@ -172,8 +173,8 @@ fi:
       history_title: Viivan %{name} historia
       nodes: Pisteet
       also_part_of:
-        one: osa viivaa %{related_ways}
-        other: osa viivoja %{related_ways}
+        one: osana viivaa %{related_ways}
+        other: osana viivoja %{related_ways}
     relation:
       title: 'Relaatio: %{name}'
       history_title: Relaation %{name} historia
@@ -471,7 +472,7 @@ fi:
           retirement_home: Vanhainkoti
           sauna: Sauna
           school: Koulu
-          shelter: Väestönsuoja
+          shelter: Katos
           shop: Kauppa
           shower: Suihku
           social_centre: Sosiaalikeskus
@@ -1123,7 +1124,7 @@ fi:
       details: 'Lisätietoja muutoskokoelmasta: %{url}'
       unsubscribe: Peruaksesi tilauksen päivityksistä tähän muutoskokoelmaan, vieraile
         sivulla %{url} ja klikkaa "Unsubscribe".
-  message:
+  messages:
     inbox:
       title: Saapuneet
       my_inbox: Saapuneet
@@ -1144,7 +1145,7 @@ fi:
       unread_button: Merkitse lukemattomaksi
       read_button: Merkitse luetuksi
       reply_button: Vastaa
-      delete_button: Poista
+      destroy_button: Poista
     new:
       title: Lähetä viesti
       send_message_to: Lähetä viesti käyttäjälle %{name}
@@ -1177,26 +1178,26 @@ fi:
       wrong_user: Olet kirjautunut sisään tunnuksella `%{user}' mutta viestiä, johon
         tahdot vastata, ei ole lähetetty kyseiselle käyttäjälle. Ole hyvä ja kirjaudu
         sisään oikealla käyttäjätunnuksella vastataksesi.
-    read:
+    show:
       title: Lue viesti
       from: 'Lähettäjä:'
       subject: Otsikko
       date: Päiväys
       reply_button: Vastaa
       unread_button: Merkitse lukemattomaksi
-      delete_button: Poista
+      destroy_button: Poista
       back: Takaisin
       to: 'Vastaanottaja:'
       wrong_user: Olet kirjautunut sisään tunnuksella `%{user}' mutta viestiä, jonka
         tahdot lukea, ei ole lähetetty kyseiselle käyttäjälle. Ole hyvä ja kirjaudu
         sisään oikealla käyttäjätunnukselle lukeaksesi sen.
     sent_message_summary:
-      delete_button: Poista
+      destroy_button: Poista
     mark:
       as_read: Viesti on merkitty luetuksi.
       as_unread: Viesti on merkitty lukemattomaksi.
-    delete:
-      deleted: Viesti on poistettu.
+    destroy:
+      destroyed: Viesti on poistettu.
   site:
     about:
       next: Seuraava
@@ -1449,21 +1450,17 @@ fi:
         description: Etsi vastauksia tai esitä oma kysymyksesi OSM:n kysy- ja vastaa
           -sivustolla. Englanninkielinen.
       mailing_lists:
-        url: https://lists.openstreetmap.org/
         title: Postituslistat
         description: Esitä kysymyksiä tai keskustele laajalti kiinnostavista aiheista
           aiheita koskevilla tai alueellisilla sähköpostilistoilla.
       forums:
-        url: https://forum.openstreetmap.org/
         title: Keskustelupalsta
         description: Kysymykset ja keskustelut niille, jotka haluavat mielummin ilmoitustaulutyylisen
           käyttöliittymän.
       irc:
-        url: https://irc.openstreetmap.org/
         title: IRC
         description: Interaktiivinen chat monilla eri kielillä ja monista eri aiheista.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm (Vaihda OSM:iin)
         description: Auta yrityksiä ja organisaatioita vaihtamaan OpenStreetMapiin
           pohjautuviin karttoihin ja muihin palveluihin.
@@ -1623,7 +1620,7 @@ fi:
           Suomessa olevista virheistä suomeksi ja muualla olevista virheistä paikallisella
           kielellä tai englanniksi. Lopuksi tallenna ilmoitus, jolloin muut kartoittajat
           voivat korjata virheen.'
-  trace:
+  traces:
     visibility:
       private: Yksityinen (vain pisteet ilman nimeä ja aikaleimoja)
       public: Julkinen (näytetään jälkiluettelossa, mutta pisteet ilman nimeä ja aikaleimoja)
@@ -1651,8 +1648,10 @@ fi:
       tags_help: pilkuilla erotettu lista
       visibility: 'Näkyvyys:'
       visibility_help: mitä tämä tarkoittaa?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Fi:GPS-j%C3%A4lkien_julkisuus
       upload_button: Tallenna
       help: Ohje
+      help_url: https://wiki.openstreetmap.org/wiki/Fi:Upload
     edit:
       title: Muokataan jälkeä %{name}
       heading: Jäljen %{name} muokkaus
@@ -2499,6 +2498,9 @@ fi:
         end_oneway_without_exit: Yksisuuntaisen tien %{name} pää
         roundabout_with_exit: Liikenneympyrässä poistu %{exit}. liittymästä tielle
           %{name}
+        roundabout_with_exit_ordinal: Liikenneympyrässä poistu %{exit}. liittymästä
+          tielle %{name}
+        exit_roundabout: Poistu liikenneympyrästä tielle %{name}
         unnamed: nimetön tie
         courtesy: Reittiohjeet tarjoaa %{link}
         exit_counts:

config/locales/fr.yml

@@ -1159,7 +1159,7 @@ fr:
       details: Plus de détails sur l’ensemble de modifications à %{url}.
       unsubscribe: Pour vous désabonner des mises à jour de cet ensemble de modifications,
         visitez %{url} et cliquez sur « Désabonner ».
-  message:
+  messages:
     inbox:
       title: Boîte de réception
       my_inbox: Ma boîte de réception
@@ -1181,7 +1181,7 @@ fr:
       unread_button: Marquer comme non lu
       read_button: Marquer comme lu
       reply_button: Répondre
-      delete_button: Supprimer
+      destroy_button: Supprimer
     new:
       title: Envoyer un message
       send_message_to: Envoyer un nouveau message à %{name}
@@ -1214,26 +1214,26 @@ fr:
       wrong_user: Vous êtes identifié(e) comme « %{user} » mais le message auquel
         vous souhaitez répondre n’a pas été envoyé à cet utilisateur. Veuillez vous
         connecter avec l’identifiant correct pour pouvoir répondre.
-    read:
+    show:
       title: Lire le message
       from: De
       subject: Objet
       date: Date
       reply_button: Répondre
       unread_button: Marque comme non lu
-      delete_button: Supprimer
+      destroy_button: Supprimer
       back: Retour
       to: À
       wrong_user: Vous êtes identifié comme « %{user} » mais le message que vous essayez
         de lire n’a pas été envoyé par cet utilisateur, ni ne lui a été destiné. Veuillez
         vous connecter avec l’identifiant correct pour pouvoir le lire.
     sent_message_summary:
-      delete_button: Supprimer
+      destroy_button: Supprimer
     mark:
       as_read: Message marqué comme lu
       as_unread: Message marqué comme non-lu
-    delete:
-      deleted: Message supprimé
+    destroy:
+      destroyed: Message supprimé
   site:
     about:
       next: Suivant
@@ -1509,22 +1509,18 @@ fr:
         description: Poser une question ou chercher des réponses sur le site de questions-et-réponses
           d’OSM.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Listes de diffusion
         description: Poser une question ou discuter de questions intéressantes sur
           un large éventail de thématiques ou des listes de diffusion régionaux.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Forums
         description: Des questions et des discussions pour ceux qui préfèrent une
           interface sous forme de tableau d’affichage.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Discussion interactive dans de nombreuses langues différentes
           et sur de nombreux sujets.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Aide pour les entreprises et les organisations de commutation
           à OpenStreetMap, en fonction des cartes et d’autres services.
@@ -1684,7 +1680,7 @@ fr:
         paragraph_2_html: |-
           Allez simplement sur <a href='%{map_url}'>la carte</a> et cliquez sur l’icône note :
           <span class='icon note'></span>. Cela ajoutera un marqueur sur la carte, que vous pouvez déplacer en faisant glisser la carte. Ajoutez votre message puis cliquez sur Enregistrer, et d’autres contributeurs iront regarder.
-  trace:
+  traces:
     visibility:
       private: Privé (partagé anonymement, points non ordonnés)
       public: Public (affiché dans la liste des traces et anonymisé, points non ordonnés)
@@ -1710,8 +1706,10 @@ fr:
       tags_help: données séparées par des virgules
       visibility: 'Visibilité :'
       visibility_help: qu’est-ce que cela veut dire ?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       upload_button: Envoyer
       help: Aide
+      help_url: https://wiki.openstreetmap.org/wiki/Upload
     edit:
       title: Modifier la trace %{name}
       heading: Modifier la trace %{name}

config/locales/fur.yml

@@ -691,7 +691,7 @@ fur:
         il cambiament.
     note_comment_notification:
       anonymous: Un utent anonim
-  message:
+  messages:
     inbox:
       title: In jentrade
       my_inbox: I miei messaçs in jentrade
@@ -713,7 +713,7 @@ fur:
       unread_button: Segne come no let
       read_button: Segne come let
       reply_button: Rispuint
-      delete_button: Elimine
+      destroy_button: Elimine
     new:
       title: Mande messaç
       send_message_to: Mande un gnûf messaç a %{name}
@@ -739,7 +739,7 @@ fur:
       no_sent_messages: No tu âs ancjemò mandât nissun messaç. Parcè no tu contatis
         cualchidun de %{people_mapping_nearby_link}?
       people_mapping_nearby: int che e je daûr a mapâ dongje di te
-    read:
+    show:
       title: Leture messaç
       from: Di
       subject: Sogjet
@@ -749,12 +749,12 @@ fur:
       back: Indaûr
       to: A
     sent_message_summary:
-      delete_button: Elimine
+      destroy_button: Elimine
     mark:
       as_read: Messaç segnât come za let
       as_unread: Messaç segnât come di lei
-    delete:
-      deleted: Messaç eliminât
+    destroy:
+      destroyed: Messaç eliminât
   site:
     about:
       next: Prossim
@@ -922,7 +922,7 @@ fur:
       start_mapping: Scomence a mapâ
       add_a_note:
         title: No tu âs timp par fâ i cambiaments? Zonte une note!
-  trace:
+  traces:
     create:
       upload_trace: Cjame percors GPS
       trace_uploaded: Il to file GPX al è stât cjamât e al è cumò daûr a spietâ di

config/locales/fy.yml

@@ -439,13 +439,13 @@ fy:
       greeting: Hallo,
     note_comment_notification:
       greeting: Hallo,
-  message:
+  messages:
     inbox:
       from: Fan
       subject: Ûnderwerp
       date: Datum
     message_summary:
-      delete_button: Fuortsmite
+      destroy_button: Fuortsmite
     new:
       subject: Ûnderwerp
       body: Tekst
@@ -453,14 +453,14 @@ fy:
       to: Oan
       subject: Ûnderwerp
       date: Datum
-    read:
+    show:
       from: Fan
       subject: Ûnderwerp
       date: Datum
       back: Foarige
       to: Oan
     sent_message_summary:
-      delete_button: Fuortsmite
+      destroy_button: Fuortsmite
   site:
     about:
       next: Folgjende
@@ -522,7 +522,7 @@ fy:
       url: URL
     welcome:
       title: Wolkom!
-  trace:
+  traces:
     create:
       description: 'Beskriuwing:'
       visibility: 'Sichtberheid:'

config/locales/ga.yml

@@ -1089,7 +1089,7 @@ ga:
           ag gabháil leis
         partial_changeset_without_comment: nach bhfuil nóta tráchta ag gabháil leis
       details: Tá tuilleadh sonraí faoin tacar athruithe ar fáil ag %{url}.
-  message:
+  messages:
     inbox:
       title: Bosca isteach
       my_inbox: Mo Bhosca Isteach
@@ -1115,7 +1115,7 @@ ga:
       unread_button: Marcáil neamhléite
       read_button: Marcáil léite
       reply_button: Freagair
-      delete_button: Scrios
+      destroy_button: Scrios
     new:
       title: Seol teachtaireacht
       send_message_to: Teachtaireacht nua a sheoladh chuig %{name}
@@ -1148,26 +1148,26 @@ ga:
       wrong_user: Tá tú logáilte isteach mar '%{user}' ach níor seoladh an teachtaireacht
         atá tú ag iarraidh freagra a thabhairt uirthi chuig an úsáideoir sin. Logáil
         isteach mar an t-úsáideoir ceart chun freagra a thabhairt.
-    read:
+    show:
       title: Léigh an teachtaireacht
       from: Ó
       subject: Ábhar
       date: Dáta
       reply_button: Freagair
       unread_button: Marcáil neamhléite
-      delete_button: Scrios
+      destroy_button: Scrios
       back: Ar ais
       to: Chuig
       wrong_user: Tá tú logáilte isteach mar '%{user}' ach níor seoladh an teachtaireacht
         atá tú ag iarraidh léamh chuig an úsáideoir sin agus ní hé a sheol é ach an
         oiread. Logáil isteach mar an t-úsáideoir ceart chun é a léamh.
     sent_message_summary:
-      delete_button: Scrios
+      destroy_button: Scrios
     mark:
       as_read: Teachtaireacht marcáilte mar léite
       as_unread: Teachtaireacht marcáilte mar neamhléite
-    delete:
-      deleted: Teachtaireacht scriosta
+    destroy:
+      destroyed: Teachtaireacht scriosta
   site:
     about:
       next: Ar aghaidh
@@ -1377,22 +1377,18 @@ ga:
         description: Is féidir ceist a chur nó freagraí a chuardach ar shuíomh ceisteanna
           agus freagraí OSM.
       mailing_lists:
-        url: https://lists.openstreetmap.org/
         title: Liosta Seachadta
         description: Is féidir ceist a chur nó ábhair shuimiúla a phlé ar raon leathan
           de liostaí seachadta téamacha agus réigiúnacha.
       forums:
-        url: https://forum.openstreetmap.org/
         title: Fóraim
         description: Ceisteanna agus plé dóibh siúd ar fearr leo comhéadan ar stíl
           clár fógraí.
       irc:
-        url: https://irc.openstreetmap.org/
         title: IRC
         description: Comhrá idirghníomhach i go leor teangacha éagsúla agus ar go
           leor ábhair éagsúla.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Cabhair do chuideachtaí agus eagraíochtaí atá ag athrú chuig
           léarscáileanna agus seirbhísí eile atá bunaithe ar OpenStreetMap.
@@ -1541,7 +1537,7 @@ ga:
         paragraph_1_html: Mura bhfuil tú ag iarraidh ach go ndéanfaí rud beag a cheartú
           agus gan an t-am agat clárú agus foghlaim conas eagarthóireacht a dhéanamh,
           tá sé an-éasca nóta a scríobh.
-  trace:
+  traces:
     visibility:
       private: Príobháideacha (ní chomhroinnfear é ach mar phointí gan ainm, gan ord)
       public: Poiblí (taispeánfar é i liosta na lorg agus mar phointí gan ainm, gan

config/locales/gd.yml

@@ -1050,7 +1050,7 @@ gd:
         partial_changeset_with_comment: leis a' bheachd '%{changeset_comment}'
         partial_changeset_without_comment: gun bheachd
       details: Gheibh thu barrachd fiosrachaidh air an seata atharraichean air %{url}.
-  message:
+  messages:
     inbox:
       title: Am bogsa a-steach
       my_inbox: Am bogsa a-steach agam
@@ -1070,7 +1070,7 @@ gd:
       unread_button: Cuir comharra nach deach a leughadh
       read_button: Cuir comharra gun deach a leughadh
       reply_button: Freagair
-      delete_button: Sguab às
+      destroy_button: Sguab às
     new:
       title: Cuir teachdaireachd
       send_message_to: Cuir teachdaireachd ùr gu %{name}
@@ -1102,7 +1102,7 @@ gd:
       wrong_user: Rinn thu clàradh a-steach mar `%{user}' ach cha deach an teachdaireachd
         a tha thu a' feuchainn ri freagairt dhi a chur gun neach-chleachdaidh ud.
         Feuch an clàraich thu a-steach 'na chleachdaiche a bu chòir airson freagairt.
-    read:
+    show:
       title: Teachdaireachd air a leughadh
       from: O
       subject: Cuspair
@@ -1115,12 +1115,12 @@ gd:
         a tha thu a' feuchainn ri leughadh a chur gun neach-chleachdaidh ud. Feuch
         an clàraich thu a-steach 'na chleachdaiche a bu chòir airson a leughadh.
     sent_message_summary:
-      delete_button: Sguab às
+      destroy_button: Sguab às
     mark:
       as_read: Chuir thu comharra gun deach an teachdaireachd a leughadh
       as_unread: Chuir thu comharra nach deach an teachdaireachd a leughadh
-    delete:
-      deleted: Chaidh an teachdaireachd a sguabadh às
+    destroy:
+      destroyed: Chaidh an teachdaireachd a sguabadh às
   site:
     about:
       next: Air adhart
@@ -1547,7 +1547,7 @@ gd:
         paragraph_2_html: |-
           Cha leig thu leas ach tadhal air a' <a href='%{map_url}'>mhapa</a> 's briogadh air ìomhaigheag an nòta:
           <span class='icon note'></span>. Cuiridh seo comharra ris a' mhapa as urrainn dhut gluasad 's tu 'ga shlaodadh. Cuir an teachdaireachd agad ris agus briog air "Sàbhail" an uairsin gus an dèan luchd-mapachaidh eile sgrùdadh air.
-  trace:
+  traces:
     visibility:
       private: Prìobhaideach (cha dèid a cho-roinneadh ach 'na phuingean gun urra
         no seòrsachadh)

config/locales/gl.yml

@@ -1096,7 +1096,7 @@ gl:
       details: Máis detalles sobre o conxunto de cambios poden atoparse en %{url}.
       unsubscribe: Para darse de baixa das actualizacións deste conxunto de cambios,
         visite %{url} e prema en "darse de baixa".
-  message:
+  messages:
     inbox:
       title: Caixa de entrada
       my_inbox: A miña caixa de entrada
@@ -1118,7 +1118,7 @@ gl:
       unread_button: Marcar como non lido
       read_button: Marcar como lido
       reply_button: Responder
-      delete_button: Borrar
+      destroy_button: Borrar
     new:
       title: Enviar unha mensaxe
       send_message_to: Enviarlle unha nova mensaxe a %{name}
@@ -1150,26 +1150,26 @@ gl:
     reply:
       wrong_user: Accedeu ao sistema como "%{user}", pero a mensaxe que pediu responder
         non lla enviou a ese usuario. Acceda co usuario correcto para redactar a resposta.
-    read:
+    show:
       title: Ler a mensaxe
       from: De
       subject: Asunto
       date: Data
       reply_button: Responder
       unread_button: Marcar como non lida
-      delete_button: Borrar
+      destroy_button: Borrar
       back: Volver
       to: Para
       wrong_user: Accedeu ao sistema como "%{user}", pero a mensaxe que pediu ler
         non lla enviou a ese usuario ou el non lla enviou a vostede. Acceda co usuario
         correcto para ler a resposta.
     sent_message_summary:
-      delete_button: Borrar
+      destroy_button: Borrar
     mark:
       as_read: Mensaxe marcada como lida
       as_unread: Mensaxe marcada como non lida
-    delete:
-      deleted: Mensaxe borrada
+    destroy:
+      destroyed: Mensaxe borrada
   site:
     about:
       next: Seguinte
@@ -1457,22 +1457,18 @@ gl:
         description: Formule unha pregunta ou busque respostas no sitio de preguntas
           e respostas do OSM.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Listas de correo
         description: Pregunta ou conversa sobre temas interesantes nun amplo abano
           de listas de correo temáticas ou rexionais.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Foros
         description: Preguntas e conversas para os que prefiren unha interface do
           estilo carteleira de anuncios.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Conversa interactiva en moitas linguaxes diferentes e sobre moitos
           temas.
       switch2osm:
-        url: https://switch2osm.org/
         title: Migra a OSM
         description: Axuda para as empresas e organizacións que migran a mapas e a
           outros servizos baseados en OpenStreetMap.
@@ -1631,7 +1627,7 @@ gl:
           de notas: <span class=''icon note''></span>. Isto ha engadir un marcador
           ao mapa, que pode desplazar arrastrándoo. Engada a súa mensaxe, logo prema
           no botón de gardar e os outros colaboradores han comprobalo.'
-  trace:
+  traces:
     visibility:
       private: Privado (só compartido como anónimo; puntos desordenados)
       public: Público (mostrado na lista de pistas e como anónimo; puntos desordenados)

config/locales/he.yml

@@ -1038,7 +1038,7 @@ he:
       details: פרטים נוספים על ערכת השינויים אפשר למצוא בכתובת %{url}
       unsubscribe: כדי לבטל את המינוי לעדכונים מערכת השינויים הזאת, נא לבקר בכתובת
         %{url} וללחוץ על „ביטול מינוי”.
-  message:
+  messages:
     inbox:
       title: תיבת דואר נכנס
       my_inbox: תיבת הדואר הנכנס שלי
@@ -1059,7 +1059,7 @@ he:
       unread_button: סימון כ„לא נקרא”
       read_button: סימון כ„נקרא”
       reply_button: תשובה
-      delete_button: מחיקה
+      destroy_button: מחיקה
     new:
       title: שליחת הודעה
       send_message_to: לשליחת הודעה חדשה אל %{name}
@@ -1089,25 +1089,25 @@ he:
     reply:
       wrong_user: נכנסת בשם „%{user}”, אבל ההודעה שביקשת להשיב עליה לא נשלחה לאותו
         המשתמש. נא להיכנס בחשבון הנכון כדי להשיב.
-    read:
+    show:
       title: הודעה שנקראה
       from: מאת
       subject: נושא
       date: תאריך
       reply_button: להשיב
       unread_button: לסימון כהודעה שלא נקראה
-      delete_button: מחיקה
+      destroy_button: מחיקה
       back: חזרה
       to: אל
       wrong_user: נכנסת בשם „%{user}”, אבל ההודעה שביקשת לקרוא לא נשלחה לאותו המשתמש.
         נא להיכנס בחשבון הנכון כדי ללקרוא אותה.
     sent_message_summary:
-      delete_button: מחיקה
+      destroy_button: מחיקה
     mark:
       as_read: ההודעה סומנה כהודעה שנקראה
       as_unread: ההודעה סומנה כהודעה שלא נקראה
-    delete:
-      deleted: ההודעה נמחקה
+    destroy:
+      destroyed: ההודעה נמחקה
   site:
     about:
       next: הבא
@@ -1535,7 +1535,7 @@ he:
         paragraph_2_html: 'צריך פשוט ללכת אל <a href=''%{map_url}''>המפה</a> וללחוץ
           על סמל ההערה: <span class=''icon note''></span>. זה יוסיף למפה סמן, שאפשר
           לגרור. אחרי הוספת ההערה יש ללחוץ על שמירה וממפים אחרים יבדקו את זה.'
-  trace:
+  traces:
     visibility:
       private: פרטי (משותף רק כאלמוני, נקודות לא ממוינות)
       public: ציבורי (מוצג ברשימת המסלולים וכאלמוני, נקודות לא ממוינות)

config/locales/hr.yml

@@ -956,7 +956,7 @@ hr:
         your_note: '%{commenter} je reaktivirao jednu od tvojih bilješki blizu %{place}.'
         commented_note: '%{commenter} je reaktivirao bilješku koju si komentirao/la.
           Ta je bilješka u blizini %{place}.'
-  message:
+  messages:
     inbox:
       title: Dolazna pošta
       my_inbox: Dolazna pošta
@@ -978,7 +978,7 @@ hr:
       unread_button: Označi kao nepročitano
       read_button: Označi kao pročitano
       reply_button: Odgovori
-      delete_button: Obriši
+      destroy_button: Obriši
     new:
       title: Pošalji poruku
       send_message_to: Pošalji novu poruku za %{name}
@@ -1011,26 +1011,26 @@ hr:
       wrong_user: 'Prijavljeni ste kao: `%{user}'', ali poruka za koju ste zamoljeni
         da odgovorite nije poslana na tom korisniku. Molimo, prijavite se kao ispravan
         korisnik kako bi se odgovorili.'
-    read:
+    show:
       title: Pročitaj poruku
       from: Od
       subject: Tema
       date: Datum
       reply_button: Odgovori
       unread_button: Označi kao nepročitano
-      delete_button: Obriši
+      destroy_button: Obriši
       back: Natrag
       to: Za
       wrong_user: 'Prijavljeni ste kao: `%{user}'', ali poruka za koju ste zamoljeni
         da pročitate nije poslana od ili prema tom korisniku. Molimo, prijavite se
         kao ispravan korisnik kako bi ste pročitali.'
     sent_message_summary:
-      delete_button: Obriši
+      destroy_button: Obriši
     mark:
       as_read: Poruka označena pročitanom
       as_unread: Poruka označena nepročitanom
-    delete:
-      deleted: Poruka obrisana
+    destroy:
+      destroyed: Poruka obrisana
   site:
     about:
       next: Dalje
@@ -1307,7 +1307,7 @@ hr:
         paragraph_1_html: Ako želiš samo napraviti malu doradu i nemaš vremena za
           registraciju i učenje pravila uređivanja, možeš jednostavno dodati bilješku
           na kartu.
-  trace:
+  traces:
     visibility:
       private: Privatni (prikazuje se kao anonimne, nespoložene točke)
       public: Javno (prikazano u listi tragova i kao anonimno, neuređene točke)

config/locales/hsb.yml

@@ -1018,7 +1018,7 @@ hsb:
         partial_changeset_with_comment: z komentarom „%{changeset_comment}“
         partial_changeset_without_comment: bjez komentara
       details: Dalše podrobnosće wo sadźbje změnow móžeš na %{url} namakać.
-  message:
+  messages:
     inbox:
       title: Póstowy kašćik
       my_inbox: Mój póst
@@ -1044,7 +1044,7 @@ hsb:
       unread_button: Jako njepřečitany markěrować
       read_button: Jako přečitany markěrować
       reply_button: Wotmołwić
-      delete_button: Zničić
+      destroy_button: Zničić
     new:
       title: Powěsć pósłać
       send_message_to: Wužiwarjej %{name} nowu powěsć pósłać
@@ -1079,7 +1079,7 @@ hsb:
       wrong_user: Sy jako `%{user}' přizjewjeny, ale powěsć, na kotruž chcyše wotmołwić,
         njebu na toho wužiwarja pósłana. Prošu přizjew so jako korektny wužiwar, zo
         by wotmołwił.
-    read:
+    show:
       title: Powěsć čitać
       from: Wot
       subject: Temowe nadpismo
@@ -1092,12 +1092,12 @@ hsb:
         njebu na toho wužiwarja pósłana. Prošu přizjew so jako korektny wužiwar, zo
         by čitał.
     sent_message_summary:
-      delete_button: Zničić
+      destroy_button: Zničić
     mark:
       as_read: Powěsć jako přečitany markěrowana
       as_unread: Powěsć jako njepřečitany markěrowana
-    delete:
-      deleted: Powěsć zničena
+    destroy:
+      destroyed: Powěsć zničena
   site:
     about:
       next: Dale
@@ -1502,7 +1502,7 @@ hsb:
         paragraph_2_html: |-
           Dźi prosće na <a href='%{map_url}'>kartu</a> a klikń na symbol pokazki:
           <span class='icon note'></span>. Tón přida karće marku, kotruž móžeš přesunyć. Přidaj swoju zdźělenku, klikń potom na Składować a druzy kartěrowarjo budu so wěcy wěnować.
-  trace:
+  traces:
     visibility:
       private: Priwatna (jenož jako anonymna, njezrjadowane dypki )
       public: Zjawna (pokazuje so w lisćinje ćěrjow a jako anonymna, njezrjadowane

config/locales/hu.yml

@@ -1111,7 +1111,7 @@ hu:
         %{url}.'
       unsubscribe: 'Az ehhez a módosításcsomaghoz tartozó frissítésekről való leiratkozáshoz
         látogasd meg a következő oldalt: %{url}, és kattints a "Leiratkozás" gombra.'
-  message:
+  messages:
     inbox:
       title: Beérkezett üzenetek
       my_inbox: Beérkezett üzenetek
@@ -1133,7 +1133,7 @@ hu:
       unread_button: Jelölés olvasatlanként
       read_button: Jelölés olvasottként
       reply_button: Válasz
-      delete_button: Törlés
+      destroy_button: Törlés
     new:
       title: Üzenet küldése
       send_message_to: 'Új üzenet küldése neki: %{name}'
@@ -1166,26 +1166,26 @@ hu:
       wrong_user: „%{user}” néven jelentkeztél be, de a levelet, amit lekérdeztél
         válaszolásra, nem ez a felhasználó kapta. Annak érdekében, hogy válaszolhass,
         jelentkezz be a helyes felhasználóval.
-    read:
+    show:
       title: Üzenet olvasása
       from: Innen
       subject: Tárgy
       date: Érkezett
       reply_button: Válasz
       unread_button: Jelölés olvasatlanként
-      delete_button: Törlés
+      destroy_button: Törlés
       back: Vissza
       to: Ide
       wrong_user: „%{user}” néven jelentkeztél be, de a levelet, amit lekérdeztél
         olvasásra, nem ez a felhasználó küldte vagy kapta. Annak érdekében, hogy elolvashasd
         a levelet, jelentkezz be a helyes felhasználóval.
     sent_message_summary:
-      delete_button: Törlés
+      destroy_button: Törlés
     mark:
       as_read: Üzenet megjelölve olvasottként
       as_unread: Üzenet megjelölve olvasatlanként
-    delete:
-      deleted: Üzenet törölve
+    destroy:
+      destroyed: Üzenet törölve
   site:
     about:
       next: Következő
@@ -1617,7 +1617,7 @@ hu:
         paragraph_2_html: |-
           Menj a <a href='%{map_url}'>térképre</a> és kattints a jegyzet ikonra:
           <span class='icon note'></span>. Ez elhelyez egy jelzést a térképen, amelyet áthúzhatsz a pontos helyére. Majd írd be az üzeneted és nyomd meg az Elküldés gombot, hogy a térképezők megvizsgálhassák.
-  trace:
+  traces:
     visibility:
       private: Magán (megosztva csak névtelenül, rendezetlen pontok)
       public: Nyilvános (megjelenik a nyomvonalak listáján névtelenül, rendezetlen

config/locales/ia.yml

@@ -1027,7 +1027,7 @@ ia:
         %{url}.
       unsubscribe: Pro disabonar te del actualisationes de iste gruppo de modificationes,
         visita %{url} e clicca sur "Disabonar".
-  message:
+  messages:
     inbox:
       title: Cassa de entrata
       my_inbox: Mi cassa de entrata
@@ -1048,7 +1048,7 @@ ia:
       unread_button: Marcar como non legite
       read_button: Marcar como legite
       reply_button: Responder
-      delete_button: Deler
+      destroy_button: Deler
     new:
       title: Inviar message
       send_message_to: Inviar un nove message a %{name}
@@ -1081,26 +1081,26 @@ ia:
       wrong_user: Tu es authenticate como "%{user}", ma le message al qual tu vole
         responder non ha essite inviate a iste usator. Per favor aperi un session
         como le usator correcte pro poter responder.
-    read:
+    show:
       title: Leger message
       from: De
       subject: Subjecto
       date: Data
       reply_button: Responder
       unread_button: Marcar como non legite
-      delete_button: Deler
+      destroy_button: Deler
       back: Retornar
       to: A
       wrong_user: Tu es authenticate como "%{user}", ma le message que tu vole leger
         non ha essite inviate per o a iste usator. Per favor aperi un session como
         le usator correcte pro poter leger lo.
     sent_message_summary:
-      delete_button: Deler
+      destroy_button: Deler
     mark:
       as_read: Message marcate como legite
       as_unread: Message marcate como non legite
-    delete:
-      deleted: Message delite
+    destroy:
+      destroyed: Message delite
   site:
     about:
       next: Sequente
@@ -1533,7 +1533,7 @@ ia:
         paragraph_2_html: |-
           Simplemente visita <a href='%{map_url}'>le carta</a> e clicca sur le icone de nota:
           <span class='icon note'></span>. Un marcator essera addite al carta, que tu pote displaciar trahente lo con le mouse. Adde tu message, pois clicca sur Salveguardar, e altere cartographos lo investigara.
-  trace:
+  traces:
     visibility:
       private: Private (solmente condividite como anonymo, punctos non ordinate)
       public: Public (monstrate in le lista de tracias e como anonymo, punctos non

config/locales/id.yml

@@ -1092,7 +1092,7 @@ id:
       details: Rincian lebuh lanjut soal perubahan ini dapat dilihat di %{url}.
       unsubscribe: Untuk berhenti berlangganan pembaruan perubahan set ini, kunjungi
         %{url} dan kli "Berhenti berlangganan".
-  message:
+  messages:
     inbox:
       title: Kotak Masuk
       my_inbox: Kotak Masuk Saya
@@ -1114,7 +1114,7 @@ id:
       unread_button: Tandai belum dibaca
       read_button: Tandai sudah dibaca
       reply_button: Balas
-      delete_button: Hapus
+      destroy_button: Hapus
     new:
       title: Kirim Pesan
       send_message_to: Kirim pesan baru ke %{name}
@@ -1146,26 +1146,26 @@ id:
     reply:
       wrong_user: Anda login sebagai '%{user}' tapi pesan yang Anda balas tidak terkirim
         ke pengguna. Silahkan login sebagai pengguna yang benar untuk membalas.
-    read:
+    show:
       title: Baca pesan
       from: Dari
       subject: Subjek
       date: Tanggal
       reply_button: Balas
       unread_button: Tandai belum dibaca
-      delete_button: Hapus
+      destroy_button: Hapus
       back: Kembali
       to: Kepada
       wrong_user: Anda login sebagai '%{user}' tetapi pesan yang anda balas tidak
         dikirim oleh atau untuk pengguna tersebut. Silahkan login sebagai pengguna
         yang benar untuk membacanya.
     sent_message_summary:
-      delete_button: Hapus
+      destroy_button: Hapus
     mark:
       as_read: Pesan ditandai sebagai telah dibaca
       as_unread: Pesan ditandai sebagai belum dibaca
-    delete:
-      deleted: Pesan dihapus
+    destroy:
+      destroyed: Pesan dihapus
   site:
     about:
       next: Berikutnya
@@ -1436,22 +1436,18 @@ id:
         description: Ajukan pertanyaan atau mencari jawaban di situs tanya-jawab OSM
           ini.
       mailing_lists:
-        url: https://lists.openstreetmap.org/
         title: Daftar Alamat
         description: Bertanya atau berdiskusi hal-hal menarik dalam daftar alamat
           menurut berbagai topik dan daerah.
       forums:
-        url: https://forum.openstreetmap.org/
         title: Forum
         description: Pertanyaan dan diskusi bagi mereka yang lebih menyukai antarmuka
           bergaya papan pengumuman.
       irc:
-        url: https://irc.openstreetmap.org/
         title: IRC
         description: Obrolan interaktif dalam berbagai bahasa mengenai bermacam-macam
           topik.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Bantuan untuk perusahaan dan organisasi yang beralih ke peta
           dan layanan lain berbasis OpenStreetMap.
@@ -1608,7 +1604,7 @@ id:
           Langsung ke <a href='%{map_url}'>peta</a> dan klik ikon catatan:
           <span class='icon note'></span>. Ini akan menambahkan sebuah penanda ke peta yang dapat bergerak
            dengan menyeretnya. Tambahkan pesan, lalu klik simpan, dan pemeta lainnya akan menyelidiki.
-  trace:
+  traces:
     visibility:
       private: Pribadi (hanya berbagi sebagai anonim, poin tidak berurut)
       public: Publik (ditampilkan dalam daftar jejak dan sebagai anonim, poin tidak

config/locales/is.yml

@@ -1114,7 +1114,7 @@ is:
       details: Nánari upplýsingar um breytingasettið er að finna á %{url}.
       unsubscribe: Til að hætta áskrift að uppfærslum á þessu breytingasetti, farðu
         þá á %{url} og smelltu á "Segja upp áskrift".
-  message:
+  messages:
     inbox:
       title: Innhólf
       my_inbox: Innhólfið mitt
@@ -1136,7 +1136,7 @@ is:
       unread_button: Merkja sem ólesin
       read_button: Merkja sem lesin
       reply_button: Svara
-      delete_button: Eyða
+      destroy_button: Eyða
     new:
       title: Senda skilaboð
       send_message_to: Senda skilaboð til %{name}
@@ -1169,26 +1169,26 @@ is:
       wrong_user: Þú hefur skráð þig inn sem `%{user}' en skilaboðin sem þú baðst
         um að svara voru ekki send til þess notanda. Skráðu þig inn sem réttan notanda
         til að geta svarað.
-    read:
+    show:
       title: Les skilaboð
       from: Frá
       subject: Titill
       date: Dags
       reply_button: Svara
       unread_button: Merkja sem ólesin
-      delete_button: Eyða
+      destroy_button: Eyða
       back: Til baka
       to: Til
       wrong_user: Þú hefur skráð þig inn sem `%{user}' en skilaboðin sem þú baðst
         um að lesa voru ekki send af eða til þess notanda. Skráðu þig inn sem réttan
         notanda til að geta svarað.
     sent_message_summary:
-      delete_button: Eyða
+      destroy_button: Eyða
     mark:
       as_read: Skilaboðin voru merkt sem lesin
       as_unread: Skilaboðin voru merkt sem ólesin
-    delete:
-      deleted: Skilaboðunum var eytt
+    destroy:
+      destroyed: Skilaboðunum var eytt
   site:
     about:
       next: Næsta
@@ -1479,21 +1479,17 @@ is:
         title: help.openstreetmap.org
         description: Spyrðu spurninga eða flettu upp svörum á spyrja/svara hluta OSM-vefsvæðisins.
       mailing_lists:
-        url: https://lists.openstreetmap.org/
         title: Póstlistar
         description: Spyrðu spurninga eða spjallaðu um áhugaverð málefni á einhverjum
           af fjölmörgum póstlistum tengdum tungumálum eða viðfangsefnum.
       forums:
-        url: https://forum.openstreetmap.org/
         title: Spjallsvæði
         description: Spurningar og umræður fyrir þá sem kunna betur við klassísk viðmót
           hefðbundinna spjallborða.
       irc:
-        url: https://irc.openstreetmap.org/
         title: IRC
         description: Gagnvirkt spjall á mörgum tungumálum og um margvísleg málefni.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Hjálp fyrir fyrirtæki, stofnanir og félagasamtök sem ætla sér
           að skipta yfir í kort byggð á OpenStreetMap og tengdum þjónustum.
@@ -1655,7 +1651,7 @@ is:
           Farðu á <a href='%{map_url}'>landakortið</a> og smelltu á minnismiðatáknið:
           <span class='icon note'></span>. Þetta mun bæta merki á kortið, sem þú getur fært til
           með því að draga það. Bættu við skilaboðunum þínum, smelltu síðan á að vista, og annað kortagerðarfólk mun væntanlega rannsaka málið.
-  trace:
+  traces:
     visibility:
       private: Prívat  (aðeins deilt sem óauðkennanlegum, óröðuðum punktum)
       public: Almennur (sýndur í ferlalista sem óauðkennanlegir, óraðaðir punktar)
@@ -2548,8 +2544,22 @@ is:
         end_oneway_without_exit: Einstefna endar á %{name}
         roundabout_with_exit: Í hringtorginu, beygðu útaf við %{exit} afrein yfir
           á %{name}
+        roundabout_with_exit_ordinal: Í hringtorginu, beygðu útaf við %{exit} afrein
+          yfir á %{name}
+        exit_roundabout: Farðu út úr hringtorginu yfir á %{name}
         unnamed: ónefnd gata
         courtesy: Leiðarlýsing í boði %{link}
+        exit_counts:
+          first: '1.'
+          second: '2.'
+          third: '3.'
+          fourth: '4.'
+          fifth: '5.'
+          sixth: '6.'
+          seventh: '7.'
+          eighth: '8.'
+          ninth: '9.'
+          tenth: '10.'
       time: Tími
     query:
       node: Hnútur

config/locales/it.yml

@@ -1136,7 +1136,7 @@ it:
         %{url}.
       unsubscribe: Per cancellarsi dagli aggiornamenti di questo insieme di modifiche,
         visita %{url} e fai clic su "Cancellazione".
-  message:
+  messages:
     inbox:
       title: Posta in arrivo
       my_inbox: Posta in arrivo
@@ -1158,7 +1158,7 @@ it:
       unread_button: Segna come non letto
       read_button: Segna come già letto
       reply_button: Rispondi
-      delete_button: Cancella
+      destroy_button: Cancella
     new:
       title: Spedisci messaggio
       send_message_to: Spedisci un nuovo messaggio a %{name}
@@ -1191,26 +1191,26 @@ it:
       wrong_user: Hai effettuato l'accesso come '%{user}', ma il messaggio al quale
         hai chiesto di rispondere non era diretto a quell'utente. Se vuoi rispondere,
         per favore accedi con l'utenza interessata.
-    read:
+    show:
       title: Leggi messaggio
       from: Da
       subject: Oggetto
       date: Data
       reply_button: Rispondi
       unread_button: Segna come non letto
-      delete_button: Cancella
+      destroy_button: Cancella
       back: Indietro
       to: A
       wrong_user: Hai effettuato l'accesso come '%{user}', ma il messaggio che hai
         chiesto di leggere non era diretto a quell'utente. Se vuoi leggerlo, per favore
         accedi con l'utenza interessata.
     sent_message_summary:
-      delete_button: Cancella
+      destroy_button: Cancella
     mark:
       as_read: Messaggio marcato come già letto
       as_unread: Messaggio marcato come non letto
-    delete:
-      deleted: Messaggio eliminato
+    destroy:
+      destroyed: Messaggio eliminato
   site:
     about:
       next: Successivo
@@ -1481,21 +1481,17 @@ it:
         description: Fai una domanda o cerca risposte sul sito di domande e risposte
           di OSM.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Mailing List
         description: Poni la tua domanda o discuti questioni di interesse su una vasta
           gamma di mailing list tematiche o regionali.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Forum
         description: Domande e discussioni per coloro che preferiscono un'interfaccia
           in stile bacheca (BBS).
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Chat interattiva in molte lingue diverse e su molti argomenti.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Aiuto per imprese e organizzazioni che intendono migrare a mappe
           e altri servizi basati su OpenStreetMap.
@@ -1651,7 +1647,7 @@ it:
         paragraph_2_html: |-
           Vai alla <a href='%{map_url}'>mappa</a> e clicca sull'icona della nota:
           <span class='icon note'></span>. Questo aggiungerà un marker alla mappa, che potrai muovere trascinandolo. Aggiungi il tuo messaggio, quindi fare clic su Salva e altri Mappers daranno un'occhiata.
-  trace:
+  traces:
     visibility:
       private: Privato (condiviso solamente come anonimo, punti non ordinati)
       public: Pubblico (visualizzato nella lista dei tracciati come anonimo, punti

config/locales/ja.yml

@@ -1020,7 +1020,7 @@ ja:
         partial_changeset_without_comment: コメントなし
       details: 変更セットについての詳細は %{url} を参照。
       unsubscribe: この変更セットの購読を中止するには%{url}を開いて"購読を中止 Unsubscribe"をクリック。
-  message:
+  messages:
     inbox:
       title: 受信箱
       my_inbox: 自分の受信箱
@@ -1039,7 +1039,7 @@ ja:
       unread_button: 未読にする
       read_button: 既読にする
       reply_button: 返信
-      delete_button: 削除
+      destroy_button: 削除
     new:
       title: メッセージの送信
       send_message_to: '%{name} への新規メッセージ送信'
@@ -1067,24 +1067,24 @@ ja:
       people_mapping_nearby: 近所でマッピングしている人々
     reply:
       wrong_user: あなたは「%{user}」としてログインしていますが、返信しようとしたメッセージはこの利用者宛てではありません。返信するには、正しい利用者としてログインしてください。
-    read:
+    show:
       title: メッセージを読む
       from: 差出人
       subject: 件名
       date: 日付
       reply_button: 返信
       unread_button: 未読にする
-      delete_button: 削除
+      destroy_button: 削除
       back: 戻る
       to: 宛先
       wrong_user: あなたは「%{user}」としてログインしていますが、閲覧しようとしたメッセージは、この利用者が送信したものでも、この利用者宛てのものでもありません。メッセージを閲覧するには、正しいユーザーとしてログインしてください。
     sent_message_summary:
-      delete_button: 削除
+      destroy_button: 削除
     mark:
       as_read: 既読メッセージ
       as_unread: 未読メッセージ
-    delete:
-      deleted: メッセージを削除しました
+    destroy:
+      destroyed: メッセージを削除しました
   site:
     about:
       next: 次へ
@@ -1279,7 +1279,6 @@ ja:
         title: help.openstreetmap.org
         description: OSM の質問回答サイトで質問したり回答を検索したりする。
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: メーリング リスト
         description: メーリングリストは話題や地域ごとに多種多様で、質問や興味のある事項について議論できる場です。
       forums:
@@ -1427,7 +1426,7 @@ ja:
           簡単にメモを追加できます。
         paragraph_2_html: <a href='%{map_url}'>地図</a>に移動してメモアイコン（<span class='icon
           note'></span>）をクリックするだけです。これで地図上に印が追加され、ドラッグして移動させることができます。あなたのメッセージを追加し、保存をクリックすれば、他のマッパーが調査するでしょう。
-  trace:
+  traces:
     visibility:
       private: 非公開 (匿名、点は順不同)
       public: 公開 (トレース一覧に匿名で表示、点は順不同)

config/locales/ka.yml

@@ -762,7 +762,7 @@ ka:
     note_comment_notification:
       anonymous: ანონიმური მომხმარებელი
       greeting: გამარჯობა,
-  message:
+  messages:
     inbox:
       title: მიღებული
       my_inbox: ჩემი მიღებული
@@ -784,7 +784,7 @@ ka:
       unread_button: მონიშნეთ როგორც წაუკითხავი
       read_button: მონიშნეთ როგორც წაკითხული
       reply_button: პასუხი
-      delete_button: წაშლა
+      destroy_button: წაშლა
     new:
       title: შეტყობინების გაგზავნა
       send_message_to: გაუგზავნეთ ახალი შეტყობინება %{name}
@@ -817,7 +817,7 @@ ka:
       wrong_user: თქვენ შეხვედით როგორც `%{user}' მაგრამ პასუხი თქვენ კითხვაზე არ
         გაიგზავნა ამ მომხმარებელთან. გთხოვთ, შეხვიდეთ, როგორც შესაბამისი მოთხოვნის
         გამკეთებელი მომხმარებელი, რათა იხილოთ პასუხი.
-    read:
+    show:
       title: შეტყობინების წაკითხვა
       from: გამომგზავნი
       subject: თემა
@@ -829,12 +829,12 @@ ka:
         გსურთ, არ არის გაგზავნილი ამ მომხმარებელთან, ან მის მიერ. გთხოვთ, შეხვიდეთ,
         როგორც შესაბამისი მომხმარებელი, რათა წაიკითხოთ ის.
     sent_message_summary:
-      delete_button: წაშლა
+      destroy_button: წაშლა
     mark:
       as_read: შეტყობინება მონიშნულია როგორც წაკითხული
       as_unread: შეტყობინება მონიშნულია როგორც წაუკითხავი
-    delete:
-      deleted: შეტყობინება წაშლილია
+    destroy:
+      destroyed: შეტყობინება წაშლილია
   site:
     copyright:
       foreign:
@@ -935,7 +935,7 @@ ka:
       image: სურათი
       alt: ალტერნატიული ტექსტი
       url: URL
-  trace:
+  traces:
     create:
       description: 'აღწერა:'
       tags_help: მძიმის შემდეგ

config/locales/kab.yml

@@ -755,7 +755,7 @@ kab:
           yettwarnan di %{time}'
         partial_changeset_with_comment: s uwennit '%{changeset_comment}'
         partial_changeset_without_comment: S war awennit
-  message:
+  messages:
     inbox:
       title: Tanaka n urmas
       my_inbox: Tanaka-iw n urmas
@@ -768,7 +768,7 @@ kab:
       unread_button: Creḍ ur yettwaɣra ara
       read_button: Creḍ yettwaɣra
       reply_button: Err
-      delete_button: Kkes
+      destroy_button: Kkes
     new:
       title: Azen izen
       subject: Asentel
@@ -787,23 +787,23 @@ kab:
       to: I
       subject: Asentel
       date: Azemz
-    read:
+    show:
       title: Ɣeṛ izen
       from: Seg
       subject: Asentel
       date: Azemz
       reply_button: Err
       unread_button: Creḍ yettwaɣra
-      delete_button: Kkes
+      destroy_button: Kkes
       back: Uɣal
       to: I
     sent_message_summary:
-      delete_button: Kkes
+      destroy_button: Kkes
     mark:
       as_read: Izen yettwacred yettwaɣra
       as_unread: Izen yettwacred ur yettwaɣra ara
-    delete:
-      deleted: Izen yettwakkes
+    destroy:
+      destroyed: Izen yettwakkes
   site:
     about:
       next: Ar zdat
@@ -973,7 +973,7 @@ kab:
         paragraph_1_html: |-
           OpenStreetMap tsumur ddeqs n tiɣbula ara t-issineḍ ad tesxedmeḍ deg usenfaṛ, akken ad testeqsiḍ neɣ ad t-muddeḍ tiririt, udiɣ ad tmeslayeḍ neɣ ad teɣreḍ tasemlit ɣef isental n tira n tkarḍiwin d iseqdacen nniḍen.
           <a href='%{help_url}'>Wali afus dagi</a>.
-  trace:
+  traces:
     create:
       description: 'Aglam:'
       tags: 'Ticraḍ:'

config/locales/km.yml

@@ -588,7 +588,7 @@ km:
       greeting: សួស្ដី,
     lost_password_html:
       greeting: សួស្ដី​,
-  message:
+  messages:
     inbox:
       from: ពី​
       subject: ប្រធានបទ​
@@ -601,7 +601,7 @@ km:
       to: ទៅ​
       subject: ប្រធានបទ​
       date: កាលបរិច្ឆេទ​
-    read:
+    show:
       from: ពី​
       subject: ប្រធានបទ​
       date: កាលបរិច្ឆេទ​
@@ -658,7 +658,7 @@ km:
           - សាលារៀន​
           - សាកលវិទ្យាល័យ​
           station: ស្ថានីយ៍ផ្លូវដែក
-  trace:
+  traces:
     create:
       upload_gpx: ផ្ទុកឡើង​ឯកសារ GPX ៖
       description: បរិយាយ​៖

config/locales/kn.yml

@@ -507,14 +507,14 @@ kn:
       greeting: ನಮಸ್ತೆ,
     changeset_comment_notification:
       greeting: ನಮಸ್ತೆ,
-  message:
+  messages:
     inbox:
       from: ಇಂದ
       subject: ವಿಷಯ
       date: ದಿನಾಂಕ
     message_summary:
       reply_button: ಉತ್ತರಿಸಿ
-      delete_button: ಅಳಿಸು
+      destroy_button: ಅಳಿಸು
     new:
       title: ಸಂದೇಶ ಕಳುಹಿಸಿ
       send_message_to: ಹೊಸ ಸಂದೇಶವನ್ನು %{name} ಗೆ ಕಳುಹಿಸಿ
@@ -526,7 +526,7 @@ kn:
       subject: ವಿಷಯ
       date: ದಿನಾಂಕ
       people_mapping_nearby: ನಿಮ್ಮ ಹತ್ತಿರವಿರುವ ಬಳಕೆದಾರರು
-    read:
+    show:
       title: ಸಂದೇಶವನ್ನು ಓದಿ
       from: ಇಂದ
       subject: ವಿಷಯ
@@ -535,12 +535,12 @@ kn:
       back: ಹಿಂದಕ್ಕೆ
       to: ಗೆ
     sent_message_summary:
-      delete_button: ಅಳಿಸು
+      destroy_button: ಅಳಿಸು
     mark:
       as_read: ಸಂದೇಶ ಓದಾಲಾಗಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ
       as_unread: ಸಂದೇಶ ಓದಾಲಾಗಿಲ್ಲ ಎಂದು ಗುರುತು ಮಾಡಿ
-    delete:
-      deleted: ಸಂದೇಶವನ್ನು ಅಳಿಸಿ ಹಾಕಲಾಗಿದೆ
+    destroy:
+      destroyed: ಸಂದೇಶವನ್ನು ಅಳಿಸಿ ಹಾಕಲಾಗಿದೆ
   site:
     about:
       next: ಮುಂದಿನ
@@ -625,7 +625,7 @@ kn:
       start_mapping: ನಕ್ಷೆಯನ್ನು ಸಂಪಾದಿಸಿಲು ಪ್ರಾರಂಭಿಸಿ
       add_a_note:
         title: ನಕ್ಷೆಯನ್ನು ಸಂಪಾದಿಸಿಲು ಸಮಯವಿಲ್ಲವೇ? ಟಿಪ್ಪಣಿಯನ್ನು ಸೇರಿಸಿರಿ!
-  trace:
+  traces:
     create:
       upload_button: ಅಪ್ಲೋಡ್
       help: ಸಹಾಯ

config/locales/ko.yml

@@ -1038,7 +1038,7 @@ ko:
         partial_changeset_without_comment: 댓글 없이
       details: 바뀜집합에 대한 자세한 사항은 %{url}에서 찾을 수 있습니다.
       unsubscribe: 이 바뀜집합의 업데이트를 받지 않으려면 %{url} 에 방문하여 "구독 해지"를 클릭하십시오.
-  message:
+  messages:
     inbox:
       title: 받은 쪽지함
       my_inbox: 내 받은 쪽지함
@@ -1060,7 +1060,7 @@ ko:
       unread_button: 읽지 않음으로 표시
       read_button: 읽음으로 표시
       reply_button: 답장
-      delete_button: 삭제
+      destroy_button: 삭제
     new:
       title: 메시지 보내기
       send_message_to: '%{name}에게 새 메시지 보내기'
@@ -1091,25 +1091,25 @@ ko:
     reply:
       wrong_user: '''%{user}''님으로 로그인하고 있지만 답장을 요청한 메시지가 해당 사용자에게 보내지지 않았습니다. 답장을
         하려면 올바른 사용자로 로그인하세요.'
-    read:
+    show:
       title: 메시지 읽기
       from: 보낸이
       subject: 제목
       date: 날짜
       reply_button: 답글
       unread_button: 읽지 않음으로 표시
-      delete_button: 삭제
+      destroy_button: 삭제
       back: 뒤로
       to: 받는이
       wrong_user: '''%{user}''님으로 로그인하고 있지만 읽기를 요청한 메시지가 해당 사용자에게 보내지지 않았습니다. 읽으려면
         올바른 사용자로 로그인하세요.'
     sent_message_summary:
-      delete_button: 삭제
+      destroy_button: 삭제
     mark:
       as_read: 메시지를 읽은 것으로 표시
       as_unread: 메시지를 읽지 않은 것으로 표시
-    delete:
-      deleted: 메시지가 삭제됨
+    destroy:
+      destroyed: 메시지가 삭제됨
   site:
     about:
       next: 다음
@@ -1524,7 +1524,7 @@ ko:
           <a href='%{map_url}'>지도</a>로 가고 나서 참고 아이콘을 클릭하세요:
           <span class='icon note'></span>. 드래그하여 이동할 수 있는 표시가 지도에 추가됩니다.
           메시지를 추가하고 나서, 저장을 클릭하면, 다른 매퍼가 조사할 것입니다.
-  trace:
+  traces:
     visibility:
       private: 비공개(익명으로 공유됨, 정렬되지 않은 점)
       public: 공개(궤적 목록이 익명으로 보여짐, 정렬되지 않은 점)

config/locales/ku-Latn.yml

@@ -1112,7 +1112,7 @@ ku-Latn:
         bibînin.
       unsubscribe: Ji bo ku ji abonetiya rojanekirinên vê desteya guherandinê derbikevî,
         here %{url} û bitikîne ser "Abonetiyê betal bike".
-  message:
+  messages:
     inbox:
       title: Qutiya hatiyan
       my_inbox: Qutiya min a hatiyan
@@ -1134,7 +1134,7 @@ ku-Latn:
       unread_button: Wek nexwendî nîşan bide
       read_button: Wek xwendî nîşan bide
       reply_button: Cewab bide
-      delete_button: Jê bibe
+      destroy_button: Jê bibe
     new:
       title: Peyamê bişîne
       send_message_to: Ji %{name} re peyamekî nû bişîne
@@ -1167,26 +1167,26 @@ ku-Latn:
       wrong_user: Te wek `%{user}' têket, lê peyamê ku te dixwest were cewabdayîn
         ji wî/wê bikarhênerê re nehate şandin. Xêra xwe ji bo cewabdanê wekî bikarhênerê
         rast têbikeve.
-    read:
+    show:
       title: Peyamê bixwîne
       from: Ji
       subject: Mijar
       date: Dem
       reply_button: Bersiv bide
       unread_button: Wek nexwendî nîşan bide
-      delete_button: Jê bibe
+      destroy_button: Jê bibe
       back: Paşve vegere
       to: Ji bo
       wrong_user: Te wek `%{user}' têket, lê peyamê ku dihate xwestin ku tu wê bixwînî
         ji aliyê wî/wê bikarhênerê ve an jî ji wî/wê bikarhênerê re nehatiye şandin.
         Xêra xwe ji bo xwendinê wekî bikarhênerê rast têbikeve.
     sent_message_summary:
-      delete_button: Jê bibe
+      destroy_button: Jê bibe
     mark:
       as_read: Peyam wek xwendî hate nîşankirin
       as_unread: Peyam wek nexwendî hate nîşankirin
-    delete:
-      deleted: Payam hate jêbirin
+    destroy:
+      destroyed: Payam hate jêbirin
   site:
     about:
       next: Pêşve
@@ -1454,21 +1454,17 @@ ku-Latn:
         title: help.openstreetmap.org
         description: Pirsek bipirsin an binêrin cewabên li ser malpera OSMê ya pirs-û-bersivê.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Lîsteya E-nameyan
         description: Di lîsteyên e-nameyan yên deverî an jî herêmî yên cur bi cur
           de hûn dikarin pirsan bipirsin an jî mijarên balkêş nîqaş bikin.
       forums:
-        url: https://forum.openstreetmap.org/
         title: Forum
         description: Pirs û gotûbêjên ji bo kesên ku înterfeysên bi şêweya panoya
           daxuyaniyê tercîh dikin.
       irc:
-        url: https://irc.openstreetmap.org/
         title: IRC
         description: Sohbeta înteraktîv yê bi gelek zimanan û di gelek mijaran de.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Alikariya ji bo şirket û komeleyên ku derbasî nexşe û xizmetên
           din yên bi bingeha OpenStreetMapê dibin.
@@ -1630,7 +1626,7 @@ ku-Latn:
           ser sembola notê: <span class=''icon note''></span>. Wê ev, li nexşeyê nîşankerek
           zêde bike, ê ku tu bikaribî bi kaşkirinê cihê wî biguherînî. Peyamê xwe
           binivîse, dû re li qeydkirin''ê bitikîne. Nexşesazên din wê lê bikolin.'
-  trace:
+  traces:
     visibility:
       private: Xisûsî (tenê wekî nuqteyên anonîm û nerêzkirî tê belavkirin)
       public: Giştî (di lîsta şopandinê de û wekî anonîm, bi nuqteyên nerêzkirî têne

config/locales/lb.yml

@@ -682,7 +682,7 @@ lb:
       greeting: Salut,
       commented:
         partial_changeset_without_comment: ouni Kommentar
-  message:
+  messages:
     inbox:
       messages: Dir hutt %{new_messages} a(n) %{old_messages}
       new_messages:
@@ -695,7 +695,7 @@ lb:
       unread_button: Als net gelies markéieren
       read_button: Als gelies markéieren
       reply_button: Äntwerten
-      delete_button: Läschen
+      destroy_button: Läschen
     new:
       title: Noriicht schécken
       send_message_to: Dem %{name} en neie Message schécken
@@ -708,23 +708,23 @@ lb:
     outbox:
       subject: Sujet
       date: Datum
-    read:
+    show:
       title: Message liesen
       from: Vum
       subject: Sujet
       date: Datum
       reply_button: Äntwerten
       unread_button: Als net gelies markéieren
-      delete_button: Läschen
+      destroy_button: Läschen
       back: Zréck
       to: Fir
     sent_message_summary:
-      delete_button: Läschen
+      destroy_button: Läschen
     mark:
       as_read: Message als gelies markéiert
       as_unread: Message als net geliest markéiert
-    delete:
-      deleted: Message geläscht
+    destroy:
+      destroyed: Message geläscht
   site:
     about:
       next: Weider
@@ -803,10 +803,7 @@ lb:
       forums:
         title: Forumen
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
-      switch2osm:
-        url: https://switch2osm.org/
       wiki:
         url: https://wiki.openstreetmap.org/
         title: wiki.openstreetmap.org
@@ -884,7 +881,7 @@ lb:
         title: Nach Froen?
       add_a_note:
         title: Keng Zäit fir z'änneren? Setzt eng Notiz derbäi!
-  trace:
+  traces:
     create:
       upload_gpx: 'GPX-Fichier eroplueden:'
       description: 'Beschreiwung:'

config/locales/lt.yml

@@ -1049,7 +1049,7 @@ lt:
       details: Daugiau informacijos apie pakeitimą rasite čia %{url}.
       unsubscribe: Jei norite atsisakyti šio pakeitimo atnaujinimų, eikite į %{url}
         ir spauskite „Atsisakyti“.
-  message:
+  messages:
     inbox:
       title: Gautieji
       my_inbox: Mano gauti
@@ -1071,7 +1071,7 @@ lt:
       unread_button: Žymėti neskaitytu
       read_button: Žymėti skaitytu
       reply_button: Atsakyti
-      delete_button: Ištrinti
+      destroy_button: Ištrinti
     new:
       title: Siųsti žinutę
       send_message_to: Siųsti naują žinutę naudotojui %{name}
@@ -1104,7 +1104,7 @@ lt:
       wrong_user: Jūs prisijungęs kaip „%{user}“, bet pranešimas, kuriuo jūsų prašyta
         atsakyti, nebuvo nusiųstas tam naudotojui. Prisijunkite prie teisingos naudotojo
         paskyros, jei norite atsakyti.
-    read:
+    show:
       title: Skaityti pranešimą
       from: Nuo
       subject: Tema
@@ -1117,12 +1117,12 @@ lt:
         perskaityti, nebuvo nusiųstas to ar tam naudotojui. Prisijunkite prie teisingos
         naudotojo paskyros, jei norite tai perskaityti.
     sent_message_summary:
-      delete_button: Ištrinti
+      destroy_button: Ištrinti
     mark:
       as_read: Pranešimas pažymėtas kaip skaitytas
       as_unread: Pranešimas pažymėtas kaip neskaitytas
-    delete:
-      deleted: Pranešimas ištrintas
+    destroy:
+      destroyed: Pranešimas ištrintas
   site:
     about:
       next: Kitas
@@ -1556,7 +1556,7 @@ lt:
           spauskite pastabų piktogramą: <span class=''icon note''></span>. Žemėlapyje
           bus pridėtas žymeklis, kurį galite pertempti į kitą vietą. Pridėkite jūsų
           pranešimą, tada spauskite įrašyti ir kiti žymėtojai patyrinės jūsų pastabą.'
-  trace:
+  traces:
     visibility:
       private: Privatus (dalinamas tik kaip anonimiškas, taškai nesurikiuoti)
       public: Viešas (rodomas pėdsakų sąraše anonimiškai, taškai nesurikiuoti)

config/locales/lv.yml

@@ -1032,7 +1032,7 @@ lv:
       details: Vairāk informācijas par izmaiņām varat atrast %{url}.
       unsubscribe: Lai atrakstītos no labojumu atjauninājumiem, apmeklē %{url} un
         spied "Atrakstīties".
-  message:
+  messages:
     inbox:
       title: iesūtne
       my_inbox: Mana iesūtne
@@ -1053,7 +1053,7 @@ lv:
       unread_button: Atzīmēt kā nelasītu
       read_button: Atzīmēt kā lasītu
       reply_button: Atbildēt
-      delete_button: Dzēst
+      destroy_button: Dzēst
     new:
       title: Nosūtīt ziņu
       send_message_to: Sūtīt jaunu ziņu %{name}
@@ -1085,26 +1085,26 @@ lv:
       wrong_user: Tu esi autorizējies kā `%{user}', bet ziņojums, kuram tu vēlies
         atbildēt, nav sūtīts šim lietotājam. Lūdzu  autorizējies, kā pareizais lietotājs,
         lai atbildētu.
-    read:
+    show:
       title: Lasīt ziņu
       from: "No"
       subject: Temats
       date: Datums
       reply_button: Atbilde
       unread_button: Atzīmēt kā nelasītu
-      delete_button: Dzēst
+      destroy_button: Dzēst
       back: Atpakaļ
       to: Kam
       wrong_user: Jūs esat autorizējies kā `%{user}', bet ziņojums, kuru vēlaties
         izlasīt, nav sūtīts šim lietotājam. Lūdzu autorizējaties kā pareizais lietotājs,
         lai izlasītu to.
     sent_message_summary:
-      delete_button: Dzēst
+      destroy_button: Dzēst
     mark:
       as_read: Ziņa atzīmēta kā lasīta
       as_unread: Ziņa atzīmēta kā nelasīta
-    delete:
-      deleted: Ziņa izdzēsta
+    destroy:
+      destroyed: Ziņa izdzēsta
   site:
     about:
       next: Tālāk
@@ -1533,7 +1533,7 @@ lv:
           uz <span class='icon note'></span>. Tas pievienos marķieri kartē, kuru tu
           vari pārvietot pavelkot to. Pievieno savu ziņojumu, tad spied saglabāt,
           un citi kartētāji varēs izpētīt problēmu.
-  trace:
+  traces:
     visibility:
       private: Privāts (kopīgots kā anonīms, nesakārtoti punkti)
       public: Publisks (rādīt trašu sarakstā un kā anonīms, nesakārtoti punkti)

config/locales/mk.yml

@@ -1094,7 +1094,7 @@ mk:
       details: Поподробно за промената на %{url}.
       unsubscribe: За да се отпишете од подновите на овие промени, посетете ја страницата
         %{url} и стиснете на „Отпиши се“.
-  message:
+  messages:
     inbox:
       title: Примени
       my_inbox: Моето сандаче
@@ -1115,7 +1115,7 @@ mk:
       unread_button: Означи како непрочитано
       read_button: Означи како прочитано
       reply_button: Одговори
-      delete_button: Избриши
+      destroy_button: Избриши
     new:
       title: Испрати ја пораката
       send_message_to: Испрати нова порака за %{name}
@@ -1148,26 +1148,26 @@ mk:
       wrong_user: Најавени сте како „%{user}“, но пораката на којашто побаравте да
         одговорите не е испратена до тој корисник. Најавете се под правилно корисничко
         име за да одговорите.
-    read:
+    show:
       title: Прочитај ја пораката
       from: Од
       subject: Наслов
       date: Датум
       reply_button: Одговори
       unread_button: Означи како непрочитано
-      delete_button: Избриши
+      destroy_button: Избриши
       back: Назад
       to: За
       wrong_user: Најавени сте како „%{user}“, но пораката што побаравте да ја прочитате
         не е испратена до или од тој корисник. Најавете се под правилно корисничко
         име за да ја прочитате.
     sent_message_summary:
-      delete_button: Избриши
+      destroy_button: Избриши
     mark:
       as_read: Пораката е означена како прочитана
       as_unread: Пораката е означена како непрочитана
-    delete:
-      deleted: Пораката е избришана
+    destroy:
+      destroyed: Пораката е избришана
   site:
     about:
       next: Следно
@@ -1445,20 +1445,16 @@ mk:
         description: Поставете прашање или побарајте во одговорите на порталот за
           прашања и одговори на OSM.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Поштенски списоци
         description: Поставете прашање или разговарајте за интересни прашања на широк
           опсег на тематски и регионални поштенски списоци.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Форуми
         description: Прашања и разговори за оние кои претпочитаат да општат со објави.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Разговор во живо на најразлични јазици и на многу теми.
       switch2osm:
-        url: https://switch2osm.org/
         title: Преод на OSM
         description: Помош за претпријатија и организации кои преоѓаат на  карти на
           OpenStreetMap и други услуги.
@@ -1613,7 +1609,7 @@ mk:
         paragraph_2_html: |-
           Едноставно појдете на <a href='%{map_url}'>картата</a> и стиснете на иконата со белешка:
           <span class='icon note'></span>. Со ова ќе ставите бележник на картата, што потоа можете да го преместувате со влечење. Внесете ја пораката, па зачувајте. Другите кратографи потоа ќе иследат за што станува збор.
-  trace:
+  traces:
     visibility:
       private: Доверливо (споделено само како анонимни, неподредени точки)
       public: Јавно (се прикажува во списокот на траги како анонимни, неподредени

config/locales/mr.yml

@@ -847,7 +847,7 @@ mr:
       anonymous: एक अनामिक सदस्य
       greeting: नमस्कार,
       details: '%{url} येथे टीपेबद्दल अधिक तपशील मिळू शकेल.'
-  message:
+  messages:
     inbox:
       title: अंतर्पेटी
       my_inbox: माझी अंतर्पेटी
@@ -869,7 +869,7 @@ mr:
       unread_button: न वाचलेले अशी खूण करा
       read_button: वाचले अशी खूण करा
       reply_button: उत्तर
-      delete_button: वगळा
+      destroy_button: वगळा
     new:
       title: संदेश पाठवा
       send_message_to: '%{name}ला नवीन संदेश पाठवा'
@@ -900,7 +900,7 @@ mr:
       wrong_user: आपण '%{user}' म्हणून दाखल झालेले आहात, पण आपण ज्या संदेशास उत्तर
         देऊ इच्छिता, तो संदेश वेगळ्या सदस्यास पाठविण्यात आला आहे. कृपया उत्तर देण्यासाठी
         बरोबर सदस्य म्हणून दाखल व्हा.
-    read:
+    show:
       title: संदेश वाचा
       from: प्रेषक
       subject: विषय
@@ -913,12 +913,12 @@ mr:
         तो संदेश वेगळ्या सदस्यास पाठविण्यात आला आहे. कृपया संदेश वाचण्यासाठी बरोबर
         सदस्य म्हणून दाखल व्हा.
     sent_message_summary:
-      delete_button: वगळा
+      destroy_button: वगळा
     mark:
       as_read: संदेश वाचला आहे अशी खूण केली
       as_unread: संदेश वाचला नाही अशी खूण केली
-    delete:
-      deleted: संदेश वगळला
+    destroy:
+      destroyed: संदेश वगळला
   site:
     about:
       next: पुढील
@@ -1137,7 +1137,7 @@ mr:
           जर आपणास काही छोटेसेच ठिक करुन हवे आहे व आपल्यापाशी प्रवेशाचा व संपादन शिकण्यास वेळ नाही
 
           तर एक टिप्पणी जोडणे सोपे आहे.
-  trace:
+  traces:
     create:
       upload_trace: GPS अनुरेख चढवा
       description: 'वर्णन:'

config/locales/ms.yml

@@ -1002,7 +1002,7 @@ ms:
       commented:
         partial_changeset_with_comment: dengan komen '%{changeset_comment}'
         partial_changeset_without_comment: tanpa komen
-  message:
+  messages:
     inbox:
       title: Peti Masuk
       my_inbox: Peti masuk saya
@@ -1019,7 +1019,7 @@ ms:
       unread_button: Tanda sebagai belum dibaca
       read_button: Tanda sebagai sudah dibaca
       reply_button: Balas
-      delete_button: Hapuskan
+      destroy_button: Hapuskan
     new:
       title: Hantar pesanan
       send_message_to: Hantar pesanan baru kepada %{name}
@@ -1050,7 +1050,7 @@ ms:
       wrong_user: Anda telah log masuk sebagai `%{user}' tetapi pesanan yang anda
         pohon untuk membalas itu tidak dihantar kepada pengguna itu. Sila log masuk
         sebagai pengguna yang betul untuk membacanya.
-    read:
+    show:
       title: Baca pesanan
       from: Daripada
       subject: Subjek
@@ -1063,12 +1063,12 @@ ms:
         pohon untuk membaca itu tidak dihantar oleh/kepada pengguna itu. Sila log
         masuk sebagai pengguna yang betul untuk membacanya.
     sent_message_summary:
-      delete_button: Hapuskan
+      destroy_button: Hapuskan
     mark:
       as_read: Pesanan ditandai sebagai sudah dibaca
       as_unread: Pesanan ditandai sebagai belum dibaca
-    delete:
-      deleted: Pesanan dihapuskan
+    destroy:
+      destroyed: Pesanan dihapuskan
   site:
     about:
       next: Berikutnya
@@ -1455,7 +1455,7 @@ ms:
         paragraph_2_html: |-
           Layari <a href='%{map_url}'>peta</a> dan klik pada ikon nota:
           <span class='icon note'></span>. Ini akan meletakkan penanda pada peta yang boleh anda alihkan dengan menyeret. Tulis pesanan anda, kemudian klik Simpan, supaya penyunting lain boleh mengkajinya.
-  trace:
+  traces:
     visibility:
       private: Peribadi (hanya dikongsikan sebagai titik yang tidak tersusun secara
         tanpa nama)

config/locales/nb.yml

@@ -1034,7 +1034,7 @@ nb:
       details: Flere detaljer om endringen finnes på %{url}.
       unsubscribe: For å fjerne abonnementet på oppdateringer til dette endringssettet,
         besøk %{url} og klikk «Avslutt abonnement».
-  message:
+  messages:
     inbox:
       title: Innboks
       my_inbox: Min innboks
@@ -1056,7 +1056,7 @@ nb:
       unread_button: Marker som ulest
       read_button: Marker som lest
       reply_button: Svar
-      delete_button: Slett
+      destroy_button: Slett
     new:
       title: Send melding
       send_message_to: Send en ny melding til %{name}
@@ -1088,25 +1088,25 @@ nb:
     reply:
       wrong_user: Du er logget inn som «%{user}», men meldingen du ønsker å svare
         på ble ikke sendt til den brukeren. Logg inn som korrekt bruker for å svare.
-    read:
+    show:
       title: Les melding
       from: Fra
       subject: Emne
       date: Dato
       reply_button: Svar
       unread_button: Marker som ulest
-      delete_button: Slett
+      destroy_button: Slett
       back: Tilbake
       to: Til
       wrong_user: Du er logget inn som «%{user}», men meldingen du ønsker å lese ble
         ikke sendt fra eller til den brukeren. Logg inn som korrekt bruker for å lese.
     sent_message_summary:
-      delete_button: Slett
+      destroy_button: Slett
     mark:
       as_read: Melding markert som lest
       as_unread: Melding markert som ulest
-    delete:
-      deleted: Melding slettet
+    destroy:
+      destroyed: Melding slettet
   site:
     about:
       next: Neste
@@ -1530,7 +1530,7 @@ nb:
         paragraph_2_html: |-
           Bare gå til <a href='%{map_url}'>kartet</a> og klikk på notis-ikonet:
           <span class='icon note'></span>. Dette vil legge en markør på kartet, som du så kan dra til annet sted. Legg til meldingen og lagre. Andre kan da sjekke meldingen.
-  trace:
+  traces:
     visibility:
       private: Privat (bare delt som anononyme, usorterte punkter)
       public: Offentlig (vist i sporlista og som anononyme, usorterte punkter)

config/locales/nds.yml

@@ -382,7 +382,7 @@ nds:
       greeting: Moin,
     lost_password_html:
       greeting: Moin,
-  message:
+  messages:
     inbox:
       title: Postfack Ingang
       my_inbox: Mien Postfack Ingang
@@ -394,7 +394,7 @@ nds:
       unread_button: as ‚noch nich leest‘ kennteken
       read_button: as ‚leest‘ kennteken
       reply_button: Antern
-      delete_button: Wegdoon
+      destroy_button: Wegdoon
     new:
       title: Naricht sennen
       send_button: Versennen
@@ -408,16 +408,16 @@ nds:
       to: An
       subject: Thema
       date: Datum
-    read:
+    show:
       from: Von
       subject: Thema
       date: Datum
       reply_button: Antern
       to: An
     sent_message_summary:
-      delete_button: Wegdoon
-    delete:
-      deleted: Naricht wegdaan
+      destroy_button: Wegdoon
+    destroy:
+      destroyed: Naricht wegdaan
   site:
     copyright:
       native:
@@ -507,7 +507,7 @@ nds:
           bridge: Fett Rand = Brügg
           private: Privat Togang
           construction: Straat, an de noch boot warrt
-  trace:
+  traces:
     create:
       upload_gpx: GPX-Datei hoochladen
       description: Beschrieven

config/locales/ne.yml

@@ -772,7 +772,7 @@ ne:
     changeset_comment_notification:
       hi: नमस्ते %{to_user},
       greeting: नमस्ते,
-  message:
+  messages:
     inbox:
       title: इनबक्स
       my_inbox: मेरो इनबक्स
@@ -784,7 +784,7 @@ ne:
       unread_button: नपढिएको रूपमा चिनो लगाउनुहोस्
       read_button: पढिएको रूपमा चिनो लगाउनुहोस्
       reply_button: जवाफ दिने
-      delete_button: हटाउनुहोस्
+      destroy_button: हटाउनुहोस्
     new:
       title: सान्देस पठाउ
       send_message_to: '%{name} लाई नयाँ सन्देश पठाउनुहोस्'
@@ -800,20 +800,20 @@ ne:
       to: लाई
       subject: विषय
       date: मिति
-    read:
+    show:
       title: सन्देश पढ्नुहोस्
       from: बाट
       subject: विषय
       date: मिति
       reply_button: जवाफ दिनुहोस्
       unread_button: नपढिएको रूपमा चिनो लगाउनुहोस्
-      delete_button: मेट्नुहोस्
+      destroy_button: मेट्नुहोस्
       back: पछाडि
       to: लाई
     sent_message_summary:
-      delete_button: हटाउनुहोस्
-    delete:
-      deleted: सन्देश मेटियो
+      destroy_button: हटाउनुहोस्
+    destroy:
+      destroyed: सन्देश मेटियो
   site:
     about:
       next: अर्को
@@ -899,16 +899,12 @@ ne:
       help:
         title: help.openstreetmap.org
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: मेलिङ्ग सूचीहरू
       forums:
-        url: http://forum.openstreetmap.org/
         title: मञ्च
       irc:
-        url: http://irc.openstreetmap.org/
         title: आईआरसि
       switch2osm:
-        url: https://switch2osm.org/
         title: स्विचटु‍ओएसएम
       wiki:
         url: http://wiki.openstreetmap.org/
@@ -971,7 +967,7 @@ ne:
         title: म्यापमा के छ
       rules:
         title: नियमहरू !
-  trace:
+  traces:
     create:
       upload_trace: GPS Trace अपलोड गर्ने
       upload_gpx: 'GPX फाइल अपलोड गर्ने:'

config/locales/nl.yml

@@ -1115,7 +1115,7 @@ nl:
       details: Meer details over de wijzigingenset kunt u vinden op %{url}.
       unsubscribe: Om je af te melden van de updates van deze wijziging, ga naar %{url}
         en klik op "Afmelden".
-  message:
+  messages:
     inbox:
       title: Postvak IN
       my_inbox: Mijn Postvak IN
@@ -1136,7 +1136,7 @@ nl:
       unread_button: Markeren als ongelezen
       read_button: Markeren als gelezen
       reply_button: Antwoorden
-      delete_button: Verwijderen
+      destroy_button: Verwijderen
     new:
       title: Bericht verzenden
       send_message_to: Een persoonlijk bericht naar %{name} verzenden
@@ -1169,26 +1169,26 @@ nl:
       wrong_user: U bent aangemeld als "%{user}", maar het bericht waarop u wilt antwoorden
         is niet aan die gebruiker gericht. Meld u aan als de juiste gebruiker om te
         antwoorden.
-    read:
+    show:
       title: Bericht lezen
       from: Van
       subject: Onderwerp
       date: Datum
       reply_button: Antwoorden
       unread_button: Markeren als ongelezen
-      delete_button: Verwijderen
+      destroy_button: Verwijderen
       back: Terug
       to: Aan
       wrong_user: |-
         U bent aangemeld als "%{user}", maar het bericht dat u wilt lezen is niet aan die gebruiker gericht.
         Meld u aan als de juiste gebruiker om het te lezen.
     sent_message_summary:
-      delete_button: Verwijderen
+      destroy_button: Verwijderen
     mark:
       as_read: Gemarkeerd als gelezen
       as_unread: Gemarkeerd als ongelezen
-    delete:
-      deleted: Het bericht is verwijderd
+    destroy:
+      destroyed: Het bericht is verwijderd
   site:
     about:
       next: Volgende
@@ -1472,22 +1472,18 @@ nl:
         description: Stel een vraag of zoek antwoorden op de vraag- en antwoordsite
           van OSM.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Mailinglijsten
         description: Stel een vraag of bespreek interessante zaken op een hele reeks
           onderwerpsgebonden of regionale mailinglijsten.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Forums
         description: Vragen en overleg voor als u liever met een interface in bulletin
           boardstijl werkt.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Interactieve chat in vele verschillende talen en over tal van
           onderwerpen.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Hulp voor bedrijven en organisaties om over te schakelen op OpenStreetMap-gebaseerde
           kaarten en andere diensten.
@@ -1642,7 +1638,7 @@ nl:
         paragraph_2_html: |-
           Ga naar <a href='%{map_url}'>de kaart</a> en klik op het notitiesymbool:
           <span class='icon note'></span>. Er wordt een markering toegevoegd aan de kaart die u kunt verplaatsen door te slepen. Voeg uw bericht toe en klik dan op Opslaan, zodat andere mapper het kunnen onderzoeken.
-  trace:
+  traces:
     visibility:
       private: Persoonlijk (alleen gedeeld als anoniem; ongeordende punten)
       public: Publiek (weergegeven in tracklijst en als anonieme, ongeordende punten)

config/locales/nn.yml

@@ -976,7 +976,7 @@ nn:
       commented:
         partial_changeset_with_comment: med kommentaren '%{changeset_comment}'
         partial_changeset_without_comment: utan kommentar
-  message:
+  messages:
     inbox:
       title: Innboks
       my_inbox: Min innboks
@@ -998,7 +998,7 @@ nn:
       unread_button: Marker som ulese
       read_button: Marker som lese
       reply_button: Svar
-      delete_button: Slett
+      destroy_button: Slett
     new:
       title: Send melding
       send_message_to: Send ei ny melding til %{name}
@@ -1030,25 +1030,25 @@ nn:
     reply:
       wrong_user: Du er logga inn som «%{user}», men meldinga du ynskjer å svare på
         vart ikkje send til den brukaren. Logg inn som korrekt brukar for å svare.
-    read:
+    show:
       title: Les melding
       from: Frå
       subject: Emne
       date: Dato
       reply_button: Svar
       unread_button: Marker som ulese
-      delete_button: Slett
+      destroy_button: Slett
       back: Tilbake
       to: Til
       wrong_user: Du er logga inn som «%{user}», men meldinga du ynskjer å lese vart
         ikkje send til den brukaren. Logg inn som korrekt brukar for å lese.
     sent_message_summary:
-      delete_button: Slett
+      destroy_button: Slett
     mark:
       as_read: Melding markert som lese
       as_unread: Melding markert som ulese
-    delete:
-      deleted: Melding sletta
+    destroy:
+      destroyed: Melding sletta
   site:
     about:
       next: Neste
@@ -1367,7 +1367,7 @@ nn:
       start_mapping: Start kartlegging
       add_a_note:
         title: Ikkje tid til å kartleggje sjølv? Legg inn ein merknad.
-  trace:
+  traces:
     visibility:
       private: Privat (berre delt som anononyme, usorterte punkt)
       public: Offentleg (vist i sporlista og som anononyme, usorterte punkt)

config/locales/oc.yml

@@ -1087,7 +1087,7 @@ oc:
       details: Mai de detalhs sus l’ensemble de modificacions a %{url}.
       unsubscribe: Per vos desabonar de las mesas a jorn d'aqueste ensemble de modificacions,
         visitatz %{url} e clicatz sus « Desabonar ».
-  message:
+  messages:
     inbox:
       title: Bóstia de recepcion
       my_inbox: Ma bóstia de recepcion
@@ -1109,7 +1109,7 @@ oc:
       unread_button: Marcar coma pas legit
       read_button: Marcar coma legit
       reply_button: Respondre
-      delete_button: Suprimir
+      destroy_button: Suprimir
     new:
       title: Mandar un messatge
       send_message_to: Mandar un messatge novèl a %{name}
@@ -1142,26 +1142,26 @@ oc:
       wrong_user: Sètz identificat(-ada) coma « %{user} » mas lo messatge al qual
         volètz respondre es pas estat enviat a aqueste utilizaire. Connectatz-vos
         amb l'identificant corrècte per poder respondre.
-    read:
+    show:
       title: Legir lo messatge
       from: De
       subject: Subjècte
       date: Data
       reply_button: Respondre
       unread_button: Marcar coma pas legit
-      delete_button: Suprimir
+      destroy_button: Suprimir
       back: Retorn
       to: A
       wrong_user: Sètz identificat(-ada) coma « %{user} » mas lo messatge qu'ensajatz
         de legir es pas estat enviat a vos o a aqueste utilizaire. Connectatz-vos
         amb l'identificant corrècte per lo poder legir.
     sent_message_summary:
-      delete_button: Suprimir
+      destroy_button: Suprimir
     mark:
       as_read: Messatge marcat coma legit
       as_unread: Messatge marcat coma pas legit
-    delete:
-      deleted: Messatge suprimit
+    destroy:
+      destroyed: Messatge suprimit
   site:
     about:
       next: Seguent
@@ -1502,7 +1502,7 @@ oc:
       start_mapping: Començar de cartografiar
       add_a_note:
         title: Pas lo temps d'editar ? Apodètz una nòta !
-  trace:
+  traces:
     visibility:
       private: Privat (partejat anonimament, punts pas ordenats)
       public: Public (afichat dins la lista de las traças e anonim, punts pas ordenats)

config/locales/pa.yml

@@ -712,7 +712,7 @@ pa:
       greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ,
       commented:
         partial_changeset_without_comment: ਬਿਨਾ ਟਿੱਪਣੀ
-  message:
+  messages:
     inbox:
       title: ਇਨਬਾਕਸ
       my_inbox: ਮੇਰਾ ਇਨਬਾਕਸ
@@ -722,7 +722,7 @@ pa:
       date: ਮਿਤੀ
     message_summary:
       reply_button: ਜੁਆਬ
-      delete_button: ਮਿਟਾਉ
+      destroy_button: ਮਿਟਾਉ
     new:
       title: ਸੁਨੇਹਾ ਘੱਲੋ
       subject: ਵਿਸ਼ਾ
@@ -740,7 +740,7 @@ pa:
       to: ਵੱਲ
       subject: ਵਿਸ਼ਾ
       date: ਮਿਤੀ
-    read:
+    show:
       title: ਸੁਨੇਹਾ ਪੜ੍ਹੋ
       from: ਵੱਲੋਂ
       subject: ਵਿਸ਼ਾ
@@ -750,9 +750,9 @@ pa:
       back: ਪਿੱਛੇ
       to: ਸੇਵਾ ਵਿਖੇ
     sent_message_summary:
-      delete_button: ਮਿਟਾਉ
-    delete:
-      deleted: ਸੁਨੇਹਾ ਮਿਟਾਇਆ ਗਿਆ
+      destroy_button: ਮਿਟਾਉ
+    destroy:
+      destroyed: ਸੁਨੇਹਾ ਮਿਟਾਇਆ ਗਿਆ
   site:
     about:
       next: ਅੱਗੇ
@@ -916,7 +916,7 @@ pa:
       start_mapping: ਨਕਸ਼ਾਬੰਦੀ ਸ਼ੁਰੂ ਕਰੋ
       add_a_note:
         title: ਸੋਧਣ ਦੀ ਵਿਹਲ ਨਹੀਂ? ਕੋਈ ਨੋਟ ਜੋੜੋ!
-  trace:
+  traces:
     create:
       description: 'ਵੇਰਵਾ:'
       tags: 'ਟੈਗ:'

config/locales/pl.yml

@@ -1134,7 +1134,7 @@ pl:
         %{url}.'
       unsubscribe: Aby wypisać się z subskrypcji dotyczącej tego zestawu zmian, odwiedź
         %{url} i kliknij "Nie obserwuj".
-  message:
+  messages:
     inbox:
       title: Wiadomości odebrane
       my_inbox: skrzynka odbiorcza
@@ -1159,7 +1159,7 @@ pl:
       unread_button: Oznacz jako nieprzeczytaną
       read_button: Oznacz jako przeczytaną
       reply_button: Odpowiedz
-      delete_button: Usuń
+      destroy_button: Usuń
     new:
       title: Wysyłanie wiadomości
       send_message_to: Wyślij nową wiadomość do %{name}
@@ -1193,26 +1193,26 @@ pl:
       wrong_user: Jesteś zalogowany jako „%{user}”, ale wiadomość, na którą chcesz
         odpowiedzieć, nie została wysłana do tego użytkownika. Zaloguj się jako właściwy
         użytkownik, aby na nią odpowiedzieć.
-    read:
+    show:
       title: Czytanie wiadomości
       from: Od
       subject: Temat
       date: Nadano
       reply_button: Odpowiedz
       unread_button: Oznacz jako nieprzeczytaną
-      delete_button: Usuń
+      destroy_button: Usuń
       back: Cofnij
       to: Do
       wrong_user: Jesteś zalogowany jako „%{user}”, ale wiadomość, którą chcesz przeczytać,
         nie została wysłana przez tego użytkownika ani do niego. Proszę zalogować
         się jako właściwy użytkownik, aby ją przeczytać.
     sent_message_summary:
-      delete_button: Usuń
+      destroy_button: Usuń
     mark:
       as_read: Wiadomość została oznaczona jako przeczytana
       as_unread: Wiadomość została oznaczona jako nieprzeczytana
-    delete:
-      deleted: Wiadomość usunięta
+    destroy:
+      destroyed: Wiadomość usunięta
   site:
     about:
       next: Dalej
@@ -1474,20 +1474,16 @@ pl:
         description: Zadaj pytanie lub odszukaj odpowiedzi na stronie pytań i odpowiedzi
           OSM.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Listy mailignowe
         description: Zadaj pytanie lub przedyskutuj interesujący temat niezależnie
           od wybranego tematu lub lokalizacji.
       forums:
-        url: http://forum.openstreetmap.org/viewforum.php?id=23
         title: Forum
         description: Pytania, dyskusje w formie internetowego forum dyskusyjnego.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Interaktywny czat w różnych językach i na różne tematy.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Pomoc firmom i organizacjom w przejściu do mapy OpenStreetMap
           i inne usługi.
@@ -1643,7 +1639,7 @@ pl:
           i klikniesz ikonę: <span class=''icon note''></span>. Ta czynność doda znacznik,
           który możesz przesunąć przez przeciągnięcie. Dodaj swoją uwagę i zapisz
           ją - inni maperzy zajmą się twoim zgłoszeniem.'
-  trace:
+  traces:
     visibility:
       private: Prywatny (udostępniany jedynie jako anonimowy, nieuporządkowane punkty)
       public: Publiczny (wyświetlany na liście śladów i jako anonimowy, nieuporządkowane

config/locales/pt-BR.yml

@@ -1140,7 +1140,7 @@ pt-BR:
         em %{url}
       unsubscribe: Para cancelar a subscrição das atualizações deste conjunto de alterações,
         visite %{url} e clique em "Anular subscrição".
-  message:
+  messages:
     inbox:
       title: Caixa de Entrada
       my_inbox: Minha Caixa de Entrada
@@ -1162,7 +1162,7 @@ pt-BR:
       unread_button: Marcar como não lida
       read_button: Marcar como lida
       reply_button: Responder
-      delete_button: Apagar
+      destroy_button: Apagar
     new:
       title: Enviar mensagem
       send_message_to: Enviar uma nova mensagem para %{name}
@@ -1195,26 +1195,26 @@ pt-BR:
       wrong_user: Você está conectado como `%{user}' mas a mensagem que você quer
         responder não foi enviada para este usuário. Faça o login com o usuário correto
         para poder responder.
-    read:
+    show:
       title: Ler mensagem
       from: De
       subject: Assunto
       date: Data
       reply_button: Responder
       unread_button: Marcar como não lida
-      delete_button: Deletar
+      destroy_button: Deletar
       back: Voltar
       to: Para
       wrong_user: Você está conectado como `%{user}' mas a mensagem que você quer
         ler não foi enviada para este usuário. Faça o login com o usuário correto
         para poder responder.
     sent_message_summary:
-      delete_button: Apagar
+      destroy_button: Apagar
     mark:
       as_read: Mensagem marcada como lida
       as_unread: Mensagem marcada como não lida
-    delete:
-      deleted: Mensagem apagada
+    destroy:
+      destroyed: Mensagem apagada
   site:
     about:
       next: Próximo
@@ -1488,20 +1488,16 @@ pt-BR:
         description: Faça uma pergunta ou procure por respostas no fórum de perguntas
           e respostas do OpenStreetMap.
       mailing_lists:
-        url: https://lists.openstreetmap.org/
         title: Listas de E-mail
         description: Tire uma dúvida ou discuta assuntos interessantes em várias listas
           regionais ou por assunto.
       forums:
-        url: https://forum.openstreetmap.org/
         title: Fóruns
         description: Questões e discussões para quem prefere fóruns.
       irc:
-        url: https://irc.openstreetmap.org/
         title: IRC
         description: Bate-papo interativo em vários idiomas e sobre vários assuntos.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Ajuda para empresas e organizações migrando para mapas baseados
           no OpenStreetMap e outros serviços.
@@ -1657,7 +1653,7 @@ pt-BR:
           da nota:<span class='icon note'></span> . Isto incluirá um marcador no mapa,
           que você pode mover \narrastando. Adicione a sua mensagem e clique em salvar,
           e outros mapeadores vão investigar."
-  trace:
+  traces:
     visibility:
       private: Privado (compartilhado apenas como pontos anônimos e não ordenados)
       public: Público (apresentado na lista como pontos anônimos e não ordenados)

config/locales/pt-PT.yml

@@ -1120,7 +1120,7 @@ pt-PT:
       details: Pode encontrar mais informações sobre a edição em %{url}.
       unsubscribe: Para deixar de seguir as atualizações deste conjunto de alterações,
         aceda a %{url} e clique em "Anular subscrição".
-  message:
+  messages:
     inbox:
       title: Caixa de Entrada
       my_inbox: A minha caixa de entrada
@@ -1142,7 +1142,7 @@ pt-PT:
       unread_button: Marcar como não lida
       read_button: Marcar como lido
       reply_button: Responder
-      delete_button: Eliminar
+      destroy_button: Eliminar
     new:
       title: Enviar mensagem
       send_message_to: Enviar uma nova mensagem para %{name}
@@ -1175,26 +1175,26 @@ pt-PT:
       wrong_user: Está autenticado como o utilizador `%{user}' mas a mensagem que
         pediu para responder não foi enviada para esse utilizador. Por favor entre
         na conta de utilizador correta para responder.
-    read:
+    show:
       title: Ler mensagem
       from: De
       subject: Assunto
       date: Data
       reply_button: Responder
       unread_button: Marcar como não lida
-      delete_button: Eliminar
+      destroy_button: Eliminar
       back: Voltar
       to: Para
       wrong_user: Está autenticado com a conta `%{user}', mas a mensagem que pediu
         para ler não foi enviada por, ou para, essa conta de utilizador. Por favor,
         entre na conta de utilizador correta para ler a mensagem.
     sent_message_summary:
-      delete_button: Eliminar
+      destroy_button: Eliminar
     mark:
       as_read: Mensagem marcada como lida
       as_unread: Mensagem marcada como não lida
-    delete:
-      deleted: Mensagem eliminada
+    destroy:
+      destroyed: Mensagem eliminada
   site:
     about:
       next: Seguinte
@@ -1463,21 +1463,17 @@ pt-PT:
         description: Faça uma pergunta ou procure respostas no fórum de perguntas
           e respostas do OpenStreetMap.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Listas de divulgação
         description: Faça uma pergunta ou debata temas interessantes numa vasta gama
           de listas de divulgação temáticas ou regionais.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Fóruns
         description: Questões e discussões para quem preferir uma interface ao estilo
           dos sistemas de boletins eletrónicos.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Sala de discussão IRC em várias línguas e vários tópicos.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Informações para empresas e organizações que queiram mudar para
           os mapas do OpenStreetMap e outros serviços.
@@ -1633,7 +1629,7 @@ pt-PT:
         paragraph_2_html: |-
           Vá <a href='%{map_url}'>ao mapa</a> e clique no ícone da nota: <span class='icon note'></span>. Isto adiciona um marcador no mapa, que pode reposicionar arrastando-o.
           Adicione a sua mensagem, clique para gravar e outros colaboradores irão investigar.
-  trace:
+  traces:
     visibility:
       private: Privado (apenas partilhado como anónimo, pontos não ordenados)
       public: Público (mostrado na lista de trilhos GPS como anónimo, pontos não ordenados)
@@ -1661,8 +1657,10 @@ pt-PT:
       tags_help: separadas por vírgulas
       visibility: 'Visibilidade:'
       visibility_help: o que significa isto?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Pt:Visibility_of_GPS_traces
       upload_button: Enviar
       help: Ajuda
+      help_url: https://wiki.openstreetmap.org/wiki/Pt:Upload
     edit:
       title: A editar o trilho %{name}
       heading: A editar o trilho %{name}

config/locales/ro.yml

@@ -799,14 +799,14 @@ ro:
       greeting: Salut,
       commented:
         partial_changeset_without_comment: fără comentarii
-  message:
+  messages:
     inbox:
       title: Mesaje primite
       from: De la
       subject: Subiect
       date: Dată
     message_summary:
-      delete_button: Şterge
+      destroy_button: Şterge
     new:
       title: Trimite mesajul
       subject: Subiect
@@ -824,7 +824,7 @@ ro:
       to: Către
       subject: Subiect
       date: Dată
-    read:
+    show:
       title: Citire mesaj
       from: De la
       subject: Subiect
@@ -834,9 +834,9 @@ ro:
       back: Înapoi
       to: Către
     sent_message_summary:
-      delete_button: Şterge
-    delete:
-      deleted: Mesaj șters
+      destroy_button: Şterge
+    destroy:
+      destroyed: Mesaj șters
   site:
     about:
       next: Înainte
@@ -934,7 +934,7 @@ ro:
       start_mapping: Începeți să cartografiați
       add_a_note:
         title: <h3>Nu aveți timp pentru editare? Adaugați o notă!<h3>
-  trace:
+  traces:
     create:
       upload_gpx: 'Încărcați fișier GPX:'
       description: 'Descriere:'

config/locales/ru.yml

@@ -1164,7 +1164,7 @@ ru:
       details: Дополнительные сведения о пакете правок можно найти на %{url}.
       unsubscribe: Чтобы отписаться от обновлений этого пакета правок посетите %{url}
         и нажмите кнопку "Отписаться".
-  message:
+  messages:
     inbox:
       title: Входящие
       my_inbox: Мои входящие
@@ -1189,7 +1189,7 @@ ru:
       unread_button: Пометить как непрочитанное
       read_button: Пометить как прочитанное
       reply_button: Ответить
-      delete_button: Удалить
+      destroy_button: Удалить
     new:
       title: Отправить сообщение
       send_message_to: Отправить новое сообщение для %{name}
@@ -1229,26 +1229,26 @@ ru:
       wrong_user: |2-
 
         Вы вошли как `%{user}', но ответ на ваш вопрос был отправлен не этому пользователю. Пожалуйста, войдите как соответствующий вашему вопросу пользователь, чтобы прочитать ответ.
-    read:
+    show:
       title: Просмотр сообщения
       from: От
       subject: Тема
       date: Дата
       reply_button: Ответить
       unread_button: Пометить как непрочитанное
-      delete_button: Удалить
+      destroy_button: Удалить
       back: Назад
       to: 'Кому:'
       wrong_user: Вы вошли как пользователь `%{user}', но ответ на ваш вопрос был
         отправлен не этим или не этому пользователю. Пожалуйста, войдите как соответствующий
         вашему вопросу пользователь, чтобы прочитать его.
     sent_message_summary:
-      delete_button: Удалить
+      destroy_button: Удалить
     mark:
       as_read: Сообщение отмечено как прочитанное
       as_unread: Сообщение отмечено как непрочитанное
-    delete:
-      deleted: Сообщение удалено
+    destroy:
+      destroyed: Сообщение удалено
   site:
     about:
       next: Далее
@@ -1503,20 +1503,16 @@ ru:
         title: help.openstreetmap.org
         description: Задать вопрос или найти ответы на сайте вопросов и ответов OSM.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Списки рассылок
         description: Задайте вопрос или обсудите насущные вопросы в списке рассылок
           (количество активных пользователей зависит от языка).
       forums:
-        url: http://forum.openstreetmap.org/
         title: Форумы
         description: Вопросы и обсуждения для тех, кто предпочитает форумы для общения.
       irc:
-        url: https://irc.openstreetmap.org/
         title: IRC
         description: Интерактивный чат на разных языках и на разные темы.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Помощь компаниям и организациям в переходе на карты и другие
           ресурсы OpenStreetMap.
@@ -1673,7 +1669,7 @@ ru:
         paragraph_2_html: |-
           Просто перейдите <a href='%{map_url}'>к карте</a> и нажмите на иконку заметок:
           <span class='icon note'></span>. Это добавит на карту маркер, который можно перетаскивать. Просто напишите сообщение и нажмите "Добавить", и другие участники увидят его.
-  trace:
+  traces:
     visibility:
       private: Частный (доступно только анонимно, неупорядоченные точки)
       public: Общедоступный (показывается в списке треков и анонимно, неупорядоченные

config/locales/scn.yml

@@ -1019,7 +1019,7 @@ scn:
         partial_changeset_without_comment: senza cummentu
       details: Si ponnu attruvari àutri dittagghî a prupòsitu di stu gruppu di canciamenti
         nta %{url}.
-  message:
+  messages:
     inbox:
       title: Posta arrivata
       my_inbox: La mè posta arrivata
@@ -1041,7 +1041,7 @@ scn:
       unread_button: Signa comu di lèggiri
       read_button: Signa comu già liggiutu
       reply_button: Arrispunni
-      delete_button: Cancella
+      destroy_button: Cancella
     new:
       title: Manna un missaggiu
       send_message_to: Manna un missaggiu novu a %{name}
@@ -1074,7 +1074,7 @@ scn:
       wrong_user: Trasisti comu «%{user}» pirò lu missaggiu ô quali vulivi arrispùnniri
         nun fu mannatu a dd'utenti. Pi favuri trasi comu l'utenti giustu pi putiri
         arrispùnniri.
-    read:
+    show:
       title: Leggi lu missaggiu
       from: Di
       subject: Oggettu
@@ -1086,12 +1086,12 @@ scn:
       wrong_user: Trasisti comu «%{user}» pirò lu missaggiu chi vulivi lèggiri nun
         fu mannatu a dd'utenti. Pi favuri trasi comu l'utenti giustu pi putiri liggìrilu.
     sent_message_summary:
-      delete_button: Cancella
+      destroy_button: Cancella
     mark:
       as_read: Missaggiu signatu comu già liggiutu
       as_unread: Missaggiu marcatu comu di lèggiri
-    delete:
-      deleted: Missaggiu cancillatu
+    destroy:
+      destroyed: Missaggiu cancillatu
   site:
     about:
       next: Appressu
@@ -1358,21 +1358,17 @@ scn:
         description: Fai n'addumannata o cerca n'arrispunnuta ntô situ d'addumannati
           e arrispunnuti d'OSM.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: Mailing list
         description: Fai addumannati o discuti di quistioni ntirissanti nta na gamma
           ampia di mailing list spicializzati pi tema o pi riggiuni.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Forum
         description: Addumannati e discussioni pi chiddi chi prifirìscinu na ntirfaccia
           fatta a bacheca.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Chat ntirattiva nta tanti lingui e supra a tanti argumenti diffirenti.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Aiutu pi mprisi e assuciazzioni chi vannu a passari ê cartini
           e a l'àutri sirvizzi basati supra a OpenStreetMap.
@@ -1524,7 +1520,7 @@ scn:
         paragraph_2_html: |-
           Abbasta chi vai <a href='%{map_url}'>supra â cartina</a> e clicchi la cona dâ nota:
           <span class='icon note'></span>. Di sta manera s'agghiunci un signali supra â cartina, e lu poi spustari strascinànnulu. Agghiunci lu tò missaggiu, clicca sarva, e a stu puntu l'àutri mappatura dùnanu n'occhiata.
-  trace:
+  traces:
     visibility:
       private: Privata (cunnivisu sulu comu anònimu, òrdini dî punti nun mantinutu)
       public: Pùbblica (ammustratu ntâ lista dî tracciati e comu anònimu, òrdini dî

config/locales/sco.yml

@@ -1061,7 +1061,7 @@ sco:
           Whit it <em>disna</em> include is opinionatit data lik ratins, historical or
           hypothetical featurs, an data frae copyrichtit soorces. Unless ye hae special
           permission, dinna copy frae online or paper cairts.
-  trace:
+  traces:
     create:
       upload_trace: Uplaid GPS Trace
   user:

config/locales/sk.yml

@@ -947,7 +947,7 @@ sk:
       details: Viac podrobností o poznámke môžete nájsť nájsť na %{url}.
     changeset_comment_notification:
       greeting: Ahoj,
-  message:
+  messages:
     inbox:
       title: Doručená pošta
       my_inbox: Moja doručená pošta
@@ -970,7 +970,7 @@ sk:
       unread_button: Označiť ako neprečítané
       read_button: Označiť ako prečítané
       reply_button: Odpovedať
-      delete_button: Zmazať
+      destroy_button: Zmazať
     new:
       title: Odoslať správu
       send_message_to: Poslať novú správu používateľovi %{name}
@@ -1004,7 +1004,7 @@ sk:
       wrong_user: Ste prihlásený ako „%{user}“, ale správa, na ktorú chcete odpovedať,
         nebola odoslaná tomuto používateľovi. Ak na ňu chcete odpovedať, prihláste
         sa pod správnym kontom.
-    read:
+    show:
       title: Čítať správu
       from: Od
       subject: Predmet
@@ -1017,12 +1017,12 @@ sk:
         nie je ani od, ani pre tohoto používateľa. Ak si ju chcete prečítať, prihláste
         sa pod príslušným kontom.
     sent_message_summary:
-      delete_button: Zmazať
+      destroy_button: Zmazať
     mark:
       as_read: Správa označená ako prečítaná
       as_unread: Správa označená ako neprečítaná
-    delete:
-      deleted: Správa vymazaná
+    destroy:
+      destroyed: Správa vymazaná
   site:
     about:
       next: Ďalej
@@ -1343,7 +1343,7 @@ sk:
         title: Nie je čas upravovať? Pridajte poznámku!
         paragraph_1_html: Pokiaľ chcete len opraviť nejakú drobnosť a nemáte čas sa
           registrovať a učiť sa upravovať, môžete jednoducho pridať poznámku.
-  trace:
+  traces:
     visibility:
       private: Súkromné (iba zdieľané ako anonymné, neusporiadané body)
       public: Verejné (zobrazené v prehľade stopy, aj ako anonymné, neusporiadané

config/locales/sl.yml

@@ -1065,7 +1065,7 @@ sl:
         partial_changeset_with_comment: s komentarjem "%{changeset_comment}"
         partial_changeset_without_comment: brez komentarja
       details: Več podrobnosti o tem paketu sprememb lahko najdete na %{url}.
-  message:
+  messages:
     inbox:
       title: Prejeta pošta
       my_inbox: Moja prejeta
@@ -1091,7 +1091,7 @@ sl:
       unread_button: Označi kot neprebrano
       read_button: Označi kot prebrano
       reply_button: Odgovori
-      delete_button: Izbriši
+      destroy_button: Izbriši
     new:
       title: Pošiljanje sporočila
       send_message_to: Pošlji novo sporočilo uporabniku %{name}
@@ -1125,25 +1125,25 @@ sl:
     reply:
       wrong_user: Prijavljeni ste kot '%{user}', ampak sporočilo na katerega odgovarjate,
         ni bilo poslano vam. Prosimo, prijavite se, kot pravi uporabnik za odgovarjanje.
-    read:
+    show:
       title: Branje sporočila
       from: Od
       subject: Zadeva
       date: Datum
       reply_button: Odgovori
       unread_button: Označi kot neprebrano
-      delete_button: Izbriši
+      destroy_button: Izbriši
       back: Nazaj
       to: Za
       wrong_user: Prijavljeni ste kot '%{user}', ampak sporočilo, ko ga \elite prebrati
         ni bilo poslano vam. Prosimo, prijavite se, kot pravi uporabnik za branje.
     sent_message_summary:
-      delete_button: Izbriši
+      destroy_button: Izbriši
     mark:
       as_read: Sporočilo označeno kot prebrano
       as_unread: Sporočilo označeno kot neprebrano
-    delete:
-      deleted: Sporočilo izbrisano
+    destroy:
+      destroyed: Sporočilo izbrisano
   site:
     about:
       next: Naslednji
@@ -1430,7 +1430,7 @@ sl:
           kliknite ikono opombe: <span class=''icon note''></span>. Tako boste na
           zemljevid dodali oznako, ki jo lahko premaknete z vlečenjem. Dodajte vašo
           opombo in nato kliknite Shrani. Drugi kartografi bodo to preiskali.'
-  trace:
+  traces:
     visibility:
       private: Zasebna (v skupni rabi kot anonimna, neurejene točke)
       public: Javna (prikazana v spisku kot anonimna, neurejene točke)

config/locales/sq.yml

@@ -898,7 +898,7 @@ sq:
       greeting: Përshëndetje,
       commented:
         partial_changeset_without_comment: pa koment
-  message:
+  messages:
     inbox:
       title: Kutia mbërritëse
       my_inbox: Kutia ime mbërritëse
@@ -912,7 +912,7 @@ sq:
       unread_button: Shëno si të palexuar
       read_button: Shëno si të lexuar
       reply_button: Përgjigje
-      delete_button: Fshi
+      destroy_button: Fshi
     new:
       title: Dërgo mesazh
       send_message_to: Dërgo një mesazh të ri për %{name}
@@ -935,7 +935,7 @@ sq:
       to: Për
       subject: Titulli
       date: Data
-    read:
+    show:
       from: Prej
       subject: Titulli
       date: Data
@@ -947,7 +947,7 @@ sq:
         të lexuar nuk ishte dërguar nga ose për atë përdorues. Të lutem identifikohu
         si përdorues i saktë për të lexuar atë.'
     sent_message_summary:
-      delete_button: Fshi
+      destroy_button: Fshi
     mark:
       as_read: Mesazhi është shënuar si të lexuar
       as_unread: Mesazhi është shënuar si i palexuar
@@ -1162,7 +1162,7 @@ sq:
       start_mapping: Fillo hartografimin
       add_a_note:
         title: Nuk ke kohë për të redaktuar? Shto një shënim!
-  trace:
+  traces:
     visibility:
       private: Privat (ndahet vetëm si anonim, pika të parenditura)
       public: Publik (ndahet vetëm si anonim, pika të parenditura)

config/locales/sr-Latn.yml

@@ -768,7 +768,7 @@ sr-Latn:
       hopefully_you: Neko (verovatno vi) zatražio je poništavanje lozinke za ovaj
         nalog.
       click_the_link: Ako ste to vi, kliknite na vezu ispod da biste poništili lozinku.
-  message:
+  messages:
     inbox:
       title: Primljene
       my_inbox: Primljene
@@ -790,7 +790,7 @@ sr-Latn:
       unread_button: Označi kao nepročitano
       read_button: Označi kao pročitano
       reply_button: Odgovori
-      delete_button: Obriši
+      destroy_button: Obriši
     new:
       title: Pošalji poruku
       send_message_to: Pošalji novu poruku za %{name}
@@ -822,7 +822,7 @@ sr-Latn:
     reply:
       wrong_user: Prijavljeni ste kao %{user}, ali poruka na koju ste želeli da odgovorite
         nije poslata tom korisniku. Prijavite se kao ispravan korisnik da biste odgovorili.
-    read:
+    show:
       title: Pročitaj poruku
       from: Od
       subject: Naslov
@@ -834,12 +834,12 @@ sr-Latn:
         nije poslata tom korisniku. Prijavite se kao ispravan korisnik da biste je
         pročitali.
     sent_message_summary:
-      delete_button: Obriši
+      destroy_button: Obriši
     mark:
       as_read: Poruka je označena kao pročitana
       as_unread: Poruka je označena kao nepročitana
-    delete:
-      deleted: Poruka je obrisana
+    destroy:
+      destroyed: Poruka je obrisana
   site:
     copyright:
       foreign:
@@ -1076,7 +1076,7 @@ sr-Latn:
       image: Slika
       alt: Rezervni tekst
       url: Adresa
-  trace:
+  traces:
     visibility:
       private: Privatni (prikazuje se kao anonimne, neraspoređene tačke)
       public: Javni (prikazane u spisku tragova kao anonimne, neraspoređene tačke)

config/locales/sr.yml

@@ -217,8 +217,8 @@ sr:
       open_by_anonymous: Направио анониман корисник пре <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by: Коментар корисника %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by_anonymous: Коментар анонимног корисника пре <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by: Решио %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous: Решио анонимни корисник пре <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Разрешио %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Разрешио анонимни корисник пре <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by: Поново активирао %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous: Поново активирао анонимни корисник пре <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by: Сакрио %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
@@ -1036,11 +1036,12 @@ sr:
         commented_note: '%{commenter} је оставио коментар на белешки мапе коју сте
           Ви коментарисали. Белешка је у близини места %{place}.'
       closed:
-        subject_own: '[OpenStreetMap] %{commenter} је решио једну од Ваших белешки'
-        subject_other: '[OpenStreetMap] %{commenter} је решио белешу за коју сте заинтересовани'
-        your_note: '%{commenter} је решио једну од Ваших белешки на мапи у близини
+        subject_own: '[OpenStreetMap] %{commenter} је разрешио једну од Ваших белешки'
+        subject_other: '[OpenStreetMap] %{commenter} је разрешио белешку за коју сте
+          заинтересовани'
+        your_note: '%{commenter} је разрешио једну од Ваших белешки на мапи у близини
           места %{place}.'
-        commented_note: '%{commenter} је решио белешку мапе коју сте коментарисали.
+        commented_note: '%{commenter} је разрешио белешку мапе коју сте коментарисали.
           Белешка је у близини места %{place}.'
       reopened:
         subject_own: '[OpenStreetMap] %{commenter} је реактивирао једну од Ваших белешки'
@@ -1068,7 +1069,7 @@ sr:
       details: Више информација о чејнџсетовима може да се пронађе на %{url}.
       unsubscribe: Да бисте престали пратити апдејте овог чејнџсета, посетите %{url}
         и кликните на „Престани пратити”.
-  message:
+  messages:
     inbox:
       title: Примљене
       my_inbox: Примљене
@@ -1090,7 +1091,7 @@ sr:
       unread_button: Означи као непрочитано
       read_button: Означи као прочитано
       reply_button: Одговори
-      delete_button: Обриши
+      destroy_button: Обриши
     new:
       title: Пошаљи поруку
       send_message_to: Пошаљи нову поруку за %{name}
@@ -1122,26 +1123,26 @@ sr:
     reply:
       wrong_user: Пријављени сте као %{user}, али порука на коју сте желели да одговорите
         није послата том кориснику. Пријавите се као исправан корисник да бисте одговорили.
-    read:
+    show:
       title: Прочитај поруку
       from: Од
       subject: Наслов
       date: Датум
       reply_button: Одговори
       unread_button: Означи као непрочитано
-      delete_button: Обриши
+      destroy_button: Обриши
       back: Назад
       to: За
       wrong_user: Пријављени сте као %{user}, али порука коју сте желели да прочитате
         није послата том кориснику. Пријавите се као исправан корисник да бисте је
         прочитали.
     sent_message_summary:
-      delete_button: Обриши
+      destroy_button: Обриши
     mark:
       as_read: Порука је означена као прочитана
       as_unread: Порука је означена као непрочитана
-    delete:
-      deleted: Порука је обрисана
+    destroy:
+      destroyed: Порука је обрисана
   site:
     about:
       next: Следеће
@@ -1577,7 +1578,7 @@ sr:
         paragraph_2_html: |-
           Само иди на <a href='%{map_url}'>карту</a> и кликни иконицу за белешке:
           <span class='icon note'></span>. Ово ће додати ознаку на карту, коју можеш да помераш превлачењем. Додај своју поруку, сними, и други картографи ће то истражити.
-  trace:
+  traces:
     visibility:
       private: Приватни (приказује се као анонимне, непоређане тачке)
       public: Јавни (приказани у списку трагова и као јавне, непоређане тачке)
@@ -2263,7 +2264,7 @@ sr:
       commented_at_html: Освежено пре %{when}
       commented_at_by_html: '%{user} освежио пре %{when}'
       closed_at_html: Решено пре %{when}
-      closed_at_by_html: '%{user} решио пре %{when}'
+      closed_at_by_html: '%{user} разрешио пре %{when}'
       reopened_at_html: Поново покренуто пре %{when}
       reopened_at_by_html: '%{user} поново покренуо пре %{when}'
     rss:
@@ -2363,9 +2364,9 @@ sr:
         anonymous_warning: Ова белешка садржи коментаре анонимних корисника које би
           требало посебно проверити.
         hide: Сакриј
-        resolve: Реши
+        resolve: Разреши
         reactivate: Поново покрени
-        comment_and_resolve: Коментариши и реши
+        comment_and_resolve: Коментариши и разреши
         comment: Коментариши
     edit_help: Помери карту и увећај на место које хоћеш да уредиш, затим кликни овде.
     directions:

config/locales/sv.yml

@@ -1133,7 +1133,7 @@ sv:
       details: Mer detaljer om ändringssetet finns på %{url}.
       unsubscribe: För att avsluta prenumerationen av uppdateringar i denna ändringsgrupp,
         besök %{url} och klicka på "Avprenumerera".
-  message:
+  messages:
     inbox:
       title: Inkorg
       my_inbox: Min inkorg
@@ -1155,7 +1155,7 @@ sv:
       unread_button: Markera som oläst
       read_button: Markera som läst
       reply_button: Svar
-      delete_button: Radera
+      destroy_button: Radera
     new:
       title: Skicka meddelande
       send_message_to: Skicka ett nytt meddelande till %{name}
@@ -1188,26 +1188,26 @@ sv:
       wrong_user: Du är inloggad som '%{user}', men meddelandet du har bett om att
         besvara skickades inte till den användaren. Logga in med korrekt användare
         för att svara.
-    read:
+    show:
       title: Läs meddelande
       from: Från
       subject: Ärende
       date: Datum
       reply_button: Svara
       unread_button: Markera som oläst
-      delete_button: Radera
+      destroy_button: Radera
       back: Tillbaka
       to: Till
       wrong_user: Du är inloggad som '%{user}', men meddelandet du har bett om att
         få läsa skickades inte till eller av den användaren. Logga in med korrekt
         användare för att läsa det.
     sent_message_summary:
-      delete_button: Radera
+      destroy_button: Radera
     mark:
       as_read: Meddelandet markerat som läst
       as_unread: Meddelandet markerat som oläst
-    delete:
-      deleted: Meddelande raderat
+    destroy:
+      destroyed: Meddelande raderat
   site:
     about:
       next: Nästa
@@ -1484,21 +1484,17 @@ sv:
         description: Ställ en fråga eller kolla upp svar på OSM:s sida med svar på
           ofta förekommande frågor.
       mailing_lists:
-        url: http://lists.openstreetmap.org/
         title: E-postlistor
         description: Ställ en fråga eller diskutera intressanta saker på ett brett
           utbud av lokala eller regionala e-postlistor.
       forums:
-        url: http://forum.openstreetmap.org/
         title: Forum
         description: Frågor och diskussioner för de som föredrar ett gränssnitt liknande
           en anslagstavla.
       irc:
-        url: http://irc.openstreetmap.org/
         title: IRC
         description: Interaktiv chatt på flera olika språk rörande mängder av ämnen.
       switch2osm:
-        url: https://switch2osm.org/
         title: switch2osm
         description: Hjälp för företag och organisationer att byta till OpenStreetMap-baserade
           kartor och andra tjänster.
@@ -1654,7 +1650,7 @@ sv:
         paragraph_2_html: |-
           Gå till <a href='%{map_url}'>kartan</a> och tryck på anteckningsikonen:
           <span class='icon note'></span>. En markör, som du kan dra omkring, kommer att läggas till på kartan. Lägg till ett meddelande och spara. Någon annan kommer att undersöka frågan.
-  trace:
+  traces:
     visibility:
       private: Privat (spåret delas anonymt och utan ordning)
       public: Publik (visas i GPS-spårlistan och som anonyma punkter utan ordning)
@@ -1679,8 +1675,10 @@ sv:
       tags_help: kommaseparerad
       visibility: 'Synlighet:'
       visibility_help: vad betyder detta?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Sv:Visibility_of_GPS_traces
       upload_button: Uppladdning
       help: Hjälp
+      help_url: http://wiki.openstreetmap.org/wiki/Sv:Upload
     edit:
       title: Redigerar spår %{name}
       heading: Redigerar spår %{name}
@@ -1750,7 +1748,7 @@ sv:
         GPS-spår</a> eller lär dig om GPS-spår på <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikin</a>.
       upload_trace: Ladda upp GPS-spår
       see_all_traces: Se alla GPS-spår
-      see_my_traces: Se mina spår
+      see_my_traces: Se mina GPS-spår
     delete:
       scheduled_for_deletion: GPS-spår schemalagt för radering
     make_public: