From: Tom Hughes <tom@compton.nu>
Date: Sun, 20 Oct 2019 18:13:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2383'
X-Git-Tag: live~2481
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9508368d37fe6e9d54a2d51ed8d886261ec4a9e9?hp=7fb5bcaf3f9775ee1de185efb3164a100ecccdc3

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 397215c03..9e27360ca 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-08-14 19:26:21 +0100 using RuboCop version 0.74.0.
+# on 2019-10-07 20:37:25 +0100 using RuboCop version 0.75.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 33
+# Offense count: 34
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
@@ -32,9 +32,9 @@ Lint/HandleExceptions:
     - 'app/controllers/api/amf_controller.rb'
     - 'app/controllers/users_controller.rb'
 
-# Offense count: 699
+# Offense count: 700
 Metrics/AbcSize:
-  Max: 279
+  Max: 189
 
 # Offense count: 39
 # Configuration parameters: CountComments, ExcludedMethods.
@@ -56,12 +56,12 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 22
 
-# Offense count: 719
+# Offense count: 721
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 179
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
   Max: 107
@@ -177,6 +177,18 @@ Style/AsciiComments:
 Style/Documentation:
   Enabled: false
 
+# Offense count: 27
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
+  Exclude:
+    - 'app/models/concerns/geo_record.rb'
+    - 'lib/bounding_box.rb'
+    - 'test/controllers/api/map_controller_test.rb'
+    - 'test/controllers/api/relations_controller_test.rb'
+    - 'test/controllers/api/ways_controller_test.rb'
+    - 'test/lib/bounding_box_test.rb'
+
 # Offense count: 539
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -196,7 +208,7 @@ Style/IfUnlessModifier:
 Style/NumericLiterals:
   MinDigits: 11
 
-# Offense count: 3322
+# Offense count: 3330
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
diff --git a/Gemfile.lock b/Gemfile.lock
index a4104c536..9e1e32109 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    aasm (5.0.5)
+    aasm (5.0.6)
       concurrent-ruby (~> 1.0)
     actioncable (5.2.3)
       actionpack (= 5.2.3)
@@ -51,9 +51,9 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    annotate (2.7.5)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    annotate (3.0.2)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 13.0)
     arel (9.0.0)
@@ -61,8 +61,8 @@ GEM
     autoprefixer-rails (8.6.5)
       execjs
     aws-eventstream (1.0.3)
-    aws-partitions (1.206.0)
-    aws-sdk-core (3.64.0)
+    aws-partitions (1.220.0)
+    aws-sdk-core (3.68.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.1)
@@ -70,7 +70,7 @@ GEM
     aws-sdk-kms (1.24.0)
       aws-sdk-core (~> 3, >= 3.61.1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.46.0)
+    aws-sdk-s3 (1.48.0)
       aws-sdk-core (~> 3, >= 3.61.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -91,7 +91,7 @@ GEM
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.4.4)
+    bootsnap (1.4.5)
       msgpack (~> 1.0)
     browser (2.6.1)
     builder (3.2.3)
@@ -156,7 +156,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-schema (1.3.3)
+    dry-schema (1.3.4)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.4)
@@ -164,7 +164,7 @@ GEM
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
       dry-types (~> 1.0)
-    dry-types (1.1.1)
+    dry-types (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
@@ -172,23 +172,23 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     dynamic_form (1.1.4)
-    erb_lint (0.0.29)
+    erb_lint (0.0.30)
       activesupport
       better_html (~> 1.0.7)
       html_tokenizer
       rainbow
       rubocop (~> 0.51)
       smart_properties
-    erubi (1.8.0)
+    erubi (1.9.0)
     execjs (2.7.0)
     exifr (1.3.6)
-    factory_bot (5.0.2)
+    factory_bot (5.1.1)
       activesupport (>= 4.2.0)
-    factory_bot_rails (5.0.2)
-      factory_bot (~> 5.0.2)
+    factory_bot_rails (5.1.1)
+      factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
     fakefs (0.20.1)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     ffi-libarchive (0.4.10)
@@ -236,16 +236,15 @@ GEM
     kgio (2.11.2)
     kramdown (2.1.0)
     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)
+    listen (3.2.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     logstash-event (1.2.02)
     logstasher (1.3.0)
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store
-    loofah (2.2.3)
+    loofah (2.3.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -257,12 +256,12 @@ GEM
     mini_magick (4.9.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.12.2)
     msgpack (1.3.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nio4r (2.4.0)
+    nio4r (2.5.2)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.1)
@@ -273,8 +272,8 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.2)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
@@ -307,8 +306,8 @@ GEM
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    parallel (1.18.0)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     pg (1.1.4)
     poltergeist (1.18.1)
@@ -317,7 +316,7 @@ GEM
       websocket-driver (>= 0.2.0)
     progress (3.5.2)
     psych (3.1.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     puma (3.12.1)
     quad_tile (1.0.1)
     r2 (0.2.7)
@@ -349,8 +348,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)
@@ -372,29 +371,27 @@ GEM
     rinku (2.0.6)
     rotp (5.1.0)
       addressable (~> 2.5)
-    rubocop (0.74.0)
+    rubocop (0.75.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.4.1)
+    rubocop-performance (1.5.0)
       rubocop (>= 0.71.0)
-    rubocop-rails (2.3.1)
+    rubocop-rails (2.3.2)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
-    ruby-openid (2.7.0)
+    ruby-openid (2.9.1)
     ruby-progressbar (1.10.1)
-    ruby_dep (1.5.0)
     safe_yaml (1.0.5)
-    sanitize (5.0.0)
+    sanitize (5.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
-    sassc (2.0.1)
+    sassc (2.2.1)
       ffi (~> 1.9)
-      rake
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
       sassc (>= 2.0)
@@ -421,17 +418,17 @@ GEM
       tins (~> 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     tins (1.21.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.20)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)
-    webmock (3.6.2)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
diff --git a/INSTALL.md b/INSTALL.md
index cc191aebe..4c2c7c6c8 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -124,6 +124,14 @@ We use [Yarn](https://yarnpkg.com/) to manage the Node.js modules required for t
 bundle exec rake yarn:install
 ```
 
+## Prepare local settings file
+
+This is a workaround. [See issues/2185 for details](https://github.com/openstreetmap/openstreetmap-website/issues/2185#issuecomment-508676026).
+
+```
+touch config/settings.local.yml
+```
+
 ## Storage setup
 
 The Rails port needs to be configured with an object storage facility - for
diff --git a/app/assets/images/banners/saveyourinternet.png b/app/assets/images/banners/saveyourinternet.png
deleted file mode 100644
index 4263396a8..000000000
Binary files a/app/assets/images/banners/saveyourinternet.png and /dev/null differ
diff --git a/app/assets/images/banners/sotm2018.png b/app/assets/images/banners/sotm2018.png
deleted file mode 100644
index c7411a5b1..000000000
Binary files a/app/assets/images/banners/sotm2018.png and /dev/null differ
diff --git a/app/assets/images/banners/sotm2019.png b/app/assets/images/banners/sotm2019.png
deleted file mode 100644
index 982c90ca1..000000000
Binary files a/app/assets/images/banners/sotm2019.png and /dev/null differ
diff --git a/app/assets/images/banners/sotm_asia_2019.png b/app/assets/images/banners/sotm_asia_2019.png
new file mode 100644
index 000000000..ef2f1c20b
Binary files /dev/null and b/app/assets/images/banners/sotm_asia_2019.png differ
diff --git a/app/assets/images/browse/farm.png b/app/assets/images/browse/farm.png
deleted file mode 100644
index 97890000c..000000000
Binary files a/app/assets/images/browse/farm.png and /dev/null differ
diff --git a/app/assets/images/browse/farmland.png b/app/assets/images/browse/farmland.png
new file mode 100644
index 000000000..c894c8455
Binary files /dev/null and b/app/assets/images/browse/farmland.png differ
diff --git a/app/assets/images/browse/farmyard.png b/app/assets/images/browse/farmyard.png
new file mode 100644
index 000000000..ca41410a8
Binary files /dev/null and b/app/assets/images/browse/farmyard.png differ
diff --git a/app/assets/images/browse/grass.png b/app/assets/images/browse/grass.png
new file mode 100644
index 000000000..79baac3ee
Binary files /dev/null and b/app/assets/images/browse/grass.png differ
diff --git a/app/assets/images/browse/grassland.png b/app/assets/images/browse/grassland.png
new file mode 100644
index 000000000..79baac3ee
Binary files /dev/null and b/app/assets/images/browse/grassland.png differ
diff --git a/app/assets/images/browse/meadow.png b/app/assets/images/browse/meadow.png
new file mode 100644
index 000000000..79baac3ee
Binary files /dev/null and b/app/assets/images/browse/meadow.png differ
diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index a80966ee1..2db397a07 100644
--- a/app/assets/stylesheets/browse.scss
+++ b/app/assets/stylesheets/browse.scss
@@ -163,14 +163,16 @@
   .landuse.brownfield::before { content: image-url('browse/brownfield.png'); }
   .landuse.cemetery::before { content: image-url('browse/cemetery.png'); }
   .landuse.commercial::before { content: image-url('browse/commercial.png'); }
-  .landuse.farm::before { content: image-url('browse/farm.png'); }
+  .landuse.farmland::before { content: image-url('browse/farmland.png'); }
+  .landuse.farmyard::before { content: image-url('browse/farmyard.png'); }
   .landuse.forest::before { content: image-url('browse/forest.png'); }
+  .landuse.grass::before { content: image-url('browse/grass.png'); }
   .landuse.industrial::before { content: image-url('browse/industrial.png'); }
+  .landuse.meadow::before { content: image-url('browse/meadow.png'); }
   .landuse.military::before { content: image-url('browse/military.png'); }
   .landuse.residential::before { content: image-url('browse/residential.png'); }
   .landuse.retail::before { content: image-url('browse/retail.png'); }
   .landuse.tourism::before { content: image-url('browse/tourism.png'); }
-  .landuse.wood::before { content: image-url('browse/wood.png'); }
 
   .leisure.golf_course::before { content: image-url('browse/golf.png'); }
   .leisure.park::before { content: image-url('browse/park.png'); }
@@ -180,8 +182,10 @@
   .leisure.nature_reserve::before { content: image-url('browse/reserve.png'); }
   .leisure.water_park::before { content: image-url('browse/leisure_water_park.16.png'); }
 
+  .natural.grassland::before { content: image-url('browse/grassland.png'); }
   .natural.heath::before { content: image-url('browse/heathland.png'); }
   .natural.water::before { content: image-url('browse/lake.png'); }
+  .natural.wood::before { content: image-url('browse/wood.png'); }
 
   .railway.light_rail::before { content: image-url('browse/light_rail.20.png'); }
   .railway.rail::before { content: image-url('browse/rail.20.png'); }
diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index d4a32efb2..ba2a2976e 100644
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -235,11 +235,12 @@ class DiaryEntriesController < ApplicationController
   end
 
   def comments
+    conditions = { :user_id => @user }
+
+    conditions[:visible] = true unless current_user&.administrator?
+
     @comment_pages, @comments = paginate(:diary_comments,
-                                         :conditions => {
-                                           :user_id => @user,
-                                           :visible => true
-                                         },
+                                         :conditions => conditions,
                                          :order => "created_at DESC",
                                          :per_page => 20)
     @page = (params[:page] || 1).to_i
diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb
index 10028bdea..56dba30b8 100644
--- a/app/views/diary_entries/comments.html.erb
+++ b/app/views/diary_entries/comments.html.erb
@@ -10,7 +10,7 @@
   </tr>
   <% @comments.each do |comment| -%>
   <% cl = cycle("table0", "table1") %>
-  <tr class="<%= cl %>">
+  <tr class="<%= cl %><%= " deemphasize" unless comment.visible? %>">
     <td width="25%"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>
     <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= time_ago_in_words(comment.created_at, :scope => :'datetime.distance_in_words_ago') %></span></td>
     <td width="50%" class="richtext"><%= comment.body.to_html %></td>
diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index ceeb4d88d..1fde78790 100644
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -12,7 +12,7 @@
   <td class="<%= cl %>"><%= link_to trace.name, :controller => "traces", :action => "show", :display_name => trace.user.display_name, :id => trace.id %>
     <span class="trace_summary" title="<%= trace.timestamp %>"> ...
       <% if trace.inserted %>
-        (<%= t ".count_points", :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %>)
+        (<%= t ".count_points", :count => trace.size %>)
       <% end %>
       ... <%= time_ago_in_words(trace.timestamp, :scope => :'datetime.distance_in_words_ago') %></span>
       <%= link_to_if trace.inserted?, t(".map"), { :controller => "site", :action => "index", :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}" }, { :title => t(".view_map") } %> /
diff --git a/config/banners.yml b/config/banners.yml
index f6ef3f48a..d8b8ecb49 100644
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -1,6 +1,6 @@
-sotm2010:
-  id: sotm2019
-  alt: State of the Map 2019
-  link: https://2019.stateofthemap.org/
-  img: banners/sotm2019.png
-  enddate: 2019-sep-23
+sotm_asia_2019:
+  id: sotm_asia_2019
+  alt: State of the Map Asia 2019
+  link: https://stateofthemap.asia/
+  img: banners/sotm_asia_2019.png
+  enddate: 2019-nov-03
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index dc5b28e66..a61fe960c 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -21,7 +21,7 @@ end
 
 openid_options = { :name => "openid", :store => openid_store }
 google_options = { :name => "google", :scope => "email", :access_type => "online" }
-facebook_options = { :name => "facebook", :scope => "email" }
+facebook_options = { :name => "facebook", :scope => "email", :client_options => { :site => "https://graph.facebook.com/v4.0", :authorize_url => "https://www.facebook.com/v4.0/dialog/oauth" } }
 windowslive_options = { :name => "windowslive", :scope => "wl.signin,wl.emails" }
 github_options = { :name => "github", :scope => "user:email" }
 wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://meta.wikimedia.org" } }
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index a36ddde4b..9eb4a7d77 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -42,6 +42,7 @@ ar:
   time:
     formats:
       friendly: '%e %B %Y في %H:%M'
+      blog: '%e %B %Y'
   helpers:
     submit:
       diary_comment:
@@ -176,6 +177,9 @@ ar:
       x_years:
         one: منذ سنة واحدة
         other: منذ %{count} سنوات
+  printable_name:
+    with_version: '%{id}، v%{version}'
+    with_name_html: '%{name} (%{id})'
   editor:
     default: الافتراضي (حالياً %{name})
     potlatch:
@@ -267,6 +271,7 @@ ar:
       history_title: 'تاريخ الصلة: %{name}'
       members: الأعضاء
     relation_member:
+      entry: '%{type} %{name}'
       entry_role: '%{type} %{name} كــ%{role}'
       type:
         node: عقدة
@@ -467,6 +472,7 @@ ar:
           خريطة الشارع المفتوحة</a>
         geonames_reverse: نتائج من <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
+      prefix_format: '%{name}'
       prefix:
         aerialway:
           cable_car: عربة قطار هوائي
@@ -1217,6 +1223,7 @@ ar:
       footer: يمكنك أيضًا قراءة التعليق على %{readurl} ويمكنك التعليق على %{commenturl}
         أو الرد على %{replyurl}
     message_notification:
+      subject_header: '[OpenStreetMap] %{subject}'
       hi: مرحبًا %{to_user}،
       header: '%{from_user} قام بإرسال رسالة لك عبر خريطة الشارع المفتوحة بالعنوان
         %{subject}:'
@@ -1238,6 +1245,7 @@ ar:
         failed_to_import: 'فشل الاستيراد، الخطأ هو:'
         more_info_1: المزيد من المعلومات حول فشل استيراد جي بي إكس وكيفية تجنبه
         more_info_2: 'وهي موجودة على:'
+        import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       success:
         subject: '[خريطة الشارع المفتوحة] نجاح استيراد جي بي إكس'
         loaded_successfully: تم تحميل بنجاح %{trace_points} نقطة من أصل %{possible_points}
@@ -1545,7 +1553,7 @@ ar:
           إضافة إلى قاعدة بيانات OpenStreetMap أو هذا الموقع ، يرجى الرجوع
           إلى <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure"> إزالة الموقع
           الإجراء </a> أو الملف مباشرة في موقعنا
-          <a href="http://dmca.openstreetmap.org/"> صفحة الإيداع عبر الإنترنت </a>.
+          <a href="https://dmca.openstreetmap.org/"> صفحة الإيداع عبر الإنترنت </a>.
         trademarks_title_html: <span id="trademarks"></span>علامات تجارية
         trademarks_1_html: OpenStreetMap ، وشعار العدسة المكبرة وحالة الخريطة هي علامات
           تجارية مسجلة لمؤسسة OpenStreetMap. إذا كانت لديك أسئلة حول استخدامك للعلامات
@@ -1566,6 +1574,7 @@ ar:
       not_public_description: أنت لم تعد قادر على تعديل الخريطة إلا إذا قمت بذلك،
         يمكنك تعيين تعديلاتك لتكون علنية من %{user_page} الخاصة بك.
       user_page_link: صفحة مستخدم
+      anon_edits: (%{link})
       anon_edits_link_text: ابحث عن السبب لماذا هو هذا الحال.
       flash_player_required: أنت بحاجة لمشغل فلاش لاستخدام Potlatch، محرر فلاش خريطة
         الشارع المفتوحة. يمكنك <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">تنزيل
@@ -1877,6 +1886,7 @@ ar:
       tags_help: محددة بفواصل
       visibility: 'الرؤية:'
       visibility_help: ماذا يعني هذا؟
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
       updated: تم تحديث التتبع
     trace_optionals:
@@ -1907,7 +1917,9 @@ ar:
       newer: الآثار الحديثة
     trace:
       pending: في الانتظار
-      count_points: '%{count} نقطة'
+      count_points:
+        one: 1 نقطة
+        other: '%{count} نقاط'
       more: المزيد
       trace_details: اعرض تفاصيل الأثر
       view_map: اعرض الخريطة
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 3a0309efd..3cc37c646 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -284,6 +284,7 @@ ast:
       wikidata_link: L'elementu %{page} en Wikidata
       wikipedia_link: L'artículu %{page} en Wikipedia
       telephone_link: Llamar a %{phone_number}
+      colour_preview: Entever el color %{colour_value}
     note:
       title: 'Nota: %{id}'
       new_note: Nota nueva
@@ -1511,7 +1512,7 @@ ast:
         infringement_2_html: Si crees que s'amestó de mou inapropiáu material con
           drechos d'autor a la base de datos d'OpenStreetMap o a esti sitiu, consulta'l
           nuesu <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimientu
-          de retirada de datos</a> o pidilo direutamente nel nuesu <a href="http://dmca.openstreetmap.org/">formulariu
+          de retirada de datos</a> o pidilo direutamente nel nuesu <a href="https://dmca.openstreetmap.org/">formulariu
           en llinia</a>.
         trademarks_title_html: <span id="trademarks"></span>Marques rexistraes
         trademarks_1_html: OpenStreetMap, el logotipu de la lente y «State of the
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 7add020e3..d02caab33 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1478,7 +1478,7 @@ be:
         infringement_2_html: Калі вы лічыце, што абаронены аўтарскім правам матэрыял
           быў недарэчна дададзены ў базу дадзеных OpenStreetMap або да гэтага сайту,
           азнаёмціся з нашым <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">парадкам
-          выдалення такіх дадзеных</a> або скарыстайцеся непасрэдна нашай <a href="http://dmca.openstreetmap.org/">старонкай
+          выдалення такіх дадзеных</a> або скарыстайцеся непасрэдна нашай <a href="https://dmca.openstreetmap.org/">старонкай
           для онлайн зваротаў</a>.
         trademarks_title_html: <span id="trademarks"></span>Таварныя знакі
         trademarks_1_html: OpenStreetMap і лагатып з лупаю з'яўляюцца зарэгістраванымі
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 41f2df675..681ac3ce2 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -1501,7 +1501,7 @@ br:
         infringement_2_html: ma kredit ez eus bet ouzhpennet danvez dindan aotre-implijout
           e gaou da diaz roadennoù OpenStreetMat pe d'al lec'hienn-mañ, roit an dra-se
           da c'houzout d'hon <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">argerzh
-          dizober</a>, mar plij, pe skrivit war-eeun war hor <a href="http://dmca.openstreetmap.org/">furmskrid
+          dizober</a>, mar plij, pe skrivit war-eeun war hor <a href="https://dmca.openstreetmap.org/">furmskrid
           enlinenn</a>.
         trademarks_title_html: <span id="merkoù"></span>Merkoù
         trademarks_1_html: Openstreet, al logo brasaer ha State of the Map zo merkoù
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index f42ba84f8..011c3654b 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1087,7 +1087,7 @@ bs:
         infringement_2_html: Ako vjerujete da je zaštićeni materijal bio dodan bazi
           podataka OpenStreetMapa ili ovoj veb-stranici, molimo da pogledate našu
           <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">proceduru
-          skidanja</a> ili uložite prigovor direktno na našu <a href="http://dmca.openstreetmap.org/">stranicu</a>.
+          skidanja</a> ili uložite prigovor direktno na našu <a href="https://dmca.openstreetmap.org/">stranicu</a>.
     index:
       js_1: Koristite internet preglednik koji ne podržava JavaScript, ili ste onemogućili
         JavaScript.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 181ae1dcb..ffb73f425 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1429,7 +1429,7 @@ ca:
           que ha estat afegit a la base de dades d'OpenStreetMap o a aquest web, si
           us plau aneu a la pàgina web dedicada al <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">Procediment
           per eliminar dades protegides pels drets d'autor</a> o empleneu aquest <a
-          href="http://dmca.openstreetmap.org/">formulari en línia.</a>.
+          href="https://dmca.openstreetmap.org/">formulari en línia.</a>.
         trademarks_title_html: <span id="trademarks"></span>Marques registrades
         trademarks_1_html: OpenStreetMap, el logotip de la lupa i «State of the Map»
           són marques registrades de la Fundació OpenStreetMap. Si teniu preguntes
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 91569f0ec..fdab78343 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -49,6 +49,9 @@ cs:
         create: Uložit
       diary_entry:
         create: Publikovat
+        update: Aktualizovat
+      issue_comment:
+        create: Přidat komentář
       message:
         create: Odeslat
       client_application:
@@ -135,6 +138,9 @@ cs:
         description: Popis
         languages: Jazyky
         pass_crypt: Heslo
+  datetime:
+    distance_in_words_ago:
+      half_a_minute: před půl minutou
   editor:
     default: Výchozí (aktuálně %{name})
     potlatch:
@@ -152,14 +158,14 @@ cs:
   api:
     notes:
       comment:
-        opened_at_html: Vytvořeno před %{when}
-        opened_at_by_html: Vytvořeno před %{when} uživatelem %{user}
-        commented_at_html: Aktualizováno před %{when}
-        commented_at_by_html: Aktualizováno před %{when} uživatelem %{user}
-        closed_at_html: Vyřešeno před %{when}
-        closed_at_by_html: Vyřešeno před %{when} uživatelem %{user}
-        reopened_at_html: Reaktivováno před %{when}
-        reopened_at_by_html: Reaktivováno před %{when} uživatelem %{user}
+        opened_at_html: Vytvořeno %{when}
+        opened_at_by_html: Vytvořeno %{when} uživatelem %{user}
+        commented_at_html: Aktualizováno %{when}
+        commented_at_by_html: Aktualizováno %{when} od %{user}
+        closed_at_html: Vyřešeno %{when}
+        closed_at_by_html: Vyřešeno %{when} od %{user}
+        reopened_at_html: Reaktivováno %{when}
+        reopened_at_by_html: Reaktivováno %{when} od %{user}
       rss:
         title: Poznámky OpenStreetMap
         description_area: Seznam poznámek hlášených, komentovaných nebo uzavřených
@@ -175,16 +181,12 @@ cs:
   browse:
     created: Vytvořeno
     closed: Uzavřeno
-    created_html: Vytvořeno <abbr title='%{title}'>před %{time}</abbr>
-    closed_html: Uzavřeno <abbr title='%{title}'>před %{time}</abbr>
-    created_by_html: Vytvořeno <abbr title='%{title}'>před %{time}</abbr> uživatelem
-      %{user}
-    deleted_by_html: Smazáno <abbr title='%{title}'>před %{time}</abbr> uživatelem
-      %{user}
-    edited_by_html: Upraveno <abbr title='%{title}'>před %{time}</abbr> uživatelem
-      %{user}
-    closed_by_html: Uzavřeno <abbr title='%{title}'>před %{time}</abbr> uživatelem
-      %{user}
+    created_html: Vytvořeno <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Uzavřeno <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Vytvořeno <abbr title='%{title}'>%{time}</abbr> od %{user}
+    deleted_by_html: Smazáno <abbr title='%{title}'>%{time}</abbr> od %{user}
+    edited_by_html: Upraveno <abbr title='%{title}'>%{time}</abbr> od %{user}
+    closed_by_html: Uzavřeno <abbr title='%{title}'>%{time}</abbr> od %{user}
     version: Verze
     in_changeset: Sada změn
     anonymous: anonym
@@ -204,9 +206,8 @@ cs:
       relation: Relace (%{count})
       relation_paginated: Relace (%{x}–%{y} z %{count})
       comment: Komentáře (%{count})
-      hidden_commented_by: Skrytý komentář od uživatele %{user} <abbr title='%{exact_time}'>před
-        %{when}</abbr>
-      commented_by: <abbr title='%{exact_time}'>Před %{when}</abbr> okomentoval %{user}
+      hidden_commented_by: Skrytý komentář od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Komentář od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: Sada změn XML
       osmchangexml: osmChange XML
       feed:
@@ -276,6 +277,7 @@ cs:
       wikidata_link: Položka %{page} na Wikidatech
       wikipedia_link: Článek %{page} na Wikipedii
       telephone_link: Volat %{phone_number}
+      colour_preview: Náhled barvy %{colour_value}
     note:
       title: 'Poznámka: %{id}'
       new_note: Nová poznámka
@@ -283,14 +285,12 @@ cs:
       open_title: 'Nevyřešená poznámka #%{note_name}'
       closed_title: 'Vyřešená poznámka #%{note_name}'
       hidden_title: 'Skrytá poznámka #%{note_name}'
-      open_by: Vytvořil %{user} <abbr title='%{exact_time}'>před %{when}</abbr>
-      open_by_anonymous: Vytvořil anonym <abbr title='%{exact_time}'>před %{when}</abbr>
-      commented_by: <abbr title='%{exact_time}'>Před %{when}</abbr> okomentoval uživatel
-        %{user}
-      commented_by_anonymous: <abbr title='%{exact_time}'>Před %{when}</abbr> okomentoval
+      open_by: Vytvořil %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Vytvořil anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: <abbr title='%{exact_time}'>%{when}</abbr> okomentoval %{user}
+      commented_by_anonymous: <abbr title='%{exact_time}'>%{when}</abbr> okomentoval
         anonym
-      closed_by: Vyřešil <abbr title='%{exact_time}'>před %{when}</abbr> uživatel
-        %{user}
+      closed_by: Vyřešeno od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       closed_by_anonymous: Vyřešil <abbr title='%{exact_time}'>před %{when}</abbr>
         anonym
       reopened_by: Reaktivoval <abbr title='%{exact_time}'>před %{when}</abbr> uživatel
@@ -336,7 +336,7 @@ cs:
   changeset_comments:
     comment:
       comment: '%{author} napsal nový komentář k sadě změn #%{changeset_id}'
-      commented_at_by_html: Aktualizováno před %{when} uživatelem %{user}
+      commented_at_by_html: Aktualizováno %{when} od %{user}
     comments:
       comment: '%{author} napsal nový komentář k sadě změn #%{changeset_id}'
     index:
@@ -369,7 +369,7 @@ cs:
       older_entries: Starší záznamy
       newer_entries: Novější záznamy
     edit:
-      title: Upravit deníkový záznam
+      title: Upravit zápis do deníku
       marker_text: Místo deníkového záznamu
     show:
       title: Deník uživatele %{user} | %{title}
@@ -393,11 +393,13 @@ cs:
         other: '%{count} komentářů'
       edit_link: Upravit tento záznam
       hide_link: Skrýt tento záznam
+      unhide_link: Odkrýt tento záznam
       confirm: Potvrdit
       report: Nahlásit tento záznam
     diary_comment:
       comment_from: Komentář od %{link_user} z %{comment_created_at}
       hide_link: Skrýt tento komentář
+      unhide_link: Odkrýt tento komentář
       confirm: Potvrdit
       report: Nahlásit tento komentář
     location:
@@ -1033,8 +1035,8 @@ cs:
       status: Stav
       reports: Hlášení
       last_updated: Poslední změna
-      last_updated_time_html: <abbr title='%{title}'>před %{time}</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>před %{time}</abbr> od %{user}
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> od %{user}
       link_to_reports: Zobrazit hlášení
       reports_count:
         one: 1 Hlášení
@@ -1492,7 +1494,7 @@ cs:
         infringement_2_html: Pokud si myslíte, že byl do databáze OpenStreetMap nebo
           na tento server neoprávněně vložen autorskoprávně chráněný obsah, postupujte
           podle našeho <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">postupu
-          pro odstranění</a> nebo přímo podejte výzvu pomocí <a href="http://dmca.openstreetmap.org/">on-line
+          pro odstranění</a> nebo přímo podejte výzvu pomocí <a href="https://dmca.openstreetmap.org/">on-line
           formuláře</a>.
         trademarks_title_html: <span id="trademarks"></span>Ochranné známky
         trademarks_1_html: OpenStreetMap, jeho logo s lupou a State of the Map jsou
@@ -1627,6 +1629,7 @@ cs:
         description: Pomoc společnostem a organizacím s přechodem na mapy a další
           služby založené na OpenStreetMap.
       welcomemat:
+        url: https://welcome.openstreetmap.org/
         title: Pro organizace
         description: Jste u organizace, která má plány s OpenStreetMap? Podívejte
           se na uvítací průvodce.
@@ -2172,7 +2175,7 @@ cs:
       ct status: 'Podmínky pro přispěvatele:'
       ct undecided: Nerozhodnuto
       ct declined: Odmítnuty
-      latest edit: 'Poslední editace %{ago}:'
+      latest edit: 'Poslední úprava (%{ago}):'
       email address: 'E-mailová adresa:'
       created from: 'Vytvořeno od:'
       status: 'Stav:'
@@ -2430,7 +2433,7 @@ cs:
       title: Zrušení bloku pro %{block_on}
       heading: Zrušení bloku pro %{block_on} od %{block_by}
       time_future: Tento blok skončí v %{time}.
-      past: Teto blok již skončil před %{time} a již nemůže být zrušen.
+      past: Teto blok skončil %{time} a již nemůže být zrušen.
       confirm: Opravdu chcete zrušit tento blok?
       revoke: Zrušit !
       flash: Tento blok byl zrušen.
@@ -2438,7 +2441,7 @@ cs:
       time_future: Končí za %{time}.
       until_login: Aktivní dokud se uživatel nepřihlásí.
       time_future_and_until_login: Končí za %{time} a až se uživatel přihlásí.
-      time_past: Ukončeno před %{time}.
+      time_past: Ukončeno %{time}.
       block_duration:
         hours:
           one: 1 hodina
diff --git a/config/locales/da.yml b/config/locales/da.yml
index f890d658b..94890f346 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1552,7 +1552,7 @@ da:
           Hvis du mener, at ophavsretligt beskyttet materiale uberettiget er
            føjet til OpenStreetMap databasen eller dette websted, bedes du følge
            vores <a hrefs="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedure til fjernelse a materiale</a> eller udfyld formular direkte på vores
-          <a href="http://dmca.openstreetmap.org/">on-line side</a>.
+          <a href="https://dmca.openstreetmap.org/">on-line side</a>.
         trademarks_title_html: <span id="trademarks"></span>Varemærker
         trademarks_1_html: OpenStreetMap, forstørrelsesglas-logoet og "State of the
           Map" er registrerede varemærker til OpenStreetMap Foundation. Hvis du har
diff --git a/config/locales/de.yml b/config/locales/de.yml
index f3d2ecca0..1211ac0ab 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -22,6 +22,7 @@
 # Author: Fujnky
 # Author: Geitost
 # Author: GerdP
+# Author: Gravitystorm
 # Author: Grille chompa
 # Author: Hendrik-17
 # Author: Hikemaniac
@@ -1605,7 +1606,7 @@ de:
           OpenStreetMap-Datenbank oder auf dieser Website hinzugefügt wurde, informiere dich
           bitte über unser <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">Verfahren
           zum Entfernen von Inhalten</a> oder melde dies direkt mit unserem
-          <a href="http://dmca.openstreetmap.org/">Onlineformular</a>.
+          <a href="https://dmca.openstreetmap.org/">Onlineformular</a>.
         trademarks_title_html: <span id="trademarks"></span>Markenzeichen
         trademarks_1_html: OpenStreetMap, das Lupenlogo und „State of the Map“ sind
           eingetragene Warenzeichen der OpenStreetMap Foundation. Falls du Fragen
@@ -1925,7 +1926,7 @@ de:
       visibility_help: Was bedeutet das?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/DE:Visibility_of_GPS_traces
       help: Hilfe
-      help_url: http://wiki.openstreetmap.org/wiki/DE:Upload
+      help_url: https://wiki.openstreetmap.org/wiki/DE:Upload
     create:
       upload_trace: Lade einen GPS-Track hoch
       trace_uploaded: Deine GPX-Datei wurde hochgeladen und wartet auf die Aufnahme
@@ -2399,7 +2400,7 @@ de:
       image: 'Bild:'
       gravatar:
         gravatar: Gravatar verwenden
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
         link text: Was ist das?
         disabled: Gravatar wurde deaktiviert.
         enabled: Die Anzeige deines Gravatars wurde aktiviert.
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index d8439149c..46cbc822f 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -862,7 +862,9 @@ diq:
       showing_page: Pele %{page}
     trace:
       pending: PAWEDEYO
-      count_points: '%{count} puan'
+      count_points:
+        one: 1 puwan
+        other: '%{count} puwani'
       more: dehana vêşi
       trace_details: Teferruatanê rêça bıvin
       view_map: Xeriti Bımocnê
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 4e86e9672..ca0aa6598 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1161,7 +1161,7 @@ dsb:
         infringement_2_html: Joli měniš, aý awtorskopšawniski šćitany material jo
           se datowej bance OpenStreetMap abo toś tomu sedłoju bźez dowólnosći pśidał,
           póśěguj se pšosym na našo <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">póstupowanje
-          za wótwónoźowanje wopśimjeśa</a>abo daj to direktnje na našom <a href="http://dmca.openstreetmap.org/">formularnem
+          za wótwónoźowanje wopśimjeśa</a>abo daj to direktnje na našom <a href="https://dmca.openstreetmap.org/">formularnem
           boku</a> k wěsći.
     index:
       js_1: Pak wužywaš wobglědowak, kótaryž njepódpěra JavaScript, pak sy znjemóžnił
diff --git a/config/locales/el.yml b/config/locales/el.yml
index cb369a9cd..9a4da6ede 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1514,7 +1514,7 @@ el:
         infringement_2_html: Εάν πιστεύετε ότι προστέθηκε παράνομα υλικό που προστατεύεται
           από πνευματικά δικαιώματα στη βάση δεδομένων του OpenStreetMap ή σε αυτόν
           τον ιστότοπο, παρακαλούμε απευθυνθείτε στη <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">
-          διαδικασία απομάκρυνσης </a> ή καταθέστε άμεσα μια αίτηση στην <a href="http://dmca.openstreetmap.org/">on-line
+          διαδικασία απομάκρυνσης </a> ή καταθέστε άμεσα μια αίτηση στην <a href="https://dmca.openstreetmap.org/">on-line
           σελίδα αιτήσεων</a>.
         trademarks_title_html: <span id="trademarks"></span>Εμπορικά σήματα
         trademarks_1_html: Το OpenStreetMap, το λογότυπο με το μεγεθυντικό φακό και
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2aca19795..2954b2154 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -11,6 +11,7 @@
 # Author: E THP
 # Author: EdLoach
 # Author: Eduard Popov
+# Author: Gravitystorm
 # Author: IknowJoseph
 # Author: Jagwar
 # Author: Jguthrie100
@@ -1166,7 +1167,7 @@ en-GB:
       community_driven_title: Community Driven
       community_driven_html: |-
         OpenStreetMap's community is diverse, passionate, and growing every day. Our contributors include enthusiast mappers, GIS professionals, engineers running the OSM servers, humanitarians mapping disaster-affected areas, and many more.
-        To learn more about the community, see the <a href='%{diary_path}'>user diaries</a>, <a href='http://blogs.openstreetmap.org/'>community blogs</a>, and the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
+        To learn more about the community, see the <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>, <a href='%{diary_path}'>user diaries</a>, <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.
       open_data_title: Open Data
       open_data_html: |-
         OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
@@ -1203,17 +1204,17 @@ en-GB:
         title_html: Copyright and Licence
         intro_1_html: |-
           OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
+          href="https://opendatacommons.org/licenses/odbl/">Open Data
           Commons Open Database License</a> (ODbL) by the  <a
-          href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
+          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
         intro_2_html: You are free to copy, distribute,  transmit and adapt our data,
           as long as you credit OpenStreetMap and its contributors. If you alter or
           build upon our data, you may distribute the result only under the same licence.
-          The full <a href="http://opendatacommons.org/licenses/odbl/1.0/">legal code</a>
-          explains your rights and responsibilities.
+          The full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
+          code</a> explains your rights and responsibilities.
         intro_3_html: |-
           The cartography in our map tiles, and our documentation, are
-          licenced under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+          licenced under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |-
@@ -1223,7 +1224,7 @@ en-GB:
           You must also make it clear that the data is available under the Open
           Database Licence, and if using our map tiles, that the cartography is
           licenced as CC BY-SA. You may do this by linking to
-          <a href="http://www.openstreetmap.org/copyright">this copyright page</a>.
+          <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
           Alternatively, and as a requirement if you are distributing OSM in a
           data form, you can name and link directly to the licence(s). In media
           where links are not possible (e.g. printed works), we suggest you
@@ -1239,9 +1240,7 @@ en-GB:
         more_title_html: Finding out more
         more_1_html: |-
           Read more about using our data, and how to credit us, at the <a
-          href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
-          href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
-          FAQ</a>.
+          href="https://osmfoundation.org/Licence">OSMF Licence page</a>.
         more_2_html: |-
           Although OpenStreetMap is open data, we cannot provide a
           free-of-charge map API for third-parties.
@@ -1290,7 +1289,7 @@ en-GB:
         contributors_gb_html: '<strong>United Kingdom</strong>: Contains Ordnance
           Survey data &copy; Crown copyright and database right 2010-19.'
         contributors_footer_1_html: For further details of these, and other sources
-          that have been used to help improve OpenStreetMap, please see the <a href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors
+          that have been used to help improve OpenStreetMap, please see the <a href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
           page</a> on the OpenStreetMap Wiki.
         contributors_footer_2_html: Inclusion of data in OpenStreetMap does not imply
           that the original data provider endorses OpenStreetMap, provides any warranty,
@@ -1301,8 +1300,8 @@ en-GB:
           permission from the copyright holders.
         infringement_2_html: If you believe that copyrighted material has been inappropriately
           added to the OpenStreetMap database or this site, please refer to our <a
-          href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
-          procedure</a> or file directly at our <a href="http://dmca.openstreetmap.org/">on-line
+          href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
+          procedure</a> or file directly at our <a href="https://dmca.openstreetmap.org/">on-line
           filing page</a>.
         trademarks_title_html: <span id="trademarks"></span>Trademarks
         trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of
@@ -1415,7 +1414,7 @@ en-GB:
         mapping topics.
       welcome:
         url: /welcome
-        title: Welcome to OSM
+        title: Welcome to OpenStreetMap
         description: Start with this quick guide covering the OpenStreetMap basics.
       beginners_guide:
         url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
@@ -1423,8 +1422,8 @@ en-GB:
         description: Community maintained guide for beginners.
       help:
         url: https://help.openstreetmap.org/
-        title: help.openstreetmap.org
-        description: Ask a question or look up answers on OSM's question-and-answer
+        title: Help Forum
+        description: Ask a question or look up answers on OpenStreetMap's question-and-answer
           site.
       mailing_lists:
         title: Mailing Lists
@@ -1443,8 +1442,8 @@ en-GB:
           based maps and other services.
       wiki:
         url: http://wiki.openstreetmap.org/
-        title: wiki.openstreetmap.org
-        description: Browse the wiki for in-depth OSM documentation.
+        title: OpenStreetMap Wiki
+        description: Browse the wiki for in-depth OpenStreetMap documentation.
     sidebar:
       search_results: Search Results
       close: Close
@@ -1666,7 +1665,9 @@ en-GB:
       newer: Newer Traces
     trace:
       pending: PENDING
-      count_points: '%{count} points'
+      count_points:
+        one: 1 point
+        other: '%{count} points'
       more: more
       trace_details: View Trace Details
       view_map: View Map
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c6ed0f628..35da13709 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1251,8 +1251,8 @@ en:
       commented:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
-        your_changeset: "%{commenter} has left a comment on one of your changesets created at %{time}"
-        commented_changeset: "%{commenter} has left a comment on a map changeset you are watching created by %{changeset_author} at %{time}"
+        your_changeset: "%{commenter} left a comment at %{time} on one of your changesets"
+        commented_changeset: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}"
         partial_changeset_with_comment: "with comment '%{changeset_comment}'"
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
@@ -1503,7 +1503,7 @@ en:
           added to the OpenStreetMap database or this site, please refer
           to our <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
           procedure</a> or file directly at our
-          <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
+          <a href="https://dmca.openstreetmap.org/">on-line filing page</a>.
         trademarks_title_html: <span id="trademarks"></span>Trademarks
         trademarks_1_html: |
           OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.
@@ -1856,7 +1856,9 @@ en:
       newer: "Newer Traces"
     trace:
       pending: "PENDING"
-      count_points: "%{count} points"
+      count_points:
+        one: "1 point"
+        other: "%{count} points"
       more: "more"
       trace_details: "View Trace Details"
       view_map: "View Map"
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index c77081d84..50d3cfd5e 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1513,7 +1513,7 @@ eo:
         infringement_2_html: Se ve pensas, ke datumoj protektataj per kopirajto estas
           misaldonitaj al OpenStreetMap-datumbazo aŭ al tiu ĉi retejo, bonvolu legi
           pri <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">proceduro
-          de forigado de datumoj</a> aÅ­ plenigi la <a href="http://dmca.openstreetmap.org/">enretan
+          de forigado de datumoj</a> aÅ­ plenigi la <a href="https://dmca.openstreetmap.org/">enretan
           formularon</a>.
         trademarks_title_html: <span id="trademarks"></span>Registritaj markoj
         trademarks_1_html: OpenStreetMap, la piktogramo de grandiga lenso kaj “State
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a234545f9..a85fc9920 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1581,7 +1581,7 @@ es:
         infringement_2_html: Si usted cree que algún material con derechos de autor
           ha sido incorrectamente agregado a la base de datos de OpenStreetMap o a
           este sitio, consulte nuestro <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimiento
-          de descolgado</a> o preséntelo directamente en nuestra <a href="http://dmca.openstreetmap.org/">página
+          de descolgado</a> o preséntelo directamente en nuestra <a href="https://dmca.openstreetmap.org/">página
           de presentación en línea</a>.
         trademarks_title_html: <span id="trademarks"></span>Marcas registradas
         trademarks_1_html: OpenStreetMap, el logotipo de la lupa y «State of the Map»
@@ -1958,7 +1958,9 @@ es:
       newer: Trazas más recientes
     trace:
       pending: PENDIENTE
-      count_points: '%{count} puntos'
+      count_points:
+        one: 1 punto
+        other: '%{count} puntos'
       more: más
       trace_details: Ver detalles de la traza
       view_map: Ver mapa
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 264480ced..4b3b69b2a 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1270,7 +1270,7 @@ et:
           Kui usud, et OpenStreetMapi andmebaasi või sellele saidile on lisatud sobimatult
           autoriõigusega kaitstud materjali, siis palun juhindu
           <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">eemaldamise protseduurist</a>
-          või täida <a href="http://dmca.openstreetmap.org/">vastaval leheküljel</a> vorm, et kaebus esitada.
+          või täida <a href="https://dmca.openstreetmap.org/">vastaval leheküljel</a> vorm, et kaebus esitada.
         trademarks_title_html: <span id="trademarks"></span>Kaubamärgid
         trademarks_1_html: OpenStreetMap, suurendusklaasi logo ja State of the Map
           on OpenStreetMap Foundationi registreeritud kaubamärgid. Kui sul on nende
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 965b832c9..43b43d3a3 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1495,7 +1495,7 @@ eu:
           OpenStreetMap datu-baseari edo gune honi gehitu zaionean, mesedez
           Gure <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure"> bajazioa
           prozedura </a> edo zuzenean gure fitxategian
-          <a href="http://dmca.openstreetmap.org/"> lineako aurkezpen orrira jo</a>.
+          <a href="https://dmca.openstreetmap.org/"> lineako aurkezpen orrira jo</a>.
         trademarks_title_html: <span id="trademarks"></span>Marka komertzialak
         trademarks_1_html: OpenStreetMap, lupa-logotipoa eta Maparen egoera OpenStreetMap
           Fundazioaren marka erregistratuak dira. Marka erabiltzeari buruzko galderarik
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index e0f6e952a..f93ce0762 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1539,7 +1539,7 @@ fa:
         infringement_2_html: اگر بر این باورید که داده‌های مشمول حق‌نشر به‌طور نامناسبی
           به پایگاه‌دادهٔ OpenStreetMap  یا به این وبسایت افزوده شده، لطفاً به <a
           href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">روندنامهٔ
-          حذف</a> مراجعه کنید یا دادخواست خود را مستقیماً در <a href="http://dmca.openstreetmap.org/">صفحهٔ
+          حذف</a> مراجعه کنید یا دادخواست خود را مستقیماً در <a href="https://dmca.openstreetmap.org/">صفحهٔ
           دادخواهی برخط</a> تسلیم کنید.
         trademarks_title_html: <span id="trademarks"></span>نشان‌های تجاری
         trademarks_1_html: OpenStreetMap،‏ نشان‌وارهٔ ذره‌بین‌دار و State of the Map
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 5d105c476..8ae7b524d 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -32,6 +32,7 @@
 # Author: Samoasambia
 # Author: Silvonen
 # Author: Snidata
+# Author: Spude
 # Author: Str4nd
 # Author: Susannaanas
 # Author: Tomi Toivio
@@ -42,7 +43,7 @@
 fi:
   time:
     formats:
-      friendly: '%e. %Bta %Y kello %H.%M'
+      friendly: '%e. %Bta %Y klo %H.%M'
       blog: '%e. %Bta %Y'
   helpers:
     submit:
@@ -56,13 +57,13 @@ fi:
       message:
         create: Lähetä
       client_application:
-        create: Rekisteröi
+        create: Rekisteröidy
         update: Muokkaa
       redaction:
         create: Luo redaktio
         update: Tallenna redaktio
       trace:
-        create: Tallenna
+        create: Lähetä
         update: Tallenna muutokset
       user_block:
         create: Luo esto
@@ -102,13 +103,13 @@ fi:
       tracetag: Jäljen tagi
       user: Käyttäjä
       user_preference: Käyttäjän asetus
-      user_token: Käyttäjän tunnus
+      user_token: Käyttäjän poletti
       way: Viiva
       way_node: Viivan piste
       way_tag: Viivan tagi
     attributes:
       diary_comment:
-        body: Kommentti
+        body: Leipäteksti
       diary_entry:
         user: Käyttäjä
         title: Aihe
@@ -135,7 +136,7 @@ fi:
       user:
         email: Sähköpostiosoite
         active: Aktivoitu
-        display_name: Nimi
+        display_name: Näyttönimi
         description: Kuvaus
         languages: Kielet
         pass_crypt: Salasana
@@ -151,8 +152,8 @@ fi:
         one: noin 1 vuosi sitten
         other: noin %{count} vuotta sitten
       almost_x_years:
-        one: melkein 1 vuosi sitten
-        other: melkein %{count} vuotta sitten
+        one: 1 vuosi sitten
+        other: lähes%{count} vuotta sitten
       half_a_minute: puoli minuuttia sitten
       less_than_x_seconds:
         one: vähemmän kuin 1 sekuntia sitten
@@ -316,6 +317,7 @@ fi:
       wikidata_link: '%{page} Wikidatassa'
       wikipedia_link: Artikkeli %{page} Wikipediassa
       telephone_link: Soita %{phone_number}
+      colour_preview: Värin %{colour_value} esikatselu
     note:
       title: 'Karttailmoitus: %{id}'
       new_note: Uusi karttailmoitus
@@ -1915,7 +1917,7 @@ fi:
     trace:
       pending: JONOSSA
       count_points:
-        one: '%{count} piste'
+        one: 1 piste
         other: '%{count} pistettä'
       more: tiedot
       trace_details: Näytä jäljen tiedot
@@ -1992,7 +1994,7 @@ fi:
     authorize_failure:
       title: Valtuutuspyyntö epäonnistui
       denied: Sovelluksen %{app_name} käyttöoikeus käyttäjätiliisi on poistettu.
-      invalid: Lupamerkki ei kelpaa.
+      invalid: Tunnistuspoletti ei kelpaa.
     revoke:
       flash: Olet poistanut sovelluksen %{application} käyttöoikeudet
     permissions:
@@ -2006,8 +2008,8 @@ fi:
       title: OAuth-tiedot sovellukselle %{app_name}
       key: 'Kuluttajan avain:'
       secret: 'Kuluttajan salaisuus:'
-      url: 'Pyynnön URL-avain:'
-      access_url: 'Pääsyavaimen URL-osoite:'
+      url: 'Pyynnön URL-poletti:'
+      access_url: 'Käyttöoikeuspoletin URL-osoite:'
       authorize_url: 'Valtuuta URL-osoite:'
       support_notice: Tuemme HMAC-SHA1 (suositeltu) ja RSA-SHA1 allekirjoituksia.
       edit: Muokkaa yksityiskohtia
@@ -2171,8 +2173,10 @@ fi:
       contributor_terms_explain: Tämä sopimus koskee jo tekemiäsi sekä tulevaisuudessa
         tekemiäsi muokkauksia.
       read_ct: Olen lukenut ja hyväksyn yllä olevat osallistumisehdot
+      tou_explain_html: Nämä %{tou_link} ohjaavat verkkosivuston ja muun OSMF:n tarjoaman
+        infrastruktuurin käyttöä. Napsauta linkkiä, lue ja suostu tekstin sisältöön.
       read_tou: Olen lukenut ja hyväksynyt käyttöehdot
-      consider_pd: Edellisen sopimuksen lisäksi katson lisäyksieni olevan tekijänoikeudettomia
+      consider_pd: Edellisen lisäksi katson lisäyksieni olevan tekijänoikeudettomia
         Public Domain -lisenssillä
       consider_pd_why: Mikä tämä on?
       consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
@@ -2767,6 +2771,8 @@ fi:
       flash: Redaktio tuhottu.
       error: Laitosta tuhottaessa tapahtui virhe.
   validations:
+    leading_whitespace: tyhjää tilaa alussa
+    trailing_whitespace: tyhjää tilaa lopussa
     invalid_characters: sisältää virheellisiä merkkejä
     url_characters: sisältää erikoismerkkejä URL:ssa (%{characters})
 ...
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ea167e15b..974d769bd 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -275,8 +275,8 @@ fr:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x} à %{y} sur %{count})
       comment: Commentaires (%{count})
-      hidden_commented_by: Commentaire masqué de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Commentaire de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_commented_by: Commentaire masqué de %{user}, <abbr title="%{exact_time}">%{when}</abbr>
+      commented_by: Commentaire de %{user} <abbr title="%{exact_time}">%{when}</abbr>
       changesetxml: XML du groupe de modifications
       osmchangexml: XML osmChange
       feed:
@@ -356,13 +356,13 @@ fr:
       open_title: Note non résolue nº %{note_name}
       closed_title: Note résolue nº %{note_name}
       hidden_title: Note masquée nº %{note_name}
-      open_by: Créée par %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      open_by_anonymous: Créée par un utilisateur anonyme <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by: Créée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
+      open_by_anonymous: Créée par un utilisateur anonyme, <abbr title="%{exact_time}">%{when}</abbr>
       commented_by: Commenté par %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by_anonymous: Commenté par un utilisateur anonyme <abbr title='%{exact_time}'>%{when}</abbr>
       closed_by: Résolu par %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       closed_by_anonymous: Résolu par un utilisateur anonyme le <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by: Réactivée par %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Réactivée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
       reopened_by_anonymous: Réactivé par un utilisateur anonyme <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by: Masqué par %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Signaler cette note
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index fa4aec5c5..ec2fea79d 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1308,7 +1308,7 @@ gd:
           na còrach-lethbhreac.
         infringement_2_html: |-
           Ma tha thu dhen bheachd gun deach stuth fo chòir-lethbhreac a chur ri stòr-dàta OpenStreetMap no an làrach-lìn seo ann an dòigh nach eil iomchaidh, thoir sùil air a' <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">mhodh toirt air falbh</a> againn no faidhlich e gu dìreach air an
-          <a href="http://dmca.openstreetmap.org/">duilleag faidhlidh air loidhne</a> againn.
+          <a href="https://dmca.openstreetmap.org/">duilleag faidhlidh air loidhne</a> againn.
         trademarks_title_html: <span id="trademarks"></span>Comharran-malairt
     index:
       js_1: Tha thu a' chleachdadh brabhsair nach cuir taic ri JavaScript no chuir
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 5b5b386c4..425ef49ec 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -784,7 +784,7 @@ gl:
         mountain_pass:
           "yes": Porto de montaña
         natural:
-          bay: Baía
+          bay: Badía
           beach: Praia
           cape: Cabo
           cave_entrance: Entrada de cova
@@ -1555,7 +1555,7 @@ gl:
           á base de datos do OpenStreetMap ou a este sitio, olle
           o noso <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedemento
           para desbotar datos</a> ou deixe unha notificación na nosa
-          <a href="http://dmca.openstreetmap.org/">enquisa en liña</a>.
+          <a href="https://dmca.openstreetmap.org/">enquisa en liña</a>.
         trademarks_title_html: <span id="trademarks"></span>Marcas rexistadas
         trademarks_1_html: O OpenStreetMap, o logotipo ca lupa e ''State of the Map''
           son marcas rexistadas da Fundación OpenStreetMap. Se ten algunha pregunta
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 1c0a26aff..5813b94dd 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -195,14 +195,14 @@ he:
   api:
     notes:
       comment:
-        opened_at_html: נוצרה ב{{GRAMMAR|תחילית|%{when}$1}}
-        opened_at_by_html: נוצרה ב{{GRAMMAR|תחילית|%{when}$1}} על־ידי %{user}
-        commented_at_html: עודכנה ב{{GRAMMAR|תחילית|%{when}}}
-        commented_at_by_html: עודכנה ב{{GRAMMAR|תחילית|%{when}$1}} על־ידי %{user}
-        closed_at_html: נפתרה ב{{GRAMMAR|תחילית|%{when}$1}}
-        closed_at_by_html: נפתרה ב{{GRAMMAR|תחילית|%{when}}} על־ידי %{user}
-        reopened_at_html: הופעלה מחדש ב{{GRAMMAR|תחילית|%{when}}}
-        reopened_at_by_html: הופעלה מחדש {{GRAMMAR|תחילית|%{when}}} על־ידי %{user}
+        opened_at_html: נוצרה %{when}
+        opened_at_by_html: נוצרה %{when} על־ידי %{user}
+        commented_at_html: עודכנה %{when}
+        commented_at_by_html: עודכנה %{when} על־ידי %{user}
+        closed_at_html: נפתרה %{when}
+        closed_at_by_html: נפתרה %{when} על־ידי %{user}
+        reopened_at_html: הופעלה מחדש %{when}
+        reopened_at_by_html: הופעלה מחדש %{when} על־ידי %{user}
       rss:
         title: הערות של OpenStreetMap
         description_area: רשימת הערות שהוספו, שהתקבלו עליהן הערות ושנדבגרו באזור שלך
@@ -218,16 +218,12 @@ he:
   browse:
     created: נוצרה
     closed: נסגרה
-    created_html: נוצרה ב{{GRAMMAR|תחילית|<abbr title='%{title}'>%{time}</abbr>}}
-    closed_html: נסגרה ב{{GRAMMAR|תחילית|<abbr title='%{title}'>%{time}</abbr>}}
-    created_by_html: נוצרה ב{{GRAMMAR|תחילית|<abbr title='%{title}'>%{time}</abbr>}}
-      על־ידי %{user}
-    deleted_by_html: נמחקה ב{{GRAMMAR|תחילית|<abbr title='%{title}'>%{time}</abbr>}}
-      על־ידי %{user}
-    edited_by_html: נערכה ב{{GRAMMAR|תחילית|<abbr title='%{title}'>%{time}</abbr>}}
-      על־ידי %{user}
-    closed_by_html: נסגרה ב{{GRAMMAR|תחילית|<abbr title='%{title}'>%{time}</abbr>}}
-      על־ידי %{user}
+    created_html: נוצרה <abbr title='%{title}'>%{time}</abbr>
+    closed_html: נסגרה <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: נוצרה <abbr title='%{title}'>%{time}</abbr> על־ידי %{user}
+    deleted_by_html: נמחקה <abbr title='%{title}'>%{time}</abbr> על־ידי %{user}
+    edited_by_html: נערכה <abbr title='%{title}'>%{time}</abbr> על־ידי %{user}
+    closed_by_html: נסגרה <abbr title='%{title}'>%{time}</abbr> על־ידי %{user}
     version: גרסה
     in_changeset: ערכת שינויים
     anonymous: אלמוני
@@ -326,10 +322,10 @@ he:
       open_title: הערה שלא נפתרה מס׳ %{note_name}
       closed_title: הערה פתורה מס׳ %{note_name}
       hidden_title: הערה מוסתרת מס׳ %{note_name}
-      open_by: נוצרה על־ידי %{user} ב{{GRAMMAR|תחילית|<abbr title='%{exact_time}'>%{when}</abbr>}}
-      open_by_anonymous: נוצרה על־ידי אלמוני ב{{GRAMMAR|תחילית|<abbr title='%{exact_time}'>%{when}</abbr>}}
-      commented_by: הערה מ{{GRAMMAR|תחילית|%{user}}} ב{{GRAMMAR|תחילית|<abbr title='%{exact_time}'>%{when}</abbr>}}
-      commented_by_anonymous: הערה מאלמוני ב{{GRAMMAR|תחילית|<abbr title='%{exact_time}'>%{when}</abbr>}}
+      open_by: נוצרה על־ידי %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      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>
       reopened_by: הופעל מחדש על־ידי %{user} ב־<abbr title='%{exact_time}'>%{when}</abbr>
@@ -373,7 +369,7 @@ he:
   changeset_comments:
     comment:
       comment: הערה חדשה על ערכת שינויים מס׳ %{changeset_id} מאת %{author}
-      commented_at_by_html: עודכנה ב{{GRAMMAR|תחילית|%{when}}} על־ידי %{user}
+      commented_at_by_html: עודכנה %{when} על־ידי %{user}
     comments:
       comment: הערה חדשה בערכת שינויים מס׳ %{changeset_id} מאת %{author}
     index:
@@ -1541,7 +1537,7 @@ he:
           אל מסד הנתונים של OpenStreetMap או אל האתר הזה, נא לפנות
           אל <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">נוהל
           ההסרה</a> שלנו או כתבו תלונה ישירות
-          <a href="http://dmca.openstreetmap.org/">בדף התלונות המקוון שלנו</a>.
+          <a href="https://dmca.openstreetmap.org/">בדף התלונות המקוון שלנו</a>.
         trademarks_title_html: <span id="trademarks"></span>סימנים מסחריים
         trademarks_1_html: OpenStreetMap, סמל הזכוכית המגדלת ו־State of the Map הם
           סימנים מסחריים של קרן OpenStreetMap. אם יש לך שאלות על השימוש שלך בסימנים,
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index fba612593..b83c9da83 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -1261,7 +1261,7 @@ hsb:
         infringement_2_html: Jeli měniš, zo awtorskoprawnisce škitany material je
           so datowej bance OpenStreetMap abo tutomu sydłu bjez dowolnosće přidał,
           poćahuj so prošu na naše <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">postupowanje
-          za wotstronjenje wobsaha</a>abo zdźěl to direktnje na našej <a href="http://dmca.openstreetmap.org/">formularnej
+          za wotstronjenje wobsaha</a>abo zdźěl to direktnje na našej <a href="https://dmca.openstreetmap.org/">formularnej
           stronje</a>.
         trademarks_title_html: <span id="trademarks"></span>markowe znamjo
         trademarks_1_html: OpenStreetMap, logo z lupu a staw karty su registrowane
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index a59711355..57d02de70 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1050,6 +1050,7 @@ hu:
       title: Problémák
       select_status: Állapot kiválasztása
       select_type: Típus kiválasztása
+      select_last_updated_by: Utoljára módosította kiválasztása
       reported_user: Jelentett felhasználó
       not_updated: Nem frissített
       search: Keresés
@@ -1081,12 +1082,17 @@ hu:
         one: 1 bejelentés
         other: '%{count} bejelentés'
       report_created_at: Először bejelentve %{datetime} időpontban
+      last_resolved_at: Utoljára megoldva %{datetime} időpontban
       last_updated_at: Utoljára frissítve %{displayname} által %{datetime} időpontban
       resolve: Megold
       ignore: Hanyagol
       reopen: Újra megnyit
+      reports_of_this_issue: Ezen probléma bejelentései
+      read_reports: Bejelentések olvasása
+      new_reports: Új bejelentések
       other_issues_against_this_user: Ezen felhasználóval kapcsolatos további problémák
       no_other_issues: Nincsenek további problémák ezzel a felhasználóval kapcsolatban
+      comments_on_this_issue: Hozzászólások ehhez a problémához
     resolve:
       resolved: 'A probléma állapota átállítva a következőre: "megoldódott"'
     ignore:
@@ -1534,7 +1540,7 @@ hu:
         infringement_2_html: |-
           Ha úgy gondolod, hogy jogvédett anyag került jogszerűtlenül az OpenStreetMap adatbázisba vagy erre a weblapra, kérjük olvasd el az <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">eltávolítási
           folyamat leírását</a> vagy jelentsd be közvetlenül az
-          <a href="http://dmca.openstreetmap.org/">online bejelentő oldalon</a>.
+          <a href="https://dmca.openstreetmap.org/">online bejelentő oldalon</a>.
         trademarks_title_html: <span id="trademarks"></span>Védjegyek
         trademarks_1_html: Az OpenStreetMap, a nagyító ikon és a State of the Map
           az OpenStreetMap Foundation bejegyzett védjegyei. Ha kérdésed van ezek felhasználásával
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 094e99279..4d7b0090d 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -19,6 +19,9 @@ ia:
         create: Salveguardar
       diary_entry:
         create: Publicar
+        update: Actualisar
+      issue_comment:
+        create: Adder commento
       message:
         create: Inviar
       client_application:
@@ -281,6 +284,7 @@ ia:
       wikidata_link: Le elemento %{page} in Wikidata
       wikipedia_link: Le articulo %{page} in Wikipedia
       telephone_link: Telephonar %{phone_number}
+      colour_preview: Previsualisation del color %{colour_value}
     note:
       title: 'Nota: %{id}'
       new_note: Nove nota
@@ -724,10 +728,37 @@ ia:
           "yes": Tempore libere
         man_made:
           adit: Galeria de mina
+          beacon: Fanal
+          beehive: Apiculario
+          breakwater: Rumpe-undas
+          bridge: Ponte
+          bunker_silo: Bunker
+          chimney: Camino
+          crane: Grue
+          dolphin: Poste de ammarrage
+          dyke: Dica
+          embankment: Terrapleno
+          flagpole: Palo de baniera
+          gasometer: Gasometro
+          kiln: Furno
           lighthouse: Pharo
+          mast: Mast
           mine: Mina
+          mineshaft: Puteo de mina
+          monitoring_station: Station de surveliantia
+          petroleum_well: Puteo petrolifere
+          pier: Jectata
           pipeline: Tubulatura
+          silo: Silo
+          storage_tank: Cisterna de immagazinage
+          surveillance: Surveliantia
           tower: Turre
+          wastewater_plant: Station de depuration de aquas usate
+          watermill: Molino de aqua
+          water_tower: Turre de aqua
+          water_well: Puteo
+          water_works: Tractamento de aqua
+          windmill: Molino de vento
           works: Fabrica
           "yes": Artificial
         military:
@@ -782,10 +813,12 @@ ia:
           architect: Architecto
           association: Association
           company: Compania
+          educational_institution: Institution educative
           employment_agency: Agentia de empleo
           estate_agent: Agentia immobiliari
           government: Officio governamental
           insurance: Officio de assecurantia
+          it: Officio informatic
           lawyer: Advocato
           ngo: Officio de un ONG
           telecommunication: Officio de telecommunication
@@ -794,6 +827,7 @@ ia:
         place:
           allotments: Jardines familial
           city: Citate
+          city_block: Bloco urban
           country: Pais
           county: Contato
           farm: Ferma
@@ -807,6 +841,7 @@ ia:
           municipality: Municipalitate
           neighbourhood: Quartiero
           postcode: Codice postal
+          quarter: Quartiero
           region: Region
           sea: Mar
           square: Placia
@@ -1034,6 +1069,53 @@ ia:
       reassign_param: Reassignar problema?
     reports:
       updated_at: Le %{datetime}
+      reported_by_html: Reportate como %{category} per %{user}
+    helper:
+      reportable_title:
+        diary_comment: '%{entry_title}, commento #%{comment_id}'
+        note: 'Nota #%{note_id}'
+  issue_comments:
+    create:
+      comment_created: Tu commento ha essite create
+  reports:
+    new:
+      title_html: Reportar %{link}
+      missing_params: Impossibile crear un nove reporto
+      details: Per favor, forni plus detalios sur le problema (obligatori).
+      select: 'Selige un motivo pro tu reporto:'
+      disclaimer:
+        intro: 'Ante de inviar tu reporto al moderatores del sito, per favor assecura
+          te que:'
+        not_just_mistake: Tu es secur que le problema non es solmente un error
+        unable_to_fix: Tu non es capace de solver le problema tu mesme o con le adjuta
+          de altere membros del communitate
+        resolve_with_user: Tu ha jam essayate de resolver le problema con le usator
+          in question
+      categories:
+        diary_entry:
+          spam_label: Iste entrata de diario es/contine spam
+          offensive_label: Iste entrata de diario es obscen/offensive
+          threat_label: Iste entrata de diario contine un menacia
+          other_label: Altere
+        diary_comment:
+          spam_label: Iste commento de diario es/contine spam
+          offensive_label: Iste commento de diario es obscen/offensive
+          threat_label: Iste commento de diario contine un menacia
+          other_label: Altere
+        user:
+          spam_label: Iste profilo de usator es/contine spam
+          offensive_label: Iste profilo de usator es obscen/offensive
+          threat_label: Iste profilo de usator contine un menacia
+          vandal_label: Iste usator es un vandalo
+          other_label: Altere
+        note:
+          spam_label: Iste nota es spam
+          personal_label: Iste nota contine datos personal
+          abusive_label: Iste nota es injuriose
+          other_label: Altere
+    create:
+      successful_report: Tu reporto ha essite registrate
+      provide_details: Per favor, forni le detalios necessari
   layouts:
     logo:
       alt_text: Logo de OpenStreetMap
@@ -1047,6 +1129,7 @@ ia:
     edit: Modificar
     history: Historia
     export: Exportar
+    issues: Problemas
     data: Datos
     export_data: Exportar datos
     gps_traces: Tracias GPS
@@ -1059,9 +1142,12 @@ ia:
     intro_text: OpenStreetMap es un carta del mundo, create per gente como tu e libere
       de usar sub un licentia aperte.
     intro_2_create_account: Crea un conto de usator
+    hosting_partners_html: Le allogiamento web es supportate per %{ucl}, %{bytemark}
+      e altere %{partners}.
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
+    tou: Conditiones de uso
     osm_offline: Le base de datos de OpenStreetMap non es disponibile al momento debite
       a operationes de mantenentia essential.
     osm_read_only: Le base de datos de OpenStreetMap es al momento in modo de solmente
@@ -1397,6 +1483,11 @@ ia:
           <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> e del
           <a href="http://www.mkgp.gov.si/en/">Ministerio del Agricultura, Silvicultura e Alimento</a>
           (information public de Slovenia).
+        contributors_es_html: '<strong>Espania</strong>: Contine datos proveniente
+          del Instituto Geographic National (<a href="http://www.ign.es/">IGN</a>)
+          e del Systema Cartographic National (<a href="http://www.scne.es/">SCNE</a>),
+          licentiate pro su reutilisation sub <a href="https://creativecommons.org/licenses/by/4.0/">CC
+          BY 4.0</a>.'
         contributors_za_html: |-
           <strong>Africa del Sud</strong>: Contine datos proveniente del
              <a href="http://www.ngi.gov.za/">Chief Directorate:
@@ -1404,7 +1495,7 @@ ia:
         contributors_gb_html: |-
           <strong>Regno Unite</strong>: Contine datos de Ordnance
              Survey &copy; copyright del Corona e derecto de base de datos
-             2010-12.
+             2010-19.
         contributors_footer_1_html: |-
           Pro ulterior detalios de iste e altere fontes que ha essite usate
           pro adjutar a meliorar OpenStreetMap, vide le <a
@@ -1534,16 +1625,16 @@ ia:
         subjectos de cartographia in collaboration con alteres.
       welcome:
         url: /welcome
-        title: Benvenite a OSM
+        title: Benvenite a OpenStreetMap
         description: Comencia con iste guida rapide sur le fundamentos de OpenStreetMap.
       beginners_guide:
         title: Guida pro comenciantes
         description: Guida pro comenciantes, mantenite per le communitate.
       help:
         url: https://help.openstreetmap.org/
-        title: help.openstreetmap.org
+        title: Foro de adjuta
         description: Pone un question o cerca responsas sur le sito de questiones
-          e responsas de OSM.
+          e responsas de OpenStreetMap.
       mailing_lists:
         title: Listas de diffusion
         description: Pone un question o discute cosas interessante sur un varietate
@@ -1559,10 +1650,14 @@ ia:
       switch2osm:
         description: Adjuta pro companias e organisationes qui vole migrar a cartas
           e altere servicios a base de OpenStreetMap.
+      welcomemat:
+        title: Pro organisationes
+        description: Es tu con un organisation que face planos pro OpenStreetMap?
+          Trova lo que tu debe saper sur le Matta de Benvenita.
       wiki:
         url: http://wiki.openstreetmap.org/
-        title: wiki.openstreetmap.org
-        description: Percurre le wiki pro le documentation in detalio de OSM.
+        title: Wiki OpenStreetMap
+        description: Percurre le wiki pro le documentation in detalio de OpenStreetMap.
     sidebar:
       search_results: Resultatos del recerca
       close: Clauder
@@ -1575,6 +1670,7 @@ ia:
       where_am_i: Ubi es isto?
       where_am_i_title: Describer le position actual per medio del motor de recerca
       submit_text: Va
+      reverse_directions_text: Inverter le itinerario
     key:
       table:
         entry:
@@ -1720,6 +1816,7 @@ ia:
       identifiable: Identificabile (monstrate in le lista de tracias e como identificabile,
         punctos ordinate con datas e horas)
     new:
+      upload_trace: Incargar tracia GPS
       upload_gpx: 'Incargar file GPX:'
       description: 'Description:'
       tags: 'Etiquettas:'
@@ -1732,6 +1829,8 @@ ia:
       trace_uploaded: Tu file GPX ha essite incargate e attende insertion in le base
         de datos. Isto prende generalmente minus de un medie hora, e un e-mail te
         essera inviate al completion.
+      upload_failed: Le incargamento GPX ha fallite. Un administrator ha essite advertite
+        del error. Per favor, proba lo de novo.
       traces_waiting:
         one: Tu ha %{count} tracia attendente incargamento. Per favor considera attender
           le completion de iste ante de incargar alteres, pro non blocar le cauda
@@ -1755,6 +1854,8 @@ ia:
       tags_help: separate per commas
       visibility: 'Visibilitate:'
       visibility_help: que significa isto?
+    update:
+      updated: Tracia actualisate
     trace_optionals:
       tags: Etiquettas
     show:
@@ -1776,13 +1877,16 @@ ia:
       delete_trace: Deler iste tracia
       trace_not_found: Tracia non trovate!
       visibility: 'Visibilitate:'
+      confirm_delete: Deler iste tracia?
     trace_paging_nav:
       showing_page: Pagina %{page}
       older: Tracias plus ancian
       newer: Tracias plus nove
     trace:
       pending: PENDENTE
-      count_points: '%{count} punctos'
+      count_points:
+        one: 1 puncto
+        other: '%{count} punctos'
       more: plus
       trace_details: Vider detalios del tracia
       view_map: Vider carta
@@ -1797,6 +1901,7 @@ ia:
       map: carta
     index:
       public_traces: Tracias GPS public
+      my_traces: Mi tracias GPS
       public_traces_from: Tracias GPS public de %{user}
       description: Percurrer le tracias GPS incargate recentemente
       tagged_with: '  etiquettate con %{tags}'
@@ -1805,6 +1910,7 @@ ia:
         wiki</a>.
       upload_trace: Incargar un tracia
       see_all_traces: Vider tote le tracias
+      see_my_traces: Vider mi tracias
     delete:
       scheduled_for_deletion: Tracia programmate pro deletion
     make_public:
@@ -1822,9 +1928,12 @@ ia:
         other: File GPX con %{count} punctos de %{user}
       description_without_count: File GPX de %{user}
   application:
+    permission_denied: Tu non ha le permission de acceder a iste action
     require_cookies:
       cookies_needed: Tu pare haber disactivate le cookies. Per favor activa le cookies
         in tu navigator ante de continuar.
+    require_admin:
+      not_an_admin: Tu debe esser administrator pro exequer iste action.
     setup_user_auth:
       blocked_zero_hour: Tu ha un message urgente sur le sito web de OpenStreetMap.
         Tu debe leger le message ante de poter salveguardar tu modificationes.
@@ -2041,12 +2150,17 @@ ia:
       contributor_terms_explain: Iste accordo regula le conditiones de tu contributiones
         existente e futur.
       read_ct: Io ha legite e io accepta le precedente terminos de contributor
+      tou_explain_html: Iste %{tou_link} governa le uso del sito web e altere infrastructura
+        fornite per OSMF. Per favor, clicca sur le ligamine, lege le texto, e declara
+        te de accordo.
+      read_tou: Io ha legite e io accepta le Conditiones de uso
       consider_pd: In addition a lo que precede, io considera mi contributiones como
         essente in le dominio public
       consider_pd_why: que es isto?
       guidance: 'Informationes pro adjutar a comprender iste terminos: a <a href="%{summary}">summario
         facile a comprender</a> e alcun <a href="%{translations}">traductiones non
         official</a>'
+      continue: Continuar
       decline: Declinar
       you need to accept or decline: Per favor lege e postea accepta o declina le
         nove Conditiones del Contributor pro continuar.
@@ -2095,6 +2209,7 @@ ia:
       if set location: Defini tu position de origine in le %{settings_link} pro vider
         le usatores a proximitate.
       settings_link_text: configurationes
+      my friends: Mi amicos
       no friends: Tu non ha ancora addite alcun amico.
       km away: a %{count} km de distantia
       m away: a %{count} m de distantia
@@ -2124,6 +2239,7 @@ ia:
       friends_diaries: articulos de diario de tu amicos
       nearby_changesets: gruppos de modificationes de usatores a proximitate
       nearby_diaries: articulos de diario per usatores a proximitate
+      report: Signalar iste usator
     popup:
       your location: Tu position
       nearby mapper: Cartographo vicin
@@ -2359,6 +2475,18 @@ ia:
         hours:
           one: 1 hora
           other: '%{count} horas'
+        days:
+          one: 1 die
+          other: '%{count} dies'
+        weeks:
+          one: 1 septimana
+          other: '%{count} septimanas'
+        months:
+          one: 1 mense
+          other: '%{count} menses'
+        years:
+          one: 1 anno
+          other: '%{count} annos'
     blocks_on:
       title: Blocadas de %{name}
       heading: Lista de blocadas de %{name}
@@ -2476,6 +2604,9 @@ ia:
         intro: Tu ha trovate un error? Qualcosa manca? Face lo saper al altere cartographos
           a fin que nos pote corriger lo. Displacia le marcator al position correcte
           e scribe un nota pro explicar le problema.
+        advice: Tu nota es public e pote esser usate pro actualisar le carta. Dunque,
+          non insere alcun information personal, ni datos ab cartas o catalogos protegite
+          per derectos de autor.
         add: Adder nota
       show:
         anonymous_warning: Iste nota include commentos de usatores anonyme que debe
@@ -2490,7 +2621,9 @@ ia:
     directions:
       ascend: Ascender
       engines:
+        fossgis_osrm_bike: Bicycletta (OSRM)
         fossgis_osrm_car: Auto (OSRM)
+        fossgis_osrm_foot: A pede (OSRM)
         graphhopper_bicycle: Bicycletta (GraphHopper)
         graphhopper_car: Auto (GraphHopper)
         graphhopper_foot: Pedestre (GraphHopper)
@@ -2503,8 +2636,23 @@ ia:
       instructions:
         continue_without_exit: Continuar sur %{name}
         slight_right_without_exit: Girar legiermente a dextra verso %{name}
+        offramp_right: Prende le rampa a dextra
+        offramp_right_with_exit: Prende le exito %{exit} a dextra
+        offramp_right_with_exit_name: Prende le exito %{exit} a dextra verso %{name}
+        offramp_right_with_exit_directions: Prende le exito %{exit} a dextra in direction
+          %{directions}
+        offramp_right_with_exit_name_directions: Prende le exito %{exit} a dextra
+          verso %{name}, in direction %{directions}
         offramp_right_with_name: Prende le rampa a dextra verso %{name}
+        offramp_right_with_directions: Prende le rampa a dextra in direction %{directions}
+        offramp_right_with_name_directions: Prende le rampa a dextra verso %{name},
+          in direction %{directions}
         onramp_right_without_exit: Girar a dextra sur le rampa verso %{name}
+        onramp_right_with_directions: Gira a dextra sur le rampa in direction %{directions}
+        onramp_right_with_name_directions: Gira a dextra sur le rampa verso %{name},
+          in direction %{directions}
+        onramp_right_without_directions: Gira a dextra sur le rampa
+        onramp_right: Gira a dextra sur le rampa
         endofroad_right_without_exit: Al fin del strata, girar a dextra verso %{name}
         merge_right_without_exit: Junger a dextra verso %{name}
         fork_right_without_exit: Al bifurcation, girar a dextra verso %{name}
@@ -2513,8 +2661,23 @@ ia:
         uturn_without_exit: Retornar preter %{name}
         sharp_left_without_exit: Curva acute a sinistra verso %{name}
         turn_left_without_exit: Girar a sinistra verso %{name}
+        offramp_left: Prende le rampa a sinistra
+        offramp_left_with_exit: Prende le exito %{exit} a sinistra
+        offramp_left_with_exit_name: Prende le exito %{exit} a sinistra verso %{name}
+        offramp_left_with_exit_directions: Prende le exito %{exit} a sinistra in direction
+          %{directions}
+        offramp_left_with_exit_name_directions: Prende le exito %{exit} a sinistra
+          verso %{name}, in direction %{directions}
         offramp_left_with_name: Prende le rampa al sinistra verso %{name}
+        offramp_left_with_directions: Prende le rampa a sinistra in direction %{directions}
+        offramp_left_with_name_directions: Prende le rampa a sinistra verso %{name},
+          in direction %{directions}
         onramp_left_without_exit: Girar a sinistra sur le rampa verso %{name}
+        onramp_left_with_directions: Gira a sinistra sur le rampa in direction %{directions}
+        onramp_left_with_name_directions: Gira a sinistra sur le rampa verso %{name},
+          in direction %{directions}
+        onramp_left_without_directions: Gira a sinistra sur le rampa
+        onramp_left: Gira a sinistra sur le rampa
         endofroad_left_without_exit: Al fin del strata, girar a sinistra verso %{name}
         merge_left_without_exit: Junger a sinistra verso %{name}
         fork_left_without_exit: Al bifurcation, girar a sinistra verso %{name}
@@ -2529,6 +2692,8 @@ ia:
         against_oneway_without_exit: Ir contra direction obligatori sur %{name}
         end_oneway_without_exit: Fin del direction obligatori sur %{name}
         roundabout_with_exit: Al rotunda prende le exito %{exit} sur %{name}
+        roundabout_with_exit_ordinal: Al rotunda prende le exito %{exit} verso %{name}
+        exit_roundabout: Exi del rotunda verso %{name}
         unnamed: cammino sin nomine
         courtesy: Itinerario fornite per %{link}
         exit_counts:
@@ -2587,4 +2752,9 @@ ia:
         pertinente a iste obscuration ante de destruer lo.
       flash: Obscuration destruite.
       error: Un error occurreva durante le destruction de iste obscuration.
+  validations:
+    leading_whitespace: ha spatios al initio
+    trailing_whitespace: ha spatios al fin
+    invalid_characters: contine characteres invalide
+    url_characters: contine characteres special de adresse URL (%{characters})
 ...
diff --git a/config/locales/id.yml b/config/locales/id.yml
index d8e324681..0d2baa962 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1484,7 +1484,7 @@ id:
         infringement_2_html: |-
           Jika Anda percaya bahwa materi berhak cipta telah tidak tepat
            ditambahkan ke OpenStreetMap database atau situs ini, silakan lihat <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">prosedur takedown</a> kami atau kirimkan file langsung pada
-          <a href="http://dmca.openstreetmap.org/">pengajuan halaman on-line</a>.
+          <a href="https://dmca.openstreetmap.org/">pengajuan halaman on-line</a>.
         trademarks_title_html: <span id="trademarks"></span>Merek dagang
         trademarks_1_html: OpenStreetMap, logo lup, dan State of the Map adalah merek
           dagang terdaftar dari OpenStreetMap Foundation. Jika Anda memiliki pertanyaan
diff --git a/config/locales/is.yml b/config/locales/is.yml
index feb19a189..8aaad60d9 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1572,7 +1572,7 @@ is:
           Ef þú heldur að höfundarréttarvarið efni hafi ranglega verið bætt í
           OpenStreetMap gagnagrunninn eða á þetta vefsvæði, skaltu skoða
           <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">fjarlægingarferlið</a> okkar eða skrá fyrirspurn beint á
-           veflægu <a href="http://dmca.openstreetmap.org/">kröfugerðarsíðuna</a> okkar.
+           veflægu <a href="https://dmca.openstreetmap.org/">kröfugerðarsíðuna</a> okkar.
         trademarks_title_html: <span id="trademarks"></span>Vörumerki
         trademarks_1_html: OpenStreetMap, merkið með stækkunarglerinu staða kortsins
           eru skrásett vörumerki OpenStreetMap Foundation sjálfseignarstofnuninnar.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 6edfa8983..f76d2dbf2 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1330,10 +1330,10 @@ it:
         subject_own: '[OpenStreetMap] %{commenter} ha commentato uno dei tuoi changeset'
         subject_other: '[OpenStreetMap] %{commenter} ha commentato su uno dei changeset
           cui sei interessato'
-        your_changeset: '%{commenter} ha lasciato un commento su uno dei tuoi changeset
-          creato il %{time}'
+        your_changeset: '%{commenter} ha lasciato un commento alle %{time} su uno
+          dei tuoi gruppo di modifiche'
         commented_changeset: In data %{time}, %{commenter} ha lasciato un commento
-          su un gruppo di modifiche di %{changeset_author} che stai osservando
+          alle %{time} su un gruppo di modifiche che stai osservando creato da %{changeset_author}
         partial_changeset_with_comment: con il commento '%{changeset_comment}'
         partial_changeset_without_comment: senza commento
       details: Ulteriori dettagli sul gruppo di modifiche possono essere trovati su
@@ -1572,7 +1572,7 @@ it:
         infringement_2_html: |-
           Se ritieni che materiale protetto da copyright sia stato impropriamente aggiunto al database di OpenStreetMap o a questo sito, consulta la nostra
            <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura di rimozione per violazione del copyright</a> o segnalacelo direttamente alla nostra
-          <a href="http://dmca.openstreetmap.org/">pagina di segnalazione on-line</a>.
+          <a href="https://dmca.openstreetmap.org/">pagina di segnalazione on-line</a>.
         trademarks_title_html: <span id="trademarks"></span>Marchi registrati
         trademarks_1_html: '"OpenStreetMap", il logo con la lente d''ingrandimento
           e "State of the Map" sono marchi registrati della <i>Fondazione OpenStreetMap</i>.
@@ -1951,7 +1951,9 @@ it:
       newer: Tracce più recenti
     trace:
       pending: IN ATTESA
-      count_points: '%{count} punti'
+      count_points:
+        one: 1 punto
+        other: '%{count} punti'
       more: altri
       trace_details: Visualizza i dettagli del tracciato
       view_map: Visualizza mappa
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 58ee55046..912107e91 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -1417,7 +1417,8 @@ kab:
       title: Iseqdacen
       heading: Iseqdacen
       showing:
-        other: Asebter %{page} (%{first_item}one= ɣef %{items})
+        one: Asebter %{page} (%{first_item} ɣef %{items})
+        other: Asebter %{page} (%{first_item}-%{last_item} ɣef %{items})
       summary: '%{name} yettwarna si %{ip_address} di %{date}'
       summary_no_ip: '%{name} yettwarna di  %{date}'
       confirm: Sentem iseqdacen yettwafernen
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 07312b633..f140e9127 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1480,7 +1480,7 @@ ko:
         infringement_2_html: |-
           저작권을 가진 자료가 부적절하게 OpenStreetMap 데이터베이스나 이 사이트에
           추가되었다고 생각하면 <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">게시
-          중단 절차</a>를 참고하거나 <a href="http://dmca.openstreetmap.org/">온라인
+          중단 절차</a>를 참고하거나 <a href="https://dmca.openstreetmap.org/">온라인
           신고 페이지</a>에서 직접 제출하세요.
         trademarks_title_html: <span id="trademarks"></span>등록 상표
         trademarks_1_html: OpenStreetMap, 돋보기 로고, 스테이트 오브 맵은 OpenStreetMap 재단의 등록상표입니다.
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 8b700192c..5714ef7f1 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -990,7 +990,9 @@ lb:
     trace_paging_nav:
       showing_page: Säit %{page}
     trace:
-      count_points: '%{count} Punkten'
+      count_points:
+        one: 1 Punkt
+        other: '%{count} Punkten'
       more: méi
       view_map: Kaart weisen
       edit: änneren
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 003a097b0..022f76ba2 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -196,16 +196,12 @@ lt:
   browse:
     created: Sukurtas
     closed: Uždarytas
-    created_html: Sukurtas <abbr title='%{title}'>prieš %{time}</abbr>
-    closed_html: Uždarytas <abbr title='%{title}'>prieš %{time}</abbr>
-    created_by_html: Sukurtas <abbr title='%{title}'>prieš %{time}</abbr> naudotojo
-      %{user}
-    deleted_by_html: Ištrintas <abbr title='%{title}'>prieš %{time}</abbr> naudotojo
-      %{user}
-    edited_by_html: Keistas <abbr title='%{title}'>prieš %{time}</abbr> naudotojo
-      %{user}
-    closed_by_html: Uždarytas <abbr title='%{title}'>prieš %{time}</abbr> naudotojo
-      %{user}
+    created_html: Sukurtas <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Uždarytas <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Sukurtas <abbr title='%{title}'>%{time}</abbr> naudotojo %{user}
+    deleted_by_html: IÅ¡trintas <abbr title='%{title}'>%{time}</abbr> naudotojo %{user}
+    edited_by_html: Keistas <abbr title='%{title}'>%{time}</abbr> naudotojo %{user}
+    closed_by_html: Uždarytas <abbr title='%{title}'>%{time}</abbr> naudotojo %{user}
     version: Versija
     in_changeset: Pakeitimas
     anonymous: anonimas
@@ -225,10 +221,8 @@ lt:
       relation: Ryšiai (%{count})
       relation_paginated: Ryšiai (%{x}-%{y} iš %{count})
       comment: Komentarai (%{count})
-      hidden_commented_by: Paslėptas naudotojo %{user} komentaras <abbr title='%{exact_time}'>prieš
-        %{when}</abbr>
-      commented_by: Naudotojo %{user} komentaras <abbr title='%{exact_time}'>prieš
-        %{when}</abbr>
+      hidden_commented_by: Paslėptas naudotojo %{user} komentaras <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Naudotojo %{user} komentaras <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: Pakeitimo XML
       osmchangexml: osmChange XML
       feed:
@@ -236,6 +230,8 @@ lt:
         title_comment: Pakeitimas %{id} - %{comment}
       join_discussion: Prisijunkite norėdami dalyvauti aptarime
       discussion: Diskusija
+      still_open: Pakeitimas vis dar atidarytas - diskusija prasidės tik uždarius
+        pakeitimą.
     node:
       title: 'Taškas: %{name}'
       history_title: 'Taško istorija: %{name}'
@@ -297,6 +293,7 @@ lt:
       wikidata_link: '%{page} elementas Wikidata svetainėje'
       wikipedia_link: '%{page} straipsnis Vikipedijoje'
       telephone_link: Skambinti %{phone_number}
+      colour_preview: Spalvos %{colour_value} peržiūra
     note:
       title: 'Pastaba: %{id}'
       new_note: Nauja pastaba
@@ -304,19 +301,15 @@ lt:
       open_title: 'Neišspręsta pastaba: %{note_name}'
       closed_title: 'Išspręsta pastaba: %{note_name}'
       hidden_title: 'Paslėpta pastaba #%{note_name}'
-      open_by: Sukurta naudotojo %{user} <abbr title='%{exact_time}'>prieš %{when}</abbr>
-      open_by_anonymous: Sukurta anonimo <abbr title='%{exact_time}'>prieš %{when}</abbr>
-      commented_by: Naudotojo %{user} komentaras <abbr title='%{exact_time}'>prieš
-        %{when}</abbr>
-      commented_by_anonymous: Anonimo komentaras <abbr title='%{exact_time}'>prieš
-        %{when}</abbr>
-      closed_by: Išsprendė naudotojas %{user} <abbr title='%{exact_time}'>prieš %{when}</abbr>
-      closed_by_anonymous: Išsprendė anonimas <abbr title='%{exact_time}'>prieš %{when}</abbr>
-      reopened_by: Iš naujo aktyvavo naudotojas %{user} <abbr title='%{exact_time}'>prieš
-        %{when}</abbr>
-      reopened_by_anonymous: Iš naujo aktyvavo anonimas <abbr title='%{exact_time}'>prieš
-        %{when}</abbr>
-      hidden_by: Paslėpė naudotojas %{user} <abbr title='%{exact_time}'>prieš %{when}</abbr>
+      open_by: Sukurta naudotojo %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Sukurta anonimo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Naudotojo %{user} komentaras <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous: Anonimo komentaras <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Išsprendė naudotojas %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Išsprendė anonimas <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: IÅ¡ naujo aktyvavo naudotojas %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: IÅ¡ naujo aktyvavo anonimas <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: Paslėpė naudotojas %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Pranešti apie šią pastabą
     query:
       title: Ieškoti geoobjektų
@@ -354,11 +347,16 @@ lt:
       sorry: Atsiprašome, bet jūsų prašytų pakeitimų ištraukimas užtruko per ilgai.
   changeset_comments:
     comment:
-      comment: 'Naujas pakeitimo #%{changeset_id} komentaras, parašytas %{author}'
-      commented_at_by_html: '%{user} pakeitė prieš %{when}'
+      comment: 'Naujas pakeitimo #%{changeset_id} komentaras. Parašė %{author}'
+      commented_at_by_html: '%{user} pakeitė %{when}'
+    comments:
+      comment: 'Naujas pakeitimo #%{changeset_id} komentaras. Parašė %{author}'
     index:
       title_all: OpenStreetMap pakeitimo aptarimas
       title_particular: 'OpenStreetMap pakeitimo #%{changeset_id} aptarimas'
+    timeout:
+      sorry: Atsiprašome, jūsų paprašytų pakeitimo komentarų ištraukimas užtruko per
+        ilgai.
   diary_entries:
     new:
       title: Naujas dienoraščio įrašas
@@ -377,7 +375,7 @@ lt:
       user_title: '%{user} dienoraštis'
       in_language_title: 'Dienoraščio įrašai: %{language}'
       new: Naujas dienoraščio įrašas
-      new_title: Sukurti naują jūsų dienoraščio įrašą
+      new_title: Sukurti naują mano dienoraščio įrašą
       no_entries: Nėra dienoraščio įrašų
       recent_entries: Paskutiniai dienoraščio įrašai
       older_entries: Senesni įrašai
@@ -389,7 +387,7 @@ lt:
       title: '%{user} dienoraštis | %{title}'
       user_title: '%{user} dienoraštis'
       leave_a_comment: Palikti komentarą
-      login_to_leave_a_comment: '%{login_link} palikti komentarą'
+      login_to_leave_a_comment: '%{login_link}, kad paliktumėte komentarą'
       login: Prisijungti
     no_such_entry:
       title: Nėra tokio dienoraščio įrašo
@@ -406,17 +404,19 @@ lt:
         other: '%{count} komentarai (-ų)'
       edit_link: Keisti šį įrašą
       hide_link: Slėpti šį įrašą
+      unhide_link: Nebeslėpti šio įrašo
       confirm: Patvirtinti
       report: Pranešti apie šį įrašą
     diary_comment:
       comment_from: Naudotojo %{link_user} komentaras, parašytas %{comment_created_at}
       hide_link: Slėpti šį komentarą
+      unhide_link: Nebeslėpti šio komentaro
       confirm: Patvirtinti
       report: Pranešti apie šį komentarą
     location:
       location: 'Vieta:'
       view: Žiūrėti
-      edit: Taisyti
+      edit: Keisti
     feed:
       user:
         title: Naudotojo %{user} OpenStreetMap dienoraščio įrašai
@@ -429,7 +429,7 @@ lt:
         description: Paskutiniai OpenStreetMap naudotojų dienoraščių įrašai
     comments:
       has_commented_on: '%{display_name} pakomentavo vieno iš jūsų dienoraščio įrašų.'
-      post: Rašyti
+      post: Įrašas
       when: Kada
       comment: Komentuoti
       newer_comments: Naujesni komentarai
@@ -505,6 +505,7 @@ lt:
           fuel: Degalinė
           gambling: Lošimas
           grave_yard: Kapinės
+          grit_bin: Smėlio dėžė
           hospital: Ligoninė
           hunting_stand: Medžiotojų bokštelis
           ice_cream: Ledai
@@ -579,6 +580,7 @@ lt:
           "yes": Amatų parduotuvė
         emergency:
           ambulance_station: Greitosios medicinos pagalbos stotis
+          assembly_point: Susirinkimo taškas
           defibrillator: Defibriliatorius
           landing_site: Avarinio nusileidimo aikštelė
           phone: Avarinis telefonas
@@ -724,9 +726,11 @@ lt:
           chimney: Kaminas
           crane: Kranas
           lighthouse: Å vyturys
+          mast: Stiebas
           mine: Kasykla
           mineshaft: Kasyklos Å¡achta
           monitoring_station: Stebėjimo Stotis
+          petroleum_well: Naftos Å¡ulinys
           pipeline: Vamzdynas
           surveillance: Stebėjimas
           tower: Bokštas
@@ -818,6 +822,7 @@ lt:
           postcode: Pašto kodas
           region: Regionas
           sea: JÅ«ra
+          square: Aikštė
           state: Valstija
           subdivision: Administracinis suskirstymas
           suburb: Miesto dalis
@@ -950,6 +955,7 @@ lt:
           viewpoint: Apžvalgos aikštelė
           zoo: Zoologijos sodas
         tunnel:
+          building_passage: Praėjimas pro pastatą
           culvert: Vamzdis
           "yes": Tunelis
         waterway:
@@ -993,11 +999,83 @@ lt:
       more_results: Daugiau rezultatų
   issues:
     index:
+      title: Problemos
+      select_status: Parinkite būseną
       search: Ieškoti
+      status: BÅ«sena
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      link_to_reports: Žiūrėti pranešimus
+      reports_count:
+        one: 1 Report
+        other: '%{count} pranešimas'
+      reported_item: Praneštas elementas
       states:
+        ignored: Ignoruota
         open: Atidaryta
+        resolved: Išspręsta
+    update:
+      new_report: Jūsų pranešimas sėkmingai užregistruotas
+      successful_update: Jūsų pranešimas sėkmingai atnaujintas
+      provide_details: Prašome pateikti reikiamas detales
     show:
+      title: '%{status} Problema #%{issue_id}'
+      reports:
+        zero: No reports
+        one: 1 report
+        other: '%{count} pranešimų'
+      report_created_at: Pirmą kartą pranešta %{datetime}
+      last_resolved_at: Paskutinį kartą išspręsta %{datetime}
+      last_updated_at: Paskutinį kartą atnaujinta %{datetime} naudotojo %{displayname}
+      resolve: Išspręsti
       ignore: Ignoruoti
+      reopen: IÅ¡ naujo atidaryti
+      reports_of_this_issue: Šios problemos pranešimai
+      read_reports: Skaityti pranešimus
+      new_reports: Nauji pranešimai
+      other_issues_against_this_user: Kiti pranešimai rieš šį naudotoją
+      no_other_issues: Nėra kitų pranešimų prieš šį naudotoją.
+      comments_on_this_issue: Å ios problemos komentarai
+    resolve:
+      resolved: Problemos būsena pakeista į „Išspręsta“
+    ignore:
+      ignored: Problemos būsena pakeista į „Ignoruota“
+    reopen:
+      reopened: Problemos būsena pakeista į „Atvira“
+    helper:
+      reportable_title:
+        note: 'Pastaba #%{note_id}'
+  issue_comments:
+    create:
+      comment_created: Jūsų komentaras sėkmingai sukurtas
+  reports:
+    new:
+      title_html: Pranešimas %{link}
+      missing_params: Negalima sukurti naujo pranešimo
+      select: 'Parinktie jūsų pranešimo priežastį:'
+      disclaimer:
+        intro: 'Prieš siųsdami jūsų pranešimą svetainės moderatoriams, įsitikinkite,
+          kad:'
+        not_just_mistake: Jūs tikri, kad problema nėra tiesiog klaida
+        unable_to_fix: Jūs negalite pataisyti problemos patys arba su bendruomenės
+          draugų pagalba
+        resolve_with_user: Jūs jau bandėte išspręsti problemą su konkrečiu naudotoju
+      categories:
+        diary_entry:
+          spam_label: Šiame dienoraščio įraše yra šlamštas
+          offensive_label: Dienoraššio įrašas yra įžeidžiantis
+          threat_label: Dienoraščio įraše yra grasinimų
+          other_label: Kita
+        user:
+          vandal_label: Å is naudotojas yra vandalas
+          other_label: Kita
+        note:
+          spam_label: Ši pastaba yra šlamštas
+          personal_label: Šioje pastaboje yra asmeninių duomenų
+          abusive_label: Ši pastaba įžeidžianti
+          other_label: Kita
+    create:
+      successful_report: Jūsų pranešimas sėkmingai įregistruotas
+      provide_details: Prašome nurodyti prašomą informaciją
   layouts:
     logo:
       alt_text: OpenStreetMap logotipas
@@ -1011,6 +1089,7 @@ lt:
     edit: Keisti
     history: Istorija
     export: Eksportuoti
+    issues: Problemos
     data: Duomenys
     export_data: Eksportuoti duomenis
     gps_traces: GPS pėdsakai
@@ -1061,6 +1140,7 @@ lt:
       footer_html: Pranešimą galite skaityti čia %{readurl}, o atsakyti galite čia
         %{replyurl}
     friend_notification:
+      hi: Labas, %{to_user},
       subject: '[OpenStreetMap] %{user} prisidėjo jus kaip draugą'
       had_added_you: '%{user} pridėjo jus į savo OpenStreetMap draugų sąrašą.'
       see_their_profile: Galite peržiūrėti jo profilį adresu %{userurl}.
@@ -1216,6 +1296,7 @@ lt:
       date: Data
       reply_button: Atsakyti
       unread_button: Pažymėti neperskaitytu
+      destroy_button: Trinti
       back: Grįžti
       to: Kam
       wrong_user: Jūs prisijungęs kaip „%{user}“, bet pranešimas, kurį jūsų prašyta
@@ -1254,13 +1335,15 @@ lt:
         ir licencija</a>.'
       legal_title: Teisės
       legal_html: "Šis puslapis ir daugelis kitų susijusių paslaugų yra formaliai
-        valdomi \n<a href='http://osmfoundation.org/'>OpenStreetMap fondo</a> (OSMF)
-        \nbendruomenės vardu. Visų OSMF valdomų paslaugų naudojimas yra\npriklausomas
-        nuo <a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nPriimtino
-        naudojimo politikos</a> ir mūsų <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privatumo
-        politikos</a>.\n<br> \n<a href='http://osmfoundation.org/Contact'>Susisiekite
+        valdomi \n<a href='https://osmfoundation.org/'>OpenStreetMap fondo</a> (OSMF)
+        \nbendruomenės vardu. Visų OSMF valdomų paslaugų naudojimas turi <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">naudojimo
+        sąlygas</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\npriimtino
+        naudojimo politiką</a> ir mūsų <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">privatumo
+        politiką</a>.\n<br> \n<a href='https://osmfoundation.org/Contact'>Susisiekite
         su OSMF</a>, \njei turite licencijavimo, autoriaus teisių ar kitų teisinių
-        klausimų ar problemų."
+        klausimų ar problemų.\n<br>\nOpenStreetMap, lupos logo ir State of the Map
+        yra <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">registruoti
+        OSMF prekių ženklai</a>."
       partners_title: Partneriai
     copyright:
       foreign:
@@ -1338,7 +1421,7 @@ lt:
           Resources Canada), CanVec (&copy; Department of Natural
           Resources Canada), bei StatCan (Geography Division,
           Statistics Canada).
-        contributors_fi_html: '<strong>Suomija</strong>: Yra duomenų iš Nacionalinio
+        contributors_fi_html: '<strong>Suomija</strong>: yra duomenų iš Nacionalinio
           žemės tyrimo Suomijos topografijos duomenų bazės ir kitų duomenų rinkinių,
           pagal <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI
           Licensiją</a>.'
@@ -1346,23 +1429,27 @@ lt:
           <strong>Prancūzija</strong>: yra duomenų iš:
           Direction Générale des Impôts.
         contributors_nl_html: |-
-          <strong>Nyderlandai</strong>: Apima &copy; AND duomenys, 2007
+          <strong>Nyderlandai</strong>: yra &copy; AND duomenų, 2007
           (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Naujoji Zelandija</strong>: Turi duomenys nuo
-          Land Information New Zealand. Karūnos išsaugotos autorinės teisės.
+        contributors_nz_html: '<strong>Naujoji Zelandija</strong>: yra duomenų iš
+          <a href="https://data.linz.govt.nz/">LINZ Data Service</a>, licencijuota
+          perpanaudojimui pagal <a href="https://creativecommons.org/licenses/by/4.0/">CC
+          BY 4.0</a>.'
         contributors_si_html: |-
-          <strong>Slovėnija</strong>: Panaudoti duomenys iš <a href="http://www.gu.gov.si/en/">Apžiūros ir kartografavimo valdžios</a> bei
+          <strong>Slovėnija</strong>: panaudoti duomenys iš <a href="http://www.gu.gov.si/en/">Matavimo ir kartografavimo valdžios</a> bei
           <a href="http://www.mkgp.gov.si/en/">Žemės ūkio, miškų ir maisto ministerijos</a>
           (vieša Slovėnijos informacija).
+        contributors_es_html: "<strong>Ispanija</strong>: yra duomenų iš \nSpanish
+          National Geographic Institute (<a href=\"http://www.ign.es/\">IGN</a>) ir\nNational
+          Cartographic System (<a href=\"http://www.scne.es/\">SCNE</a>)\nlicencijuota
+          pagal <a href=\"https://creativecommons.org/licenses/by/4.0/\">CC BY 4.0</a>."
         contributors_za_html: |-
-          <strong>Pietų Afrika</strong>: Turi duomenis nuo:
+          <strong>Pietų Afrika</strong>: yra duomenų iš:
           <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, Valstybinės išsaugotos autoriaus teisės.
+          National Geo-Spatial Information</a>, autoriaus teisės saugomos.
         contributors_gb_html: |-
-          <strong>Jungtinė Karalystė</strong>: Apima Ordnance
-          Survey data &copy; Karūnos autorinės teisės ir duomenų teisės
-          2010-12.
+          <strong>Jungtinė Karalystė</strong>: yra duomenų iš Ordnance
+          Survey data &copy; Karūnos autorinės teisės ir duomenų teisės 2010-19.
         contributors_footer_1_html: Norėdami daugiau sužinoti apie šiuos ir kitus
           šaltinius, kurie buvo naudojami tobulinant OpenStreetMap, peržiūrėkite <a
           href="http://wiki.openstreetmap.org/wiki/Contributors">vystytojų puslapį</a>
@@ -1377,7 +1464,7 @@ lt:
         infringement_2_html: Jei manote, kad autorių teisių saugomi darbai buvo netinkamai
           panaudoti pildant OpenStreetMap duomenų bazę ar šią svetainę, susipažinkite
           su mūsų <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">duomenų
-          pašalinimo procedūra</a> arba užpildykite <a href="http://dmca.openstreetmap.org/">vienos
+          pašalinimo procedūra</a> arba užpildykite <a href="https://dmca.openstreetmap.org/">vienos
           eilutės</a> pareiškimą.
         trademarks_title_html: <span id="trademarks"></span>Prekių ženklai
         trademarks_1_html: OpenStreetMap, lupos logotipas ir „State of the Map“ yra
@@ -1402,16 +1489,16 @@ lt:
         Jūs galite nustatyti keitimus, kaip viešus, iš savo %{user_page}.
       user_page_link: naudotojo puslapis
       anon_edits_link_text: Sužinokite, kodėl taip yra.
-      flash_player_required: Jums reikalingas Flash player norint redaguoti su Potlatch,
-        OpenStreetMap Flash rengykle. Jūs galite <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">parsisiųsti
-        Flash Player iš Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Taip
+      flash_player_required: Norint redaguoti su Potlatch, OpenStreetMap Flash rengykle,
+        jums reikia Flash player. Jūs galite <a href="https://get.adobe.com/flashplayer/">parsisiųsti
+        Flash Player iš Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Taip
         pat yra daugybė kitų būdų</a>, kuriais galėsite prisidėti prie OpenStreetMap
         žemėlapio redagavimo.
       potlatch_unsaved_changes: Turite neįrašytų keitimų. Norint įrašyti keitimą Potlatch'e,
         jūs turite nuimti pažymėtus taškus ir kelius jei redaguojate gyvai (live mode)
         ar tiesiog tiesiog paspauskite mygtuką 'įrašyti'.
       potlatch2_not_configured: Potlatch 2 nesukonfigūruotas - daugiau informacijos
-        rasite http://wiki.openstreetmap.org/wiki/The_Rails_Port
+        rasite https://wiki.openstreetmap.org/wiki/The_Rails_Port
       potlatch2_unsaved_changes: Yra neįrašytų pakeitimų. (Norėdami įrašyti Potlatch
         2, turėtumėte spustelėti įrašyti.)
       id_not_configured: iD nesukonfigūruotas
@@ -1490,7 +1577,7 @@ lt:
         užduoti klausimus, diskutuoti ir dokumentuoti žymėjimo temas.
       welcome:
         url: /welcome
-        title: Sveiki atvykę į OSM
+        title: Sveiki atvykę į OpenStreetMap
         description: Pradėkite šiuo greitu vadovu apie OpenStreetMap pagrindus.
       beginners_guide:
         url: http://wiki.openstreetmap.org/wiki/Lt:Beginners%27_guide
@@ -1498,8 +1585,8 @@ lt:
         description: Bendruomenės palaikomas vadovas pradedantiesiems.
       help:
         url: https://help.openstreetmap.org/
-        title: help.openstreetmap.org
-        description: Užduokite klausimą arba ieškokite atsakymą OSM klausimų-ir-atsakymų
+        title: Pagalbos forumas
+        description: Užduokite klausimą arba ieškokite atsakymų OpenStreetMap klausimų-ir-atsakymų
           svetainėje.
       mailing_lists:
         title: El. pašto grupės
@@ -1516,10 +1603,13 @@ lt:
         title: switch2osm
         description: Pagalba kompanijoms ir organizacijoms pereinant į OpenStreetMap
           paremtus žemėlapius ir kitas paslaugas.
+      welcomemat:
+        url: https://welcome.openstreetmap.org/
+        title: Organizacijoms
       wiki:
         url: https://wiki.openstreetmap.org/
-        title: wiki.openstreetmap.org
-        description: Naršykite OSM detalios dokumentacijos wiki.
+        title: OpenStreetMap Wiki
+        description: Daugiau detalios informacijos apie OpenStreetMap rasite wiki.
     sidebar:
       search_results: Paieškos rezultatai
       close: Uždaryti
@@ -1532,6 +1622,7 @@ lt:
       where_am_i: Kur tai yra?
       where_am_i_title: Apibūdinti dabartinę poziciją naudojant paieškos variklį
       submit_text: Rodyti
+      reverse_directions_text: Apsukti kryptį
     key:
       table:
         entry:
@@ -1656,8 +1747,8 @@ lt:
       questions:
         title: Turite klausimų?
         paragraph_1_html: |-
-          Yra kelios vietos, kur galima rasti informacijos apie OpenStreetMap, užduoti klausimus, diskutuoti ir dokumentuoti žymėjimo temas.
-          <a href='%{help_url}'>Pagalbą rasite čia</a>.
+          Yra kelios vietos, kur galima rasti informacijos apie OpenStreetMap, užduoti klausimus, diskutuoti ir dokumentuoti žymėjimo klausimus.
+          <a href='%{help_url}'>Pagalbą rasite čia</a>. Organizacija turi planų su OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Perskaitykite įžanginę informaciją</a>.
       start_mapping: Pradėti žymėti
       add_a_note:
         title: Neturite laiko redaguoti? Pridėkite pastabą!
@@ -1676,18 +1767,23 @@ lt:
       identifiable: Identifikuojamas (pėdsakų sąraše rodomas kaip identifikuojamas,
         taškai surikiuoti su laiko žymėmis)
     new:
+      upload_trace: Įkelti GPS pėdsaką
       upload_gpx: 'Įkelti GPX failą:'
       description: Aprašymas
       tags: 'Žymos:'
       tags_help: atskirta kableliais
       visibility: 'Matomumas:'
       visibility_help: ką tai reiškia?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Pagalba
+      help_url: https://wiki.openstreetmap.org/wiki/Upload
     create:
       upload_trace: Įkelti GPS pėdsaką
       trace_uploaded: Jūsų GPX pėdsakas įkrautas ir laukia įterpimo į duomenų bazę.
         Paprastai tai įvyks pusvalandžio bėgyje, o tada jums bus išsiųstas patvirtinimo
         laiškas.
+      upload_failed: Atsiprašome, nepavyko įkelti GPX. Administratoriams pranešta
+        apie klaidą. Bandykite dar kartą
       traces_waiting:
         one: Jūs turite %{count} pėdsakus laukiant, kad įkrautų. Apsvarstykite savo
           galimą įkrovos laiką, kad nesukeltumėte didesnių eilių kitų naudotojų, kurie
@@ -1711,6 +1807,8 @@ lt:
       tags_help: atskirti kableliu
       visibility: 'Matomumas:'
       visibility_help: ką tai reiškia?
+    update:
+      updated: Pėdsakas įkeltas
     trace_optionals:
       tags: Žymos
     show:
@@ -1732,6 +1830,7 @@ lt:
       delete_trace: Naikinti šį pėdsaką
       trace_not_found: Pėdsakas nerastas!
       visibility: 'Matomumas:'
+      confirm_delete: Trinti šį pėdsaką?
     trace_paging_nav:
       showing_page: Puslapis %{page}
       older: Senesni pėdsakai
@@ -1753,6 +1852,7 @@ lt:
       map: žemėlapis
     index:
       public_traces: Vieši GPS pėdsakai
+      my_traces: Mano GPS pėdsakai
       public_traces_from: Vieši naudotojo %{user} pėdsakai
       description: Peržiūrėti naujausias įkeltas GPS trasas
       tagged_with: ' pažymėta žymomis %{tags}'
@@ -1761,6 +1861,7 @@ lt:
         Dokumentacijos puslapyje</a>.
       upload_trace: Įkelti pėdsaką
       see_all_traces: Rodyti visus pėdsakus
+      see_my_traces: Žiūrėti mano pėdsakus
     delete:
       scheduled_for_deletion: Trasa, numatyta ištrinimui
     make_public:
@@ -1778,9 +1879,12 @@ lt:
         other: GPX failas su %{count} taškais, naudotojo %{user}
       description_without_count: Naudotojo %{user} GPX failas
   application:
+    permission_denied: Jūs neturite teisių vykdyti šį veiksmą
     require_cookies:
       cookies_needed: Panašu, kad išjungėte slapukus. Prieš tęsdami, įjunkite savo
         naršyklėje slapukus.
+    require_admin:
+      not_an_admin: Norėdami įvykdyti šį veiksmą turite būti administratoriumi.
     setup_user_auth:
       blocked_zero_hour: Turite skubų pranešimą OpenStreetMap puslapyje. Jums reikia
         perskaityti šį pranešimą prieš galint išsaugoti pakeitimus.
@@ -1982,9 +2086,16 @@ lt:
       terms accepted: Ačiū, kad patvirtinote naująsias talkininkų sąlygas!
       terms declined: Atsiprašome, jei nesutinkate su naujomis Talkininkų sąlygomis.
         Daugiau informacijos rasite <a href="%{url}">čia</a>.
+      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
       title: Sąlygos
       heading: Sąlygos
+      heading_ct: Talkininkų sąlygos
+      read and accept with tou: Prašome perskaityti talkininko sutartį ir naudojimo
+        sąlygas, tai padarius, pažymėti abi varneles ir tada spausti tęsimo mygtuką.
+      contributor_terms_explain: Ši sutartis valdo jūsų dabartinį ir būsimą indėlį.
+      read_ct: Aš perskaičiau ir sutinku su aukščiau pateiktomis talkininko sąlygomis
+      read_tou: Aš perskaičiau ir sutinku su naudojimo sąlygomis
       consider_pd: Be pirmiau minėto susitarimo, manau, kad mano indėlis būtų viešo
         naudojimo
       consider_pd_why: kas tai?
@@ -2029,7 +2140,7 @@ lt:
       ct status: Talkininkų sąlygos
       ct undecided: Nenuspręsta
       ct declined: Atmesta
-      latest edit: 'Paskutinis pakeitimas %{ago}:'
+      latest edit: 'Paskutinis pakeitimas (%{ago}):'
       email address: 'E-pašto adresas:'
       created from: 'Sukurta iš:'
       status: 'BÅ«sena:'
@@ -2039,6 +2150,7 @@ lt:
       if set location: nurodykite jūsų buvimo vietą per %{settings_link} puslapį,
         norint matyti naudotojus netoliese.
       settings_link_text: nustatymai
+      my friends: Mano draugai
       no friends: Jūs dar nepridėjote nei vieno draugo.
       km away: Nutolęs %{count}km
       m away: nutolęs %{count}m
@@ -2069,6 +2181,7 @@ lt:
       friends_diaries: draugų dienoraščių įrašai
       nearby_changesets: greta esančių naudotojų keitimai
       nearby_diaries: greta esančių naudotojų dienoraščių įrašai
+      report: Pranešti apie šį naudotoją
     popup:
       your location: Jūsų pozicija
       nearby mapper: Šalia esantis žemėlapių kūrėjas
@@ -2109,6 +2222,7 @@ lt:
           talkininkų sąlygas.
         agreed_with_pd: Jūs taip pat pareiškėte, kad visi jūsų pakeitimai yra viešo
           naudojimo.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: kas tai?
       profile description: 'Profilio aprašymas:'
       preferred languages: 'Pageidautinos kalbos:'
@@ -2116,6 +2230,7 @@ lt:
       image: 'Nuotrauka:'
       gravatar:
         gravatar: Naudoti Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
         link text: kas tai?
         disabled: Gravatar buvo išjungtas.
         enabled: Jūsų Gravatar rodymas įjungtas.
@@ -2219,6 +2334,8 @@ lt:
       not_a_role: Eilutė „%{role}“ nėra tinkama rolė.
       already_has_role: Naudotojas jau turi rolę „%{role}“.
       doesnt_have_role: Naudotojas neturi rolės „%{role}“.
+      not_revoke_admin_current_user: Negalima atimti administratoriaus rolės iš dabartinio
+        naudotojo.
     grant:
       title: Patvirtinkite rolės suteikimą
       heading: Patvirtinkite rolės suteikimą
@@ -2288,18 +2405,31 @@ lt:
       title: Atšaukiamas naudotojo %{block_on} blokavimas
       heading: Atšaukiamas naudotojo %{block_on} blokavimas, sukurtas naudotojo %{block_by}
       time_future: Å is blokavimas pasibaigs po %{time}.
-      past: Šis blokavimas baigėsi prieš %{time}, todėl nebegali būti atšauktas.
+      past: Šis blokavimas baigėsi %{time}, todėl nebegali būti atšauktas.
       confirm: Ar tikrai norite atšaukti šį blokavimą?
       revoke: Atšaukti!
       flash: Šis blokavimas buvo atšauktas
     helper:
       time_future: Baigiasi po %{time}.
       until_login: Aktyvus iki naudotojo prisijungimo.
-      time_past: Pasibaigė prieš %{time}
+      time_future_and_until_login: Baigiasi %{time} ir po to, kai naudotojas prisijungia.
+      time_past: Pasibaigė %{time}
       block_duration:
         hours:
           one: 1 valanda
           other: '%{count} valandos'
+        days:
+          one: 1 day
+          other: '%{count} diena'
+        weeks:
+          one: 1 week
+          other: '%{count} savaitė'
+        months:
+          one: 1 month
+          other: '%{count} mėnuo'
+        years:
+          one: 1 year
+          other: '%{count} metai'
     blocks_on:
       title: Naudotojo %{name} blokavimai
       heading: Naudotojo %{name} apribojimų sąrašas
@@ -2395,6 +2525,7 @@ lt:
         title: Sluoksniai
       copyright: © <a href='%{copyright_url}'>OpenStreetMap talkininkai</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Paremkite</a>
+      terms: <a href='%{terms_url}' target='_blank'>Svetainės ir API sąlygos</a>
     site:
       edit_tooltip: Redaguoti žemėlapį
       edit_disabled_tooltip: Norėdami redaguoti, priartinkite
@@ -2415,8 +2546,10 @@ lt:
       new:
         intro: Pastebėjote klaidą ar kažko trūksta? Praneškite kitiems žymėtojams,
           kad jie galėtų pataisyti. Perkelkite žymeklį į teisingą poziciją ir įrašykite
-          pastabą, aprašančią problemą. (Neįvedinėkite asmeninės informacijos arba
-          informacijos iš autorinėmis teisėmis apsaugotų žemėlapių ar katalogų/registrų.)
+          pastabą, aprašančią problemą.
+        advice: Jūsų pastaba yra vieša ir gali būti naudojama žemėlapio atnaujinimui,
+          todėl neįvedinėkite asmeninės informacijos arba informacijos iš autorių
+          teisių apsaugotų žemėlapių ar katalogų.
         add: Pridėti pastabą
       show:
         anonymous_warning: Ši pastaba turi komentarų nuo anoniminių naudotojų, kurie
@@ -2430,14 +2563,17 @@ lt:
       spauskite čia.
     directions:
       engines:
+        fossgis_osrm_bike: Dviračiu (OSRM)
         fossgis_osrm_car: Mašina (OSRM)
+        fossgis_osrm_foot: Pėsčiomis (OSRM)
         graphhopper_bicycle: Dviračiu (GraphHopper)
+        graphhopper_car: Mašina (GraphHopper)
         graphhopper_foot: Pėsčiomis (GraphHopper)
       directions: Nurodymai
       distance: Atstumas
       errors:
         no_route: Nepavyko rasti maršruto tarp šių dviejų vietų.
-        no_place: Atsiprašome - nerandame tokios vietos.
+        no_place: 'Atsiprašome - nerandame tokios vietos: %{place}'
       instructions:
         continue_without_exit: Tęskite kelionę %{name}
         slight_right_without_exit: Dešiniau į %{name}
@@ -2467,8 +2603,21 @@ lt:
         against_oneway_without_exit: Važiuokite prieš eismą %{name}
         end_oneway_without_exit: Vienpusio eismo pabaiga %{name}
         roundabout_with_exit: Žiede pasirinkite išvažiavimą %{exit} į %{name}
+        roundabout_with_exit_ordinal: Žiede sukite į %{exit} išvažiavimą į %{name}
+        exit_roundabout: Išvažiuokite iš žiedo į %{name}
         unnamed: bevardis
         courtesy: Nuorodas pateikė %{link}
+        exit_counts:
+          first: 1ą
+          second: 2ą
+          third: 3ią
+          fourth: 4ą
+          fifth: 5ą
+          sixth: 6ą
+          seventh: 7ą
+          eighth: 8ą
+          ninth: 9ą
+          tenth: 10ą
       time: Laikas
     query:
       node: Taškas
@@ -2514,4 +2663,9 @@ lt:
         redakcijai, prieš ją sunaikinant.
       flash: Redakcija sunaikinta.
       error: Įvyko klaida, naikinant redakciją.
+  validations:
+    leading_whitespace: turi tarpų pradžioje
+    trailing_whitespace: turi tarpų pabaigoje
+    invalid_characters: turi netinkamų simbolių
+    url_characters: turi specialių URL simbolių (%{characters})
 ...
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 1d4b8e83d..a22cd73d6 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1315,7 +1315,7 @@ lv:
           pievienots OpenStreetMap datubāzei vai vietnei, lūdzu atsaucies uz
           mūsu <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">noņemšanas
           procedūru</a> vai paziņo pa tiešo mums, izmantojot
-          <a href="http://dmca.openstreetmap.org/">on-line ziņošanas veidni</a>.
+          <a href="https://dmca.openstreetmap.org/">on-line ziņošanas veidni</a>.
         trademarks_title_html: <span id="trademarks"></span>Reģistrētas preču zīmes
         trademarks_1_html: OpenStreetMap, lupa un štata karte ir reģistrētas OpenStreetMap
           fonda preču zīmes. Ja jums ir jautājumi par mūsu logotipu lietošanu, lūdzu
@@ -1670,7 +1670,8 @@ lv:
       newer: Jaunākas Trases
     trace:
       pending: RINDĀ
-      count_points: '%{count} punkti'
+      count_points:
+        other: '%{count} punkti'
       more: vairāk
       trace_details: Skatīt sīkāku informāciju par šo trasi
       view_map: Skatīt karti
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index ccdea6d79..cb625873f 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1286,10 +1286,9 @@ mk:
         subject_own: '[OpenStreetMap] %{commenter} искоментира на една од вашите промени'
         subject_other: '[OpenStreetMap] %{commenter} искоментира на промена што ве
           интересира'
-        your_changeset: '%{commenter} даде коментар на една од вашите промени направени
-          во %{time}'
-        commented_changeset: '%{commenter} даде коментар на променa што ја набљудувате
-          направена од %{changeset_author} во %{time}'
+        your_changeset: '%{commenter} во %{time} даде коментар на една од вашите промени'
+        commented_changeset: '%{commenter} во %{time} даде коментар на променa што
+          ја набљудувате, направена од %{changeset_author}'
         partial_changeset_with_comment: со коментарот „%{changeset_comment}“
         partial_changeset_without_comment: без коментар
       details: Поподробно за промената на %{url}.
@@ -1535,7 +1534,7 @@ mk:
         infringement_2_html: "Доколку сметате дека базата на OpenStreetMap или ова
           мрежно место\nсодржи бесправно или неисправно поставени податоци, погледајте
           ја\n<a href=\"https://www.osmfoundation.org/wiki/License/Takedown_procedure\">процедурата
-          \nза отстранување</a> или поднесете жалба на \n<a href=\"http://dmca.openstreetmap.org/\">оваа
+          \nза отстранување</a> или поднесете жалба на \n<a href=\"https://dmca.openstreetmap.org/\">оваа
           наменска страница</a>."
         trademarks_title_html: <span id="trademarks"></span>Заштитни знаци
         trademarks_1_html: OpenStreetMap, логото со лупа и  „State of the Map“ („Состојба
@@ -1906,7 +1905,9 @@ mk:
       newer: Понови траги
     trace:
       pending: ВО ИСЧЕКУВАЊЕ
-      count_points: '%{count} точки'
+      count_points:
+        one: 1 точка
+        other: '%{count} точки'
       more: повеќе
       trace_details: Погледајте ги деталите за трагата
       view_map: Погледај ја картата
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 588eee833..25d61e3ec 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1229,7 +1229,7 @@ ms:
         infringement_2_html: "Sekiranya anda percaya bahawa bahan berhak cipta telah
           dtambahkan secara tidak berpatutan ke dalam pangkalan OpenStreetMap atau
           tapak ini, sila rujuk <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">prosedur
-          penarikan</a> atau laporkan secara terus ke dalam \n<a href=\"http://dmca.openstreetmap.org/\">halaman
+          penarikan</a> atau laporkan secara terus ke dalam \n<a href=\"https://dmca.openstreetmap.org/\">halaman
           laporan on-line</a>."
     index:
       js_1: Anda sedang menggunakan pelayar web yang tidak menyokong JavaScript, ataupun
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index ad81a3750..bb5d48691 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1486,7 +1486,7 @@ nb:
           Hvis du mener at opphavsrettslig beskyttet materiale feilaktig er
           lagt til OpenStreetMap-databasen eller dette nettstedet, ber vi deg se på
           vår <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">prosedyre for fjerning av materiale</a> eller send inn klagen direkte på
-          <a href="http://dmca.openstreetmap.org/">nettsiden</a>.
+          <a href="https://dmca.openstreetmap.org/">nettsiden</a>.
         trademarks_title_html: <span id="trademarks"></span>Varemerker
         trademarks_1_html: OpenStreetMap, forstørrelsesglasslogoen og State of the
           Map er registrerte varemerker beskyttet på vegne av OpenStreetMap Foundation.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index c678333cb..9b2845f85 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -887,7 +887,7 @@ nl:
           municipality: Gemeente
           neighbourhood: Wijk
           postcode: Postcode
-          quarter: Per kwartaal
+          quarter: Stadsdeel
           region: Regio
           sea: Zee
           square: Plein
@@ -1137,7 +1137,7 @@ nl:
       comment_created: Je reactie is succesvol gemaakt
   reports:
     new:
-      title_html: RApporteer %{link}
+      title_html: Rapporteer %{link}
       missing_params: Kan geen nieuw rapport maken
       details: Verschaf a.u.b. nog wat meer details over het probleem (vereist).
       select: 'Selecteer een reden voor je rapport:'
@@ -2716,16 +2716,16 @@ nl:
         offramp_right_with_exit: Neem afslag%{exit} aan de rechterkant
         offramp_right_with_exit_name: Neem afslag %{exit} aan de rechterkant naar
           %{name}
-        offramp_right_with_exit_directions: Neem afslag%{exit} aan de rechterkant
-          richting%{directions}
-        offramp_right_with_exit_name_directions: Neem afslag%{exit} aan de rechterkant
-          naar%{name}, richting%{directions}
+        offramp_right_with_exit_directions: Neem afslag %{exit} aan de rechterkant
+          richting %{directions}
+        offramp_right_with_exit_name_directions: Neem afslag %{exit} aan de rechterkant
+          naar %{name}, richting %{directions}
         offramp_right_with_name: Neem de oprit aan de rechterkant naar %{name}
         offramp_right_with_directions: Neem de oprit rechts richting%{directions}
         offramp_right_with_name_directions: Neem de oprit aan de rechterkant naar%{name},
           richting%{directions}
         onramp_right_without_exit: Sla rechtsaf op de oprit naar %{name}
-        onramp_right_with_directions: Sla rechtsaf de oprit op richting%{directions}
+        onramp_right_with_directions: Sla rechtsaf de oprit op richting %{directions}
         onramp_right_with_name_directions: Ga rechts op de oprit naar%{name}, richting%{directions}
         onramp_right_without_directions: Sla rechtsaf de oprit op
         onramp_right: Sla rechtsaf de oprit op
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 937c8bba4..c789a75b6 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1194,7 +1194,7 @@ nn:
         infringement_2_html: "Dersom du trur at kopibeskytta materiale har blitt lagt
           inn i OpenStreetMap databasen eller denne sida, venligst henvend deg til
           vår <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">takedown
-          \nprosedyre</a> eller direkte til vårt <a href=\"http://dmca.openstreetmap.org/\">online
+          \nprosedyre</a> eller direkte til vårt <a href=\"https://dmca.openstreetmap.org/\">online
           skjema</a>."
     index:
       js_1: Du har ein nettleser som ikkje støttar JavaScript eller så har du slått
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 7645136c3..f046a541b 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -17,6 +17,7 @@
 # Author: DeRudySoulStorm
 # Author: Debeet
 # Author: Deejay1
+# Author: FunPL
 # Author: GlutPaprykarz
 # Author: Ireun
 # Author: Kaligula
@@ -67,7 +68,7 @@ pl:
         create: Zapisz
       diary_entry:
         create: Opublikuj
-        update: Aktualizuj
+        update: Uaktualnij
       issue_comment:
         create: Dodaj komentarz
       message:
@@ -1582,7 +1583,7 @@ pl:
         infringement_2_html: Jeśli uważasz, że materiał chroniony prawem autorskim
           został niewłaściwie dodany do bazy OpenStreetMap, zajrzyj pod adres naszej
           <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedury
-          usuwania danych</a> lub <a href="http://dmca.openstreetmap.org/">wypełnij
+          usuwania danych</a> lub <a href="https://dmca.openstreetmap.org/">wypełnij
           formularz on-line</a>.
         trademarks_title_html: <span id="trademarks"></span>Znaki towarowe
         trademarks_1_html: OpenStreetMap, logo i nazwa State of the Map są zastrzeżonymi
@@ -2221,6 +2222,7 @@ pl:
     terms:
       title: Warunki
       heading: Warunki
+      heading_ct: Warunki uczestnictwa
       consider_pd: Oprócz powyższych warunków, stwierdzam również, że mój wkład jest
         w domenie publicznej
       consider_pd_why: co to oznacza?
@@ -2228,6 +2230,7 @@ pl:
       guidance: 'Informacje, które pomogą zrozumieć te warunki: <a href="%{summary}">w
         formie czytelnego podsumowania</a> oraz <a href="%{translations}">nieoficjalne
         tłumaczenia</a>'
+      continue: Dalej
       declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       decline: Nie akceptuję
       you need to accept or decline: Prosimy przeczytać i następnie przyjąć lub odrzucić
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index e149c06fe..dbca5e248 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1336,10 +1336,10 @@ pt-BR:
           seu'
         subject_other: '[OpenStreetMap] %{commenter} comentou um conjunto de alterações
           que interessa a você'
-        your_changeset: '%{commenter} deixou um comentário num conjunto de alterações
-          seu em %{time}'
-        commented_changeset: '%{commenter} deixou um comentário num conjunto de alterações
-          que você está acompanhando criado por %{changeset_author} em %{time},'
+        your_changeset: '%{commenter} deixou um comentário em %{time} em conjunto
+          de alterações'
+        commented_changeset: '%{commenter} deixou um comentário a %{time} num conjunto
+          de alterações em que está interessado, criado por %{changeset_author}'
         partial_changeset_with_comment: com comentário %{changeset_comment}
         partial_changeset_without_comment: sem comentários
       details: Mais detalhes sobre o conjunto de alterações podem ser encontrados
@@ -1579,7 +1579,7 @@ pt-BR:
           direitos de autor indevidamente à base de dados do OpenStreetMap, por favor
           consulte o <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimento
           para retirar dados protegidos</a> (em inglês) ou preencha os dados diretamente
-          no <a href="http://dmca.openstreetmap.org/">formulário</a> (em inglês).
+          no <a href="https://dmca.openstreetmap.org/">formulário</a> (em inglês).
         trademarks_title_html: <span id="trademarks"></span>Marcas registradas
         trademarks_1_html: OpenStreetMap, o respetivo logótipo e State of the Map
           são marcas registadas da Fundação OpenStreetMap. Se tiver alguma questão
@@ -1956,7 +1956,9 @@ pt-BR:
       newer: Trilhas mais recentes
     trace:
       pending: PENDENTE
-      count_points: '%{count} pontos'
+      count_points:
+        one: 1 ponto
+        other: '%{count} pontos'
       more: mais
       trace_details: Ver detalhes da trilha
       view_map: Ver Mapa
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index ae14d11c3..5888fa03b 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -312,7 +312,7 @@ pt-PT:
       wikidata_link: O item %{page} como Wikidata
       wikipedia_link: A página %{page} na Wikipédia
       telephone_link: Telefonar %{phone_number}
-      colour_preview: Pré-visualização da cor %{colour_value}
+      colour_preview: Antevisão da cor %{colour_value}
     note:
       title: 'Erro: %{id}'
       new_note: Reportar Erro
@@ -1320,10 +1320,10 @@ pt-PT:
           de alterações'
         subject_other: '[OpenStreetMap] %{commenter} comentou um conjunto de alterações
           no qual você está interessado'
-        your_changeset: '%{commenter} deixou um comentário num dos seus conjuntos
-          de alterações criado em %{time}'
-        commented_changeset: '%{commenter} deixou um comentário numa edição em que
-          está interessado criada por %{changeset_author} há %{time}'
+        your_changeset: '%{commenter} deixou um comentário a %{time} num dos seus
+          conjuntos de alterações'
+        commented_changeset: '%{commenter} deixou um comentário a %{time} num conjunto
+          de alterações em que está interessado, criado por %{changeset_author}'
         partial_changeset_with_comment: com o comentário '%{changeset_comment}'
         partial_changeset_without_comment: sem comentários
       details: Pode encontrar mais informações sobre a edição em %{url}.
@@ -1555,7 +1555,7 @@ pt-PT:
           direitos de autor indevidamente à base de dados do OpenStreetMap, por favor
           consulte o <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimento
           para retirar dados protegidos</a> (em inglês) ou preencha os dados diretamente
-          no <a href="http://dmca.openstreetmap.org/">formulário</a> (em inglês).
+          no <a href="https://dmca.openstreetmap.org/">formulário</a> (em inglês).
         trademarks_title_html: <span id="trademarks"></span>Marcas registadas
         trademarks_1_html: OpenStreetMap, o respetivo logótipo e State of the Map
           são marcas registadas da Fundação OpenStreetMap. Se tiver alguma questão
@@ -1931,7 +1931,9 @@ pt-PT:
       newer: Trilhos GPS mais recentes
     trace:
       pending: PENDENTE
-      count_points: '%{count} pontos'
+      count_points:
+        one: 1 ponto
+        other: '%{count} pontos'
       more: mais
       trace_details: Ver Detalhes do Trilho
       view_map: Ver Mapa
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index ba31de481..1cf647f02 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1549,7 +1549,7 @@ ro:
         infringement_2_html: |-
           Dacă credeți că materialul protejat prin drepturi de autor a fost necorespunzător adăugați la baza de date OpenStreetMap sau la acest site, vă rugăm să consultați la <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
           procedure</a> procedura noastră de retragere</a> sau fișier direct la adresa noastră
-          <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
+          <a href="https://dmca.openstreetmap.org/">on-line filing page</a>.
         trademarks_title_html: <span id="trademarks"></span>Mărci înregistrate
         trademarks_1_html: OpenStreetMap, sigla cu lupă și starea hărții sunt mărci
           comerciale înregistrate ale Fundației OpenStreetMap. Dacă aveți întrebări
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ead9bbb1f..35477d1fe 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -39,6 +39,7 @@
 # Author: Infovarius
 # Author: Irus
 # Author: Kaganer
+# Author: Katunchik
 # Author: Komzpa
 # Author: Link2xt
 # Author: Lockal
@@ -1599,7 +1600,7 @@ ru:
            добавлен к базе OpenStreetMap или к этому сайту, пожалуйста, обратитесь
            к нашей <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">процедуре
            изымания</a> или непосредственно на нашу
-          <a href="http://dmca.openstreetmap.org/">вебстраницу регистрации</a>.
+          <a href="https://dmca.openstreetmap.org/">вебстраницу регистрации</a>.
         trademarks_title_html: <span id="trademarks"></span>Товарные знаки
         trademarks_1_html: OpenStreetMap, логотип с увеличительным стеклом и State
           of the Map являются зарегистрированными товарными знаками Фонда OpenStreetMap.
@@ -1973,7 +1974,10 @@ ru:
       newer: Более новые треки
     trace:
       pending: ОБРАБОТКА
-      count_points: '%{count} точек'
+      count_points:
+        one: 1 точка
+        few: '%{count} точки'
+        other: '%{count} точек'
       more: подробнее
       trace_details: Показать данные трека
       view_map: Просмотр карты
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 0ff3f3719..d8692ffa0 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -1271,7 +1271,8 @@ scn:
           prutettu dû drittu d'auturi o ntâ basi di dati di OpenStreetMap o puru nta
           stu situ, pi favuri fai rifirimentu â nostra\n <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">prucidura
           di cancillazzioni</a> o puru signalinilu direttamenti pi menzu dû nostru
-          \n<a href=\"http://dmca.openstreetmap.org/\">mòdulu di signalazzioni n lìnia</a>."
+          \n<a href=\"https://dmca.openstreetmap.org/\">mòdulu di signalazzioni n
+          lìnia</a>."
         trademarks_title_html: <span id="trademarks"></span>Marchi riggistrati
         trademarks_1_html: OpenStreetMap e lu logu dâ lenti di ngrannimentu sunnu
           marchi riggistrati dâ Funnazzioni OpenStreetMap. Si hai quarchi addumannata
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 0e73e7539..e4d9c1f50 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1178,7 +1178,7 @@ sk:
         infringement_2_html: Ak sa domnievate, že materiál podliehajúci autorským
           právam bol neoprávnene pridaný do databázy OpenStreetMap alebo na tieto
           stránky, prosíme vás, aby ste si pozreli náš <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">postup
-          odstraňovania</a> alebo podajte žiadosť priamo na <a href="http://dmca.openstreetmap.org/">stránke
+          odstraňovania</a> alebo podajte žiadosť priamo na <a href="https://dmca.openstreetmap.org/">stránke
           pre podávanie sťažností</a>.
     index:
       js_1: Používate prehliadač bez podpory JavaScriptu, alebo máte JavaScript vypnutý.
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 612c6fef4..0d198bac1 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1426,7 +1426,7 @@ sr:
           додат у базу података OpenStreetMap или овај сајт, молимо да пратите
           нашу <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">процедуру за
           скидање</a> или да се директно обратите на
-          нашој <a href="http://dmca.openstreetmap.org/">онлајн страници за пријаве</a>.
+          нашој <a href="https://dmca.openstreetmap.org/">онлајн страници за пријаве</a>.
         trademarks_title_html: <span id="trademarks"></span>Робне марке
         trademarks_1_html: OpenStreetMap, лого лупе и State of the Map регистроване
           су робне марке Фондације OpenStreetMap. Ако имате питања о томе како да
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 979798f51..e2ee7aba0 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -320,6 +320,7 @@ sv:
       wikidata_link: Objektet %{page} på Wikidata
       wikipedia_link: Artikeln om %{page} på Wikipedia
       telephone_link: Ring %{phone_number}
+      colour_preview: Förhandsgranskning av färgen %{colour_value}
     note:
       title: 'Anteckning: %{id}'
       new_note: Ny anteckning
@@ -1570,7 +1571,7 @@ sv:
           Om du tror att upphovsrättsskyddat material felaktigt har
           lagts in i OpenStreetMaps databas eller till den här webbplatsen, se
           vårt <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">borttagningsförfarande</a>
-          eller fyll i vårt <a href="http://dmca.openstreetmap.org/">online-formulär</a> direkt.
+          eller fyll i vårt <a href="https://dmca.openstreetmap.org/">online-formulär</a> direkt.
         trademarks_title_html: <span id="trademarks"></span>Varumärken
         trademarks_1_html: OpenStreetMap, förstoringsglas-logotypen och State of the
           Map är registrerade varumärken hos OpenStreetMap Foundation. Om du har frågor
@@ -1940,7 +1941,9 @@ sv:
       newer: Nyare GPS-spår
     trace:
       pending: VÄNTANDE
-      count_points: '%{count} punkter'
+      count_points:
+        one: 1 punkt
+        other: '%{count} punkter'
       more: mer
       trace_details: Visa detaljer för GPS-spår
       view_map: Visa karta
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 393f62b06..a4cf0e86f 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1342,7 +1342,7 @@ th:
         infringement_title_html: การละเมิดลิขสิทธิ์
         infringement_2_html: |-
           หากท่านเชื่อว่าข้อมูลละเมิดลิขสิทธิ์ปรากฏในเว็บไซต์นี้หรือในฐานข้อมูล OpenStreetMap โปรดดู <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">ขั้นตอนการลบข้อมูลละเมิดลิขสิทธิ์</a> หรือแจ้งได้ที่
-          <a href="http://dmca.openstreetmap.org/">หน้ารับแจ้งการละเมิดข้อมูลลิขสิทธิ์</a>
+          <a href="https://dmca.openstreetmap.org/">หน้ารับแจ้งการละเมิดข้อมูลลิขสิทธิ์</a>
         trademarks_title_html: <span id="trademarks"></span>เครื่องหมายการค้า
         trademarks_1_html: OpenStreetMap, State of the Map, และตราสัญลักษณ์แว่นขยาย
           เป็นเครื่องหมายการค้าจดทะเบียนของมูลนิธิ OpenStreetMap, หากคุณมีข้อสงสัยเกี่ยวกับการใช้ชื่อและตราสัญลักษณ์ของเรา
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 60a205a73..6653739d2 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1562,7 +1562,7 @@ uk:
         infringement_2_html: Якщо ви вважаєте, що захищений авторським правом матеріал
           був недоречно доданий до бази даних OpenStreetMap або до цього сайту, ознайомтесь
           із нашим <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">порядком
-          з вилучення таких даних</a> або скористуйтесь безпосередньо нашою <a href="http://dmca.openstreetmap.org/">сторінкою
+          з вилучення таких даних</a> або скористуйтесь безпосередньо нашою <a href="https://dmca.openstreetmap.org/">сторінкою
           для онлайн звернень</a>.
         trademarks_title_html: <span id="trademarks"></span>Торгові марки
         trademarks_1_html: OpenStreetMap і логотип з лупою є зареєстрованими торговими
@@ -1937,7 +1937,9 @@ uk:
       newer: Новіші треки
     trace:
       pending: ОЧІКУЄ
-      count_points: '%{count} точок'
+      count_points:
+        one: 1 точка
+        other: '%{count} точки'
       more: більше
       trace_details: Показати дані треку
       view_map: Перегляд Мапи
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index d6621cf53..2dd2b2ece 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1462,7 +1462,7 @@ vi:
         infringement_2_html: Nếu bạn tin rằng tài liệu có bản quyền đã được bổ sung
           vào cơ sở dữ liệu OpenStreetMap hoặc trang này một cách không thích đáng,
           xin vui lòng tham khảo <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure?uselang=vi">quá
-          trình <i>takedown</i></a> hoặc nộp đơn trực tiếp tại <a href="http://dmca.openstreetmap.org/">trang
+          trình <i>takedown</i></a> hoặc nộp đơn trực tiếp tại <a href="https://dmca.openstreetmap.org/">trang
           khiếu nại trực tuyến</a> của chúng tôi.
         trademarks_title_html: <span id="trademarks"></span>Nhãn hiệu
         trademarks_1_html: OpenStreetMap, biểu trưng kính lúp, và State of the Map
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 0d59a484f..6e3869732 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1466,7 +1466,7 @@ zh-CN:
         infringement_title_html: 著作权侵犯
         infringement_1_html: OSM 的贡献者会被提醒，绝不要在没有著作权人的明确许可时添加来自任何有著作权的来源的数据(如谷歌地图或印刷地图)。
         infringement_2_html: 如果您认为版权的材料已被不恰当地添加的 OpenStreetMap 数据库或该网站，请参见我们的<a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我们的<a
-          href="http://dmca.openstreetmap.org/">在线申报页面</a>上提出。
+          href="https://dmca.openstreetmap.org/">在线申报页面</a>上提出。
         trademarks_title_html: <span id="trademarks"></span>商标
         trademarks_1_html: OpenStreetMap、放大镜标志和地图状态是OpenStreetMap基金会的注册商标。如果您对使用这些标志有任何问题，请参见我们的<a
           href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">商标方针</a>。
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 414d27179..ca79ef932 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1484,7 +1484,7 @@ zh-TW:
         infringement_1_html: OSM 的貢獻者會被提醒，絕不要在沒有版權所有人的明確淮許下，加入來自任何有版權的來源的資料 (如 Google
           地圖或印刷地圖)。
         infringement_2_html: 如果你認為有版權的材料被不恰當地加入到 OpenStreetMap 資料庫或此網站，請請參考我們的<a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我們的<a
-          href="http://dmca.openstreetmap.org/">網上申報頁面</a>提出。
+          href="https://dmca.openstreetmap.org/">網上申報頁面</a>提出。
         trademarks_title_html: <span id="trademarks"></span>商標
         trademarks_1_html: OpenStreetMap、放大鏡標誌和 OpenStreetMap 研討會是 OpenStreetMap 基金會的註冊商標。如果你對於使用這些商標有疑問的話，請查看我們的<a
           href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">商標方針</a>。
@@ -1808,7 +1808,9 @@ zh-TW:
       newer: 較新軌跡
     trace:
       pending: 等候
-      count_points: '%{count} 個點'
+      count_points:
+        one: 1 個點
+        other: '%{count} 個點'
       more: 更多
       trace_details: 檢視軌跡詳細資料
       view_map: 檢視地圖
diff --git a/test/factories/traces.rb b/test/factories/traces.rb
index 8663ccf27..713a5be17 100644
--- a/test/factories/traces.rb
+++ b/test/factories/traces.rb
@@ -7,6 +7,7 @@ FactoryBot.define do
 
     timestamp { Time.now }
     inserted { true }
+    size { 10 }
 
     trait :deleted do
       visible { false }