Merge tooltip fixes/tests

.github/ISSUE_TEMPLATE/feature.yml

@@ -4,18 +4,26 @@ description: You want to request a feature, share an idea or have a question.
 # labels:
 # assignees:
 body:
+  - type: textarea
+    id: idea
+    attributes:
+      label: Problem
+      description: Please describe the problem or use case that is the cause for your feature request or idea.
+      placeholder:
+    validations:
+      required: false
   - type: textarea
     id: idea
     attributes:
       label: Description
-      description: Please describe you feature request, idea or question.
+      description: Please describe your feature request, idea or question.
       placeholder:
     validations:
       required: false
   - type: textarea
     attributes:
       label: Screenshots
-      description: Please add screenshots if they can help us understand your request/idea/question.
+      description: Please add screenshots or mockups if they can help us understand your request/idea/question.
       placeholder:
     validations:
       required: false

.github/workflows/docker.yml

@@ -26,8 +26,8 @@ jobs:
         sleep 15 # let the DB warm up a little
     - name: Prepare Database
       run: |
-        docker-compose run --rm web rake db:migrate
+        docker-compose run --rm web bundle exec rails db:migrate
-        docker-compose run web bundle exec rake i18n:js:export
+        docker-compose run --rm web bundle exec rails i18n:js:export
         docker-compose run --rm web osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no
     - name: Test Basic Website
       run: |

.gitignore

@@ -6,7 +6,6 @@
 .vagrant
 app/assets/javascripts/i18n
 config/environments/*.local.yml
-config/piwik.yml
 config/settings.local.yml
 config/settings/*.local.yml
 coverage

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "7.0.3.1"
+gem "rails", "7.0.4"
 
 # Require json for multi_json
 gem "json"
@@ -36,6 +36,9 @@ gem "image_optim_rails"
 # Use argon2 for password hashing
 gem "argon2"
 
+# Support brotli compression for assets
+gem "sprockets-exporters_pack"
+
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
@@ -47,7 +50,7 @@ gem "composite_primary_keys", "~> 14.0.0"
 gem "config"
 gem "delayed_job_active_record"
 gem "http_accept_language", "~> 2.1.1"
-gem "i18n-js", ">= 3.0.0"
+gem "i18n-js", "~> 3.9.2"
 gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"
 gem "rack-cors"

Gemfile.lock

@@ -3,79 +3,79 @@ GEM
   specs:
     aasm (5.3.0)
       concurrent-ruby (~> 1.0)
-    actioncable (7.0.3.1)
+    actioncable (7.0.4)
-      actionpack (= 7.0.3.1)
+      actionpack (= 7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.3.1)
+    actionmailbox (7.0.4)
-      actionpack (= 7.0.3.1)
+      actionpack (= 7.0.4)
-      activejob (= 7.0.3.1)
+      activejob (= 7.0.4)
-      activerecord (= 7.0.3.1)
+      activerecord (= 7.0.4)
-      activestorage (= 7.0.3.1)
+      activestorage (= 7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.3.1)
+    actionmailer (7.0.4)
-      actionpack (= 7.0.3.1)
+      actionpack (= 7.0.4)
-      actionview (= 7.0.3.1)
+      actionview (= 7.0.4)
-      activejob (= 7.0.3.1)
+      activejob (= 7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.3.1)
+    actionpack (7.0.4)
-      actionview (= 7.0.3.1)
+      actionview (= 7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
-    actiontext (7.0.3.1)
+    actiontext (7.0.4)
-      actionpack (= 7.0.3.1)
+      actionpack (= 7.0.4)
-      activerecord (= 7.0.3.1)
+      activerecord (= 7.0.4)
-      activestorage (= 7.0.3.1)
+      activestorage (= 7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.3.1)
+    actionview (7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
-    activejob (7.0.3.1)
+    activejob (7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
       globalid (>= 0.3.6)
-    activemodel (7.0.3.1)
+    activemodel (7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
-    activerecord (7.0.3.1)
+    activerecord (7.0.4)
-      activemodel (= 7.0.3.1)
+      activemodel (= 7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
     activerecord-import (1.4.0)
       activerecord (>= 4.2)
-    activestorage (7.0.3.1)
+    activestorage (7.0.4)
-      actionpack (= 7.0.3.1)
+      actionpack (= 7.0.4)
-      activejob (= 7.0.3.1)
+      activejob (= 7.0.4)
-      activerecord (= 7.0.3.1)
+      activerecord (= 7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.3.1)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
+    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 5.0)
+      public_suffix (>= 2.0.2, < 6.0)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
@@ -86,8 +86,8 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.610.0)
+    aws-partitions (1.628.0)
-    aws-sdk-core (3.131.3)
+    aws-sdk-core (3.144.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -105,17 +105,16 @@ GEM
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
-    better_html (1.0.16)
+    better_html (2.0.1)
-      actionview (>= 4.0)
+      actionview (>= 6.0)
-      activesupport (>= 4.0)
+      activesupport (>= 6.0)
       ast (~> 2.0)
       erubi (~> 1.4)
-      html_tokenizer (~> 0.0.6)
       parser (>= 2.4)
       smart_properties
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.12.0)
+    bootsnap (1.13.0)
       msgpack (~> 1.2)
     bootstrap (5.1.3)
       autoprefixer-rails (>= 9.1.0)
@@ -124,7 +123,8 @@ GEM
     bootstrap_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
-    brakeman (5.2.3)
+    brakeman (5.3.1)
+    brotli (0.4.0)
     browser (5.3.1)
     builder (3.2.4)
     bzip2-ffi (1.1.0)
@@ -163,23 +163,23 @@ GEM
       delayed_job (>= 3.0, < 5)
     digest (3.1.0)
     docile (1.4.0)
-    doorkeeper (5.5.4)
+    doorkeeper (5.6.0)
       railties (>= 5)
     doorkeeper-i18n (5.2.4)
       doorkeeper (>= 5.2)
     dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)
-    dry-container (0.10.0)
+    dry-container (0.10.1)
       concurrent-ruby (~> 1.0)
-    dry-core (0.8.0)
+    dry-core (0.8.1)
       concurrent-ruby (~> 1.0)
     dry-inflector (0.3.0)
     dry-initializer (3.1.1)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.9.3)
+    dry-schema (1.10.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.13, >= 0.13.0)
       dry-core (~> 0.5, >= 0.5)
@@ -198,15 +198,14 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
       dry-schema (~> 1.8, >= 1.8.0)
-    erb_lint (0.1.3)
+    erb_lint (0.2.0)
       activesupport
-      better_html (~> 1.0.7)
+      better_html (>= 2.0.1)
-      html_tokenizer
       parser (>= 2.7.1.4)
       rainbow
       rubocop
       smart_properties
-    erubi (1.10.0)
+    erubi (1.11.0)
     execjs (2.8.1)
     exifr (1.3.9)
     factory_bot (6.2.1)
@@ -214,10 +213,10 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.3.0)
+    faraday (2.5.2)
-      faraday-net_http (~> 2.0)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.3)
+    faraday-net_http (3.0.0)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -231,7 +230,6 @@ GEM
       activesupport (>= 5.0)
     hashdiff (1.0.1)
     hashie (5.0.0)
-    html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
     i18n (1.12.0)
@@ -262,7 +260,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.6.2)
-    jwt (2.4.1)
+    jwt (2.5.0)
     kgio (2.11.4)
     kramdown (2.4.0)
       rexml
@@ -285,8 +283,8 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
-    msgpack (1.5.4)
+    msgpack (1.5.6)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     net-imap (0.2.3)
@@ -353,13 +351,13 @@ GEM
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.1)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    pg (1.4.1)
+    pg (1.4.3)
     popper_js (2.11.5)
     progress (3.6.0)
-    public_suffix (4.0.7)
+    public_suffix (5.0.0)
-    puma (5.6.4)
+    puma (5.6.5)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)
@@ -375,20 +373,20 @@ GEM
     rack-test (2.0.2)
       rack (>= 1.3)
     rack-uri_sanitizer (0.0.2)
-    rails (7.0.3.1)
+    rails (7.0.4)
-      actioncable (= 7.0.3.1)
+      actioncable (= 7.0.4)
-      actionmailbox (= 7.0.3.1)
+      actionmailbox (= 7.0.4)
-      actionmailer (= 7.0.3.1)
+      actionmailer (= 7.0.4)
-      actionpack (= 7.0.3.1)
+      actionpack (= 7.0.4)
-      actiontext (= 7.0.3.1)
+      actiontext (= 7.0.4)
-      actionview (= 7.0.3.1)
+      actionview (= 7.0.4)
-      activejob (= 7.0.3.1)
+      activejob (= 7.0.4)
-      activemodel (= 7.0.3.1)
+      activemodel (= 7.0.4)
-      activerecord (= 7.0.3.1)
+      activerecord (= 7.0.4)
-      activestorage (= 7.0.3.1)
+      activestorage (= 7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
       bundler (>= 1.15.0)
-      railties (= 7.0.3.1)
+      railties (= 7.0.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -401,16 +399,16 @@ GEM
     rails-i18n (7.0.5)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.0.3.1)
+    railties (7.0.4)
-      actionpack (= 7.0.3.1)
+      actionpack (= 7.0.4)
-      activesupport (= 7.0.3.1)
+      activesupport (= 7.0.4)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (2.5.0)
@@ -419,27 +417,27 @@ GEM
     rexml (3.2.5)
     rinku (2.0.6)
     rotp (6.2.0)
-    rubocop (1.32.0)
+    rubocop (1.36.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.19.1, < 2.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
-    rubocop-minitest (0.20.1)
+    rubocop-minitest (0.22.0)
       rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.14.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.15.2)
+    rubocop-rails (2.16.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
+      rubocop (>= 1.33.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-openid (2.9.2)
@@ -459,8 +457,8 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    secure_headers (6.3.4)
+    secure_headers (6.4.0)
-    selenium-webdriver (4.3.0)
+    selenium-webdriver (4.4.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -476,11 +474,14 @@ GEM
     sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
+    sprockets-exporters_pack (0.1.2)
+      brotli (>= 0.2.0)
+      sprockets (>= 4.0.0.beta3)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    strong_migrations (1.2.0)
+    strong_migrations (1.3.0)
       activerecord (>= 5.2)
     strscan (3.0.4)
     terser (1.1.12)
@@ -491,10 +492,10 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
-    validates_email_format_of (1.6.3)
+    validates_email_format_of (1.7.2)
       i18n
     vendorer (0.2.0)
-    webmock (3.14.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -544,7 +545,7 @@ DEPENDENCIES
   gd2-ffij (>= 0.4.0)
   htmlentities
   http_accept_language (~> 2.1.1)
-  i18n-js (>= 3.0.0)
+  i18n-js (~> 3.9.2)
   image_optim_rails
   image_processing
   jbuilder (~> 2.7)
@@ -574,7 +575,7 @@ DEPENDENCIES
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
-  rails (= 7.0.3.1)
+  rails (= 7.0.4)
   rails-controller-testing
   rails-i18n (~> 7.0.0)
   rinku (>= 2.0.6)
@@ -590,6 +591,7 @@ DEPENDENCIES
   selenium-webdriver
   simplecov
   simplecov-lcov
+  sprockets-exporters_pack
   strong_migrations
   terser
   validates_email_format_of (>= 1.5.1)

SECURITY.md

@@ -0,0 +1,9 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+We welcome any reports of security vulnerabilities, and we will respond to you quickly to acknowledge receipt.
+
+To report a vulnerability please email [the maintainers using this link](mailto:tom@compton.nu;openstreetmap-website@gravitystorm.co.uk;security@openstreetmap.org). This will also notify the security team for the main deployment of this software.
+
+Please note that we do not offer any bug bounties and we do not participate in any bug programs. If your security report is validated by us, then we are happy to credit you publicly in our issue tracker, on request.

app/assets/javascripts/application.js

@@ -13,7 +13,7 @@
 //= require leaflet.locationfilter
 //= require i18n
 //= require oauth
-//= require piwik
+//= require matomo
 //= require richtext
 //= require qs/dist/qs
 //= require bs-custom-file-input

app/assets/javascripts/index.js

@@ -1,5 +1,6 @@
 //= require_self
 //= require leaflet.sidebar
+//= require leaflet.sidebar-pane
 //= require leaflet.locatecontrol/src/L.Control.Locate
 //= require leaflet.layers
 //= require leaflet.key
@@ -195,7 +196,7 @@ $(document).ready(function () {
     $(".welcome").addClass("visible");
   }
 
-  $(".welcome .close").on("click", function () {
+  $(".welcome .btn-close").on("click", function () {
     $(".welcome").removeClass("visible");
     Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
   });
@@ -203,7 +204,7 @@ $(document).ready(function () {
   var bannerExpiry = new Date();
   bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
 
-  $("#banner .close-wrap").on("click", function (e) {
+  $("#banner .btn-close").on("click", function (e) {
     var cookieId = e.target.id;
     $("#banner").hide();
     e.preventDefault();
@@ -212,13 +213,13 @@ $(document).ready(function () {
     }
   });
 
-  if (OSM.PIWIK) {
+  if (OSM.MATOMO) {
     map.on("layeradd", function (e) {
       if (e.layer.options) {
-        var goal = OSM.PIWIK.goals[e.layer.options.keyid];
+        var goal = OSM.MATOMO.goals[e.layer.options.keyid];
 
         if (goal) {
-          $("body").trigger("piwikgoal", goal);
+          $("body").trigger("matomogoal", goal);
         }
       }
     });

app/assets/javascripts/index/browse.js

@@ -48,20 +48,20 @@ OSM.initializeBrowse = function (map) {
 
   function displayFeatureWarning(count, limit, add, cancel) {
     $("#browse_status").html(
-      $("<div>")
+      $("<div>").append(
-        .append(
+        $("<div class='d-flex'>").append(
-          $("<h2>")
+          $("<div class='flex-grow-1 text-break'>").append(
-            .text(I18n.t("browse.start_rjs.load_data"))
+            $("<h2>")
-            .prepend($("<span class='icon close'></span>").click(cancel)))
+              .text(I18n.t("browse.start_rjs.load_data"))),
-        .append(
+          $("<div>").append(
-          $("<div>")
+            $("<button type='button' class='btn-close mt-1'>")
-            .append(
+              .click(cancel))),
-              $("<p class='alert alert-warning clearfix'></p>")
+        $("<div>").append(
-                .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })))
+          $("<p class='alert alert-warning'></p>")
-            .append(
+            .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })),
-              $("<input type='submit' class='btn btn-primary'>")
+          $("<input type='submit' class='btn btn-primary'>")
-                .val(I18n.t("browse.start_rjs.load_data"))
+            .val(I18n.t("browse.start_rjs.load_data"))
-                .click(add))));
+            .click(add))));
   }
 
   var dataLoader;

app/assets/javascripts/index/directions.js

@@ -157,7 +157,7 @@ OSM.Directions = function (map) {
     }));
   });
 
-  $(".directions_form .close").on("click", function (e) {
+  $(".directions_form .btn-close").on("click", function (e) {
     e.preventDefault();
     var route_from = endpoints[0].value;
     if (route_from) {
@@ -254,20 +254,30 @@ OSM.Directions = function (map) {
         map.fitBounds(polyline.getBounds().pad(0.05));
       }
 
-      var html = "<h2><a class=\"geolink\" href=\"#\">" +
+      var distanceText = $("<p>").append(
-        "<span class=\"icon close\"></span></a>" + I18n.t("javascripts.directions.directions") +
-        "</h2><p>" +
         I18n.t("javascripts.directions.distance") + ": " + formatDistance(route.distance) + ". " +
-        I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + ".";
+        I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + ".");
       if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") {
-        html += "<br />" +
+        distanceText.append(
+          $("<br>"),
           I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " +
-          I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m.";
+          I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m.");
       }
-      html += "</p><table id=\"turnbyturn\" class=\"mb-3\"/>";
+
+      var turnByTurnTable = $("<table class='mb-3'>");
+      var directionsCloseButton = $("<button type='button' class='btn-close mt-1'>");
 
       $("#sidebar_content")
-        .html(html);
+        .empty()
+        .append(
+          $("<div class='d-flex'>").append(
+            $("<div class='flex-grow-1 text-break'>").append(
+              $("<h2>")
+                .text(I18n.t("javascripts.directions.directions"))),
+            $("<div>").append(directionsCloseButton)),
+          distanceText,
+          turnByTurnTable
+        );
 
       // Add each row
       route.steps.forEach(function (step) {
@@ -309,15 +319,14 @@ OSM.Directions = function (map) {
           map.removeLayer(highlight);
         });
 
-        $("#turnbyturn").append(row);
+        turnByTurnTable.append(row);
       });
 
       $("#sidebar_content").append("<p class=\"text-center\">" +
         I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) +
         "</p>");
 
-      $("#sidebar_content a.geolink").on("click", function (e) {
+      directionsCloseButton.on("click", function () {
-        e.preventDefault();
         map.removeLayer(polyline);
         $("#sidebar_content").html("");
         map.setSidebarOverlaid(true);

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

@@ -14,7 +14,7 @@ function GraphHopperEngine(id, vehicleType) {
 
   return {
     id: id,
-    creditline: "<a href=\"https://www.graphhopper.com/\" target=\"_blank\">Graphhopper</a>",
+    creditline: "<a href=\"https://www.graphhopper.com/\" target=\"_blank\">GraphHopper</a>",
     draggable: false,
 
     getRoute: function (points, callback) {

app/assets/javascripts/index/history.js

@@ -10,18 +10,6 @@ OSM.History = function (map) {
     })
     .on("mouseout", "[data-changeset]", function () {
       unHighlightChangeset($(this).data("changeset").id);
-    })
-    .on("mousedown", "[data-changeset]", function () {
-      var moved = false;
-      $(this)
-        .one("click", function (e) {
-          if (!moved && !$(e.target).is("a")) {
-            clickChangeset($(this).data("changeset").id, e);
-          }
-        })
-        .one("mousemove", function () {
-          moved = true;
-        });
     });
 
   var group = L.featureGroup()

app/assets/javascripts/leaflet.key.js

@@ -1,38 +1,11 @@
 L.OSM.key = function (options) {
-  var control = L.control(options);
+  var control = L.OSM.sidebarPane(options, "key", null, "javascripts.key.title");
-
-  control.onAdd = function (map) {
-    var $container = $("<div>")
-      .attr("class", "control-key");
-
-    var button = $("<a>")
-      .attr("class", "control-button")
-      .attr("href", "#")
-      .html("<span class=\"icon key\"></span>")
-      .on("click", toggle)
-      .appendTo($container);
-
-    var $ui = $("<div>")
-      .attr("class", "key-ui");
-
-    $("<div>")
-      .attr("class", "sidebar_heading")
-      .appendTo($ui)
-      .append(
-        $("<span>")
-          .text(I18n.t("javascripts.close"))
-          .attr("class", "icon close")
-          .bind("click", toggle))
-      .append(
-        $("<h4>")
-          .text(I18n.t("javascripts.key.title")));
 
+  control.onAddPane = function (map, button, $ui) {
     var $section = $("<div>")
       .attr("class", "section")
       .appendTo($ui);
 
-    options.sidebar.addPane($ui);
-
     $ui
       .on("show", shown)
       .on("hide", hidden);
@@ -50,15 +23,6 @@ L.OSM.key = function (options) {
       map.off("zoomend baselayerchange", update);
     }
 
-    function toggle(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      if (!button.hasClass("disabled")) {
-        options.sidebar.togglePane($ui, button);
-      }
-      $(".leaflet-control .control-button").tooltip("hide");
-    }
-
     function updateButton() {
       var disabled = ["mapnik", "cyclemap"].indexOf(map.getMapBaseLayerId()) === -1;
       button
@@ -82,8 +46,6 @@ L.OSM.key = function (options) {
         }
       });
     }
-
-    return $container[0];
   };
 
   return control;

app/assets/javascripts/leaflet.layers.js

@@ -1,35 +1,9 @@
 L.OSM.layers = function (options) {
-  var control = L.control(options);
+  var control = L.OSM.sidebarPane(options, "layers", "javascripts.map.layers.title", "javascripts.map.layers.header");
 
-  control.onAdd = function (map) {
+  control.onAddPane = function (map, button, $ui, toggle) {
     var layers = options.layers;
 
-    var $container = $("<div>")
-      .attr("class", "control-layers");
-
-    var button = $("<a>")
-      .attr("class", "control-button")
-      .attr("href", "#")
-      .attr("title", I18n.t("javascripts.map.layers.title"))
-      .html("<span class=\"icon layers\"></span>")
-      .on("click", toggle)
-      .appendTo($container);
-
-    var $ui = $("<div>")
-      .attr("class", "layers-ui");
-
-    $("<div>")
-      .attr("class", "sidebar_heading")
-      .appendTo($ui)
-      .append(
-        $("<span>")
-          .text(I18n.t("javascripts.close"))
-          .attr("class", "icon close")
-          .bind("click", toggle))
-      .append(
-        $("<h4>")
-          .text(I18n.t("javascripts.map.layers.header")));
-
     var baseSection = $("<div>")
       .attr("class", "section base-layers")
       .appendTo($ui);
@@ -171,8 +145,7 @@ L.OSM.layers = function (options) {
           }
 
           $(item).attr("class", disabled ? "disabled" : "");
-          // item.attr("data-bs-original-title", disabled ? // has additional bug when zooming out from enabled state
+          item.attr("data-bs-original-title", disabled ? // has additional bug when zooming out from enabled state
-          item.attr("data-original-title", disabled ?
             I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : "");
         });
       };
@@ -181,17 +154,6 @@ L.OSM.layers = function (options) {
       addOverlay(map.dataLayer, "data", OSM.MAX_REQUEST_AREA);
       addOverlay(map.gpsLayer, "gps", Number.POSITIVE_INFINITY);
     }
-
-    options.sidebar.addPane($ui);
-
-    function toggle(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      options.sidebar.togglePane($ui, button);
-      $(".leaflet-control .control-button").tooltip("hide");
-    }
-
-    return $container[0];
   };
 
   return control;

app/assets/javascripts/leaflet.share.js

@@ -1,38 +1,12 @@
 L.OSM.share = function (options) {
-  var control = L.control(options),
+  var control = L.OSM.sidebarPane(options, "share", "javascripts.share.title", "javascripts.share.title"),
       marker = L.marker([0, 0], { draggable: true }),
       locationFilter = new L.LocationFilter({
         enableButton: false,
         adjustButton: false
       });
 
-  control.onAdd = function (map) {
+  control.onAddPane = function (map, button, $ui) {
-    var $container = $("<div>")
-      .attr("class", "control-share");
-
-    var button = $("<a>")
-      .attr("class", "control-button")
-      .attr("href", "#")
-      .attr("title", I18n.t("javascripts.share.title"))
-      .html("<span class=\"icon share\"></span>")
-      .on("click", toggle)
-      .appendTo($container);
-
-    var $ui = $("<div>")
-      .attr("class", "share-ui");
-
-    $("<div>")
-      .attr("class", "sidebar_heading")
-      .appendTo($ui)
-      .append(
-        $("<span>")
-          .text(I18n.t("javascripts.close"))
-          .attr("class", "icon close")
-          .bind("click", toggle))
-      .append(
-        $("<h4>")
-          .text(I18n.t("javascripts.share.title")));
-
     // Link / Embed
 
     var $linkSection = $("<div>")
@@ -246,11 +220,15 @@ L.OSM.share = function (options) {
     map.on("move", movedMap);
     map.on("moveend layeradd layerremove", update);
 
-    options.sidebar.addPane($ui);
-
     $ui
+      .on("show", shown)
       .on("hide", hidden);
 
+    function shown() {
+      $("#mapnik_scale").val(getScale());
+      update();
+    }
+
     function hidden() {
       map.removeLayer(marker);
       map.options.scrollWheelZoom = map.options.doubleClickZoom = true;
@@ -258,18 +236,6 @@ L.OSM.share = function (options) {
       update();
     }
 
-    function toggle(e) {
-      e.stopPropagation();
-      e.preventDefault();
-
-      $("#mapnik_scale").val(getScale());
-      marker.setLatLng(map.getCenter());
-
-      update();
-      options.sidebar.togglePane($ui, button);
-      $(".leaflet-control .control-button").tooltip("hide");
-    }
-
     function toggleMarker() {
       if ($(this).is(":checked")) {
         marker.setLatLng(map.getCenter());
@@ -414,8 +380,6 @@ L.OSM.share = function (options) {
       var precision = 5 * Math.pow(10, Math.floor(Math.LOG10E * Math.log(scale)) - 2);
       return precision * Math.ceil(scale / precision);
     }
-
-    return $container[0];
   };
 
   return control;

app/assets/javascripts/leaflet.sidebar-pane.js

@@ -0,0 +1,53 @@
+L.OSM.sidebarPane = function (options, uiClass, buttonTitle, paneTitle) {
+  var control = L.control(options);
+
+  control.onAdd = function (map) {
+    var $container = $("<div>")
+      .attr("class", "control-" + uiClass);
+
+    var button = $("<a>")
+      .attr("class", "control-button")
+      .attr("href", "#")
+      .html("<span class=\"icon " + uiClass + "\"></span>")
+      .on("click", toggle);
+
+    if (buttonTitle) {
+      button.attr("title", I18n.t(buttonTitle));
+    }
+
+    button.appendTo($container);
+
+    var $ui = $("<div>")
+      .attr("class", uiClass + "-ui");
+
+    $("<div class='sidebar_heading d-flex'>")
+      .appendTo($ui)
+      .append($("<div class='flex-grow-1 text-break'>")
+        .append($("<h4>")
+          .text(I18n.t(paneTitle))))
+      .append($("<div>")
+        .append($("<button type='button' class='btn-close mt-1'>")
+          .attr("aria-label", I18n.t("javascripts.close"))
+          .bind("click", toggle)));
+
+    options.sidebar.addPane($ui);
+
+    this.onAddPane(map, button, $ui, toggle);
+
+    function toggle(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      if (!button.hasClass("disabled")) {
+        options.sidebar.togglePane($ui, button);
+      }
+      $(".leaflet-control .control-button").tooltip("hide");
+    }
+
+    return $container[0];
+  };
+
+  // control.onAddPane = function (map, button, $ui, toggle) {
+  // }
+
+  return control;
+};

app/assets/javascripts/matomo.js

@@ -0,0 +1,32 @@
+if (OSM.MATOMO) {
+  $(document).ready(function () {
+    var base = document.location.protocol + "//" + OSM.MATOMO.location + "/";
+    var matomoTracker;
+
+    var matomoLoader = $.ajax({
+      url: base + "matomo.js",
+      dataType: "script",
+      cache: true,
+      success: function () {
+        matomoTracker = Matomo.getTracker(base + "matomo.php", OSM.MATOMO.site);
+
+        if (OSM.user) {
+          matomoTracker.setUserId(OSM.user.toString());
+        }
+
+        matomoTracker.trackPageView();
+        matomoTracker.enableLinkTracking();
+
+        $("meta[name=matomo-goal]").each(function () {
+          matomoTracker.trackGoal($(this).attr("content"));
+        });
+      }
+    });
+
+    $("body").on("matomogoal", function (e, goal) {
+      matomoLoader.done(function () {
+        matomoTracker.trackGoal(goal);
+      });
+    });
+  });
+}

app/assets/javascripts/osm.js.erb

@@ -3,8 +3,8 @@
 //= require qs/dist/qs
 
 OSM = {
-<% if defined?(PIWIK) %>
+<% if defined?(Settings.matomo) %>
-  PIWIK:                   <%= PIWIK.to_json %>,
+  MATOMO:                  <%= Settings.matomo.to_json %>,
 <% end %>
 
   MAX_REQUEST_AREA:        <%= Settings.max_request_area.to_json %>,

app/assets/javascripts/piwik.js

@@ -1,32 +0,0 @@
-if (OSM.PIWIK) {
-  $(document).ready(function () {
-    var base = document.location.protocol + "//" + OSM.PIWIK.location + "/";
-    var piwikTracker;
-
-    var piwikLoader = $.ajax({
-      url: base + "piwik.js",
-      dataType: "script",
-      cache: true,
-      success: function () {
-        piwikTracker = Piwik.getTracker(base + "piwik.php", OSM.PIWIK.site);
-
-        if (OSM.user) {
-          piwikTracker.setUserId(OSM.user.toString());
-        }
-
-        piwikTracker.trackPageView();
-        piwikTracker.enableLinkTracking();
-
-        $("meta[name=piwik-goal]").each(function () {
-          piwikTracker.trackGoal($(this).attr("content"));
-        });
-      }
-    });
-
-    $("body").on("piwikgoal", function (e, goal) {
-      piwikLoader.done(function () {
-        piwikTracker.trackGoal(goal);
-      });
-    });
-  });
-}

app/assets/stylesheets/common.scss

@@ -55,7 +55,6 @@ small, aside {
 .icon.clipboard   { /* no-r2 */ background-position: -160px 0; }
 .icon.link        { /* no-r2 */ background-position: -180px 0; }
 .icon.close       { /* no-r2 */ background-position: -200px 0; }
-.close-wrap:hover .icon.close,
 .icon.close:hover { /* no-r2 */ background-position: -200px -20px; }
 .icon.check       { /* no-r2 */ background-position: -220px 0; }
 .icon.note        { /* no-r2 */ background-position: -240px 0; }
@@ -146,7 +145,7 @@ header {
 
 nav.primary {
   .btn-outline-primary {
-    @include button-outline-variant($green, $white);
+    @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
   }
 
   .disabled {
@@ -191,27 +190,17 @@ nav.secondary {
 
   .login-menu {
     .btn-outline-secondary {
-      @include button-outline-variant($darkgrey, $white, null, null, $white);
+      @include button-outline-variant($darkgrey, $color-hover: $white, $active-color: $white);
     }
   }
 
   .user-menu {
     .btn-outline-secondary {
-      @include button-outline-variant($darkgrey, $darkgrey, white, $darkgrey);
+      @include button-outline-variant($darkgrey, $color-hover: $darkgrey, $active-background: white, $active-border: $darkgrey);
       border-color: $grey;
       &:hover {
         border-color: $grey;
       }
-      &:focus {
-        background-color: white;
-        box-shadow: none;
-      }
-    }
-    &.show .btn-outline-secondary {
-      background-color: white;
-      &:focus {
-        box-shadow: none;
-      }
     }
   }
 
@@ -284,7 +273,8 @@ body.compact-nav {
   margin-bottom: 10px;
   outline: none;
 
-  &:hover {
+  &:hover,
+  &:focus {
     background-color: black;
   }
 
@@ -358,22 +348,6 @@ body.compact-nav {
       clear: both;
       width: 100%;
     }
-
-    .close-wrap {
-      cursor: pointer;
-      position: absolute;
-      top: 0;
-      right: 0;
-      width: 60px;
-      height: 60px;
-
-      .icon.close {
-        pointer-events: none;
-        position: absolute;
-        right: 20px;
-        top: 20px;
-      }
-    }
   }
 
   .overlay-sidebar #sidebar {
@@ -625,11 +599,6 @@ body.compact-nav {
   padding: $lineheight/2 $lineheight;
   // background: $offwhite;
   // border-bottom: 1px solid $grey;
-  > .close {
-    float: right;
-    margin-top: 2px;
-    cursor: pointer;
-  }
 }
 
 #browse_status {
@@ -678,15 +647,15 @@ legend {
    reconsider our colours at some point with that in mind. */
 
 .btn-primary {
-  @include button-variant($primary, $primary, $white, null, null, $white, null, null, $white, null, null, $white);
+  @include button-variant($primary, $primary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white);
 }
 
 .btn-secondary {
-  @include button-variant($secondary, $secondary, $white, null, null, $white, null, null, $white, null, null, $white);
+  @include button-variant($secondary, $secondary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white);
 }
 
 .btn-outline-secondary {
-  @include button-outline-variant($secondary, $white, null, null, $white);
+  @include button-outline-variant($secondary, $color-hover: $white, $active-color: $white);
 }
 
 /* Rules for the search and direction forms */
@@ -773,10 +742,13 @@ tr.turn:hover {
 
 #sidebar .changesets {
   li {
-    cursor: pointer;
-
     &.selected { background: $list-highlight; }
     /* color is derived from changeset bbox fillColor in history.js */
+
+    a.stretched-link > span, a:not(.stretched-link), [title] {
+      position: relative;
+      z-index: 2; /* needs to be higher than Bootstrap's stretched link ::after z-index */
+    }
   }
 
   .comments {
@@ -1310,10 +1282,6 @@ tr.turn:hover {
       vertical-align: middle;
     }
   }
-
-  a.reverse_directions {
-    cursor: pointer;
-  }
 }
 
 /* Rules for user images */

app/controllers/geocoder_controller.rb

@@ -167,7 +167,8 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue StandardError => e
-    @error = "Error contacting nominatim.openstreetmap.org: #{e}"
+    host = URI(Settings.nominatim_url).host
+    @error = "Error contacting #{host}: #{e}"
     render :action => "error"
   end
 
@@ -231,7 +232,8 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue StandardError => e
-    @error = "Error contacting nominatim.openstreetmap.org: #{e}"
+    host = URI(Settings.nominatim_url).host
+    @error = "Error contacting #{host}: #{e}"
     render :action => "error"
   end
 

app/controllers/issue_comments_controller.rb

@@ -11,9 +11,20 @@ class IssueCommentsController < ApplicationController
     comment = @issue.comments.build(issue_comment_params)
     comment.user = current_user
     comment.save!
-    notice = t(".comment_created")
+
-    reassign_issue(@issue) if params[:reassign]
+    if params[:reassign]
-    redirect_to @issue, :notice => notice
+      reassign_issue(@issue)
+      flash[:notice] = t ".issue_reassigned"
+
+      if current_user.has_role? @issue.assigned_role
+        redirect_to @issue
+      else
+        redirect_to issues_path(:status => "open")
+      end
+    else
+      flash[:notice] = t(".comment_created")
+      redirect_to @issue
+    end
   end
 
   private

app/controllers/preferences_controller.rb

@@ -26,7 +26,7 @@ class PreferencesController < ApplicationController
       flash[:notice] = { :partial => "preferences/update_success_flash" }
       redirect_to preferences_path
     else
-      flash[:error] = t ".failure"
+      flash.now[:error] = t ".failure"
       render :edit
     end
   end

app/controllers/profiles_controller.rb

@@ -36,7 +36,7 @@ class ProfilesController < ApplicationController
       flash[:notice] = t ".success"
       redirect_to user_path(current_user)
     else
-      flash[:error] = t ".failure"
+      flash.now[:error] = t ".failure"
       render :edit
     end
   end

app/controllers/reports_controller.rb

@@ -28,7 +28,7 @@ class ReportsController < ApplicationController
 
       redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t(".successful_report")
     else
-      flash[:notice] = t(".provide_details")
+      flash.now[:notice] = t(".provide_details")
       render :action => "new"
     end
   end

app/controllers/users_controller.rb

@@ -83,7 +83,7 @@ class UsersController < ApplicationController
         end
 
         if current_user.save
-          flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)
+          flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo)
 
           referer = welcome_path
 

app/mailers/user_mailer.rb

@@ -183,7 +183,7 @@ class UserMailer < ApplicationMailer
   end
 
   def attach_project_logo
-    attachments.inline["logo.png"] = File.read(Rails.root.join("app/assets/images/osm_logo_30.png"))
+    attachments.inline["logo.png"] = Rails.root.join("app/assets/images/osm_logo_30.png").read
   end
 
   def attach_user_avatar(user)
@@ -199,7 +199,7 @@ class UserMailer < ApplicationMailer
         avatar.blob.download
       end
     else
-      File.read(Rails.root.join("app/assets/images/avatar_small.png"))
+      Rails.root.join("app/assets/images/avatar_small.png").read
     end
   end
 

app/views/application/_sidebar_header.html.erb

@@ -3,8 +3,6 @@
     <h2><%= title %></h2>
   </div>
   <div>
-    <a class="geolink" href="<%= root_path %>">
+    <a class="geolink d-block btn-close mt-1" href="<%= root_path %>"></a>
-      <span class="icon close"></span>
-    </a>
   </div>
 </div>

app/views/browse/_common_details.html.erb

@@ -3,7 +3,7 @@
   #<%= common_details.version %>
 </h4>
 
-<p class="font-italic">
+<p class="fst-italic">
   <% if common_details.changeset.tags["comment"].present? %>
     <%= linkify(common_details.changeset.tags["comment"]) %>
   <% else %>

app/views/browse/changeset.html.erb

@@ -3,7 +3,7 @@
 <%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
 
 <div class="browse-section">
-  <p class="font-italic">
+  <p class="fst-italic">
     <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
   </p>
   <p class="details"><%= changeset_details(@changeset) %></p>

app/views/browse/note.html.erb

@@ -28,10 +28,6 @@
     <p class='alert alert-warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
   <% end -%>
 
-  <% if current_user && current_user != @note.author %>
-    <p class="text-muted"><%= report_link(t(".report"), @note) %></p>
-  <% end %>
-
   <% if @note_comments.length > 1 %>
     <div class='note-comments'>
       <ul class="list-unstyled">
@@ -47,7 +43,7 @@
 
   <% if @note.status == "open" %>
     <% if current_user -%>
-      <form action="#">
+      <form class="mb-3" action="#">
         <div class="mb-3">
           <textarea class="form-control" name="text" cols="40" rows="5" maxlength="2000"></textarea>
         </div>
@@ -61,7 +57,7 @@
       </form>
     <% end -%>
   <% else %>
-    <form action="#">
+    <form class="mb-3" action="#">
       <input type="hidden" name="text" value="" autocomplete="off">
       <div class="btn-wrapper">
         <% if current_user and current_user.moderator? -%>
@@ -73,4 +69,8 @@
       </div>
     </form>
   <% end %>
+
+  <% if current_user && current_user != @note.author %>
+    <p><small class="text-muted"><%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %></small></p>
+  <% end %>
 </div>

app/views/changesets/_changeset.html.erb

@@ -11,16 +11,18 @@
    end %>
 
 <%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %>
-  <p class="font-italic">
+  <p class="fst-italic">
-    <a class="changeset_id text-dark" href="<%= changeset_path(changeset) %>">
+    <a class="changeset_id text-dark stretched-link" href="<%= changeset_path(changeset) %>">
-      <%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %>
+      <span><%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %></span>
     </a>
   </p>
   <div class="row">
     <div class="col">
       <%= changeset_details(changeset) %>
       &middot;
-      #<%= changeset.id %>
+      <a class="changeset_id text-dark" href="<%= changeset_path(changeset) %>">
+        #<%= changeset.id %>
+      </a>
     </div>
     <div class="col-auto comments comments-<%= changeset.comments.length %>">
       <%= changeset.comments.length %>

app/views/layouts/_banner.html.erb

@@ -1,4 +1,4 @@
 <% unless (banner = next_banner()).nil? %>
 <%= link_to (image_tag banner[:img], :alt => banner[:alt], :title => banner[:alt]), banner[:link] %>
-<div class="close-wrap" id="<%= banner_cookie(banner[:id]) %>"><span class="icon close"></span></div>
+<button type="button" class="btn-close position-absolute top-0 end-0 p-4" id="<%= banner_cookie(banner[:id]) %>"></button>
 <% end %>

app/views/layouts/_meta.html.erb

@@ -20,6 +20,6 @@
 <%= tag.link :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") %>
 <%= tag.meta :name => "description", :content => "OpenStreetMap is the free wiki world map." %>
 <%= opengraph_tags(@title) %>
-<% if flash[:piwik_goal] -%>
+<% if flash[:matomo_goal] -%>
-<%= tag.meta :name => "piwik-goal", :content => flash[:piwik_goal] %>
+<%= tag.meta :name => "matomo-goal", :content => flash[:matomo_goal] %>
 <% end -%>

app/views/layouts/_search.html.erb

@@ -19,7 +19,7 @@
   </form>
 
   <form method="GET" action="<%= directions_path %>" class="directions_form pb-3">
-    <div class="clearfix px-3 py-3"><span class="icon close"></span></div>
+    <div class="d-flex flex-row-reverse px-3 py-3"><button type="button" class="btn-close"></button></div>
 
     <div class="row gx-2 m-1">
       <div class="col-1">
@@ -47,7 +47,7 @@
     </div>
     <div class="row gx-2 m-1">
       <div class="col offset-1">
-        <a class="reverse_directions"><%= t("site.search.reverse_directions_text") %></a>
+        <button class="btn btn-sm btn-link reverse_directions"><%= t("site.search.reverse_directions_text") %></button>
       </div>
     </div>
 

app/views/layouts/site.html.erb

@@ -4,8 +4,8 @@
   <body class="<%= body_class %>">
     <%= render :partial => "layouts/header" %>
     <%= render :partial => "layouts/content" %>
-    <% if defined?(PIWIK) -%>
+    <% if defined?(Settings.matomo) -%>
-    <noscript><p><img src="<%= request.protocol %><%= PIWIK["location"] %>/piwik.php?idsite=<%= PIWIK["site"] %>" class="piwik" alt="" /></p></noscript>
+    <noscript><p><img src="<%= request.protocol %><%= Settings.matomo["location"] %>/matomo.php?idsite=<%= Settings.matomo["site"] %>" class="matomo" alt="" /></p></noscript>
     <% end -%>
   </body>
 </html>

app/views/site/help.html.erb

@@ -4,7 +4,7 @@
 
 <p class='introduction'><%= t ".introduction" %></p>
 
-<% sites = %w[beginners_guide help mailing_lists forums irc switch2osm welcomemat wiki] %>
+<% sites = %w[beginners_guide help mailing_lists forums community irc switch2osm welcomemat wiki] %>
 <% sites.prepend("welcome") if current_user %>
 
 <div class="row row-cols-sm-3 g-4 mb-3">

app/views/traces/_trace.html.erb

@@ -25,7 +25,7 @@
                          when "public", "identifiable" then "success"
                          else "danger"
                          end %>
-        <span class="badge badge-<%= badge_class %> text-white"><%= t(".#{trace.visibility}") %></span>
+        <span class="badge bg-<%= badge_class %> text-white"><%= t(".#{trace.visibility}") %></span>
       </li>
     </ul>
     <p class="text-muted mb-0">
@@ -38,7 +38,7 @@
         <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
       <% end %>
     </p>
-    <p class="font-italic mb-0">
+    <p class="fst-italic mb-0">
       <%= trace.description %>
     </p>
   </td>

config/eslint.json

@@ -11,7 +11,7 @@
     "I18n": "readonly",
     "L": "readonly",
     "OSM": "writable",
-    "Piwik": "readonly",
+    "Matomo": "readonly",
     "Qs": "readonly",
     "updateLinks": "readonly"
   },

config/initializers/brotli.rb

@@ -0,0 +1,3 @@
+Rails.application.config.assets.configure do |env|
+  env.register_exporter %w[text/* application/javascript application/json application/xml image/x-icon image/svg+xml], Sprockets::ExportersPack::BrotliExporter
+end

config/initializers/config.rb

@@ -2,7 +2,7 @@
 # Otherwise, admins might not be aware that they are now silently ignored
 # and major problems could occur
 # rubocop:disable Rails/Output, Rails/Exit
-if File.exist?(Rails.root.join("config/application.yml"))
+if Rails.root.join("config/application.yml").exist?
   puts "The config/application.yml file is no longer supported."
   puts ""
   puts "Default settings are now found in config/settings.yml and you"

config/initializers/doorkeeper.rb

@@ -1,486 +1,486 @@
 # frozen_string_literal: true
 
-Rails.application.reloader.to_prepare do
+require_relative "../../lib/oauth"
-  Doorkeeper.configure do
-    # Change the ORM that doorkeeper will use (requires ORM extensions installed).
-    # Check the list of supported ORMs here: https://github.com/doorkeeper-gem/doorkeeper#orms
-    orm :active_record
 
-    # This block will be called to check whether the resource owner is authenticated or not.
+Doorkeeper.configure do
-    resource_owner_authenticator do
+  # Change the ORM that doorkeeper will use (requires ORM extensions installed).
-      current_user
+  # Check the list of supported ORMs here: https://github.com/doorkeeper-gem/doorkeeper#orms
-    end
+  orm :active_record
 
-    # If you didn't skip applications controller from Doorkeeper routes in your application routes.rb
+  # This block will be called to check whether the resource owner is authenticated or not.
-    # file then you need to declare this block in order to restrict access to the web interface for
+  resource_owner_authenticator do
-    # adding oauth authorized applications. In other case it will return 403 Forbidden response
+    current_user
-    # every time somebody will try to access the admin web interface.
-
-    admin_authenticator do
-      current_user
-    end
-
-    # You can use your own model classes if you need to extend (or even override) default
-    # Doorkeeper models such as `Application`, `AccessToken` and `AccessGrant.
-    #
-    # Be default Doorkeeper ActiveRecord ORM uses it's own classes:
-    #
-    # access_token_class "Doorkeeper::AccessToken"
-    # access_grant_class "Doorkeeper::AccessGrant"
-    # application_class "Doorkeeper::Application"
-    #
-    # Don't forget to include Doorkeeper ORM mixins into your custom models:
-    #
-    #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken - for access token
-    #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessGrant - for access grant
-    #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::Application - for application (OAuth2 clients)
-    #
-    # For example:
-    #
-    # access_token_class "MyAccessToken"
-    #
-    # class MyAccessToken < ApplicationRecord
-    #   include ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken
-    #
-    #   self.table_name = "hey_i_wanna_my_name"
-    #
-    #   def destroy_me!
-    #     destroy
-    #   end
-    # end
-
-    application_class "Oauth2Application" unless Settings.status == "database_offline"
-
-    # Enables polymorphic Resource Owner association for Access Tokens and Access Grants.
-    # By default this option is disabled.
-    #
-    # Make sure you properly setup you database and have all the required columns (run
-    # `bundle exec rails generate doorkeeper:enable_polymorphic_resource_owner` and execute Rails
-    # migrations).
-    #
-    # If this option enabled, Doorkeeper will store not only Resource Owner primary key
-    # value, but also it's type (class name). See "Polymorphic Associations" section of
-    # Rails guides: https://guides.rubyonrails.org/association_basics.html#polymorphic-associations
-    #
-    # [NOTE] If you apply this option on already existing project don't forget to manually
-    # update `resource_owner_type` column in the database and fix migration template as it will
-    # set NOT NULL constraint for Access Grants table.
-    #
-    # use_polymorphic_resource_owner
-
-    # If you are planning to use Doorkeeper in Rails 5 API-only application, then you might
-    # want to use API mode that will skip all the views management and change the way how
-    # Doorkeeper responds to a requests.
-    #
-    # api_only
-
-    # Enforce token request content type to application/x-www-form-urlencoded.
-    # It is not enabled by default to not break prior versions of the gem.
-
-    enforce_content_type
-
-    # Authorization Code expiration time (default: 10 minutes).
-    #
-    # authorization_code_expires_in 10.minutes
-
-    # Access token expiration time (default: 2 hours).
-    # If you want to disable expiration, set this to `nil`.
-
-    access_token_expires_in nil
-
-    # Assign custom TTL for access tokens. Will be used instead of access_token_expires_in
-    # option if defined. In case the block returns `nil` value Doorkeeper fallbacks to
-    # +access_token_expires_in+ configuration option value. If you really need to issue a
-    # non-expiring access token (which is not recommended) then you need to return
-    # Float::INFINITY from this block.
-    #
-    # `context` has the following properties available:
-    #
-    #   * `client` - the OAuth client application (see Doorkeeper::OAuth::Client)
-    #   * `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
-    #   * `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
-    #   * `resource_owner` - authorized resource owner instance (if present)
-    #
-    # custom_access_token_expires_in do |context|
-    #   context.client.additional_settings.implicit_oauth_expiration
-    # end
-
-    # Use a custom class for generating the access token.
-    # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-access-token-generator
-    #
-    # access_token_generator '::Doorkeeper::JWT'
-
-    # The controller +Doorkeeper::ApplicationController+ inherits from.
-    # Defaults to +ActionController::Base+ unless +api_only+ is set, which changes the default to
-    # +ActionController::API+. The return value of this option must be a stringified class name.
-    # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-controllers
-
-    base_controller "ApplicationController"
-
-    # Reuse access token for the same resource owner within an application (disabled by default).
-    #
-    # This option protects your application from creating new tokens before old valid one becomes
-    # expired so your database doesn't bloat. Keep in mind that when this option is `on` Doorkeeper
-    # doesn't updates existing token expiration time, it will create a new token instead.
-    # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383
-    #
-    # You can not enable this option together with +hash_token_secrets+.
-
-    reuse_access_token
-
-    # In case you enabled `reuse_access_token` option Doorkeeper will try to find matching
-    # token using `matching_token_for` Access Token API that searches for valid records
-    # in batches in order not to pollute the memory with all the database records. By default
-    # Doorkeeper uses batch size of 10 000 records. You can increase or decrease this value
-    # depending on your needs and server capabilities.
-    #
-    # token_lookup_batch_size 10_000
-
-    # Set a limit for token_reuse if using reuse_access_token option
-    #
-    # This option limits token_reusability to some extent.
-    # If not set then access_token will be reused unless it expires.
-    # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/1189
-    #
-    # This option should be a percentage(i.e. (0,100])
-    #
-    # token_reuse_limit 100
-
-    # Only allow one valid access token obtained via client credentials
-    # per client. If a new access token is obtained before the old one
-    # expired, the old one gets revoked (disabled by default)
-    #
-    # When enabling this option, make sure that you do not expect multiple processes
-    # using the same credentials at the same time (e.g. web servers spanning
-    # multiple machines and/or processes).
-    #
-    # revoke_previous_client_credentials_token
-
-    # Hash access and refresh tokens before persisting them.
-    # This will disable the possibility to use +reuse_access_token+
-    # since plain values can no longer be retrieved.
-    #
-    # Note: If you are already a user of doorkeeper and have existing tokens
-    # in your installation, they will be invalid without adding 'fallback: :plain'.
-    #
-    # hash_token_secrets
-    # By default, token secrets will be hashed using the
-    # +Doorkeeper::Hashing::SHA256+ strategy.
-    #
-    # If you wish to use another hashing implementation, you can override
-    # this strategy as follows:
-
-    hash_token_secrets :using => "::Doorkeeper::SecretStoring::Plain",
-                       :fallback => "::Doorkeeper::SecretStoring::Sha256Hash"
-
-    # Keep in mind that changing the hashing function will invalidate all existing
-    # secrets, if there are any.
-
-    # Hash application secrets before persisting them.
-
-    hash_application_secrets
-
-    # By default, applications will be hashed
-    # with the +Doorkeeper::SecretStoring::SHA256+ strategy.
-    #
-    # If you wish to use bcrypt for application secret hashing, uncomment
-    # this line instead:
-    #
-    # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt'
-
-    # When the above option is enabled, and a hashed token or secret is not found,
-    # you can allow to fall back to another strategy. For users upgrading
-    # doorkeeper and wishing to enable hashing, you will probably want to enable
-    # the fallback to plain tokens.
-    #
-    # This will ensure that old access tokens and secrets
-    # will remain valid even if the hashing above is enabled.
-    #
-    # This can be done by adding 'fallback: plain', e.g. :
-    #
-    # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt', fallback: :plain
-
-    # Issue access tokens with refresh token (disabled by default), you may also
-    # pass a block which accepts `context` to customize when to give a refresh
-    # token or not. Similar to +custom_access_token_expires_in+, `context` has
-    # the following properties:
-    #
-    # `client` - the OAuth client application (see Doorkeeper::OAuth::Client)
-    # `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
-    # `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
-    #
-    # use_refresh_token
-
-    # Provide support for an owner to be assigned to each registered application (disabled by default)
-    # Optional parameter confirmation: true (default: false) if you want to enforce ownership of
-    # a registered application
-    # NOTE: you must also run the rails g doorkeeper:application_owner generator
-    # to provide the necessary support
-
-    enable_application_owner :confirmation => true
-
-    # Define access token scopes for your provider
-    # For more information go to
-    # https://doorkeeper.gitbook.io/guides/ruby-on-rails/scopes
-
-    # default_scopes  :public
-    optional_scopes(*Oauth::SCOPES, *Oauth::PRIVILEGED_SCOPES)
-
-    # Allows to restrict only certain scopes for grant_type.
-    # By default, all the scopes will be available for all the grant types.
-    #
-    # Keys to this hash should be the name of grant_type and
-    # values should be the array of scopes for that grant type.
-    # Note: scopes should be from configured_scopes (i.e. default or optional)
-    #
-    # scopes_by_grant_type password: [:write], client_credentials: [:update]
-
-    # Forbids creating/updating applications with arbitrary scopes that are
-    # not in configuration, i.e. +default_scopes+ or +optional_scopes+.
-    # (disabled by default)
-
-    enforce_configured_scopes
-
-    # Change the way client credentials are retrieved from the request object.
-    # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
-    # falls back to the `:client_id` and `:client_secret` params from the `params` object.
-    # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated
-    # for more information on customization
-    #
-    # client_credentials :from_basic, :from_params
-
-    # Change the way access token is authenticated from the request object.
-    # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
-    # falls back to the `:access_token` or `:bearer_token` params from the `params` object.
-    # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated
-    # for more information on customization
-
-    access_token_methods :from_bearer_authorization
-
-    # Forces the usage of the HTTPS protocol in non-native redirect uris (enabled
-    # by default in non-development environments). OAuth2 delegates security in
-    # communication to the HTTPS protocol so it is wise to keep this enabled.
-    #
-    # Callable objects such as proc, lambda, block or any object that responds to
-    # #call can be used in order to allow conditional checks (to allow non-SSL
-    # redirects to localhost for example).
-
-    force_ssl_in_redirect_uri do |uri|
-      !Rails.env.development? && uri.host != "127.0.0.1"
-    end
-
-    # Specify what redirect URI's you want to block during Application creation.
-    # Any redirect URI is whitelisted by default.
-    #
-    # You can use this option in order to forbid URI's with 'javascript' scheme
-    # for example.
-    #
-    # forbid_redirect_uri { |uri| uri.scheme.to_s.downcase == 'javascript' }
-
-    # Allows to set blank redirect URIs for Applications in case Doorkeeper configured
-    # to use URI-less OAuth grant flows like Client Credentials or Resource Owner
-    # Password Credentials. The option is on by default and checks configured grant
-    # types, but you **need** to manually drop `NOT NULL` constraint from `redirect_uri`
-    # column for `oauth_applications` database table.
-    #
-    # You can completely disable this feature with:
-    #
-    # allow_blank_redirect_uri false
-    #
-    # Or you can define your custom check:
-    #
-    # allow_blank_redirect_uri do |grant_flows, client|
-    #   client.superapp?
-    # end
-
-    # Specify how authorization errors should be handled.
-    # By default, doorkeeper renders json errors when access token
-    # is invalid, expired, revoked or has invalid scopes.
-    #
-    # If you want to render error response yourself (i.e. rescue exceptions),
-    # set +handle_auth_errors+ to `:raise` and rescue Doorkeeper::Errors::InvalidToken
-    # or following specific errors:
-    #
-    #   Doorkeeper::Errors::TokenForbidden, Doorkeeper::Errors::TokenExpired,
-    #   Doorkeeper::Errors::TokenRevoked, Doorkeeper::Errors::TokenUnknown
-    #
-    # handle_auth_errors :raise
-
-    # Customize token introspection response.
-    # Allows to add your own fields to default one that are required by the OAuth spec
-    # for the introspection response. It could be `sub`, `aud` and so on.
-    # This configuration option can be a proc, lambda or any Ruby object responds
-    # to `.call` method and result of it's invocation must be a Hash.
-    #
-    # custom_introspection_response do |token, context|
-    #   {
-    #     "sub": "Z5O3upPC88QrAjx00dis",
-    #     "aud": "https://protected.example.net/resource",
-    #     "username": User.find(token.resource_owner_id).username
-    #   }
-    # end
-    #
-    # or
-    #
-    # custom_introspection_response CustomIntrospectionResponder
-
-    # Specify what grant flows are enabled in array of Strings. The valid
-    # strings and the flows they enable are:
-    #
-    # "authorization_code" => Authorization Code Grant Flow
-    # "implicit"           => Implicit Grant Flow
-    # "password"           => Resource Owner Password Credentials Grant Flow
-    # "client_credentials" => Client Credentials Grant Flow
-    #
-    # If not specified, Doorkeeper enables authorization_code and
-    # client_credentials.
-    #
-    # implicit and password grant flows have risks that you should understand
-    # before enabling:
-    #   http://tools.ietf.org/html/rfc6819#section-4.4.2
-    #   http://tools.ietf.org/html/rfc6819#section-4.4.3
-
-    grant_flows %w[authorization_code]
-
-    # Allows to customize OAuth grant flows that +each+ application support.
-    # You can configure a custom block (or use a class respond to `#call`) that must
-    # return `true` in case Application instance supports requested OAuth grant flow
-    # during the authorization request to the server. This configuration +doesn't+
-    # set flows per application, it only allows to check if application supports
-    # specific grant flow.
-    #
-    # For example you can add an additional database column to `oauth_applications` table,
-    # say `t.array :grant_flows, default: []`, and store allowed grant flows that can
-    # be used with this application there. Then when authorization requested Doorkeeper
-    # will call this block to check if specific Application (passed with client_id and/or
-    # client_secret) is allowed to perform the request for the specific grant type
-    # (authorization, password, client_credentials, etc).
-    #
-    # Example of the block:
-    #
-    #   ->(flow, client) { client.grant_flows.include?(flow) }
-    #
-    # In case this option invocation result is `false`, Doorkeeper server returns
-    # :unauthorized_client error and stops the request.
-    #
-    # @param allow_grant_flow_for_client [Proc] Block or any object respond to #call
-    # @return [Boolean] `true` if allow or `false` if forbid the request
-    #
-    # allow_grant_flow_for_client do |grant_flow, client|
-    #   # `grant_flows` is an Array column with grant
-    #   # flows that application supports
-    #
-    #   client.grant_flows.include?(grant_flow)
-    # end
-
-    # If you need arbitrary Resource Owner-Client authorization you can enable this option
-    # and implement the check your need. Config option must respond to #call and return
-    # true in case resource owner authorized for the specific application or false in other
-    # cases.
-    #
-    # Be default all Resource Owners are authorized to any Client (application).
-    #
-    # authorize_resource_owner_for_client do |client, resource_owner|
-    #   resource_owner.admin? || client.owners_whitelist.include?(resource_owner)
-    # end
-
-    # Hook into the strategies' request & response life-cycle in case your
-    # application needs advanced customization or logging:
-    #
-    # before_successful_strategy_response do |request|
-    #   puts "BEFORE HOOK FIRED! #{request}"
-    # end
-    #
-    # after_successful_strategy_response do |request, response|
-    #   puts "AFTER HOOK FIRED! #{request}, #{response}"
-    # end
-
-    # Hook into Authorization flow in order to implement Single Sign Out
-    # or add any other functionality. Inside the block you have an access
-    # to `controller` (authorizations controller instance) and `context`
-    # (Doorkeeper::OAuth::Hooks::Context instance) which provides pre auth
-    # or auth objects with issued token based on hook type (before or after).
-    #
-    # before_successful_authorization do |controller, context|
-    #   Rails.logger.info(controller.request.params.inspect)
-    #
-    #   Rails.logger.info(context.pre_auth.inspect)
-    # end
-    #
-    # after_successful_authorization do |controller, context|
-    #   controller.session[:logout_urls] <<
-    #     Doorkeeper::Application
-    #       .find_by(controller.request.params.slice(:redirect_uri))
-    #       .logout_uri
-    #
-    #   Rails.logger.info(context.auth.inspect)
-    #   Rails.logger.info(context.issued_token)
-    # end
-
-    # Under some circumstances you might want to have applications auto-approved,
-    # so that the user skips the authorization step.
-    # For example if dealing with a trusted application.
-
-    skip_authorization do |_, client|
-      client.scopes.include?("skip_authorization")
-    end
-
-    # Configure custom constraints for the Token Introspection request.
-    # By default this configuration option allows to introspect a token by another
-    # token of the same application, OR to introspect the token that belongs to
-    # authorized client (from authenticated client) OR when token doesn't
-    # belong to any client (public token). Otherwise requester has no access to the
-    # introspection and it will return response as stated in the RFC.
-    #
-    # Block arguments:
-    #
-    # @param token [Doorkeeper::AccessToken]
-    #   token to be introspected
-    #
-    # @param authorized_client [Doorkeeper::Application]
-    #   authorized client (if request is authorized using Basic auth with
-    #   Client Credentials for example)
-    #
-    # @param authorized_token [Doorkeeper::AccessToken]
-    #   Bearer token used to authorize the request
-    #
-    # In case the block returns `nil` or `false` introspection responses with 401 status code
-    # when using authorized token to introspect, or you'll get 200 with { "active": false } body
-    # when using authorized client to introspect as stated in the
-    # RFC 7662 section 2.2. Introspection Response.
-    #
-    # Using with caution:
-    # Keep in mind that these three parameters pass to block can be nil as following case:
-    #  `authorized_client` is nil if and only if `authorized_token` is present, and vice versa.
-    #  `token` will be nil if and only if `authorized_token` is present.
-    # So remember to use `&` or check if it is present before calling method on
-    # them to make sure you doesn't get NoMethodError exception.
-    #
-    # You can define your custom check:
-    #
-    # allow_token_introspection do |token, authorized_client, authorized_token|
-    #   if authorized_token
-    #     # customize: require `introspection` scope
-    #     authorized_token.application == token&.application ||
-    #       authorized_token.scopes.include?("introspection")
-    #   elsif token.application
-    #     # `protected_resource` is a new database boolean column, for example
-    #     authorized_client == token.application || authorized_client.protected_resource?
-    #   else
-    #     # public token (when token.application is nil, token doesn't belong to any application)
-    #     true
-    #   end
-    # end
-    #
-    # Or you can completely disable any token introspection:
-    #
-    # allow_token_introspection false
-    #
-    # If you need to block the request at all, then configure your routes.rb or web-server
-    # like nginx to forbid the request.
-
-    # WWW-Authenticate Realm (default: "Doorkeeper").
-    #
-    # realm "Doorkeeper"
   end
+
+  # If you didn't skip applications controller from Doorkeeper routes in your application routes.rb
+  # file then you need to declare this block in order to restrict access to the web interface for
+  # adding oauth authorized applications. In other case it will return 403 Forbidden response
+  # every time somebody will try to access the admin web interface.
+
+  admin_authenticator do
+    current_user
+  end
+
+  # You can use your own model classes if you need to extend (or even override) default
+  # Doorkeeper models such as `Application`, `AccessToken` and `AccessGrant.
+  #
+  # Be default Doorkeeper ActiveRecord ORM uses it's own classes:
+  #
+  # access_token_class "Doorkeeper::AccessToken"
+  # access_grant_class "Doorkeeper::AccessGrant"
+  # application_class "Doorkeeper::Application"
+  #
+  # Don't forget to include Doorkeeper ORM mixins into your custom models:
+  #
+  #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken - for access token
+  #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessGrant - for access grant
+  #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::Application - for application (OAuth2 clients)
+  #
+  # For example:
+  #
+  # access_token_class "MyAccessToken"
+  #
+  # class MyAccessToken < ApplicationRecord
+  #   include ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken
+  #
+  #   self.table_name = "hey_i_wanna_my_name"
+  #
+  #   def destroy_me!
+  #     destroy
+  #   end
+  # end
+
+  application_class "Oauth2Application" unless Settings.status == "database_offline"
+
+  # Enables polymorphic Resource Owner association for Access Tokens and Access Grants.
+  # By default this option is disabled.
+  #
+  # Make sure you properly setup you database and have all the required columns (run
+  # `bundle exec rails generate doorkeeper:enable_polymorphic_resource_owner` and execute Rails
+  # migrations).
+  #
+  # If this option enabled, Doorkeeper will store not only Resource Owner primary key
+  # value, but also it's type (class name). See "Polymorphic Associations" section of
+  # Rails guides: https://guides.rubyonrails.org/association_basics.html#polymorphic-associations
+  #
+  # [NOTE] If you apply this option on already existing project don't forget to manually
+  # update `resource_owner_type` column in the database and fix migration template as it will
+  # set NOT NULL constraint for Access Grants table.
+  #
+  # use_polymorphic_resource_owner
+
+  # If you are planning to use Doorkeeper in Rails 5 API-only application, then you might
+  # want to use API mode that will skip all the views management and change the way how
+  # Doorkeeper responds to a requests.
+  #
+  # api_only
+
+  # Enforce token request content type to application/x-www-form-urlencoded.
+  # It is not enabled by default to not break prior versions of the gem.
+
+  enforce_content_type
+
+  # Authorization Code expiration time (default: 10 minutes).
+  #
+  # authorization_code_expires_in 10.minutes
+
+  # Access token expiration time (default: 2 hours).
+  # If you want to disable expiration, set this to `nil`.
+
+  access_token_expires_in nil
+
+  # Assign custom TTL for access tokens. Will be used instead of access_token_expires_in
+  # option if defined. In case the block returns `nil` value Doorkeeper fallbacks to
+  # +access_token_expires_in+ configuration option value. If you really need to issue a
+  # non-expiring access token (which is not recommended) then you need to return
+  # Float::INFINITY from this block.
+  #
+  # `context` has the following properties available:
+  #
+  #   * `client` - the OAuth client application (see Doorkeeper::OAuth::Client)
+  #   * `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
+  #   * `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
+  #   * `resource_owner` - authorized resource owner instance (if present)
+  #
+  # custom_access_token_expires_in do |context|
+  #   context.client.additional_settings.implicit_oauth_expiration
+  # end
+
+  # Use a custom class for generating the access token.
+  # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-access-token-generator
+  #
+  # access_token_generator '::Doorkeeper::JWT'
+
+  # The controller +Doorkeeper::ApplicationController+ inherits from.
+  # Defaults to +ActionController::Base+ unless +api_only+ is set, which changes the default to
+  # +ActionController::API+. The return value of this option must be a stringified class name.
+  # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-controllers
+
+  base_controller "ApplicationController"
+
+  # Reuse access token for the same resource owner within an application (disabled by default).
+  #
+  # This option protects your application from creating new tokens before old valid one becomes
+  # expired so your database doesn't bloat. Keep in mind that when this option is `on` Doorkeeper
+  # doesn't updates existing token expiration time, it will create a new token instead.
+  # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383
+  #
+  # You can not enable this option together with +hash_token_secrets+.
+
+  reuse_access_token
+
+  # In case you enabled `reuse_access_token` option Doorkeeper will try to find matching
+  # token using `matching_token_for` Access Token API that searches for valid records
+  # in batches in order not to pollute the memory with all the database records. By default
+  # Doorkeeper uses batch size of 10 000 records. You can increase or decrease this value
+  # depending on your needs and server capabilities.
+  #
+  # token_lookup_batch_size 10_000
+
+  # Set a limit for token_reuse if using reuse_access_token option
+  #
+  # This option limits token_reusability to some extent.
+  # If not set then access_token will be reused unless it expires.
+  # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/1189
+  #
+  # This option should be a percentage(i.e. (0,100])
+  #
+  # token_reuse_limit 100
+
+  # Only allow one valid access token obtained via client credentials
+  # per client. If a new access token is obtained before the old one
+  # expired, the old one gets revoked (disabled by default)
+  #
+  # When enabling this option, make sure that you do not expect multiple processes
+  # using the same credentials at the same time (e.g. web servers spanning
+  # multiple machines and/or processes).
+  #
+  # revoke_previous_client_credentials_token
+
+  # Hash access and refresh tokens before persisting them.
+  # This will disable the possibility to use +reuse_access_token+
+  # since plain values can no longer be retrieved.
+  #
+  # Note: If you are already a user of doorkeeper and have existing tokens
+  # in your installation, they will be invalid without adding 'fallback: :plain'.
+  #
+  # hash_token_secrets
+  # By default, token secrets will be hashed using the
+  # +Doorkeeper::Hashing::SHA256+ strategy.
+  #
+  # If you wish to use another hashing implementation, you can override
+  # this strategy as follows:
+
+  hash_token_secrets :using => "::Doorkeeper::SecretStoring::Plain",
+                     :fallback => "::Doorkeeper::SecretStoring::Sha256Hash"
+
+  # Keep in mind that changing the hashing function will invalidate all existing
+  # secrets, if there are any.
+
+  # Hash application secrets before persisting them.
+
+  hash_application_secrets
+
+  # By default, applications will be hashed
+  # with the +Doorkeeper::SecretStoring::SHA256+ strategy.
+  #
+  # If you wish to use bcrypt for application secret hashing, uncomment
+  # this line instead:
+  #
+  # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt'
+
+  # When the above option is enabled, and a hashed token or secret is not found,
+  # you can allow to fall back to another strategy. For users upgrading
+  # doorkeeper and wishing to enable hashing, you will probably want to enable
+  # the fallback to plain tokens.
+  #
+  # This will ensure that old access tokens and secrets
+  # will remain valid even if the hashing above is enabled.
+  #
+  # This can be done by adding 'fallback: plain', e.g. :
+  #
+  # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt', fallback: :plain
+
+  # Issue access tokens with refresh token (disabled by default), you may also
+  # pass a block which accepts `context` to customize when to give a refresh
+  # token or not. Similar to +custom_access_token_expires_in+, `context` has
+  # the following properties:
+  #
+  # `client` - the OAuth client application (see Doorkeeper::OAuth::Client)
+  # `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
+  # `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
+  #
+  # use_refresh_token
+
+  # Provide support for an owner to be assigned to each registered application (disabled by default)
+  # Optional parameter confirmation: true (default: false) if you want to enforce ownership of
+  # a registered application
+  # NOTE: you must also run the rails g doorkeeper:application_owner generator
+  # to provide the necessary support
+
+  enable_application_owner :confirmation => true
+
+  # Define access token scopes for your provider
+  # For more information go to
+  # https://doorkeeper.gitbook.io/guides/ruby-on-rails/scopes
+
+  # default_scopes  :public
+  optional_scopes(*Oauth::SCOPES, *Oauth::PRIVILEGED_SCOPES)
+
+  # Allows to restrict only certain scopes for grant_type.
+  # By default, all the scopes will be available for all the grant types.
+  #
+  # Keys to this hash should be the name of grant_type and
+  # values should be the array of scopes for that grant type.
+  # Note: scopes should be from configured_scopes (i.e. default or optional)
+  #
+  # scopes_by_grant_type password: [:write], client_credentials: [:update]
+
+  # Forbids creating/updating applications with arbitrary scopes that are
+  # not in configuration, i.e. +default_scopes+ or +optional_scopes+.
+  # (disabled by default)
+
+  enforce_configured_scopes
+
+  # Change the way client credentials are retrieved from the request object.
+  # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
+  # falls back to the `:client_id` and `:client_secret` params from the `params` object.
+  # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated
+  # for more information on customization
+  #
+  # client_credentials :from_basic, :from_params
+
+  # Change the way access token is authenticated from the request object.
+  # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
+  # falls back to the `:access_token` or `:bearer_token` params from the `params` object.
+  # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated
+  # for more information on customization
+
+  access_token_methods :from_bearer_authorization
+
+  # Forces the usage of the HTTPS protocol in non-native redirect uris (enabled
+  # by default in non-development environments). OAuth2 delegates security in
+  # communication to the HTTPS protocol so it is wise to keep this enabled.
+  #
+  # Callable objects such as proc, lambda, block or any object that responds to
+  # #call can be used in order to allow conditional checks (to allow non-SSL
+  # redirects to localhost for example).
+
+  force_ssl_in_redirect_uri do |uri|
+    !Rails.env.development? && uri.host != "127.0.0.1"
+  end
+
+  # Specify what redirect URI's you want to block during Application creation.
+  # Any redirect URI is whitelisted by default.
+  #
+  # You can use this option in order to forbid URI's with 'javascript' scheme
+  # for example.
+  #
+  # forbid_redirect_uri { |uri| uri.scheme.to_s.downcase == 'javascript' }
+
+  # Allows to set blank redirect URIs for Applications in case Doorkeeper configured
+  # to use URI-less OAuth grant flows like Client Credentials or Resource Owner
+  # Password Credentials. The option is on by default and checks configured grant
+  # types, but you **need** to manually drop `NOT NULL` constraint from `redirect_uri`
+  # column for `oauth_applications` database table.
+  #
+  # You can completely disable this feature with:
+  #
+  # allow_blank_redirect_uri false
+  #
+  # Or you can define your custom check:
+  #
+  # allow_blank_redirect_uri do |grant_flows, client|
+  #   client.superapp?
+  # end
+
+  # Specify how authorization errors should be handled.
+  # By default, doorkeeper renders json errors when access token
+  # is invalid, expired, revoked or has invalid scopes.
+  #
+  # If you want to render error response yourself (i.e. rescue exceptions),
+  # set +handle_auth_errors+ to `:raise` and rescue Doorkeeper::Errors::InvalidToken
+  # or following specific errors:
+  #
+  #   Doorkeeper::Errors::TokenForbidden, Doorkeeper::Errors::TokenExpired,
+  #   Doorkeeper::Errors::TokenRevoked, Doorkeeper::Errors::TokenUnknown
+  #
+  # handle_auth_errors :raise
+
+  # Customize token introspection response.
+  # Allows to add your own fields to default one that are required by the OAuth spec
+  # for the introspection response. It could be `sub`, `aud` and so on.
+  # This configuration option can be a proc, lambda or any Ruby object responds
+  # to `.call` method and result of it's invocation must be a Hash.
+  #
+  # custom_introspection_response do |token, context|
+  #   {
+  #     "sub": "Z5O3upPC88QrAjx00dis",
+  #     "aud": "https://protected.example.net/resource",
+  #     "username": User.find(token.resource_owner_id).username
+  #   }
+  # end
+  #
+  # or
+  #
+  # custom_introspection_response CustomIntrospectionResponder
+
+  # Specify what grant flows are enabled in array of Strings. The valid
+  # strings and the flows they enable are:
+  #
+  # "authorization_code" => Authorization Code Grant Flow
+  # "implicit"           => Implicit Grant Flow
+  # "password"           => Resource Owner Password Credentials Grant Flow
+  # "client_credentials" => Client Credentials Grant Flow
+  #
+  # If not specified, Doorkeeper enables authorization_code and
+  # client_credentials.
+  #
+  # implicit and password grant flows have risks that you should understand
+  # before enabling:
+  #   http://tools.ietf.org/html/rfc6819#section-4.4.2
+  #   http://tools.ietf.org/html/rfc6819#section-4.4.3
+
+  grant_flows %w[authorization_code]
+
+  # Allows to customize OAuth grant flows that +each+ application support.
+  # You can configure a custom block (or use a class respond to `#call`) that must
+  # return `true` in case Application instance supports requested OAuth grant flow
+  # during the authorization request to the server. This configuration +doesn't+
+  # set flows per application, it only allows to check if application supports
+  # specific grant flow.
+  #
+  # For example you can add an additional database column to `oauth_applications` table,
+  # say `t.array :grant_flows, default: []`, and store allowed grant flows that can
+  # be used with this application there. Then when authorization requested Doorkeeper
+  # will call this block to check if specific Application (passed with client_id and/or
+  # client_secret) is allowed to perform the request for the specific grant type
+  # (authorization, password, client_credentials, etc).
+  #
+  # Example of the block:
+  #
+  #   ->(flow, client) { client.grant_flows.include?(flow) }
+  #
+  # In case this option invocation result is `false`, Doorkeeper server returns
+  # :unauthorized_client error and stops the request.
+  #
+  # @param allow_grant_flow_for_client [Proc] Block or any object respond to #call
+  # @return [Boolean] `true` if allow or `false` if forbid the request
+  #
+  # allow_grant_flow_for_client do |grant_flow, client|
+  #   # `grant_flows` is an Array column with grant
+  #   # flows that application supports
+  #
+  #   client.grant_flows.include?(grant_flow)
+  # end
+
+  # If you need arbitrary Resource Owner-Client authorization you can enable this option
+  # and implement the check your need. Config option must respond to #call and return
+  # true in case resource owner authorized for the specific application or false in other
+  # cases.
+  #
+  # Be default all Resource Owners are authorized to any Client (application).
+  #
+  # authorize_resource_owner_for_client do |client, resource_owner|
+  #   resource_owner.admin? || client.owners_whitelist.include?(resource_owner)
+  # end
+
+  # Hook into the strategies' request & response life-cycle in case your
+  # application needs advanced customization or logging:
+  #
+  # before_successful_strategy_response do |request|
+  #   puts "BEFORE HOOK FIRED! #{request}"
+  # end
+  #
+  # after_successful_strategy_response do |request, response|
+  #   puts "AFTER HOOK FIRED! #{request}, #{response}"
+  # end
+
+  # Hook into Authorization flow in order to implement Single Sign Out
+  # or add any other functionality. Inside the block you have an access
+  # to `controller` (authorizations controller instance) and `context`
+  # (Doorkeeper::OAuth::Hooks::Context instance) which provides pre auth
+  # or auth objects with issued token based on hook type (before or after).
+  #
+  # before_successful_authorization do |controller, context|
+  #   Rails.logger.info(controller.request.params.inspect)
+  #
+  #   Rails.logger.info(context.pre_auth.inspect)
+  # end
+  #
+  # after_successful_authorization do |controller, context|
+  #   controller.session[:logout_urls] <<
+  #     Doorkeeper::Application
+  #       .find_by(controller.request.params.slice(:redirect_uri))
+  #       .logout_uri
+  #
+  #   Rails.logger.info(context.auth.inspect)
+  #   Rails.logger.info(context.issued_token)
+  # end
+
+  # Under some circumstances you might want to have applications auto-approved,
+  # so that the user skips the authorization step.
+  # For example if dealing with a trusted application.
+
+  skip_authorization do |_, client|
+    client.scopes.include?("skip_authorization")
+  end
+
+  # Configure custom constraints for the Token Introspection request.
+  # By default this configuration option allows to introspect a token by another
+  # token of the same application, OR to introspect the token that belongs to
+  # authorized client (from authenticated client) OR when token doesn't
+  # belong to any client (public token). Otherwise requester has no access to the
+  # introspection and it will return response as stated in the RFC.
+  #
+  # Block arguments:
+  #
+  # @param token [Doorkeeper::AccessToken]
+  #   token to be introspected
+  #
+  # @param authorized_client [Doorkeeper::Application]
+  #   authorized client (if request is authorized using Basic auth with
+  #   Client Credentials for example)
+  #
+  # @param authorized_token [Doorkeeper::AccessToken]
+  #   Bearer token used to authorize the request
+  #
+  # In case the block returns `nil` or `false` introspection responses with 401 status code
+  # when using authorized token to introspect, or you'll get 200 with { "active": false } body
+  # when using authorized client to introspect as stated in the
+  # RFC 7662 section 2.2. Introspection Response.
+  #
+  # Using with caution:
+  # Keep in mind that these three parameters pass to block can be nil as following case:
+  #  `authorized_client` is nil if and only if `authorized_token` is present, and vice versa.
+  #  `token` will be nil if and only if `authorized_token` is present.
+  # So remember to use `&` or check if it is present before calling method on
+  # them to make sure you doesn't get NoMethodError exception.
+  #
+  # You can define your custom check:
+  #
+  # allow_token_introspection do |token, authorized_client, authorized_token|
+  #   if authorized_token
+  #     # customize: require `introspection` scope
+  #     authorized_token.application == token&.application ||
+  #       authorized_token.scopes.include?("introspection")
+  #   elsif token.application
+  #     # `protected_resource` is a new database boolean column, for example
+  #     authorized_client == token.application || authorized_client.protected_resource?
+  #   else
+  #     # public token (when token.application is nil, token doesn't belong to any application)
+  #     true
+  #   end
+  # end
+  #
+  # Or you can completely disable any token introspection:
+  #
+  # allow_token_introspection false
+  #
+  # If you need to block the request at all, then configure your routes.rb or web-server
+  # like nginx to forbid the request.
+
+  # WWW-Authenticate Realm (default: "Doorkeeper").
+  #
+  # realm "Doorkeeper"
 end

config/initializers/piwik.rb

@@ -1,5 +0,0 @@
-require "yaml"
-
-if File.exist?(piwik_file = File.expand_path("../piwik.yml", __dir__))
-  PIWIK = YAML.load_file(piwik_file)
-end

config/initializers/secure_headers.rb

@@ -18,9 +18,9 @@ csp_policy = {
   :report_uri => []
 }
 
-csp_policy[:connect_src] << PIWIK["location"] if defined?(PIWIK)
+csp_policy[:connect_src] << Settings.matomo["location"] if defined?(Settings.matomo)
-csp_policy[:img_src] << PIWIK["location"] if defined?(PIWIK)
+csp_policy[:img_src] << Settings.matomo["location"] if defined?(Settings.matomo)
-csp_policy[:script_src] << PIWIK["location"] if defined?(PIWIK)
+csp_policy[:script_src] << Settings.matomo["location"] if defined?(Settings.matomo)
 
 csp_policy[:img_src] << Settings.avatar_storage_url if Settings.key?(:avatar_storage_url)
 csp_policy[:img_src] << Settings.trace_image_storage_url if Settings.key?(:trace_image_storage_url)

config/locales/be-Tarask.yml

@@ -30,6 +30,7 @@ be-Tarask:
         create: Рэгістрацыя
         update: Абнавіць
       doorkeeper_application:
+        create: Рэгістрацыя
         update: Абнавіць
       redaction:
         create: Стварыць рэдакцыю
@@ -104,6 +105,7 @@ be-Tarask:
         language: Мова
       doorkeeper/application:
         name: Назва
+        redirect_uri: URI перанакіраваньняў
         scopes: Дазволы
       friend:
         user: Удзельнік
@@ -544,7 +546,7 @@ be-Tarask:
           ferry_terminal: Паромная станцыя
           fire_station: Пажарны пастарунак
           fountain: Фантан
-          fuel: Запраўка
+          fuel: Заправачная станцыя
           grave_yard: Могілкі
           hospital: Шпіталь
           hunting_stand: Паляўнічая вежа
@@ -658,8 +660,8 @@ be-Tarask:
           brownfield: Прамысловая забруджаная глеба
           cemetery: Могілкі
           commercial: Камэрцыйная тэрыторыя
-          conservation: Запаведнік
+          conservation: Запаведная зона
-          construction: Будаўніцтва
+          construction: Будаўнічая зона
           farmland: Фэрма
           farmyard: Гаспадарчае падвор’е
           forest: Лес
@@ -812,7 +814,7 @@ be-Tarask:
           cosmetics: Касмэтычная крама
           department_store: Унівэрсальная крама
           discount: Крама тавараў са зьніжкамі
-          doityourself: Зрабі сам
+          doityourself: Крама „Зрабі сам“
           dry_cleaning: Хімчыстка
           electronics: Крама электронікі
           estate_agent: Агенцтва нерухомасьці
@@ -829,7 +831,7 @@ be-Tarask:
           grocery: Бакалея
           hairdresser: Цырульня
           hardware: Гаспадарчыя тавары
-          hifi: Крама аўдыё/відэё тэхнікі
+          hifi: Крама аўдыё/відэатэхнікі
           jewelry: Ювэлірная крама
           kiosk: Шапік
           laundry: Пральня
@@ -856,7 +858,7 @@ be-Tarask:
           artwork: Твор мастацтва
           attraction: Славутасьць
           bed_and_breakfast: Танная гасьцініца
-          cabin: Кабіна
+          cabin: Турыстычная хатка
           camp_site: Кемпінг
           caravan_site: Пляцоўка для трэйлераў
           chalet: Шале
@@ -969,6 +971,9 @@ be-Tarask:
       greeting: Вітаем,
       click_the_link: Калі гэта Вы, калі ласка, націсьніце на спасылку ніжэй, каб
         скінуць Ваш пароль.
+    changeset_comment_notification:
+      commented:
+        partial_changeset_without_comment: без камэнтароў
   confirmations:
     confirm:
       heading: Праверце электронную пошту!
@@ -1120,6 +1125,8 @@ be-Tarask:
       heading: Выйсьці з OpenStreetMap
       logout_button: Выйсьці
   site:
+    about:
+      open_data_title: Адкрытыя зьвесткі
     copyright:
       foreign:
         title: Пра гэты пераклад
@@ -1145,23 +1152,19 @@ be-Tarask:
           вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны <a href="https://opendatacommons.org/licenses/odbl/1.0/">тэкст
           ліцэнзіі</a> растлумачыць вам правы і адказнасьці.
         credit_title_html: Як спасылацца на OpenStreetMap
-        credit_1_html: |-
+        credit_1_html: 'Карыстаючыся зьвесткамі OpenStreetMap, вы павінны выканаць
-          Мы патрабуем, каб
+          дзьве ўмовы:'
-          Вы пазначалі &ldquo;&copy; удзельнікі OpenStreetMap&rdquo;.
+        credit_2_1_html: |-
-        credit_2_1_html: Мусіце таксама яўна пазначыць, што зьвесткі даступныя паводле
+          <ul>
-          ліцэнзіі Open Database, а калі карыстаецеся нашымі кавалкамі мапаў, што
+            <li>Згадаць OpenStreetMap, пазначыўшы нашую нататку пра аўтарскае права.</li>
-          картаграфія ліцэнзаваная паводле CC BY-SA. Гэта можна зрабіць, спаслаўшыся
+            <li>Выразна зазначыць, што зьвесткі даступныя пад ліцэнзіяй Open Database License.</li>
-          на <a href="https://www.openstreetmap.org/copyright">гэтую старонку правоў</a>.
+          </ul>
-          Калі вы распаўсюджваеце OSM у фармаце зьвестак, вы мусіце разьмяшчаць наўпроставую
+        credit_3_1_html: Для паведамленьня пра аўтарскія правы маем розныя патрабаваньні
-          спасылку на ліцэнзіі. Калі вы выкарыстоўваеце носьбіты, дзе выкарыстаньне
+          ў залежнасьці ад таго, як вы карыстаецеся нашымі зьвесткамі. Напрыклад,
-          спасылак немагчымае (напрыклад, друкаваныя працы), мы прапануем накіроўваць
+          калі вы стварылі праглядальную мапу, друкаваную мапу ці статычную выяву,
-          вашых чытачоў на www.openstreetmap.org (магчымае выкарыстаньне поўнага адрасу
+          будуць дзейнічаць розныя правілы. Дэтальнае апісаньне патрабаваньняў можна
-          &lsquo;OpenStreetMap&rsquo;), на opendatacommons.org і, пры неабходнасьці,
+          знайсьці на <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Кіраўніцтве
-          на www.creativecommons.org.
+          атрыбуцыямі</a>.
-        credit_3_1_html: Фрагмэнты мапы ў &ldquo;стандартным стылі&rdquo; на www.openstreetmap.org
-          - гэта прадукт OpenStreetMap Foundation з выкарыстаньнем дадзеных OpenStreetMap
-          згодна з Open Database ліцэнзіяй. Пры выкарыстанні гэтага стылю мапы патрабуецца
-          такая ж спасылка, як і для дадзеных Open Database.
         more_title_html: Даведацца болей
         more_1_html: Даведайцеся болей пра выкарыстаньне нашых зьвестак і пра спасыланьне
           на нас на <a href="https://osmfoundation.org/Licence">старонцы ліцэнзіі
@@ -1566,6 +1569,8 @@ be-Tarask:
         з-за \n  падазронай актыўнасьці.\n</p>\n<p>\n  Гэтае рашэньне можа быць хутка
         перагледжанае адміністратарам, ці\n  Вы можаце зьвязацца з %{webmaster}, калі
         жадаеце гэта абмеркаваць.\n</p>"
+    auth_failure:
+      invalid_credentials: Хібныя аўтэнтыфікацыйныя зьвесткі
   user_role:
     filter:
       not_a_role: Радок «%{role}» не зьяўляецца слушнай роляй.
@@ -1679,6 +1684,8 @@ be-Tarask:
       base:
         cycle_map: Роварная мапа
         transport_map: Транспартная мапа
+      layers:
+        data: Зьвесткі мапы
     site:
       edit_tooltip: Рэдагаваць мапу
       edit_disabled_tooltip: Павялічыць маштаб мапы для рэдагаваньня

config/locales/be.yml

@@ -37,6 +37,8 @@ be:
       client_application:
         create: Зарэгістравацца
         update: Абнавіць
+      doorkeeper_application:
+        update: Абнавіць
       redaction:
         create: Стварыць рэдакцыю
         update: Захаваць рэдакцыю
@@ -114,8 +116,8 @@ be:
         public: Агульны
         description: Апісанне
         gpx_file: 'Даслаць GPX-файл:'
-        visibility: 'Бачнасць:'
+        visibility: Бачнасць
-        tagstring: 'Тэгі:'
+        tagstring: Тэгі
       message:
         sender: Ад
         title: Тэма
@@ -127,14 +129,16 @@ be:
         details: Просьба прадставіць некаторыя падрабязнасці аб праблеме (абавязкова).
       user:
         email: Электронная пошта
-        new_email: 'Новы адрас электроннай пошты:'
+        new_email: Новы адрас электроннай пошты
         active: Актыўны
         display_name: Бачнае імя
         description: Апісанне
-        home_lat: 'Шырата:'
+        home_lat: Шырата
-        home_lon: 'Даўгата:'
+        home_lon: Даўгата
-        languages: Мовы
+        languages: Пераважныя мовы
+        preferred_editor: Пераважны рэдактар
         pass_crypt: Пароль
+        pass_crypt_confirmation: Пацвердзіце пароль
     help:
       trace:
         tagstring: падзеленыя коскамі
@@ -250,8 +254,8 @@ be:
     edit:
       title: Правіць рахунак
       my settings: Мае настройкі
-      current email address: 'Бягучы адрас электроннай пошты:'
+      current email address: Бягучы адрас электроннай пошты
-      external auth: 'Знешняя Аўтэнтыфікацыя:'
+      external auth: Знешняя Аўтэнтыфікацыя
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: што гэта?
@@ -411,7 +415,7 @@ be:
       reopened_by_html: Паўторна актывавана ўдзельнікам %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Пераадкрыта ананімным удзельнікам <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Схавана ўдзельнікам %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Паскардзіцца на гэтую заўвагу
+      report: паскардзіцца на гэтую заўвагу
     query:
       title: Пошук аб’ектаў
       introduction: Пстрыкніце на карце, каб атрымаць звесткі пра аб'екты паблізу.

config/locales/bg.yml

@@ -24,10 +24,10 @@ bg:
       friendly: '%e %B %Y в %H:%M'
   helpers:
     file:
-      prompt: Избери файл
+      prompt: Избиране на файл
     submit:
       diary_comment:
-        create: Съхраняване
+        create: Запазване
       diary_entry:
         create: Публикуване
         update: Обновяване
@@ -37,9 +37,10 @@ bg:
         create: Изпращане
       client_application:
         create: Регистриране
-        update: Обнови
+        update: Обновяване
       doorkeeper_application:
         create: Регистриране
+        update: Обновяване
       redaction:
         create: Създаване на поправка
         update: Запазване на поправка
@@ -90,8 +91,8 @@ bg:
       way_tag: Етикет на път
     attributes:
       client_application:
-        name: Име (Задължително)
+        name: Име (задължително)
-        url: Основно приложение URL(Задължително)
+        url: Адрес на основното приложение (задължително)
         allow_read_prefs: прочетете потребителските предпочитания
         allow_write_prefs: променете потребителските им предпочитания
         allow_write_diary: създай дневник на бележките, коментарите и новите приятелства
@@ -230,6 +231,12 @@ bg:
       entry:
         comment: Коментар
         full: Цялата бележка
+  account:
+    deletions:
+      show:
+        title: Изтриване на профила
+        delete_account: Изтриване на профила
+        cancel: Отказ
   accounts:
     edit:
       title: Промяна на профил
@@ -250,7 +257,7 @@ bg:
         heading: Условия за сътрудничество
         agreed: Приели сте новите условия за сътрудничество.
         not yet agreed: Все още не сте приели новите Условия за участие.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: Какво е това?
       save changes button: Съхраняване на промените
       make edits public button: Всички мои промени да са публично достъпни
@@ -374,7 +381,7 @@ bg:
       reopened_by_html: Повторно отворена от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Повторно отворена от анонимен <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Скрита от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Докладване на бележката
+      report: докладване на бележката
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Търсене на обекти
@@ -538,14 +545,14 @@ bg:
           t-bar: Седалков лифт
         aeroway:
           aerodrome: Летище
-          apron: Перон
+          apron: Самолетна писта
-          gate: Врата
+          gate: Врата на летище
           hangar: Хангар
           helipad: Вертолетна площадка
           runway: Писта
           taxilane: Таксилента
           taxiway: Път за рулиране
-          terminal: Терминал
+          terminal: Летищен терминал
         amenity:
           animal_shelter: Приют за животни
           arts_centre: Център на изкуствата
@@ -586,7 +593,7 @@ bg:
           ferry_terminal: Фериботен терминал
           fire_station: Пожарна станция
           fountain: Фонтан
-          fuel: Гориво
+          fuel: Бензиностанция
           gambling: Хазартни игри
           grave_yard: Гробище
           hospital: Болница
@@ -594,7 +601,7 @@ bg:
           ice_cream: Сладолед
           internet_cafe: Интернет Кафе
           kindergarten: Детска градина
-          language_school: Училище за езици
+          language_school: Езиково училище
           library: Библиотека
           loading_dock: Товарна рампа
           marketplace: Пазар
@@ -789,7 +796,7 @@ bg:
           cemetery: Гробище
           commercial: Търговска зона
           conservation: Резерват
-          construction: Строителство
+          construction: Строителен обект
           farmland: Обработваема земя
           farmyard: Стопански двор
           forest: Гора
@@ -994,7 +1001,7 @@ bg:
           curtain: Магазин за завеси
           deli: Деликатесен магазин
           department_store: Универсален магазин
-          doityourself: Направи сам
+          doityourself: Магазин направи сам
           dry_cleaning: Химическо чистене
           e-cigarette: Магазин е-цигари
           electronics: Магазин за електроника
@@ -1016,7 +1023,7 @@ bg:
           hairdresser: Фризьорски салон
           hardware: Железария
           health_food: Магазин Здравословна храна
-          hifi: Аудиосистеми
+          hifi: Аудиомагазин
           houseware: Домашни потреби
           ice_cream: Магазин за Сладолед
           jewelry: Бижутериен магазин
@@ -1058,7 +1065,7 @@ bg:
           apartment: Ваканционен апартамент
           artwork: Произведениe на изкуството
           attraction: Атракция
-          cabin: Кабина
+          cabin: Заслон
           camp_site: Лагер
           caravan_site: Къмпинг
           chalet: Бунгало
@@ -1764,7 +1771,7 @@ bg:
       public_traces_from: Публични следи от GPS от потребител %{user}
       tagged_with: с етикет %{tags}
       upload_trace: Качване на следи от GPS
-      my_traces: Моите следи от GPS
+      my_traces: Моите следи
     georss:
       title: OpenStreetMap GPS трасета
     description:
@@ -1833,7 +1840,7 @@ bg:
       heading: Условия
       heading_ct: Условия за сътрудничество
       consider_pd_why: какво е това?
-      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       continue: Продължаване
       declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       decline: Отхвърли

config/locales/bn.yml

@@ -300,6 +300,7 @@ bn:
         agreed: আপনি নতুন অবদানকারীর শর্তাবলীতে সম্মত।
         agreed_with_pd: আপনি ঘোষণা করেছেন যে আপনি আপনার সম্পাদনাগুলো পাবলিক ডোমেইনের
           অধীনে প্রকাশ করছেন।
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: এটি কী?
       save changes button: পরিবর্তন সংরক্ষণ
       make edits public button: সমস্ত সম্পাদনাগুলি উন্মুক্ত করুন
@@ -365,6 +366,9 @@ bn:
       nodes_count:
         one: ১টি নোড
         other: '%{count}টি নোড'
+      also_part_of_html:
+        one: পথের অংশ %{related_ways}
+        other: পথের অংশ %{related_ways}
     relation:
       title_html: 'সম্পর্ক: %{name}'
       history_title_html: 'সম্পর্ক ইতিহাস: %{name}'
@@ -420,7 +424,9 @@ bn:
         tag: '%{key}=%{value} ট্যাগ এর উইকি বর্ণনা পাতা'
       wikidata_link: উইকিউপাত্ত উপাদানে %{page}
       wikipedia_link: উইকিপিডিয়াতে %{page} প্রবন্ধ
+      wikimedia_commons_link: উইকিমিডিয়া কমন্সে %{page}-এর সামগ্রী
       telephone_link: '%{phone_number}-এ কল করুন'
+      colour_preview: রঙ %{colour_value} প্রাকদর্শন
     note:
       title: 'টীকা: %{id}'
       new_note: নতুন টীকা
@@ -492,15 +498,21 @@ bn:
     index:
       title_all: ওপেনস্ট্রিটম্যাপ পরিবর্তনধার্যের আলোচনা
       title_particular: 'ওপেনস্ট্রিটম্যাপ পরিবর্তনধার্য #%{changeset_id} আলোচনা'
+    timeout:
+      sorry: দুঃখিত, আপনার অনুরোধ করা চেঞ্জসেট মন্তব্যের তালিকা পুনরুদ্ধার করতে খুব
+        বেশি সময় লেগেছে।
   dashboards:
     contact:
       km away: '%{count}কিমি দূরে'
       m away: '%{count}মিটার দূরে'
     popup:
       your location: আপনার অবস্থান
+      nearby mapper: কাছাকাছি অবস্থানকারী ম্যাপার
       friend: বন্ধু
     show:
       title: আমার ড্যাশবোর্ড
+      no_home_location_html: '%{edit_profile_link} এবং কাছাকাছি ব্যবহারকারীদের দেখতে
+        আপনার বাড়ির অবস্থান নির্ধারণ করুন।'
       edit_your_profile: আপনার প্রোফাইল সম্পাদনা করুন
       my friends: আমার বন্ধুগণ
       no friends: আপনি বন্ধুতালিকায় কাউকে যুক্ত করেননি।
@@ -622,19 +634,29 @@ bn:
       prefix:
         aerialway:
           cable_car: ক্যাবল কার
+          chair_lift: চেয়ার লিফট
+          drag_lift: ড্রাগ লিফট
+          gondola: গন্ডোলা লিফট
+          magic_carpet: ম্যাজিক কার্পেট লিফট
+          platter: প্লেটার লিফট
           pylon: পাইলন
           station: বিমানপথ স্টেশন
+          t-bar: টি-বার লিফট
+          "yes": উড়ালপথ
         aeroway:
           aerodrome: বিমানশালা
+          airstrip: ধাবনপথ
           apron: বিমানবন্দর বর্হিবাস
           gate: বিমান বন্দরের প্রবেশপথ
           hangar: বিমান রাখার স্থান
           helipad: হেলিপ্যাড
+          holding_position: হোল্ডিং পজিশন
           parking_position: পার্কিং-এর স্থান
           runway: রানওয়ে
           taxilane: ট্যাক্সিমার্গ
           taxiway: ট্যাক্সিওয়ে
           terminal: বিমান টার্মিনাল
+          windsock: উইন্ডসক
         amenity:
           animal_shelter: পশুদের আশ্রয়স্থল
           arts_centre: শিল্পকলা কেন্দ্র
@@ -680,6 +702,7 @@ bn:
           fuel: প্রেট্রোল পাম্প
           gambling: জুয়াখেলার আড্ডা
           grave_yard: কবরস্থান
+          grit_bin: গ্রিট বিন
           hospital: হাসপাতাল
           hunting_stand: শিকারশালা
           ice_cream: আইসক্রিম
@@ -713,6 +736,7 @@ bn:
           ranger_station: রেঞ্জার স্টেশন
           recycling: পুনঃপ্রক্রিয়াকরণ স্থান
           restaurant: রেঁস্তোরা
+          sanitary_dump_station: মলমূত্রাদি খালাসস্থান
           school: বিদ্যালয়
           shelter: আশ্রয়
           shower: ঝরনা
@@ -743,6 +767,7 @@ bn:
           administrative: প্রশাসনিক সীমানা
           census: আদমশুমারি এলাকা
           national_park: জাতীয় উদ্যান
+          political: নির্বাচনী সীমানা
           protected_area: সুরক্ষিত এলাকা
           "yes": সীমানা
         bridge:
@@ -754,8 +779,10 @@ bn:
         building:
           apartment: অ্যাপার্টমেন্ট
           apartments: অ্যাপার্টমেন্ট
+          barn: শস্যাগার
           bungalow: বাংলো
           cabin: কেবিন
+          chapel: চ্যাপেল
           church: গির্জা বাড়ি
           civic: নাগরিক ভবন
           college: কলেজ ভবন
@@ -781,6 +808,7 @@ bn:
           office: অফিস ভবন
           public: সরকারি ভবন
           residential: আবাসিক ভবন
+          retail: খুচরা ভবন
           roof: ছাদ
           ruins: বিধ্বস্ত ভবন
           school: বিদ্যালয় ভবন
@@ -802,19 +830,24 @@ bn:
           blacksmith: কামার
           brewery: ভাটিখানা
           carpenter: ছুতোর
+          caterer: খাজিনদার
           confectionery: মিষ্টির দোকান
           dressmaker: দর্জি
           electrician: বিদ্যুৎ মিস্তিরি
           electronics_repair: বৈদ্যুতিক যন্ত্রপাতি মেরামত
           gardener: মালি
           handicraft: হস্তশিল্প
+          hvac: HVAC ক্রাফট
+          metal_construction: ধাতুসমাগ্রী নির্মাতা
           painter: চিত্রশিল্পী
           photographer: আলোকচিত্ৰকর
           plumber: নল মিস্তিরি
           sawmill: করাত কল
           shoemaker: মুচি
+          stonemason: পাথরের রাজমিস্ত্রি
           tailor: দর্জি
           window_construction: জানালা নির্মাণ
+          winery: ওয়াইনারি
           "yes": কারুকাজ দোকান
         emergency:
           access_point: প্রবেশ বিন্দু
@@ -823,6 +856,7 @@ bn:
           defibrillator: ডিফাইব্রিলেটর
           fire_extinguisher: অগ্নি নির্বাপক
           landing_site: জরুরি অবতরণ ক্ষেত্র
+          life_ring: জরুরি জীবন বৃত্ত
           phone: জরুরি ফোন
           siren: আপৎকালীন সাইরেন
           water_tank: জরুরি পানির ট্যাংক
@@ -832,12 +866,17 @@ bn:
           bus_guideway: নির্দেশিত বাস পথ
           bus_stop: বাস স্টপ
           construction: নির্মীয়মাণ মহাসড়ক
+          crossing: পারাপার
           cycleway: সাইকেল রাস্তা
           elevator: লিফট
           emergency_access_point: জরুরি প্রবেশ স্থল
+          emergency_bay: জরুরি বে
           footway: ফুটপাথ
+          ford: ফোর্ড
           milestone: মাইলফলক
           motorway: মোটরপথ
+          motorway_junction: মোটরওয়ে জংশন
+          motorway_link: মোটরওয়ে রোড
           path: পাথ
           pedestrian: পাদচারী পথ
           platform: প্লাটফর্ম
@@ -851,6 +890,7 @@ bn:
           secondary: অপ্রধান সড়ক
           secondary_link: অপ্রধান সড়ক
           service: পার্শ্ব সড়ক
+          services: মোটরওয়ে পরিষেবা
           speed_camera: গতিমাপক ক্যামেরা
           steps: ধাপ
           stop: থামার চিহ্ন
@@ -865,35 +905,45 @@ bn:
           "yes": সড়ক
         historic:
           archaeological_site: প্রত্নতাত্ত্বিক স্থান
+          bomb_crater: ঐতিহাসিক বোমার খাদ
           battlefield: যুদ্ধক্ষেত্র
           boundary_stone: সীমানাজ্ঞাপক পাথর
           building: ঐতিহাসিক ভবন
           bunker: আপদকালীন ভূগর্ভস্থ আশ্রয়স্থল
           cannon: ঐতিহাসিক কামান
           castle: কেল্লা
+          charcoal_pile: ঐতিহাসিক কাঠকয়লার স্তূপ
           church: গির্জা
           city_gate: নগর দ্বার
           citywalls: নগর প্রাচীর
           fort: দুর্গ
           heritage: ঐতিহ্য স্থান
+          hollow_way: ফাঁপা পথ
           house: বাড়ি
           manor: জমিদারি
           memorial: স্মারক
+          milestone: ঐতিহাসিক মাইলফলক
           mine: খনি
+          mine_shaft: খনি খাদ
           monument: স্মৃতিস্তম্ভ
+          railway: ঐতিহাসিক রেলওয়ে
           roman_road: রোমান সড়ক
           ruins: ধ্বংসাবশেষ
           stone: প্রস্তর
           tomb: সমাধি
           tower: মিনার
+          wayside_chapel: ওয়েসাইড চ্যাপেল
+          wayside_cross: ওয়েসাইড ক্রস
           wreck: ভগ্নাবশেষ
           "yes": ঐতিহাসিক স্থান
         junction:
           "yes": জংশন
         landuse:
+          allotments: বরাদ্দ
           basin: অববাহিকা
           cemetery: কবরস্থান
           commercial: বানিজ্যিক এলাকা
+          conservation: সংরক্ষণ এলাকা
           construction: নির্মাণাধীন এলাকা
           farmland: কৃষিজমি
           farmyard: গোলাবাড়ির উঠোন
@@ -914,11 +964,14 @@ bn:
           reservoir: জলাধার
           reservoir_watershed: জলাধারের বিভাগরেখা
           residential: আবাসিক এলাকা
-          retail: খুচরা
+          retail: খুচরা এলাকা
           village_green: হরিত গ্রাম
           vineyard: আঙুর খেত
           "yes": ব্যবহার্য ভূমি
         leisure:
+          adult_gaming_centre: প্রাপ্তবয়স্ক গেমিং কেন্দ্র
+          amusement_arcade: পরিতৃপ্তি তোরণ
+          bandstand: ব্যান্ডস্ট্যান্ড
           beach_resort: সৈকতীয় রিসোর্ট
           bird_hide: পক্ষীদর্শন স্থান
           common: সাধারণ ভূমি
@@ -1118,6 +1171,9 @@ bn:
           hardware: যন্ত্রাংশের দোকান
           hearing_aids: শ্রবণসহায়ক যন্ত্র
           hifi: হাই-ফাই
+          houseware: ঘরোয়া জিনিসের দোকান
+          ice_cream: আইসক্রিমের দোকান
+          interior_decoration: ভিতরের সজ্জা
           jewelry: গহনার দোকান
           kitchen: রান্নাঘরের দোকান
           laundry: ধোপার দোকান
@@ -1808,18 +1864,42 @@ bn:
       auth no password: তৃতীয় কোনো পদ্ধতিতে লগইন সক্রিয় থাকলে পাসওয়ার্ড বাধ্যতামূলক
         নয়, কিন্তু অতিরিক্ত কিছু সরঞ্জাম এবং সার্ভারের জন্য কখনো প্রয়োজন হতে পারে।
       continue: নিবন্ধন করুন
+      terms accepted: নতুন অবদানকারী শর্তাবলী গ্রহণ করার জন্য ধন্যবাদ!
     terms:
       title: শর্তাবলী
       heading: শর্তাবলী
+      heading_ct: অবদানকারী শর্তাবলী
+      read and accept with tou: অনুগ্রহ করে অবদানকারী চুক্তি এবং ব্যবহারের শর্তাবলী
+        পড়ুন, হয়ে গেলে উভয় চেকবক্সে টিক চিহ্ন দিন এবং তারপর চালিয়ে যান বোতাম টিপুন।
+      contributor_terms_explain: এই চুক্তিটি আপনার বিদ্যমান এবং ভবিষ্যতের অবদানের
+        শর্তাদি নিয়ন্ত্রণ করে।
+      read_ct: আমি উপরোক্ত অবদানকারীর শর্তাবলী পড়েছি এবং তাতে সম্মত
+      read_tou: আমি ব্যবহারের শর্তাবলী পড়েছি এবং সম্মত
+      consider_pd: উপরোক্ত ছাড়াও, আমি আমার অবদানগুলিকে পাবলিক ডোমেনে বলে মনে করি৷
       consider_pd_why: এটি কী?
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
+      guidance_html: 'এই শর্তগুলো বুঝতে সাহায্য করাবে এমন কিছু তথ্য: এটি একটি <a href="%{summary}">মানুষের
+        পাঠযোগ্য সারাংশ</a> এবং কিছু <a href="%{translations}">অনানুষ্ঠানিক অনুবাদ</a>'
       continue: অব্যাহত রাখুন
+      declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       decline: প্রত্যাখ্যান করুন
+      you need to accept or decline: অনুগ্রহ করে পড়ুন এবং তারপরে চালিয়ে যেতে নতুন
+        অবদানকারীর শর্তাবলী স্বীকার করুন বা প্রত্যাখ্যান করুন।
       legale_select: 'আপনার দেশ বাছাই করুন:'
       legale_names:
         france: ফ্রান্স
         italy: ইতালি
         rest_of_world: অন্যান্য দেশসমূহ
+    terms_declined_flash:
+      terms_declined_html: আমরা দুঃখিত যে আপনি নতুন অবদানকারী শর্তাবলী গ্রহণ না করার
+        সিদ্ধান্ত নিয়েছেন। আরও তথ্যের জন্য, অনুগ্রহ করে %{terms_declined_link} দেখুন।
+      terms_declined_link: এই উইকি পাতা
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     no_such_user:
+      title: এরকম কোন ব্যবহারকারী নেই
+      heading: ব্যবহারকারী %{user} বিদ্যমান নয়
+      body: দুঃখিত, %{user} নামের কোন ব্যবহারকারী নেই। অনুগ্রহ করে আপনার বানান পরীক্ষা
+        করুন, অথবা হয়ত আপনি যে সংযোগটিতে টোকা দিয়েছেন সেটি ভুল।
       deleted: অপসারিত
     show:
       my diary: আমার দিনলিপি
@@ -1831,18 +1911,30 @@ bn:
       my settings: আমার সেটিংস
       my comments: আমার মন্তব্যসমূহ
       my_preferences: আমার পছন্দ
+      edit_profile: পরিলেখ সম্পাদনা করুন
       send message: বার্তা পাঠান
       diary: দিনলিপি
       edits: সম্পাদনাসমূহ
       remove as friend: বন্ধু থেকে বাদ দিন
       add as friend: বন্ধু যোগ করুন
       mapper since: 'এ থেকে মানচিত্র বানাচ্ছেন:'
+      ct status: 'অবদানকারী শর্তাবলী:'
       ct undecided: সিদ্ধান্তহীন
       ct declined: বাতিলকৃত
       latest edit: 'সর্বশেষ সম্পাদনা করেন (%{ago}):'
       email address: 'ই-মেইল ঠিকানা:'
+      status: 'অবস্থা:'
       description: বিবরণ
       user location: ব্যবহারকারীর অবস্থান
+      role:
+        administrator: এই ব্যবহারকারী একজন প্রশাসক
+        moderator: এই ব্যবহারকারী একজন মডারেটর
+        grant:
+          administrator: প্রশাসক প্রবেশাধিকার মঞ্জুর করুন
+          moderator: মডারেটর প্রবেশাধিকার মঞ্জুর করুন
+        revoke:
+          administrator: প্রশাসকের প্রবেশাধিকার প্রত্যাহার করুন
+          moderator: মডারেটর প্রবেশাধিকার প্রত্যাহার করুন
       block_history: সক্রিয় বাধাসমূহ
       moderator_history: প্রদত্ত বাধাগুলি
       comments: মন্তব্যসমূহ
@@ -1854,6 +1946,9 @@ bn:
       unhide_user: এই ব্যবহাকারীকে দেখান
       delete_user: এই ব্যবহাকারীকে অপসারণ করুন
       confirm: নিশ্চিত করুন
+      report: এই ব্যবহারকারীকে প্রতিবেদন করুন
+    set_home:
+      flash success: বাড়ির অবস্থান সফলভাবে সংরক্ষণ করা হয়েছে৷
     go_public:
       flash success: আপনার সকল সম্পাদনা এখন উন্মুক্ত, এবং এখন আপনার সম্পাদনের অনুমতি
         রয়েছে।
@@ -1861,7 +1956,29 @@ bn:
       title: ব্যবহারকারীগণ
       heading: ব্যবহারকারীগণ
       summary_html: '%{ip_address} থেকে %{date} তারিখে %{name} তৈরি করেছেন'
+      summary_no_ip_html: '%{date}-এ %{name} তৈরি হয়েছে'
+      confirm: নির্বাচিত ব্যবহারকারীদের নিশ্চিত করুন
+      hide: নির্বাচিত ব্যবহারকারীদের লুকান
+      empty: কোন সাদৃশ্যপূর্ণ ব্যবহারকারী পাওয়া যায়নি
+    suspended:
+      title: অ্যাকাউন্ট স্থগিত করা হয়েছে
+      heading: অ্যাকাউন্ট স্থগিত করা হয়েছে
+      support: সহায়তা
+      body_html: "<p>\n  দুঃখিত, সন্দেহজনক কার্যকলাপের কারণে \n  আপনার অ্যাকাউন্ট
+        স্বয়ংক্রিয়ভাবে স্থগিত হয়েছে।\n</p>\n<p>\n  এই সিদ্ধান্ত শীঘ্রই একজন প্রশাসক
+        কর্তৃক পর্যালোচনা করা হবে, অথবা\n  আপনি যদি এই বিষয়ে আলোচনা করতে চান তাহলে
+        \ %{webmaster}-এর সাথে যোগাযোগ করতে পারেন।\n</p>"
+    auth_failure:
+      connection_failed: প্রমাণীকরণ প্রদানকারীর সাথে সংযোগ ব্যর্থ হয়েছে৷
+      invalid_credentials: অবৈধ প্রমাণীকরণ শংসাপত্র
+      no_authorization_code: কোনও অনুমোদন কোড নেই
+      unknown_signature_algorithm: অজানা স্বাক্ষর অ্যালগরিদম
+      invalid_scope: অবৈধ সুযোগ
+      unknown_error: প্রমাণীকরণ ব্যর্থ হয়েছে
     auth_association:
+      heading: আপনার আইডি এখনও কোনও ওপেনস্ট্রিটম্যাপ অ্যাকাউন্টের সাথে যুক্ত নয়।
+      option_1: আপনি যদি ওপেনস্ট্রিটম্যাপে নতুন হন, তাহলে অনুগ্রহ করে নিচের ফর্মটি
+        ব্যবহার করে একটি নতুন অ্যাকাউন্ট তৈরি করুন!
       option_2: আপনি যদি পূর্বে নিবন্ধন করে থাকেন, তবে অনুগ্রহ করে ব্যবহারকারী নাম
         এবং পাসওয়ার্ড ব্যবহার করে লগইন করুন এবং সেটিংস থেকে আপনার অ্যাকাউন্ট আইডি
         যুক্ত করুন।
@@ -1870,6 +1987,8 @@ bn:
       not_a_role: উক্ত `%{role}' টি কোন সঠিক দায়িত্ব নয়।
       already_has_role: এই ব্যবহারকারী %{role} দায়িত্বটি এখনো আছে।
       doesnt_have_role: এই ব্যবহারকারীর %{role} দায়িত্বটি নেই।
+      not_revoke_admin_current_user: বর্তমান ব্যবহারকারীর থেকে প্রশাসকের ভূমিকা প্রত্যাহার
+        করা যাবে না৷
     grant:
       title: দায়িত্ব প্রদানকরণ নিশ্চিত করুন
       heading: দায়িত্ব প্রদানকরণ নিশ্চিত করুন
@@ -1886,11 +2005,21 @@ bn:
       fail: '`%{name}'' ব্যবহারকারীর `%{role}'' দায়িত্বটি বাতিল অযোগ্য। দয়া করে
         দেখুন যে এই ব্যবহারকারী এবং দায়িত্বটি সঠিক কিনা।'
   user_blocks:
+    model:
+      non_moderator_revoke: একটি ব্লক প্রত্যাহার করতে অবশ্যই একজন মডারেটর হতে হবে।
+    not_found:
+      sorry: দুঃখিত, ID %{id} সহ ব্যবহারকারী ব্লক খুঁজে পাওয়া যায়নি।
+      back: সূচকে ফিরে যান
+    revoke:
+      revoke: প্রত্যাহার!
+      flash: এই অবরোধ প্রত্যাহার করা হয়েছে।
     show:
-      created: তৈরি হয়েছে
+      created: 'তৈরি হয়েছে:'
-      status: স্থিতি
+      duration: 'স্থিতিকাল:'
+      status: 'স্থিতি:'
       show: দেখাও
       edit: সম্পাদনা
+      revoke: প্রত্যাহার!
       confirm: আপনি কি নিশ্চিত?
     block:
       edit: সম্পাদনা
@@ -1910,6 +2039,7 @@ bn:
     map:
       layers:
         data: মানচিত্র উপাত্ত
+      terms: <a href='%{terms_url}' target='_blank'>ওয়েবসাইট ও এপিআই শর্তাবলী</a>
     site:
       edit_tooltip: মানচিত্রটি সম্পাদনা করুন
     changesets:
@@ -1923,6 +2053,9 @@ bn:
         resolve: মিমাংসা করুন
         reactivate: পুনঃসক্রিয়
         comment: মন্তব্য
+        report_link_html: যদি এই নোটটিতে সংবেদনশীল তথ্য থাকে যা অপসারণ করা উচিত, তাহলে
+          %{link}। নোটের সাথে অন্যান্য সমস্ত সমস্যার জন্য, দয়া করে একটি মন্তব্যের
+          মাধ্যমে এটি নিজেই সমাধান করুন৷
     directions:
       engines:
         graphhopper_car: গাড়ি (GraphHopper)

config/locales/br.yml

@@ -7,6 +7,7 @@
 # Author: Fulup
 # Author: Gwendal
 # Author: Gwenn-Ael
+# Author: Huñvreüs
 # Author: Iriep
 # Author: Macofe
 # Author: McDutchie
@@ -166,11 +167,11 @@ br:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: war-dro un eurvezh 'zo
+        one: war-dro un eurvezh zo
-        two: war-dro 2 eurvezh 'zo
+        two: war-dro 2 eurvezh zo
-        few: war-dro %{count} eurvezh 'zo
+        few: war-dro %{count} eurvezh zo
-        many: war-dro %{count} eurvezh 'zo
+        many: war-dro %{count} eurvezh zo
-        other: war-dro %{count} eurvezh 'zo
+        other: war-dro %{count} eurvezh zo
       about_x_months:
         one: war-dro ur miz 'zo.
         two: war-dro 2 viz 'zo.
@@ -281,6 +282,13 @@ br:
       entry:
         comment: Evezhiadenn
         full: Notenn glok
+  account:
+    deletions:
+      show:
+        title: Dilemel ma c'hont
+        delete_account: Dilemel ar gont
+        confirm_delete: Sur oc'h?
+        cancel: Nullañ
   accounts:
     edit:
       title: Aozañ ar gont
@@ -316,14 +324,17 @@ br:
         review link text: Heuilhit al liamm-mañ evel ma karot evit sellet ouzh diferadennoù
           nevez ar c'henlabourer hag asantiñ dezho.
         agreed_with_pd: Disklêriet hoc'h eus ivez emañ ho tegasadennoù en domani foran.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: Petra eo se ?
       save changes button: Enrollañ ar c'hemmoù
       make edits public button: Lakaat ma holl aozadennoù da vezañ foran
+      delete_account: Dilemel ar gont...
     update:
       success_confirm_needed: Hizivaet eo bet titouroù an implijer. Gwiriit ho posteloù
         evit kadarnaat ho chomlec'h postel nevez.
       success: Hizivaet eo bet titouroù an implijer.
+    destroy:
+      success: Kont dilamet.
   browse:
     created: Krouet
     closed: Serret
@@ -458,7 +469,7 @@ br:
       reopened_by_anonymous_html: Adenaouet gant un den dizanv <abbr title='%{exact_time}'>%{when}
         'zo</abbr>
       hidden_by_html: Kuzhet gant %{user} <abbr title='%{exact_time}'>%{when} 'zo</abbr>
-      report: Signaliñ an notenn-mañ
+      report: danevelliñ an notenn-mañ
     query:
       title: Arc'hweladurioù enklask
       introduction: Klikit war ar gartenn evit kavout arc'hweladurioù e-kichen.
@@ -640,8 +651,8 @@ br:
         aeroway:
           aerodrome: Nijva
           airstrip: Leurenn bradañ
-          apron: ↓Parklec'h nijerezioù
+          apron: Roudenn Aerborzh
-          gate: Dor
+          gate: Dor Lestrañ
           hangar: Karrdi
           helipad: biñsporzh
           holding_position: Post gortoz
@@ -649,7 +660,7 @@ br:
           runway: Hent
           taxilane: Forzh taksi
           taxiway: Hent-taksioù aerborzh
-          terminal: Terminal
+          terminal: Termenva Aerborzh
         amenity:
           animal_shelter: Lec'h-goudor evit al loened
           arts_centre: Kreizenn an arzoù
@@ -690,7 +701,7 @@ br:
           fire_station: Kazarn pomperien
           food_court: ↓Predva
           fountain: Feunteun
-          fuel: Dour-tan
+          fuel: Porzh Servij
           gambling: C'hoari arc'hant
           grave_yard: Bered
           grit_bin: Bailh holen
@@ -699,7 +710,7 @@ br:
           ice_cream: Dienn skorn
           internet_cafe: Sibertavarn
           kindergarten: Liorzh ar vugale
-          language_school: Skol yezh
+          language_school: Skol Yezh
           library: Levraoueg
           love_hotel: Leti karantez
           marketplace: Marc'hallac'h
@@ -805,7 +816,7 @@ br:
           warehouse: Sanailh
           "yes": Savadur
         club:
-          sport: Klub sport
+          sport: Kleub sport
           "yes": Klub
         craft:
           beekeeper: Gwenaner
@@ -933,7 +944,7 @@ br:
           cemetery: Bered
           commercial: Takad kenwerzh
           conservation: Takad gwarezet
-          construction: Savadur
+          construction: Takad Savidigezh
           farmland: Douaroù-labour
           farmyard: Mereuri
           forest: Koadeg
@@ -954,7 +965,7 @@ br:
           reservoir: Mirlenn
           reservoir_watershed: ↓Mirlec'h dour
           residential: Takad annez
-          retail: Kenwerzhioù
+          retail: Takad Kenwerzh
           village_green: Takad natur foran
           vineyard: Gwinieg
           "yes": Implij an douaroù
@@ -1170,6 +1181,7 @@ br:
           platform: Savenn hent-houarn
           preserved: Hent-houarn miret
           proposed: Hent-houarn kinniget
+          rail: Hent-Houarn
           spur: Hent-houarn kevreañ
           station: Porzh-houarn
           stop: Porzh-houarn
@@ -1218,7 +1230,7 @@ br:
           deli: Tineller
           department_store: Gourstal
           discount: Stal discount
-          doityourself: Stal bitellat
+          doityourself: Stal Bitellat
           dry_cleaning: Naetaat ent sec'h
           e-cigarette: Stal sigaretennoù tredanek
           electronics: Stal traoù eletronek
@@ -1255,7 +1267,7 @@ br:
           locksmith: alc'hwezer
           lottery: Lotiri
           mall: Palier kenwerzh
-          massage: Kemenadenn
+          massage: Kemennadenn
           medical_supply: Stal dafar yec'hed
           mobile_phone: Stal pellgomzerioù hezoug
           money_lender: Amprestañ arc'hant
@@ -1304,7 +1316,7 @@ br:
           artwork: Oberenn arz
           attraction: Tra zedennus
           bed_and_breakfast: Bod ha boued
-          cabin: Kabanenn
+          cabin: Kabanenn an Douristed
           camp_pitch: Tachenn-gampiñ
           camp_site: Tachenn gampiñ
           caravan_site: Tachenn karavanennoù
@@ -1352,7 +1364,7 @@ br:
         level6: Bevenn ar gontelezh
         level7: Bevenn kêr
         level8: Bevenn kêr
-        level9: Bevenn ar gêriadenn
+        level9: Bevenn ar gumun
         level10: Bevenn ar bannlev
         level11: Harzoù amezegezh
       types:
@@ -1775,6 +1787,7 @@ br:
         ?
     update:
       success: Profil hizivaet.
+      failure: N'haller ket hizivaat ar profil.
   sessions:
     new:
       title: Kevreañ
@@ -1797,8 +1810,8 @@ br:
         war al liamm er postel kadarnaat, mar plij, evit gweredekaat ho kont, pe <a
         href="%{reconfirm}">goulennit ur postel kadarnaat all</a> .
       account is suspended: Digarezit, arsavet eo bet ho kont abalamour d'un obererezh
-        arvarus.<br />Kit e darempred gant ar <a href="%{webmaster}">webmaster</a>
+        arvarus.<br />Kit e darempred gant ar <a href="%{webmaster}">support</a> m'hoc'h
-        m'hoc'h eus c'hoant da gaozeal diwar-benn an dra-se.
+        eus c'hoant da gaozeal diwar-benn an dra-se.
       auth failure: Ho tigarez, met n'eus ket bet gallet hoc'h anavezout gant an titouroù
         pourchaset.
       openid_logo_alt: Kevreañ gant un OpenID
@@ -2181,6 +2194,7 @@ br:
           common:
           - prad
           - prad
+          - liorzh
           retail: Takad kenwerzh
           industrial: Takad greantel
           commercial: Takad kenwerzhel
@@ -2340,6 +2354,7 @@ br:
       in: e-barzh
     index:
       public_traces: Roudoù GPS foran
+      my_gps_traces: Ma Roudoù GPS
       public_traces_from: Roudoù GPS foran gant %{user}
       description: Furchal ar roud GPS pellgarget nevez zo
       tagged_with: ' balizennet gant %{tags}'
@@ -2529,7 +2544,7 @@ br:
       consider_pd: Ouzhpenn an asant amañ a-us, ez anavezan emañ ma zegasadennoù en
         domani foran
       consider_pd_why: petra eo se ?
-      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       guidance_html: 'Titouroù da skoazellañ kompren an termenoù-mañ : a <a href="%{summary}">diverradenn
         lennus gant mab-den</a> hag un nebeud <a href="%{translations}">troidigezhioù
         anfurmel</a>'
@@ -2560,7 +2575,7 @@ br:
       my notes: ma notennoù
       my messages: Ma c'hemennadennoù
       my profile: Ma frofil
-      my settings: ma arventennoù
+      my settings: Ma arventennoù
       my comments: ma evezhiadennoù
       my_preferences: Ma fenndibaboù
       my_dashboard: Ma zaolenn-vourzh
@@ -2601,6 +2616,7 @@ br:
       activate_user: Gweredekaat an implijer-mañ
       deactivate_user: Diweredekaat an implijer-mañ
       confirm_user: Kadarnaat an implijer-mañ
+      unconfirm_user: Digadarnaat an implijer-mañ
       hide_user: Kuzhat an implijer-mañ
       unhide_user: Diguzhat an implijer-mañ
       delete_user: Dilemel an implijer-mañ
@@ -2639,6 +2655,7 @@ br:
       no_authorization_code: Kod aotre ebet
       unknown_signature_algorithm: Kod aotre dianav
       invalid_scope: Astenn dianav
+      unknown_error: Dilesadur sac'het
     auth_association:
       heading: N'eo ket kevredet ho ID ouzh ur gont OpenStreetMap.
       option_1: Ma'z oc'h un den nevez en OpenStreetMap, krouit ur gont nevez, mar

config/locales/cs.yml

@@ -17,6 +17,7 @@
 # Author: Jaroslav Cerny
 # Author: Jezevec
 # Author: Jkjk
+# Author: Kareyac
 # Author: Korytaacheck
 # Author: Kudlav
 # Author: Kuvaly
@@ -503,7 +504,7 @@ cs:
       reopened_by_anonymous_html: Znovu aktivoval <abbr title='%{exact_time}'>%{when}</abbr>
         anonym
       hidden_by_html: Skryl <abbr title='%{exact_time}'>%{when}</abbr> uživatel %{user}
-      report: Nahlásit tuto poznámku
+      report: nahlásit tuto poznámku
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Průzkum prvků

config/locales/da.yml

@@ -478,7 +478,7 @@ da:
       reopened_by_html: Genaktiveret af %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Genaktiveret af anonym <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Skjult af %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Rapporter denne bemærkning
+      report: rapportere denne bemærkning
     query:
       title: Find kortobjekter
       introduction: Klik på kortet for at finde kortobjekter i nærheden.
@@ -3049,6 +3049,9 @@ da:
         reactivate: Genaktiver
         comment_and_resolve: Kommentere på og løse
         comment: Kommenter
+        report_link_html: Hvis denne bemærkning indeholder følsomme oplysninger, der
+          skal fjernes, kan du %{link}. For alle andre problemer med bemærkningen,
+          bedes du løse det selv med en kommentar.
     edit_help: Flyt kortet og zoom ind på et sted, du vil redigere, og klik så her.
     directions:
       ascend: Stigning

config/locales/de.yml

@@ -90,6 +90,7 @@
 # Author: Unkn0wnCat
 # Author: Wolfdietmann
 # Author: Woodpeck
+# Author: Wuzzy
 # Author: Zauberzunge2000
 ---
 de:
@@ -539,7 +540,7 @@ de:
       reopened_by_html: Reaktiviert von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Reaktiviert von Anonym <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Versteckt von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Diesen Hinweis melden
+      report: diesen Hinweis melden
     query:
       title: Objektabfrage
       introduction: Klicke auf die Karte, um benachbarte Objekte zu finden.
@@ -2318,9 +2319,13 @@ de:
         description: Stelle eine Frage und diskutiere interessante Sachen zu einem
           weiten Bereich von thematischen oder regionalen Mailinglisten.
       forums:
-        title: Foren
+        title: Foren (veraltet)
         description: Fragen und Diskussionen für diejenigen, die eine Oberfläche in
           der Art einer Anschlagstafel bevorzugen.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Community-Forum
+        description: Ein gemeinsamer Ort für Gespräche über OpenStreetMap.
       irc:
         title: IRC
         description: Interaktiver Chat in vielen unterschiedlichen Sprachen und zu
@@ -3153,6 +3158,9 @@ de:
         reactivate: Reaktivieren
         comment_and_resolve: Kommentieren & Erledigen
         comment: Kommentieren
+        report_link_html: Wenn diese Notiz vertrauliche Informationen enthält, die
+          entfernt werden müssen, kannst du %{link}. Alle anderen Probleme mit der
+          Notiz löse bitte selbst mit einem Kommentar.
     edit_help: Wähle eine höhere Zoomstufe und verschiebe die Karte an einen Ort,
       den du bearbeiten möchtest, und klicke hier.
     directions:

config/locales/en-GB.yml

@@ -416,7 +416,6 @@ en-GB:
       reopened_by_html: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Report this note
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Query Features

config/locales/en.yml

@@ -421,7 +421,7 @@ en:
       reopened_by_html: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
       reopened_by_anonymous_html: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
       hidden_by_html: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      report: Report this note
+      report: report this note
       coordinates_html: "%{latitude}, %{longitude}"
     query:
       title: "Query Features"
@@ -1436,6 +1436,7 @@ en:
   issue_comments:
     create:
       comment_created: Your comment was successfully created
+      issue_reassigned: Your comment was created and the issue was reassigned
   reports:
     new:
       title_html: "Report %{link}"
@@ -2124,8 +2125,12 @@ en:
         description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
       forums:
         url: https://forum.openstreetmap.org/
-        title: Forums
+        title: Forums (Legacy)
         description: Questions and discussions for those that prefer a bulletin board style interface.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Community forum
+        description: A shared place for conversations about OpenStreetMap.
       irc:
         url: https://irc.openstreetmap.org/
         title: IRC
@@ -2883,6 +2888,7 @@ en:
         reactivate: Reactivate
         comment_and_resolve: Comment & Resolve
         comment: Comment
+        report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}. For all other problems with the note, please resolve it yourself with a comment."
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"

config/locales/eo.yml

@@ -467,7 +467,7 @@ eo:
       reopened_by_html: Remalfermita de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Remalfermita de anonimulo <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Kaŝita de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Raporti tiun ĉi rimarkon
+      report: raporti tiun ĉi rimarkon
       coordinates_html: '%{latitude}; %{longitude}'
     query:
       title: Informoj pri objektoj
@@ -1486,6 +1486,7 @@ eo:
   issue_comments:
     create:
       comment_created: Vi sukcese aldonis komenton
+      issue_reassigned: Vi aldonis komenton kaj la problemo estis reasignita
   reports:
     new:
       title_html: Raporti %{link}
@@ -2990,6 +2991,9 @@ eo:
         reactivate: Remalfermi
         comment_and_resolve: Komenti kaj solvi
         comment: Komenti
+        report_link_html: Se tiu ĉi rimarko enhavas privatajn informojn, kiuj ne devas
+          esti publikigitaj, vi povas %{link}. Koncerne al ĉiuj aliaj problemoj pri
+          la rimarko – solu ilin mem per skribi komenton.
     edit_help: Movu la mapon kaj pligrandigu al loko kiun vi volas redakti, kaj poste
       alklaku tie ĉi.
     directions:

config/locales/es.yml

@@ -7,6 +7,8 @@
 # Author: Aguslr
 # Author: Alberto Chung
 # Author: Anarhistička Maca
+# Author: Angoca
+# Author: AnupamM
 # Author: Armando-Martin
 # Author: BnSrSa
 # Author: Carlosmg.dg
@@ -16,6 +18,7 @@
 # Author: Danieldegroot2
 # Author: Danniel07
 # Author: DannyS712
+# Author: DarkGames26
 # Author: Dcapillae
 # Author: Destinid10 2
 # Author: Dgstranz
@@ -2292,9 +2295,13 @@ es:
         description: Haga una pregunta o discuta asuntos interesantes en una amplia
           gama de listas de correo regionales o temáticas.
       forums:
-        title: Foros
+        title: Foros (Legado)
         description: Preguntas y discusiones para aquellos que prefieren una interfaz
           del estilo cartelera de anuncios.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Foro de la Comunidad
+        description: Un lugar compartido para conversaciones sobre OpenStreetMap.
       irc:
         title: IRC
         description: Chat interactivo en muchos idiomas diferentes y sobre muchos
@@ -2532,15 +2539,15 @@ es:
     index:
       public_traces: Trazas GPS públicas
       public_traces_from: Trazas GPS públicas de %{user}
-      description: Explorar los itinerarios GPS recién subidos
+      description: Explorar las trazas GPS recién subidas
       tagged_with: etiquetado con %{tags}
       empty_html: Todavía no hay nada aquí. <a href='%{upload_link}'>Sube una nueva
         traza</a> o aprende más sobre trazas GPS en la <a href='https://wiki.openstreetmap.org/wiki/ES:Gu%C3%ADa_del_principiante_1.2'>página
         wiki</a>.
       upload_trace: Subir una traza
-      all_traces: Todos los trazos
+      all_traces: Todas las trazas
-      my_traces: Mis rastros
+      my_traces: Mis trazas
-      traces_from: Trazos Públicos de %{user}
+      traces_from: Trazas Públicos de %{user}
       remove_tag_filter: Eliminar Filtro de Etiquetas
     destroy:
       scheduled_for_deletion: Traza programada para eliminación
@@ -2612,8 +2619,8 @@ es:
       write_prefs: modificar sus preferencias de usuario.
       write_diary: Crea entradas diarias, comentarios y haz amigos
       write_api: modificar el mapa.
-      read_gpx: leer sus trazas de GPS privadas
+      read_gpx: Leer sus trazas de GPS privadas
-      write_gpx: subir trazas de GPS
+      write_gpx: Subir trazas de GPS
       write_notes: Modifica notas
       read_email: Leer dirección de correo electrónico del usuario
       skip_authorization: Auto aprobar aplicación

config/locales/et.yml

@@ -4,6 +4,7 @@
 # Author: AivoK
 # Author: Avjoska
 # Author: Kanne
+# Author: Kareyac
 # Author: Luckas
 # Author: Macofe
 # Author: MidnightRaver
@@ -424,7 +425,7 @@ et:
       reopened_by_html: Taasaktiveerinud %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Taasaktiveerinud anonüümne kasutaja <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Peitnud %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Teata sellest märkusest
+      report: sellest märkusest teada anda
     query:
       title: Info objektide kohta
       introduction: Klõpsa kaardil, et leida läheduses asuvad objektid.
@@ -702,6 +703,7 @@ et:
           university: Ülikoolihoone
           "yes": Hoone
         craft:
+          blacksmith: Sepp
           brewery: Pruulikoda
           carpenter: Puusepp
           electrician: Elektrik
@@ -722,11 +724,13 @@ et:
           bus_stop: Bussipeatus
           construction: Ehitusjärgus tee
           corridor: Koridor
+          crossing: Ülekäik
           cycleway: Jalgrattatee
           elevator: Elevaator
           emergency_access_point: Hädaabi punkt
           footway: Jalgrada
           ford: Koolmekoht
+          give_way: Märk "Anna teed"
           living_street: Õueala
           milestone: Verstapost
           motorway: Kiirtee
@@ -741,6 +745,7 @@ et:
           service: Teenindustee
           speed_camera: Kiiruskaamera
           steps: Trepp
+          stop: Stoppmärk
           street_lamp: Tänavavalgusti
           tertiary: Kohalik maantee
           traffic_signals: Valgusfoor
@@ -924,6 +929,7 @@ et:
           car_repair: Autoparandus
           carpet: Vaibakauplus
           charity: Heategevuslik kauplus
+          cheese: Juustupood
           chemist: Apteek
           clothes: Riidepood
           computer: Arvutikauplus
@@ -949,6 +955,7 @@ et:
           kiosk: Kiosk
           laundry: Pesumaja
           mall: Ostukeskus
+          massage: Massaaž
           mobile_phone: Mobiiltelefonide pood
           motorcycle: Mootorrattapood
           music: Muusikapood
@@ -1491,28 +1498,28 @@ et:
           Meie dokumentatsioon kuulub Creative Commonsi
           litsentsi "<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.et">Autorile viitamine + jagamine samadel tingimustel 2.0</a>" (CC BY-SA 2.0) alla.
         credit_title_html: OpenStreetMapile viitamine
-        credit_1_html: |-
+        credit_1_html: 'Seal, kus kasutad OpenStreetMapi andmeid, tuleb sul teha kaht
-          Nõuame, et kasutad omistamiseks teksti &ldquo;&copy; OpenStreetMapi
+          järgmist asja:'
-          kaastöölised&rdquo;.
         credit_2_1_html: |-
-          Samuti pead selgelt välja tooma, et andmed kuuluvad litsentsi Open
+          <ul>
-          Database License alla ja kui kasutatakse kaardipaane, siis et kujutised
+            <li>Viidata OpenStreetMapile, kuvades meie autoriõiguse teatist.</li>
-          kuuluvad litsentsi CC BY-SA alla. Üks võimalus selleks on linkida
+            <li>Näidata selgelt, et andmed on saadaval litsentsi Open Database License all.</li>
-          <a href="https://www.openstreetmap.org/copyright">siia autoriõiguse leheküljele</a>.
+          </ul>
-          Teine võimalus ja samas ka nõue, kui levitad OSM-i
-          andmete kujul, on nimetada litsentsid ja linkida otse neile. Esitusvormis,
-          kus lingid pole võimalikud (nt trükises), soovitame suunata lugejad
-          aadressidele openstreetmap.org (võimalik, et laiendades teksti
-          "OpenStreetMap" täisaadressiks), opendatacommons.org ja
-          kui vaja, siis ka aadressile creativecommons.org.
         credit_3_1_html: |-
-          Standardse kujundusega kaardipaanid asukohas www.openstreetmap.org on
+          Nõuded selle kohta, kuidas autoriõiguse teatist kuvada, sõltuvad sellest,
-          litsentsi Open Database License alla kuuluvatest andmetest loodud teos,
+          kuidas andmeid kasutad. Näiteks kohalduvad erinevad reeglid sõltuvalt
-          mille autor on OpenStreetMap Foundation. Kui kasutad neid kaardipaane,
+          sellest, kas oled teinud sirvitava kaardi, trükikaardi või staatilise pildi.
-          siis tuleb need autorile omistada samamoodi nagu kaardiandmed.
+          Kõik üksikasjad nõuete kohta leiad <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">omistamisjuhendist</a>.
         credit_4_html: |-
-          Sirvitaval elektroonilisel kaardil peaks viide olema näha kaardi nurgas.
+          Näitamaks selgelt, et andmed on saadaval litsentsi Open
-          Näiteks:
+          Database License all, võid linkida
+          <a href="https://www.openstreetmap.org/copyright">sellele autoriõiguse leheküljele</a>.
+          Teise võimalusena ning ka nõudena, kui levitad OSM-i andmete kujul,
+          saad nimetada litsentsi(d) ja linkida otse sellele. Meediumites,
+          kus see pole võimalik (nt trükiteostes), soovitame juhatada
+          lugejad aadressidele openstreetmap.org (võid näiteks asendada nime
+          "OpenStreetMap" selle täieliku aadressiga) ja opendatacommons.org.
+          Selles näites on viide autoritele kaardi nurgas.
         attribution_example:
           alt: Näide, kuidas tunnustada OpenStreetMapi veebilehel
           title: Omistamise näide
@@ -2335,6 +2342,7 @@ et:
       custom_dimensions: Vali suurus käsitsi
       format: 'Vorming:'
       scale: 'Mõõtkava:'
+      image_dimensions: Pildil näeb tavakaarti suurusega %{width} × %{height}
       download: Laadi alla
       short_url: Lühilink
       include_marker: Lisa marker
@@ -2402,6 +2410,9 @@ et:
         reactivate: Aktiveeri uuesti
         comment_and_resolve: Kommenteeri ja lahenda
         comment: Kommenteeri
+        report_link_html: Kui see märkus sisaldab tundlikku teavet, mis tuleks eemaldada,
+          saad %{link}. Kõigi märkusega seotud muude probleemide korral lahenda see
+          ise kommentaariga.
     edit_help: Nihuta kaarti ja suumi sisse asukohta mida soovid redigeerida ja seejärel
       kliki siia.
     directions:

config/locales/fa.yml

@@ -31,6 +31,7 @@
 # Author: Mohammad ebz
 # Author: Mojtabakd
 # Author: Movyn
+# Author: Mskf1383
 # Author: Nbi
 # Author: Omidh
 # Author: Pirehelokan
@@ -52,36 +53,36 @@ fa:
       friendly: '%e %B %Y ساعت %H:%M'
   helpers:
     file:
-      prompt: انتخاب فایل
+      prompt: انتخاب پرونده
     submit:
       diary_comment:
         create: ذخیره
       diary_entry:
         create: انتشار
-        update: روزآمدسازی
+        update: به‌روز رسانی
       issue_comment:
-        create: نظر دهید
+        create: افزودن نظر
       message:
         create: ارسال
       client_application:
-        create: ثبت نام
+        create: نام‌نویسی
-        update: روزآمدسازی
+        update: به‌روز رسانی
       doorkeeper_application:
-        create: ثبت‌نام
+        create: نام‌نویسی
-        update: روزآمدسازی
+        update: به‌روز رسانی
       redaction:
         create: ایجاد پاک‌سازی
-        update: ذخیره‌کردن پاک‌سازی
+        update: ذخیرهٔ پاک‌سازی
       trace:
         create: بارگذاری
-        update: ذخیره‌کردن تغییرات
+        update: ذخیرهٔ تغییرات
       user_block:
         create: ایجاد مسدودی
-        update: روزآمدسازی مسدودی
+        update: به‌روز رسانی مسدودی
   activerecord:
     errors:
       messages:
-        invalid_email_address: نشانی ایمیل نامعتبر به نظر می‌رسد
+        invalid_email_address: نشانی رایانامه نامعتبر به نظر می‌رسد
         email_address_not_routable: قابل مسیریابی نیست
     models:
       acl: فهرست کنترل دسترسی
@@ -122,7 +123,7 @@ fa:
     attributes:
       client_application:
         name: نام (الزامی)
-        url: نشانی اینترنتی برنامه اصلی (الزامی)
+        url: نشانی اینترنتی برنامهٔ اصلی (الزامی)
         callback_url: Callback URL
         support_url: URL پشتیبانی
         allow_read_prefs: ترجیحات کاربری او را بخواند
@@ -143,7 +144,7 @@ fa:
       doorkeeper/application:
         name: نام
         redirect_uri: URIهای تغییرمسیر
-        confidential: اپلیکیشن محرمانه؟
+        confidential: برنامهٔ محرمانه؟
         scopes: اجازه‌ها
       friend:
         user: کاربر
@@ -151,13 +152,13 @@ fa:
       trace:
         user: کاربر
         visible: نمایان
-        name: نام فایل
+        name: نام پرونده
         size: اندازه
         latitude: عرض جغرافیایی
         longitude: طول جغرافیایی
         public: عمومی
         description: توضیح
-        gpx_file: آپلود فایل GPX
+        gpx_file: بارگذاری پروندهٔ GPX
         visibility: پدیداری
         tagstring: برچسب‌ها
       message:
@@ -184,7 +185,7 @@ fa:
         home_lon: طول جغرافیایی
         languages: زبان‌های مورد ترجیح
         preferred_editor: ویرایش‌گر مورد ترجیح
-        pass_crypt: اسم رمز
+        pass_crypt: رمز عبور
         pass_crypt_confirmation: تأیید رمز عبور
     help:
       doorkeeper/application:
@@ -490,7 +491,7 @@ fa:
         دوباره آن را فعال کرد
       hidden_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} آن را مخفی
         کرد
-      report: گزارش این یادداشت
+      report: این یادداشت را گزارش کنید
     query:
       title: پرس‌وجوی عارضه‌ها
       introduction: روی نقشه کلیک کنید تا عارضه‌های نزدیک را بیابید
@@ -794,7 +795,7 @@ fa:
           village_hall: دهیاری
           waste_basket: سطل زباله
           waste_disposal: دفع زباله
-          waste_dump_site: سایت تخلیه زباله
+          waste_dump_site: پایگاه تخلیهٔ زباله
           watering_place: مکان آبیاری
           water_point: منطقه دارای آب
           "yes": تسهیلات
@@ -1130,6 +1131,7 @@ fa:
           stone: سنگ
           strait: تنگه
           tree: درخت
+          tree_row: ردیف درخت
           valley: دره
           volcano: آتشفشان
           water: اب
@@ -1260,7 +1262,7 @@ fa:
           greengrocer: سبزی فروش
           grocery: فروشگاه خواروبار
           hairdresser: سلمانی
-          hardware: فروشگاه سخت افزار
+          hardware: فروشگاه ابزار آلات
           herbalist: عطاری
           hifi: فروشگاه Hi-Fi
           houseware: فروشگاه لوازم خانگی
@@ -1314,7 +1316,7 @@ fa:
           artwork: آثار هنری
           attraction: جاذبه
           bed_and_breakfast: تخت‌خواب و صبحانه
-          cabin: کابین
+          cabin: اتاقک گردشگر
           camp_site: محل اردوگاه
           caravan_site: مکان خودرو کاروان
           chalet: کلبه ییلاقی
@@ -1347,7 +1349,7 @@ fa:
           mooring: مکان لنگر انداختن
           rapids: سریع السیر
           river: رود
-          stream: جوی آب
+          stream: نهر
           wadi: Wadi
           waterfall: ابشار
           weir: آب بند
@@ -1441,7 +1443,7 @@ fa:
       title_html: گزارش %{link}
       missing_params: ایجاد گزارش تازه ممکن نیست
       disclaimer:
-        intro: 'پیش از اینکه گزارش خود را برای مدیران سایت ارسال کنید، مطمئن شوید
+        intro: 'پیش از اینکه گزارش خود را برای مدیران وبگاه ارسال کنید، مطمئن شوید
           که:'
         not_just_mistake: قطعاً این مسئله سهوی نبوده
         unable_to_fix: به‌تنهایی یا با کمک نقشه‌کش‌های همکارتان نمی‌توانید مشکل را
@@ -1487,10 +1489,10 @@ fa:
     sign_up_tooltip: ساخت حساب کاربری برای ویرایش
     edit: ویرایش
     history: تاریخچه
-    export: برون‌برد
+    export: برون‌ریزی
     issues: مسئله‌ها
     data: داده
-    export_data: برون‌برد داده
+    export_data: برون‌ریزی داده
     gps_traces: ردهای GPS
     gps_traces_tooltip: مدیریت ردهای GPS
     user_diaries: روزنوشت‌های کاربر
@@ -1562,14 +1564,14 @@ fa:
         %{befriendurl} ‬'
     gpx_description:
       description_with_tags_html: |-
-        به‌نظر می‌رسد فایل GPX شما:
+        به‌نظر می‌رسد پروندهٔ GPX شما:
          %{trace_name}
         با این توصیف:
          %{trace_description}
         و برچسب‌های زیر:
         %{tags}
       description_with_no_tags_html: |-
-        به‌نظر می‌رسد فایل GPX شما:
+        به‌نظر می‌رسد پروندهٔ GPX شما:
          %{trace_name}
         با این توصیف:
          %{trace_description}
@@ -1941,7 +1943,7 @@ fa:
         حق‌نشر و پروانه</a> را ببینید.'
       legal_title: قانونی
       legal_1_html: |-
-        این سایت و خدمات فراوان دیگری که به آن وابسته‌اند به‌طور رسمی و به‌نمایندگی از جامعه تحت رهبری <a href='https://osmfoundation.org/'>بنیاد OpenStreetMap</a> ‏(OSMF) دایر است. استفاده از همهٔ خدماتی که تحت رهبری OSMF قرار دارد منوط به پذیرش <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+        این وبگاه و خدمات فراوان دیگری که به آن وابسته‌اند به‌طور رسمی و به نمایندگی از جامعه، تحت رهبری <a href='https://osmfoundation.org/'>بنیاد OpenStreetMap</a> ‏(OSMF) دایر است. استفاده از همهٔ خدماتی که تحت رهبری OSMF قرار دارد منوط به پذیرش <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
         سیاست استفادهٔ قابل‌قبول</a>، <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">شرایط استفاده</a> و <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">سیاست حریم خصوصی</a> ماست.
         <br>
         اگر در رابطه با پروانه، حق‌نشر یا سایر موارد قانونی سؤالی دارید لطفاً <a href='https://osmfoundation.org/Contact'>با OSMF تماس بگیرید</a>.
@@ -1981,19 +1983,13 @@ fa:
           مستندات ما تحت پروانهٔ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0) است.
         credit_title_html: چگونه از OpenStreetMap یاد کنیم
-        credit_1_html: |-
+        credit_1_html: 'جایی که دارید از داده‌های اوپن‌استریت‌مپ استفاده می‌کنید،
-          بایسته است که این‌گونه از ما یاد کنید:
+          لازم است دو کار زیر را انجام دهید:'
-          &ldquo;&copy;مشارکت‌کنندگان OpenStreetMap&rdquo;.
+        credit_2_1_html: |-
-        credit_2_1_html: همچنین باید روشن کنید که داده‌ها تحت پروانهٔ پایگاه‌دادهٔ
+          <ul>
-          باز (Open Database License) قرار دارند و اگر کاشی‌های نقشهٔ ما را استفاده
+            <li>ارائهٔ اعبار به اوپن‌استریت‌مپ با نمایش اطلاعیهٔ کپی‌رایت‌مان.</li>
-          کردید باید به‌روشنی بیان کنید که نقشه‌نگاری‌ها تحت پروانهٔ CC BY-SA است.
+            <li>مشخص کنید که داده‌ها تحت پروانهٔ آزاد پایگاه داده هستند.</li>
-          این کار را با پیونددادن به <a href="https://www.openstreetmap.org/copyright">
+          </ul>
-          این صفحهٔ حق‌نشر</a> انجام دهید. به‌عنوان جایگزین، می‌توانید با نام و پیوند
-          مستقیماً به پروانه(ها) ارجاع بدهید (اگر OSM را در قالب داده توزیع می‌کنید
-          انجام این کار ضروری است). در رسانه‌هایی که درج پیوند ممکن نیست ( مثلاً کارهای
-          چاپی)، توصیه می‌کنیم که خوانندگان خود را به  openstreetmap.org (شاید با
-          گسترش OpenStreetMap به این نشانی کامل)، به opendatacommons.org و در صورت
-          تناسب به creativecommons.org هدایت کنید.
         credit_3_1_html: کاشی‌های نقشه با «سبک استاندارد» در www.openstreetmap.org
           کار تولیدی (Produced Work) محسوب می‌شوند که بنیاد اوپن‌استریت‌مپ با استفاده
           از دادهٔ اوپن‌استریت‌مپ تحت پروانهٔ پایگاه‌دادهٔ باز (ODbL) ساخته‌است. هنگام
@@ -2101,10 +2097,10 @@ fa:
       no_iframe_support: مرورگر شما فریم‌های HTML را، که برای این ویژگی لازم است،
         پشتیبانی نمی‌کند.
     export:
-      title: برون‌برد
+      title: برون‌ریزی
-      area_to_export: محدوده برای برون‌برد
+      area_to_export: محدوده برای برون‌ریزی
       manually_select: به‌صورت دستی منطقهٔ دیگری انتخاب کنید
-      format_to_export: قالب برون‌برد
+      format_to_export: قالب برون‌ریزی
       osm_xml_data: OpenStreetMap XML Data
       map_image: تصویر نقشه (لایهٔ استاندارد را نشان می‌دهد)
       embeddable_html: HTML توکار
@@ -2112,9 +2108,9 @@ fa:
       export_details_html: دادهٔ OpenStreetMap تحت <a href="https://opendatacommons.org/licenses/odbl/1.0/">پروانهٔ
         دادهٔ همگانی باز، پایگاه‌دادهٔ باز</a> (ODbL) قرار دارد.
       too_large:
-        advice: 'اگر برون‌برد بالا انجام نشد، لطفاً یکی از منابع زیر را استفاده کنید:'
+        advice: 'اگر برون‌ریزی بالا انجام نشد، لطفاً یکی از منابع زیر را استفاده کنید:'
-        body: این محدوده برای برون‌برد در قالب OpenStreetMap XML خیلی بزرگ است. لطفاً
+        body: این محدوده برای برون‌ریزی در قالب OpenStreetMap XML خیلی بزرگ است. لطفاً
-          بزرگنمایی کنید یا منطقهٔ کوچکتری را انتخاب کنید، یا برای دریافت داده‌های
+          بزرگ‌نمایی کنید یا منطقهٔ کوچک‌تری را انتخاب کنید، یا برای دریافت داده‌های
           انبوه یکی از منابع فهرست زیر را استفاده کنید.
         planet:
           title: سیارهٔ OSM
@@ -2144,7 +2140,7 @@ fa:
       longitude: 'طول:'
       output: خروجی
       paste_html: برای استفادهٔ توکار در وب‌سایت، HTML بچسبانید
-      export_button: برون‌برد
+      export_button: برون‌ریزی
     fixthemap:
       title: گزارش مشکل / اصلاح نقشه
       how_to_help:
@@ -2180,7 +2176,7 @@ fa:
       help:
         url: https://help.openstreetmap.org/
         title: انجمن کمک
-        description: در سایت پرسش‌وپاسخ OSM سؤال بپرسید یا بین پاسخ‌ها بگردید.
+        description: در وبگاه پرسش‌وپاسخ OSM سؤال بپرسید یا بین پاسخ‌ها بگردید.
       mailing_lists:
         title: فهرست‌های پستی
         description: در فهرست‌های پستی متنوعِ موضوعی یا منطقه‌ای سوال بپرسید یا دربارهٔ
@@ -2354,9 +2350,9 @@ fa:
       help_url: https://wiki.openstreetmap.org/wiki/Fa:Upload
     create:
       upload_trace: بارگذاری رد جی‌پی‌اس
-      trace_uploaded: فایل GPX شما بارگذاری شده و در انتظار درج در پایگاه‌داده است.
+      trace_uploaded: پروندهٔ GPX شما بارگذاری شده و در انتظار درج در پایگاه داده
-        این کار معمولاً کمتر از نیم ساعت طول می‌کشد. هنگامی که انجام شد ایمیلی برای
+        است. این کار معمولاً کمتر از نیم ساعت طول می‌کشد. هنگامی که انجام شد رایانامه‌ای
-        شما فرستاده می‌شود.
+        برای شما فرستاده می‌شود.
       upload_failed: شوربختانه بارگذاری GPX انجام نشد. به یکی از مدیران دربارهٔ این
         خطا اطلاع‌رسانی شد. لطفاً دوباره تلاش کنید
       traces_waiting:
@@ -2378,7 +2374,7 @@ fa:
       title: در حال دیدن رد %{name}
       heading: در حال دیدن رد %{name}
       pending: در انتظار
-      filename: 'نام فایل:'
+      filename: 'نام پرونده:'
       download: بارگیری
       uploaded: 'تاریخ بارگذاری:'
       points: 'نقاط:'
@@ -2434,14 +2430,14 @@ fa:
       message: سامانهٔ بارگذاری GPX در حال حاضر در دسترس نیست
     offline:
       heading: ذخیره‌گاه GPX آفلاین است
-      message: ذخیره‌گاه فایل GPX و سامانهٔ بارگذاری هم‌اکنون در دسترس نیستند.
+      message: ذخیره‌گاه پروندهٔ GPX و سامانهٔ بارگذاری هم‌اکنون در دسترس نیستند.
     georss:
       title: ‫ردهای جی‌پی‌اس OpenStreetMap‬
     description:
       description_with_count:
         one: ‫فایل GPX با %{count} نقطه از %{user}‬
         other: ' ‫فایل GPX با %{count} نقطه از %{user}‬'
-      description_without_count: فایل GPX از %{user}
+      description_without_count: پروندهٔ GPX از %{user}
   application:
     permission_denied: شما اجازهٔ دسترسی به آن کنش را ندارید.
     require_cookies:
@@ -2495,7 +2491,7 @@ fa:
       write_diary: ایجاد روزنوشت، نظردهی و افزودن دوست
       write_api: اصلاح نقشه
       read_gpx: خواندن ردهای جی‌پی‌اس خصوصی
-      write_gpx: آپلود ردهای جی‌پی‌اس
+      write_gpx: بارگذاری ردهای جی‌پی‌اس
       write_notes: اصلاح یادداشت‌ها
       read_email: خواندن نشانی ایمیل کاربر
       skip_authorization: اپلیکیشن با تأیید خودکار
@@ -2908,7 +2904,7 @@ fa:
       tooltip_disabled: کلید نقشه برای این لایه در دسترس نیست
     map:
       zoom:
-        in: بزرگنمایی
+        in: بزرگ‌نمایی
         out: کوچک‌نمایی
       locate:
         title: نمایش مکان من
@@ -2943,13 +2939,13 @@ fa:
         فرانسه </a>
     site:
       edit_tooltip: ویرایش نقشه
-      edit_disabled_tooltip: برای ویرایش نقشه بزرگنمایی کنید
+      edit_disabled_tooltip: برای ویرایش نقشه بزرگ‌نمایی کنید
       createnote_tooltip: افزودن یادداشت به نقشه
-      createnote_disabled_tooltip: برای افزودن یادداشت به نقشه بزرگنمایی کنید
+      createnote_disabled_tooltip: برای افزودن یادداشت به نقشه بزرگ‌نمایی کنید
-      map_notes_zoom_in_tooltip: برای دیدن یادداشت‌های نقشه بزرگنمایی کنید
+      map_notes_zoom_in_tooltip: برای دیدن یادداشت‌های نقشه بزرگ‌نمایی کنید
-      map_data_zoom_in_tooltip: برای دیدن دادهٔ نقشه بزرگنمایی کنید
+      map_data_zoom_in_tooltip: برای دیدن دادهٔ نقشه بزرگ‌نمایی کنید
       queryfeature_tooltip: پرس‌وجوی عارضه‌ها
-      queryfeature_disabled_tooltip: برای پرس‌وجوی عارضه‌ها بزرگنمایی کنید
+      queryfeature_disabled_tooltip: برای پرس‌وجوی عارضه‌ها بزرگ‌نمایی کنید
     changesets:
       show:
         comment: نظر
@@ -2973,7 +2969,10 @@ fa:
         reactivate: فعال‌سازی مجدد
         comment_and_resolve: نظر + حل شد
         comment: نظر
-    edit_help: نقشه را جابه‌جا کنید و روی مکانی که می‌خواهید ویرایش نمایید بزرگنمایی
+        report_link_html: اگر این یادداشت حاوی اطلاعات حساسی است که باید حذف شود،
+          می‌توانید %{link}. برای سایر مشکلات مربوط به این یادداشت لطفاً خودتان همراه
+          با نوشتن نظر آن را حل کنید.
+    edit_help: نقشه را جابه‌جا کنید و روی مکانی که می‌خواهید ویرایش نمایید بزرگ‌نمایی
       کنید. سپس اینجا کلیک کنید.
     directions:
       ascend: فراز

config/locales/fi.yml

@@ -1524,8 +1524,8 @@ fi:
     edit_with: 'Muokkaa: %{editor}'
     tag_line: Avoin wikimaailmankartta
     intro_header: Tervetuloa OpenStreetMapiin!
-    intro_text: OpenStreetMap on kaltaistesi ihmisten luoma maailmankartta, jota voi
+    intro_text: OpenStreetMap on vapaaehtoisten luoma maailmankartta, jota voi käyttää
-      vapaasti avoimen lisenssin ansiosta.
+      vapaasti avoimella lisenssillä.
     intro_2_create_account: luomalla ensin käyttäjätunnuksen
     hosting_partners_html: Palvelinkapasiteettia meille tarjoaa %{ucl}, %{fastly},
       %{bytemark} ja muut %{partners}.

config/locales/fr.yml

@@ -69,6 +69,7 @@
 # Author: Rémi Bovard
 # Author: Seb35
 # Author: Sherbrooke
+# Author: StephaneP
 # Author: Syl
 # Author: The RedBurn
 # Author: Thibaut120094
@@ -131,7 +132,7 @@ fr:
       changeset_tag: Attribut du groupe de modifications
       country: Pays
       diary_comment: Commentaire du journal
-      diary_entry: Entrée du journal
+      diary_entry: Entrée de carnet
       friend: Ami(e)
       issue: Problème
       language: Langue
@@ -169,8 +170,8 @@ fr:
         support_url: URL de l’assistance
         allow_read_prefs: lire les préférences de l’utilisateur
         allow_write_prefs: modifier les préférences de l’utilisateur
-        allow_write_diary: créer des entrées d’agenda, des commentaires et se faire
+        allow_write_diary: créer des entrées de carnet, des commentaires et des liens
-          des amis
+          d’amitié
         allow_write_api: modifier la carte
         allow_read_gpx: lire ses traces GPS privées
         allow_write_gpx: téléverser des traces GPS
@@ -185,7 +186,7 @@ fr:
         language: Langue
       doorkeeper/application:
         name: Nom
-        redirect_uri: Rediriger les URIs
+        redirect_uri: Rediriger les URI
         confidential: Application confidentielle ?
         scopes: Autorisations
       friend:
@@ -356,7 +357,7 @@ fr:
         retain_notes: Vos notes sur la cartes et les commentaires de notes, s’il y
           en a, seront conservés mais masqués au public.
         retain_changeset_discussions: Vos discussions sur les groupes de modification,
-          s’il y en a, seront conservés.
+          s’il y en a, seront conservées.
         retain_email: Votre adresse de courriel sera conservée.
         confirm_delete: Êtes-vous sûr(e) ?
         cancel: Annuler
@@ -396,7 +397,7 @@ fr:
           contribution.
         review link text: Veuillez suivre ce lien à votre convenance pour examiner
           et accepter les nouvelles Conditions de contribution.
-        agreed_with_pd: Vous avez également déclaré que vous considériez vos modifications
+        agreed_with_pd: Vous avez également déclaré que vous considérez vos modifications
           comme relevant du domaine public.
         link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: qu’est-ce que ceci ?
@@ -423,7 +424,7 @@ fr:
     in_changeset: Groupe de modifications
     anonymous: anonyme
     no_comment: (aucun commentaire)
-    part_of: Appartient à
+    part_of: Partie de
     part_of_relations:
       one: 1 relation
       other: '%{count} relations'
@@ -497,7 +498,7 @@ fr:
         changeset: groupe de modifications
         note: note
     timeout:
-      title: Erreur de dépassement de temps
+      title: Erreur de dépassement du délai d’attente
       sorry: Désolé, les données pour le type %{type} avec l’id %{id} prennent trop
         de temps à être récupérées.
       type:
@@ -546,17 +547,17 @@ fr:
       reopened_by_html: Réactivée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
       reopened_by_anonymous_html: Réactivée par un utilisateur anonyme, <abbr title="%{exact_time}">%{when}</abbr>
       hidden_by_html: Masquée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
-      report: Signaler cette note
+      report: signaler cette note
       coordinates_html: '%{latitude}, %{longitude}'
     query:
-      title: Requête sur les objets
+      title: Interroger les objets
-      introduction: Cliquer sur la carte pour trouver les objets à proximité.
+      introduction: Cliquer sur la carte pour trouver des objets à proximité.
       nearby: Objets à proximité
       enclosing: Objets englobants
   changesets:
     changeset_paging_nav:
       showing_page: Page %{page}
-      next: Suivant ››
+      next: Suivant ▸
       previous: ◂ Précédent
     changeset:
       anonymous: Anonyme
@@ -579,7 +580,7 @@ fr:
       no_more: Aucun autre groupe de modifications trouvé.
       no_more_area: Aucun autre groupe de modifications dans cette zone.
       no_more_user: Aucun autre groupe de modifications par cet utilisateur.
-      load_more: Charger plus
+      load_more: Charger davantage
     timeout:
       sorry: Désolé, la liste des groupes de modifications que vous avez demandée
         met trop de temps pour être chargée.
@@ -634,7 +635,7 @@ fr:
       new: Nouvelle entrée du journal
       new_title: Écrire une nouvelle entrée dans mon journal utilisateur
       my_diary: Mon journal
-      no_entries: Aucune entrée de journal
+      no_entries: Aucune entrée de carnet
       recent_entries: Entrées récentes du journal
       older_entries: Entrées plus anciennes
       newer_entries: Entrées plus récentes
@@ -648,9 +649,9 @@ fr:
       login_to_leave_a_comment_html: '%{login_link} pour laisser un commentaire'
       login: Se connecter
     no_such_entry:
-      title: Aucune entrée du journal correspondante
+      title: Aucune entrée de carnet correspondante
       heading: 'Aucune entrée avec l’id : %{id}'
-      body: Désolé, il n’y a aucune entrée ou commentaire dans le journal avec l’id
+      body: Désolé, il n’y a aucune entrée ni commentaire de carnet avec l’identifiant
         %{id}. Veuillez vérifier votre orthographe ou la validité du lien que vous
         avez cliqué.
     diary_entry:
@@ -711,8 +712,8 @@ fr:
       success: '%{name} est désormais votre ami(e) !'
       failed: Désolé, échec lors de l’ajout de %{name} en tant qu’ami(e).
       already_a_friend: Vous et %{name} êtes déjà ami(e)s.
-      limit_exceeded: Vous avez déclaré récemment beaucoup d’utilisateurs comme amis.
+      limit_exceeded: Vous avez récemment déclaré beaucoup d’utilisateurs comme ami(e)s.
-        Veuillez attendre un peu avant d’essayer de déclarer de nouveaux amis.
+        Veuillez attendre un peu avant d’essayer d’en déclarer d’autres.
     remove_friend:
       heading: Supprimer %{user} en tant qu’ami(e) ?
       button: Supprimer en tant qu’ami(e)
@@ -890,7 +891,7 @@ fr:
           chapel: Chapelle
           church: Bâtiment d’église
           civic: Bâtiment municipal
-          college: Bâtiment de collège
+          college: Bâtiment d’enseignement supérieur
           commercial: Bâtiment de bureaux
           construction: Bâtiment en construction
           detached: Maison isolée
@@ -937,7 +938,7 @@ fr:
           blacksmith: Forgeron
           brewery: Brasserie
           carpenter: Charpentier
-          caterer: Réfectoire / cantine
+          caterer: Traiteur
           confectionery: Confiserie
           dressmaker: Couturier
           electrician: Électricien
@@ -978,7 +979,7 @@ fr:
           bus_stop: Arrêt de bus
           construction: Route en construction
           corridor: Couloir
-          crossing: Carrefour
+          crossing: Intersection / carrefour
           cycleway: Piste cyclable
           elevator: Ascenseur
           emergency_access_point: Point d’accès d’urgence
@@ -1086,8 +1087,8 @@ fr:
           railway: Voie ferrée
           recreation_ground: Aire de jeux
           religious: Terrain religieux
-          reservoir: Réservoir
+          reservoir: Bassin de retenue
-          reservoir_watershed: Bassin versant de réservoir
+          reservoir_watershed: Bassin versant d’une retenue
           residential: Zone résidentielle
           retail: Zone commerciale
           village_green: Pré communal
@@ -1164,7 +1165,7 @@ fr:
           pier: Jetée
           pipeline: Pipeline
           pumping_station: Station de pompage
-          reservoir_covered: Réservoir couvert
+          reservoir_covered: Bassin de retenue couvert
           silo: Silo
           snow_cannon: Canon à neige
           snow_fence: Barrière à neige
@@ -1233,7 +1234,7 @@ fr:
           stone: Pierre
           strait: Détroit
           tree: Arbre
-          tree_row: Ligne d’arbres
+          tree_row: Rangée d’arbres
           tundra: Toundra
           valley: Vallée
           volcano: Volcan
@@ -1517,7 +1518,7 @@ fr:
       not_updated: Non mis à jour
       search: Rechercher
       search_guidance: 'Problèmes de recherche :'
-      user_not_found: L’utilisateur n’existe pas
+      user_not_found: L’utilisateur ou l’utilisatrice n’existe pas
       issues_not_found: Aucun problème trouvé de ce type
       status: État
       reports: Rapports
@@ -1574,6 +1575,7 @@ fr:
   issue_comments:
     create:
       comment_created: Votre commentaire a bien été créé.
+      issue_reassigned: Votre commentaire a été créé et le problème a été réattribué
   reports:
     new:
       title_html: Rapport %{link}
@@ -1698,10 +1700,10 @@ fr:
       befriend_them: 'Vous pouvez également l’ajouter comme ami(e) ici : %{befriendurl}.'
       befriend_them_html: Vous pouvez aussi l’ajouter comme ami à l’adresse %{befriendurl}.
     gpx_description:
-      description_with_tags_html: 'Il semblerait que votre fichier GPX %{trace_name}
+      description_with_tags_html: 'Cela ressemble à votre fichier GPX « %{trace_name} »
-        avec la description %{trace_description} et les balises suivantes : %{tags}'
+        avec la description « %{trace_description}«» et les balises suivantes : %{tags}'
-      description_with_no_tags_html: Il semblerait que votre fichier GPX %{trace_name}
+      description_with_no_tags_html: Cela ressemble à votre fichier GPX « %{trace_name} »
-        avec la description %{trace_description} et sans balises
+        avec la description « %{trace_description} » et sans balises
     gpx_failure:
       hi: Bonjour %{to_user},
       failed_to_import: 'n’a pas pu être importé. Voici l’erreur :'
@@ -1781,18 +1783,18 @@ fr:
       hi: Bonjour %{to_user},
       greeting: Bonjour,
       commented:
-        subject_own: '[OpenStreetMap] %{commenter} a commenté un de vos ensembles
+        subject_own: '[OpenStreetMap] %{commenter} a commenté un de vos groupes de
-          de changements'
+          modifications'
-        subject_other: '[OpenStreetMap] %{commenter} a commenté un ensemble de changements
+        subject_other: '[OpenStreetMap] %{commenter} a commenté un groupe de modifications
           auquel vous vous intéressez'
         your_changeset: '%{commenter} a laissé un commentaire le %{time} sur un de
-          vos ensembles de changements'
+          vos groupes de modifications'
         your_changeset_html: '%{commenter} a laissé un commentaire à %{time} sur un
-          de vos ensembles de modifications'
+          de vos groupes de modifications'
         commented_changeset: '%{commenter} a laissé un commentaire le %{time} sur
-          un ensemble de changements créé par %{changeset_author} et que vous suivez'
+          un groupe de modifications que vous suivez et créé par %{changeset_author}'
         commented_changeset_html: '%{commenter} a laissé un commentaire à %{time}
-          sur un ensemble de modifications que vous suivez créé par %{changeset_author}.'
+          sur un groupe de modifications que vous suivez et créé par %{changeset_author}.'
         partial_changeset_with_comment: avec le commentaire « %{changeset_comment} »
         partial_changeset_with_comment_html: avec le commentaire « %{changeset_comment} »
         partial_changeset_without_comment: sans commentaire
@@ -1866,8 +1868,8 @@ fr:
       back_to_inbox: Revenir à la boîte de réception
     create:
       message_sent: Message envoyé
-      limit_exceeded: Vous avez envoyé trop de messages récemment, attendez un moment
+      limit_exceeded: Vous avez récemment envoyé beaucoup de messages. Veuillez attendre
-        avant d’essayer d’en envoyer de nouveaux.
+        un moment avant d’essayer d’en envoyer d’autres.
     no_such_message:
       title: Message introuvable
       heading: Message introuvable
@@ -2296,7 +2298,7 @@ fr:
         add_a_note:
           instructions_html: |-
             Cliquez simplement sur <a class="icon note"></a> ou cette même icône sur l’affichage de la carte.
-            Cela placera un marqueur sur la carte, que vous pourrez déplacer en le glissant. Ajoutez votre message, puis cliquez sur Enregistrer, et d’autres cartographes l’étudieront.
+            Cela placera un marqueur sur la carte, que vous pourrez déplacer en faisant glisser la carte. Ajoutez votre message, puis cliquez sur « Enregistrer » ; alors d’autres cartographes iront enquêter.
       other_concerns:
         title: Autres préoccupations
         explanation_html: Si vous êtes préoccupé par la manière dont nos données sont
@@ -2327,9 +2329,13 @@ fr:
         description: Poser une question ou discuter de questions intéressantes sur
           un large éventail de listes de diffusion thématiques ou régionales.
       forums:
-        title: Forums
+        title: Forums (hérités)
         description: Des questions et des discussions pour ceux qui préfèrent une
           interface sous forme de tableau d’affichage.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Forum de la communauté
+        description: Un lieu partagé pour les conversations sur OpenStreetMap.
       irc:
         title: IRC
         description: Discussion interactive dans de nombreuses langues différentes
@@ -2435,7 +2441,7 @@ fr:
           tunnel: Bordure pointillée = tunnel
           bridge: Bord noir = pont
           private: Accès privé
-          destination: Réservé aux riverains
+          destination: Accès réservé aux riverains
           construction: Routes en construction
           bicycle_shop: Magasin de vélos
           bicycle_parking: Parking à vélos
@@ -2486,12 +2492,12 @@ fr:
       start_mapping: Commencer à cartographier
       add_a_note:
         title: Pas le temps d’effectuer les modifications ? Ajoutez une note !
-        paragraph_1_html: |-
+        paragraph_1_html: Si vous voulez juste une petite correction et n’avez pas
-          Si vous voulez juste une petite correction et n’avez pas le temps de vous
+          le temps de vous inscrire sur le projet et d’apprendre à effectuer des modifications,
-          enregistrer sur le projet et d’apprendre à effectuer les modifications, il est facile d’ajouter une note.
+          il est facile d’ajouter une note.
         paragraph_2_html: |-
           Allez simplement sur <a href="%{map_url}">la carte</a> et cliquez sur l’icône note :
-          <span class="icon note"></span>. Cela ajoutera un marqueur sur la carte, que vous pouvez déplacer en faisant glisser la carte. Ajoutez votre message puis cliquez sur Enregistrer, alors d’autres contributeurs iront enquêter.
+          <span class="icon note"></span>. Cela placera un marqueur sur la carte, que vous pourrez déplacer en faisant glisser la carte. Ajoutez votre message puis cliquez sur « Enregistrer » ; alors d’autres cartographes iront enquêter.
   traces:
     visibility:
       private: Privé (partagé anonymement, points non ordonnés)
@@ -2507,7 +2513,7 @@ fr:
       help: Aide
       help_url: https://wiki.openstreetmap.org/wiki/FR:Upload
     create:
-      upload_trace: Envoyer la trace GPS
+      upload_trace: Téléverser la trace GPS
       trace_uploaded: Votre fichier GPX a été téléversé et est en attente de son intégration
         dans la base de données. Ceci prend en général moins d’une demi-heure et un
         courriel vous sera envoyé lorsque ce sera terminé.
@@ -2522,12 +2528,12 @@ fr:
           afin de ne pas bloquer la file d’attente pour les autres utilisateurs.
     edit:
       cancel: Annuler
-      title: Modifier la trace %{name}
+      title: Modification de la trace %{name}
-      heading: Modifier la trace %{name}
+      heading: Modification de la trace %{name}
       visibility_help: qu’est-ce que cela signifie ?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/FR:Visibilit%C3%A9_des_traces_GPS
     update:
-      updated: Traces mises à jour
+      updated: Trace mise à jour
     trace_optionals:
       tags: Mots-clés
     show:
@@ -2546,19 +2552,19 @@ fr:
       description: 'Description :'
       tags: 'Mots-clés :'
       none: Aucun
-      edit_trace: Modifier cette piste
+      edit_trace: Modifier cette trace
-      delete_trace: Supprimer cette piste
+      delete_trace: Supprimer cette trace
       trace_not_found: Trace non trouvée !
       visibility: 'Visibilité :'
       confirm_delete: Supprimer cette trace ?
     trace_paging_nav:
       showing_page: Page %{page}
-      older: Anciennes traces
+      older: Traces plus anciennes
-      newer: Nouvelles traces
+      newer: Traces plus récentes
     trace:
       pending: EN ATTENTE
       count_points:
-        one: 1 point
+        one: '%{count} point'
         other: '%{count} points'
       more: plus
       trace_details: Voir les détails de la trace
@@ -2574,19 +2580,19 @@ fr:
       public_traces: Traces GPS publiques
       my_gps_traces: Mes traces GPS
       public_traces_from: Traces GPS publiques de %{user}
-      description: Parcourir les traces GPS récemment téléversées
+      description: Parcourir les téléversements récents de traces GPS
       tagged_with: balisée avec %{tags}
       empty_html: Il n’y a encore rien ici. <a href="%{upload_link}">Téléverser une
         nouvelle trace</a> ou pour en savoir plus sur le traçage GPS, consultez la
         <a href="https://wiki.openstreetmap.org/wiki/FR:Beginners_Guide_1.2">page
         wiki</a>.
-      upload_trace: Envoyer une trace
+      upload_trace: Téléverser une trace
       all_traces: Toutes les traces
       my_traces: Mes traces
       traces_from: Traces publiques de %{user}
-      remove_tag_filter: Supprimer le filtre de balise
+      remove_tag_filter: Retirer le filtre de balises
     destroy:
-      scheduled_for_deletion: Trace prévue pour la suppression
+      scheduled_for_deletion: Trace planifiée pour suppression
     make_public:
       made_public: Trace rendue publique
     offline_warning:
@@ -2632,11 +2638,11 @@ fr:
       allow_to: 'Autoriser l’application cliente à :'
       allow_read_prefs: lire vos préférences utilisateur ;
       allow_write_prefs: modifier vos préférences utilisateur ;
-      allow_write_diary: créer pour vous des entrées dans votre carnet, faire des
+      allow_write_diary: créer des entrées dans votre carnet, faire des commentaires
-        commentaires et ajouter des amis ;
+        et ajouter des ami(e)s ;
       allow_write_api: modifier la carte.
       allow_read_gpx: lire vos traces GPS privées ;
-      allow_write_gpx: envoyer des traces GPS en votre nom ;
+      allow_write_gpx: téléverser des traces GPS.
       allow_write_notes: modifier des notes.
       grant_access: Accorder l’accès
     authorize_success:
@@ -2665,7 +2671,7 @@ fr:
       skip_authorization: Demande d’approbation automatique
   oauth_clients:
     new:
-      title: Enregistrer une nouvelle application
+      title: Inscrire une nouvelle application
     edit:
       title: Modifier votre application
     show:
@@ -2689,12 +2695,11 @@ fr:
       issued_at: Émis le
       revoke: Révoquer !
       my_apps: Mes applications clientes
-      no_apps_html: Avez-vous une application qui aimerait s’enregistrer pour utiliser
+      no_apps_html: Avez-vous une application que vous aimeriez inscrire pour son
-        le standard %{oauth} ? Vous devez enregistrer votre application web avant
+        utilisation avec nous via le standard %{oauth} ? Vous devez inscrire votre
-        qu’elle ne puisse faire des requêtes OAuth sur ce service.
+        application web avant qu’elle puisse faire des requêtes OAuth sur ce service.
       oauth: OAuth
-      registered_apps: 'Vous avez les applications clientes suivantes enregistrées
+      registered_apps: 'Vous avez inscrit les applications clientes suivantes :'
-        :'
       register_new: Enregistrez votre application
     form:
       requests: 'Demander les permissions suivantes à l’utilisateur :'
@@ -2709,11 +2714,11 @@ fr:
   oauth2_applications:
     index:
       title: Mes applications clientes
-      no_applications_html: Avez-vous une application que vous aimeriez enregistrer
+      no_applications_html: Avez-vous une application que vous aimeriez inscrire pour
-        pour utiliser avec nous via le standard %{oauth2} ? Vous devez enregistrer
+        son utilisation avec nous via le standard %{oauth2} ? Vous devez inscrire
         votre application avant qu’elle puisse faire des requêtes OAuth à ce service.
       oauth_2: OAuth 2
-      new: Enregistrer une nouvelle application
+      new: Inscrire une nouvelle application
       name: Nom
       permissions: Autorisations
     application:
@@ -2721,19 +2726,19 @@ fr:
       delete: Supprimer
       confirm_delete: Supprimer cette application ?
     new:
-      title: Enregistrer une nouvelle application
+      title: Inscrire une nouvelle application
     edit:
       title: Modifier votre application
     show:
       edit: Modifier
       delete: Supprimer
       confirm_delete: Supprimer cette application ?
-      client_id: ID client
+      client_id: Identifiant du client
       client_secret: Secret du client
-      client_secret_warning: Assurez-vous de sauvegarder ce secret — il ne sera plus
+      client_secret_warning: Assurez-vous d’enregistrer ce secret — il ne sera plus
         accessible
       permissions: Autorisations
-      redirect_uris: Rediriger les URIs
+      redirect_uris: Rediriger les URI
     not_found:
       sorry: Désolé, cette application n’a pas pu être trouvée.
   oauth2_authorizations:
@@ -2759,15 +2764,15 @@ fr:
   users:
     new:
       title: S’inscrire
-      no_auto_account_create: Malheureusement, nous sommes actuellement dans l’impossibilité
+      no_auto_account_create: Malheureusement, nous ne sommes actuellement pas en
-        de vous créer un compte automatiquement.
+        mesure de vous créer un compte automatiquement.
       contact_support_html: Veuillez contacter l’<a href="%{support}">assistance</a>
         pour qu’elle vous crée un compte — nous essaierons de traiter votre demande
         le plus rapidement possible.
       about:
         header: Libre et modifiable
         html: |-
-          <p>À la différence des autres cartes, OpenStreetMap est entièrement créé par des gens comme vous, et chacun est libre de le modifier, le mettre à jour, le télécharger et l’utiliser.</p>
+          <p>À la différence des autres cartes, OpenStreetMap est entièrement créé par des gens comme vous, et chacun est libre de le corriger, le mettre à jour, le télécharger et l’utiliser.</p>
           <p>Inscrivez-vous pour commencer à participer. Nous vous enverrons un courriel pour confirmer votre compte.</p>
       email address: 'Adresse de courriel :'
       confirm email address: 'Confirmez l’adresse de courriel :'
@@ -2787,8 +2792,8 @@ fr:
       heading: Conditions
       heading_ct: Conditions de contribution
       read and accept with tou: Veuillez lire l’accord du contributeur et les conditions
-        d’utilisation ; une fois ceci fait cochez les deux cases, puis appuyer sur
+        d’utilisation ; une fois cela fait, cochez les deux cases et appuyez alors
-        le bouton Continuer.
+        sur le bouton « Continuer ».
       contributor_terms_explain: Cet accord impose les conditions de vos contributions
         existantes et à venir.
       read_ct: J’ai lu et j’accepte les Conditions de contribution ci-dessus.
@@ -2820,13 +2825,13 @@ fr:
       terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     no_such_user:
       title: Utilisateur inexistant
-      heading: L’utilisateur %{user} n’existe pas
+      heading: L’utilisateur ou l’utilisatrice « %{user} » n’existe pas
-      body: Désolé, il n’y a aucun utilisateur avec le nom %{user}. Veuillez vérifier
+      body: Désolé, il n’y a aucun(e) utilisateur ou utilisatrice avec le nom « %{user} ».
-        l’orthographe, ou bien le lien que vous avez cliqué n’est pas correct.
+        Veuillez vérifier votre orthographe ou la validité du lien que vous avez cliqué.
       deleted: supprimé
     show:
       my diary: Mon journal
-      new diary entry: nouvelle entrée du journal
+      new diary entry: nouvelle entrée du carnet
       my edits: Mes modifications
       my traces: Mes traces
       my notes: Mes notes
@@ -2957,7 +2962,7 @@ fr:
       title: Création d’un blocage sur « %{name} »
       heading_html: Création d’un blocage sur « %{name} »
       period: Pendant combien de temps, à partir de maintenant, l’utilisateur ou l’utilisatrice
-        doit être bloqué(e) sur l’API ?
+        doit être bloqué(e) sur l’API.
       tried_contacting: J’ai contacté l’utilisateur ou l’utilisatrice et lui ai demandé
         d’arrêter.
       tried_waiting: J’ai donné un temps raisonnable à l’utilisateur ou l’utilisatrice
@@ -2966,8 +2971,8 @@ fr:
     edit:
       title: Modification d’un blocage sur « %{name} »
       heading_html: Modification d’un blocage sur « %{name} »
-      period: Combien de temps, à partir de maintenant, l’utilisateur ou l’utilisatrice
+      period: Pendant combien de temps, à partir de maintenant, l’utilisateur ou l’utilisatrice
-        doit être bloqué(e) sur l’API ?
+        doit être bloqué(e) sur l’API.
       show: Afficher ce blocage
       back: Voir tous les blocages
     filter:
@@ -2992,7 +2997,7 @@ fr:
       heading_html: Annulation d’un blocage sur « %{block_on} » par « %{block_by} »
       time_future: Ce blocage se terminera dans %{time}.
       past: Ce blocage s’est terminé à %{time} et ne peut plus être annulé.
-      confirm: Êtes-vous sûr de vouloir annuler ce blocage ?
+      confirm: Êtes-vous sûr(e) de vouloir annuler ce blocage ?
       revoke: Révoquer !
       flash: Ce blocage a été annulé.
     helper:
@@ -3051,7 +3056,7 @@ fr:
       revoker_name: Révoqué par
       showing_page: Page %{page}
       next: Suivant »
-      previous: « Précédent
+      previous: ◂ Précédent
   notes:
     index:
       title: Notes soumises ou commentées par « %{user} »
@@ -3099,7 +3104,7 @@ fr:
         title: Afficher mon emplacement
         metersPopup:
           one: Vous êtes à moins d’un mètre de ce point
-          other: Vous êtes à %{count} mètres de ce point
+          other: Vous êtes à moins de %{count} mètres de ce point
         feetPopup:
           one: Vous êtes à moins d’un pied de ce point
           other: Vous êtes à moins de %{count} pieds de ce point
@@ -3118,7 +3123,7 @@ fr:
         overlays: Autoriser les superpositions pour réparer la carte
         title: Couches
       copyright: © <a href="%{copyright_url}">Contributeurs d’OpenStreetMap</a>
-      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Faire un don</a>
+      donate_link_text: <a class="donate-attr" href="%{donate_url}">Faire un don</a>
       terms: <a href="%{terms_url}" target="_blank">Conditions du site web et de l’API</a>
       cyclosm: Style de briques par <a href="%{cyclosm_url}" target="_blank">CyclOSM</a>
         hébergé par <a href="%{osmfrance_url}" target="_blank">OpenStreetMap France</a>
@@ -3135,7 +3140,7 @@ fr:
       createnote_disabled_tooltip: Zoomer pour ajouter une note sur la carte
       map_notes_zoom_in_tooltip: Zoomez pour lire les notes sur la carte
       map_data_zoom_in_tooltip: Zoomez pour lire voir les données sur la carte
-      queryfeature_tooltip: Requête sur les objets
+      queryfeature_tooltip: Interroger les objets
       queryfeature_disabled_tooltip: Zoomer plus pour rechercher des objets
     changesets:
       show:
@@ -3161,17 +3166,20 @@ fr:
         reactivate: Réactiver
         comment_and_resolve: Commenter et résoudre
         comment: Commenter
+        report_link_html: Si cette note contient des informations sensibles qui doivent
+          être supprimées, vous pouvez %{link}. Pour tous les autres problèmes avec
+          la note, veuillez le résoudre vous-même avec un commentaire.
     edit_help: Déplacez la carte et zoomez sur un emplacement que vous voulez modifier,
       puis cliquez dessus.
     directions:
       ascend: Croissant
       engines:
         fossgis_osrm_bike: À vélo (OSRM)
-        fossgis_osrm_car: En voiture (<i>OSRM</i>)
+        fossgis_osrm_car: En voiture (OSRM)
-        fossgis_osrm_foot: À pied (OSRM)
+        fossgis_osrm_foot: À pied (<em>OSRM<em>)
         graphhopper_bicycle: À vélo (GraphHopper)
-        graphhopper_car: En voiture (GraphHopper)
+        graphhopper_car: En voiture (<em>GraphHopper<em>)
-        graphhopper_foot: À pied (<i>GraphHopper</i>)
+        graphhopper_foot: À pied (<em>GraphHopper</em>)
       descend: Décroissant
       directions: Itinéraire
       distance: Distance
@@ -3244,7 +3252,7 @@ fr:
         courtesy: Itinéraire fourni par %{link}
         exit_counts:
           first: 1er
-          second: 2nd
+          second: 2e
           third: 3e
           fourth: 4e
           fifth: 5e

config/locales/fy.yml

@@ -448,7 +448,7 @@ fy:
       reopened_by_html: Weraktivearre troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Weraktivearre troch anonym <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Ferburgen troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Dizze notysje melde
+      report: dizze notysje melde
     query:
       title: Skaaimerken opfreegje
       introduction: Klik op 'e kaart foar skaaimerken fuortby.
@@ -658,7 +658,7 @@ fy:
           atm: Jildautomaat
           bank: Bank
           bar: Bar
-          bbq: BBQ
+          bbq: Barbekjû
           bench: Bankje
           bicycle_parking: Fytsestalling
           bicycle_rental: Fytsferhier
@@ -1465,6 +1465,7 @@ fy:
   issue_comments:
     create:
       comment_created: It oanmeitsjen fan jo reäksje is slagge
+      issue_reassigned: Jo reäksje is oanmakke, en it probleem is weryndield
   reports:
     new:
       title_html: '%{link} melde'
@@ -2222,9 +2223,13 @@ fy:
         description: Stel in fraach of bepraat nijsgjirrige saken op útienrinnende
           tematyske as regionale mailinglisten.
       forums:
-        title: Foarums
+        title: Foarums (âld)
         description: Fragen en oerlis foar dejingen dy't leaver yn pripboerd-styl
           wurkje.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Mienskipsfoarum
+        description: In mienskiplik plak foar petear oer OpenStreetMap.
       irc:
         title: IRC
         description: Ynteraktyf tsjetten yn ferskate talen en op alderlei mêd.
@@ -3043,6 +3048,9 @@ fy:
         reactivate: Weraktivearje
         comment_and_resolve: Reägearje & oplosse
         comment: Reägearje
+        report_link_html: At dizze notysje gefoelige ynformaasje befettet dy't fuorthelle
+          wurde moat, dan kinne jo %{link}. Los alle oare problemen mei de notysje
+          graach sels op fia in reäksje.
     edit_help: Sko de kaart en sûm yn op 'e lokaasje dy't jo bewurkje wolle, klik
       dan hjir.
     directions:

config/locales/he.yml

@@ -33,6 +33,7 @@
 # Author: Zstadler
 # Author: יאיר מן
 # Author: ישראל קלר
+# Author: מקף
 # Author: נדב ס
 # Author: תומר ט
 ---
@@ -1523,6 +1524,7 @@ he:
   issue_comments:
     create:
       comment_created: המודעה שלך נוצרה בהצלחה
+      issue_reassigned: ההערה שלך נוצרה והבעיה הוקצתה מחדש
   reports:
     new:
       title_html: דיווח על %{link}
@@ -2232,8 +2234,10 @@ he:
         description: לשאול שאלה או לדון בדברים מעניינים ברשימות תפוצה נושאים ואזוריות
           רבות.
       forums:
-        title: פורומים
+        title: פורומים (היסטוריים)
         description: שאלות ודיונים לאנשים שמעדיפים ממשק בסגנון פורום.
+      community:
+        title: פורום קהילתי
       irc:
         title: IRC
         description: שיחה אינטראקטיבית בשפות שונות רבות ובנושאים רבים.
@@ -3020,6 +3024,8 @@ he:
         reactivate: הפעלה מחדש
         comment_and_resolve: להגיב ולפתור
         comment: להגיב
+        report_link_html: אם ההערה הזאת מכילה מידע רגיש שיש להסיר, אפשר %{link}. עבור
+          כל שאר הבעיות עם ההערה, נא לפתור אותה בעצמך באמצעות הערה.
     edit_help: יש להזיז את המפה ולהתמקד על מיקום שברצונך לערוך ואז ללחוץ כאן.
     directions:
       ascend: מעלה

config/locales/hi.yml

@@ -407,7 +407,7 @@ hi:
         द्वारा फिर चालू किया गया
       hidden_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} द्वारा छिपाया
         गया
-      report: इस नोट को रिपोर्ट करें
+      report: इस नोट को रिपोर्ट कर
     query:
       title: क्वेरी की सुविधाएँ
       introduction: आस-पास की सुविधाओं के लिए नक़्शे पर क्लिक करें
@@ -979,7 +979,11 @@ hi:
           title: समुदाय से जुड़ें
     help:
       forums:
-        title: मंच
+        title: फ़ोरम (लिगेसी)
+      community:
+        url: https://community.openstreetmap.org/
+        title: सामुदायिक फ़ोरम
+        description: OpenStreetMap के बारे में चर्चा के लिए सार्वजनिक स्थान।
       wiki:
         url: http://wiki.openstreetmap.org/
         title: ओपनस्ट्रीटमैप विकि
@@ -1081,6 +1085,9 @@ hi:
         reactivate: 'पुन: सक्रिय करें'
         comment_and_resolve: टिप्पणी कर समाधान करें
         comment: जवाब देना
+        report_link_html: अगर इस नोट में संवेदनशील जानकारी है जिसे हटाना उचित है,
+          आप %{link} सकते हैं। नोट से जुड़ी दूसरी समस्याओं के लिए कृपया एक टिप्पणी
+          से उन्हें सुलझाएँ।
     directions:
       directions: रास्ता
       distance: दूरी

config/locales/hu.yml

@@ -475,7 +475,7 @@ hu:
       reopened_by_html: Újraaktiválta %{user}, <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Újraaktiválva névtelenül, <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Elrejtette %{user}, <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Jegyzet bejelentése
+      report: jegyzet bejelentése
     query:
       title: Objektumok lekérdezése
       introduction: Kattints a térképre a közeli objektumok megtalálásához.

config/locales/ia.yml

@@ -452,7 +452,7 @@ ia:
       reopened_by_html: Reactivate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Reactivate per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Celate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Signalar iste nota
+      report: signalar iste nota
     query:
       title: Cercar objectos
       introduction: Clicca sur le carta pro cercar objectos a proximitate.
@@ -1474,6 +1474,8 @@ ia:
   issue_comments:
     create:
       comment_created: Tu commento ha essite create
+      issue_reassigned: Tu commento ha essite create e le reporto de problema ha essite
+        reassignate
   reports:
     new:
       title_html: Reportar %{link}
@@ -2221,9 +2223,13 @@ ia:
         description: Pone un question o discute cosas interessante sur un varietate
           de listas de diffusion thematic o regional.
       forums:
-        title: Foros
+        title: Foros (ancian)
         description: Questiones e discussiones pro qui prefere un interfacie in stilo
           de tabuliero de bulletines.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Foro del communitate
+        description: Un sito commun de conversation sur OpenStreetMap.
       irc:
         title: IRC
         description: Conversation interactive in multe linguas differente e sur multe
@@ -3032,6 +3038,9 @@ ia:
         reactivate: Reactivar
         comment_and_resolve: Commentar e resolver
         comment: Commento
+        report_link_html: Si iste nota contine information sensibile que debe esser
+          removite, tu pote %{link}. Pro omne altere problemas con le nota, per favor
+          resolve lo tu mesme con un commento.
     edit_help: Displacia le carta e face zoom avante in un loco que tu vole modificar,
       postea clicca hic.
     directions:

config/locales/id.yml

@@ -35,6 +35,7 @@
 # Author: Rizkiahmadz
 # Author: Shinkiwa
 # Author: Vasanthi
+# Author: Veracious
 # Author: Wulankhairunisa
 # Author: 아라
 ---
@@ -62,18 +63,18 @@ id:
         create: Daftar
         update: Perbarui
       redaction:
-        create: Membuat Redaksi
+        create: Membuat redaksi
-        update: Simpan Redaksi
+        update: Simpan redaksi
       trace:
-        create: Upload
+        create: Unggah
         update: Simpan Perubahan
       user_block:
-        create: Buat blokir
+        create: Buat blok
-        update: Perbarui blokir
+        update: Perbarui blok
   activerecord:
     errors:
       messages:
-        invalid_email_address: tidak tampak sebagai alamat e-mail yang sah
+        invalid_email_address: nampaknya bukan alamat surel yang sah
         email_address_not_routable: tidak dapat dirutekan
     models:
       acl: Daftar Kontrol Akses
@@ -86,11 +87,11 @@ id:
       issue: Masalah
       language: Bahasa
       message: Pesan
-      node: Node/Titik
+      node: Titik noda
-      node_tag: Tag node/titik
+      node_tag: Tag titik noda
-      notifier: Pemberitahuan
+      notifier: Pemberitahu
-      old_node: Node/Titik Lama
+      old_node: Titik noda Lama
-      old_node_tag: Tag Node/Titik Lama
+      old_node_tag: Tag Titik noda Lama
       old_relation: Relasi Lama
       old_relation_member: Anggota Relasi Lama
       old_relation_tag: Tag Relasi Lama
@@ -100,7 +101,7 @@ id:
       relation: Relasi
       relation_member: Anggota Relasi
       relation_tag: Tag Relasi
-      report: Laporan
+      report: Laporkan
       session: Sesi
       trace: Jejak
       tracepoint: Titik Digitasi
@@ -162,6 +163,7 @@ id:
         category: 'Pilih alasan laporan Anda:'
         details: Silakan berikan rincian tentang masalah (wajib).
       user:
+        auth_uid: UID Otentikasi
         email: Email
         email_confirmation: Konfirmasi Surel
         new_email: Alamat Surel Baru
@@ -397,7 +399,7 @@ id:
     relation_member:
       entry_role_html: '%{type} %{name} sebagai %{role}'
       type:
-        node: Node/Titik
+        node: Titik noda
         way: Way/Garis
         relation: Relasi
     containing_relation:
@@ -469,7 +471,7 @@ id:
         yang lalu</abbr>
       hidden_by_html: Disembunyikan oleh %{user} <abbr title='%{exact_time}'>%{when}
         yang lalu</abbr>
-      report: Laporkan catatan ini
+      report: laporkan catatan ini
     query:
       title: Fitur Kueri
       introduction: Klik di peta untuk mencari fitur terdekat.
@@ -595,7 +597,7 @@ id:
     location:
       location: 'Lokasi:'
       view: Lihat
-      edit: Edit
+      edit: Sunting
     feed:
       user:
         title: Entri catatan harian OpenStreetMap untuk %{user}
@@ -668,6 +670,7 @@ id:
           taxiway: Landas hubung
           terminal: Terminal Bandara
         amenity:
+          animal_boarding: Penitipan Hewan
           animal_shelter: Tempat Perlindungan Hewan
           arts_centre: Pusat Kesenian
           atm: ATM
@@ -835,9 +838,11 @@ id:
           brewery: Pabrik Bir
           carpenter: Tukang Kayu
           caterer: Jasa Boga
+          dressmaker: Pembuat baju
           electrician: Tukang Listrik
           electronics_repair: Servis Elektronik
           gardener: Tukang Kebun
+          glaziery: Toko kaca
           handicraft: Kerajinan Tangan
           painter: Tukang Cat
           photographer: Fotografer
@@ -846,6 +851,7 @@ id:
           shoemaker: Perajin Sepatu
           tailor: Penjahit
           window_construction: Konstruksi Jendela
+          winery: Kilang anggur
           "yes": Toko Kerajinan
         emergency:
           access_point: Titik Akses
@@ -1024,6 +1030,7 @@ id:
           gasometer: Kilang
           kiln: Tanur
           lighthouse: Mercusuar
+          manhole: Lubang Got
           mine: Tambang
           mineshaft: Lubang Bukaan Tambang
           monitoring_station: Stasiun Pengawas
@@ -1277,6 +1284,7 @@ id:
           pawnbroker: Rumah Gadai
           perfumery: Toko Parfum
           pet: Toko Hewan
+          pet_grooming: Perawatan Hewan Peliharaan
           photo: Studio Foto
           seafood: Boga Bahari
           second_hand: Toko loak
@@ -1286,6 +1294,7 @@ id:
           stationery: Toko Alat Tulis
           supermarket: Supermarket
           tailor: Penjahit
+          tattoo: Studio Tato
           tea: Toko Teh
           ticket: Toko Tiket
           tobacco: Toko Tembakau
@@ -1305,7 +1314,7 @@ id:
           artwork: Karya Seni
           attraction: Atraksi
           bed_and_breakfast: Penginapan untuk Tidur dan Sarapan
-          cabin: Kabin
+          cabin: Kabin Turis
           camp_pitch: Perkemahan
           camp_site: Perkemahan
           caravan_site: Tempat Karavan
@@ -1471,7 +1480,7 @@ id:
     sign_up: Mendaftar
     start_mapping: Mulai Pemetaan
     sign_up_tooltip: Buat akun untuk mengedit
-    edit: Edit
+    edit: Sunting
     history: Riwayat
     export: Ekspor
     issues: Masalah
@@ -1945,25 +1954,26 @@ id:
           Dokumentasi kami dilisensikan di bawah <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> lisensi (CC BY-SA 2.0).
         credit_title_html: Cara memberikan kredit pada OpenStreetMap
-        credit_1_html: Kami mewajibkan Anda untuk menggunakan kredit &ldquo;&copy;
+        credit_1_html: 'Ketika Anda menggunakan data OpenStreetMap, Anda diwajibkan
-          Kontributor OpenStreetMap&rdquo;.
+          untuk melakukan dua hal berikut:'
-        credit_2_1_html: Anda juga harus memperjelas bahwa data tersedia di bawah
+        credit_2_1_html: "<ul>\n  <li> Berikan kredit kepada OpenStreetMap dengan
-          Lisensi Database Terbuka, dan jika menggunakan tiles peta kami, kartografi
+          menampilkan pemberitahuan hak cipta kami.</li> \n  <li> Jelaskan bahwa data
-          berlisensi sebagai CC-BY-SA. Anda dapat melakukannya dengan menghubungkan
+          tersedia di bawah Lisensi Open Database.</li> \n</ul>"
-          ke <a href="http://www.openstreetmap.org/copyright">halaman hak cipta</a>.
+        credit_3_1_html: Untuk pemberitahuan hak cipta, kami memiliki persyaratan
-          Alternatifnya, dan sebagai sebuah persyaratan jika Anda mendistribusikan
+          yang berbeda tentang bagaimana ini harus ditampilkan, tergantung pada bagaimana
-          OSM dalam bentuk data, Anda dapat menamakan dan menghubungkannya langsung
+          Anda menggunakan data kami. Misalnya, aturan yang berbeda berlaku tentang
-          pada lisensinya. Pada media yang tidak memungkinkan tautan (misalnya hasil
+          cara menampilkan pemberitahuan hak cipta bergantung pada apakah Anda membuat
-          cetak), kami menyarankan Anda untuk mengarahkan pembaca Anda pada openstreetmap.org
+          peta yang dapat dijelajahi, peta yang dicetak, atau gambar statis. Detail
-          (mungkin dengan memperluas halaman 'OpenStreetMap' secara penuh), untuk
+          lengkap tentang persyaratan dapat ditemukan di <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Pedoman
-          opendatacommons.org, dan jika relevan, untuk creativecommons.org.
+          Atribusi</a> .
-        credit_3_1_html: |-
+        credit_4_html: 'Untuk memperjelas bahwa data tersedia di bawah Lisensi Open
-          Tile peta dalam &ldquo;gaya standar&rdquo; di www.openstreetmap.org adalah
+          Database, Anda dapat menautkan ke <a href="http://www.openstreetmap.org/copyright">halaman
-          Karya Produksi oleh OpenStreetMap Foundation menggunakan data OpenStreetMap
+          hak cipta</a>. Cara lainnya, dan diwajibkan jika Anda mendistribusikan OSM
-          di bawah Open Database License. Ketika menggunakan gaya peta ini, atribusi yang sama diharuskan untuk data peta.
+          dalam bentul data, Anda bisa menyebut nama dan tautan ke lisensi. Dalam
-        credit_4_html: |-
+          media yang tidak memungkinkan tautan (contohnya: karya cetak), kami menyarankan
-          Untuk peta elektronik dapat ditelusuri, kredit harus muncul di sudut peta.
+          Anda mengarahkan pembaca Anda ke openstreetmap.org (mungkin dengan memperluas
-          Sebagai contoh:
+          tulisan ''OpenStreetMap'' menjadi alamat lengkap) dan opendatacommons.org.
+          Dalam contoh ini, kreditnya ditampilkan di pojok peta.'
         attribution_example:
           alt: Contoh tentang bagaimana memberikan atribusi untuk OpenStreetMap pada
             halaman web
@@ -2239,6 +2249,7 @@ id:
           common:
           - Umum
           - Padang rumput
+          - kebun
           retail: Area pertokoan
           industrial: Kawasan industri
           commercial: Area komersial
@@ -2399,6 +2410,7 @@ id:
       in: dalam
     index:
       public_traces: Jejak GPS Umum
+      my_gps_traces: Jejak GPS Saya
       public_traces_from: Jejak GPS Umum dari %{user}
       description: Ramban unggahan jejak GPS terbaru.
       tagged_with: di tag dengan %{tags}
@@ -2409,6 +2421,7 @@ id:
       all_traces: Semua Jejak
       my_traces: Jejak Saya
       traces_from: Jejak Publik dari %{user}
+      remove_tag_filter: Hapus Filter Tag
     destroy:
       scheduled_for_deletion: Trek yang dijadwalkan untuk dihapus
     make_public:
@@ -2526,6 +2539,9 @@ id:
   oauth2_applications:
     index:
       title: Aplikasi Klien Saya
+      no_applications_html: Apakah anda memiliki aplikasi yang ingin didaftarkan untuk
+        digunakan dengan menggunakan standar %{oauth2}? Anda harus mendaftarkan aplikasi
+        web Anda sebelum dapat membuat permintaan OAuth untuk layanan ini.
       new: Daftarkan aplikasi baru
       name: Nama
       permissions: Izin
@@ -2542,7 +2558,12 @@ id:
       delete: Hapus
       confirm_delete: Hapus aplikasi ini?
       client_id: ID Klien
+      client_secret: Rahasia Klien
+      client_secret_warning: Pastikan untuk menyimpan rahasia ini - ia tidak akan
+        dapat diakses lagi
       permissions: Izin
+    not_found:
+      sorry: Maaf, aplikasi itu tidak dapat ditemukan.
   oauth2_authorizations:
     new:
       title: Butuh Izin
@@ -2704,6 +2725,7 @@ id:
     suspended:
       title: Akun Ditangguhkan
       heading: Akun Ditangguhkan
+      support: dukung
       body_html: "<p>\n  Maaf, akun Anda telah ditangguhkan secara otomatis dikarenakan
         \n  aktivitas yang mencurigakan. \n</p>\n<p>\n  Keputusan ini akan ditinjau
         ulang oleh seorang administrator sesaat lagi, atau\n  anda dapat menghubungi
@@ -3056,7 +3078,7 @@ id:
           tenth: ke-10
       time: Waktu tempuh
     query:
-      node: Node/Titik
+      node: Titik noda
       way: Jalan
       relation: Relasi
       nothing_found: Tidak ada fasilitas yang ditemukan

config/locales/is.yml

@@ -473,7 +473,7 @@ is:
       reopened_by_html: Endurvirkjað af %{user} <abbr title='%{exact_time}'> %{when}</abbr>
       reopened_by_anonymous_html: Endurvirkjað af nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Falið af %{user} <abbr title='%{exact_time}'> %{when}</abbr>
-      report: Tilkynna þennan minnispunkt
+      report: tilkynnt þennan minnispunkt
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Rannsaka fitjur
@@ -1496,6 +1496,7 @@ is:
   issue_comments:
     create:
       comment_created: Það tókst að búa til athugasemdina þína
+      issue_reassigned: Athugasemdin þín var útbúin og málinu var endurúthlutað
   reports:
     new:
       title_html: Tilkynna %{link}
@@ -1652,11 +1653,11 @@ is:
       click_the_link: Ef þú óskaðir eftir þessari breytingu fylgdu tenglinum hér fyrir
         neðan til að staðfesta breytinguna.
     lost_password:
-      subject: '[OpenStreetMap] Beðni um að endurstilla lykilorð'
+      subject: '[OpenStreetMap] Beiðni um að endurstilla lykilorð'
       greeting: Hæ,
       hopefully_you: Einhver (vonandi þú) hefur beðið um að endurstilla lykilorðið
         á reikningnum með þetta netfang á openstreetmap.org
-      click_the_link: Ef þú óskaðir eftir þessari endurstillingu fylgdu tenglinum
+      click_the_link: Ef þú óskaðir eftir þessari endurstillingu, skaltu fylgja tenglinum
         hér fyrir neðan til að staðfesta breytinguna.
     note_comment_notification:
       anonymous: Nafnlaus notandi
@@ -3073,6 +3074,9 @@ is:
         reactivate: Virkja aftur
         comment_and_resolve: Athugasemd & leysa
         comment: Athugasemd
+        report_link_html: Ef þessi minnispunktur inniheldur viðkvæmar upplýsingar
+          sem þarf að fjarlægja geturðu %{link}. Fyrir öll önnur vandamál með minnispunktinn,
+          skaltu leysa það sjálf/ur með athugasemd.
     edit_help: Færðu kortið og stilltu aðdrátt inn á staðinn sem þú vilt breyta, smelltu
       síðan hér.
     directions:

config/locales/it.yml

@@ -56,6 +56,7 @@
 # Author: Sorcrosc
 # Author: Toa
 # Author: Tuxfuzz
+# Author: Vivbod
 # Author: Ximo17
 # Author: ZioNicco
 ---
@@ -508,7 +509,7 @@ it:
       reopened_by_html: Riattivata da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Riattivata da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Nascosta da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Segnala questa nota
+      report: segnalare questa nota
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Ricerca di elementi
@@ -1531,6 +1532,7 @@ it:
   issue_comments:
     create:
       comment_created: Il tuo commento è stato creato con successo
+      issue_reassigned: Il tuo commento è stato creato e il problema è stato riassegnato
   reports:
     new:
       title_html: Segnala %{link}
@@ -2278,9 +2280,12 @@ it:
         description: Poni la tua domanda o discuti questioni di interesse su una vasta
           gamma di mailing list tematiche o regionali.
       forums:
-        title: Forum
+        title: Forum (vecchio)
         description: Domande e discussioni per coloro che preferiscono un'interfaccia
           in stile bacheca (BBS).
+      community:
+        url: https://community.openstreetmap.org/
+        description: Un luogo condiviso per le conversazioni su OpenStreetMap.
       irc:
         title: IRC
         description: Chat interattiva in molte lingue diverse e su molti argomenti.
@@ -3095,6 +3100,9 @@ it:
         reactivate: Riattiva
         comment_and_resolve: Commenta e chiudi
         comment: Commenta
+        report_link_html: Se questa nota contiene informazioni sensibili che devono
+          essere rimosse, puoi %{link}. Per ogni altro tipo di problema con questa
+          nota, prova a risolverla di persona con un commento.
     edit_help: Sposta la mappa e usa lo zoom sulla posizione che vuoi modificare,
       quindi clicca qui.
     directions:

config/locales/ja.yml

@@ -297,7 +297,18 @@ ja:
     deletions:
       show:
         title: 自分のアカウントを削除する
+        warning: 警告！アカウントの削除プロセスは最終的なものであり、元に戻すことはできません。
         delete_account: アカウントを削除
+        delete_introduction: 下のボタンを使用してご自分の OpenStreetMap アカウントを削除できます。次の詳細に注意してください。
+        delete_profile: アバター、説明、自宅の場所などのプロフィール情報が削除されます。
+        delete_display_name: 表示名は削除され、他のアカウントで再利用できます。
+        retain_caveats: ただし、アカウントが削除された後でも、あなたに関する一部の情報は OpenStreetMap に保持されます（以下ご参照）。
+        retain_edits: マップ データベースへの編集内容は保持されます。
+        retain_traces: アップロードされたトレースがあれば、保持されます。
+        retain_diary_entries: 日記のエントリと日記のコメントがある場合は保持されますが、表示されません。
+        retain_notes: 日記のエントリと日記のコメントがある場合は保持されますが、表示されません。
+        retain_changeset_discussions: 変更セットのディスカッションがあれば、保持されます。
+        retain_email: メールアドレスは保持されます。
         confirm_delete: 本当によろしいですか?
         cancel: キャンセル
   accounts:
@@ -464,7 +475,7 @@ ja:
       reopened_by_html: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に再開'
       reopened_by_anonymous_html: 誰かが<abbr title='%{exact_time}'>%{when}</abbr>に再開
       hidden_by_html: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に非表示化'
-      report: このメモを報告
+      report: このノートを報告
     query:
       title: 地物を検索
       introduction: 地図上をクリックすると、近くの地物を探します。
@@ -923,6 +934,7 @@ ja:
           trailhead: トレイル終始点
           trunk: 国道
           trunk_link: 国道
+          turning_circle: ロータリー
           turning_loop: 環形ターミナル
           unclassified: 未分類の道路
           "yes": 道路
@@ -1911,15 +1923,20 @@ ja:
           ドキュメントは、<a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> ライセンス (CC BY-SA 2.0) に基づいてライセンスされます。
         credit_title_html: OpenStreetMap のクレジット表記の仕方
-        credit_1_html: '&ldquo;&copy; OpenStreetMap contributors&rdquo;のクレジットを必ず使用してください。'
+        credit_1_html: OpenStreetMap を使う場所では、以下の2つの条件を必ず守ってください。
-        credit_2_1_html: あなたはデータが Open Database License に基づいて提供されていること、そして地図タイルを使用する場合は、地図画像が
+        credit_2_1_html: |-
-          CC BY-SA としてライセンスされていることを明確にしなければなりません。<a href="https://www.openstreetmap.org/copyright">著作権表示ページ</a>にリンクすることでこれを表現することができます。また、データの形式でOpenStreetMapを配布する場合の要件として、名前を表示の上、ライセンスに直接リンクすることができます。リンクを張れないメディア（印刷など）の場合は、openstreetmap.org（OpenStreetMapをアドレスとして展開した形）、opendatacommons.org、さらに関連がある場合はcreativecommons.orgへ読者を誘導することをお勧めします。
+          <ul>
+            <li>私たちの著作権表示ページを掲載し、OpenStreetMap にクレジットがあることを示してください。</li>
+            <li>データはライセンス要件である Open Database License に基づいて提供されていることを明示してください。</li>
+          </ul>
         credit_3_1_html: |-
-          www.openstreetmap.org に載っている&ldquo;standard style&rdquo; の地図のタイルは、OpenStreetMap財団によるオープンデータベース・ライセンス（Open Database License）に準拠してOSMデータ（OpenStreetMap data ）を使用した作成物（Produced Work）です。もし皆さんがこれらのタイルを利用する場合は、以下の継承を表示してください。
+          <!-- www.openstreetmap.org に載っている&ldquo;standard style&rdquo; の地図のタイルは、OpenStreetMap財団によるオープンデータベース・ライセンス（Open Database License）に準拠してOSMデータ（OpenStreetMap data ）を使用した作成物（Produced Work）です。もし皆さんがこれらのタイルを利用する場合は、以下の継承を表示してください。
-          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;。
+          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;。 -->著作権表示に関しては、皆さんが私たちのデータをどう使われるかによって、その表示要件が異なります。たとえば皆さんが新しく作成した地図は利用者が動かせるかどうか（browsable）、地図を印刷した、静止画像の地図を作成したなど、それぞれに適用されるルールが異なります。表示要件の詳細は
+          <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">帰属のガイドライン</a>をご参照ください。
         credit_4_html: |-
-          閲覧可能な電子地図の場合は、地図の隅にクレジットを表示してください。
+          あなたはデータが Open Database License に基づいて提供されていることを明示するため
-          例:
+          <a href="https://www.openstreetmap.org/copyright">この著作権ページ</a>にリンクしてください。もしくは OSM をデータ形式で配布する場合の必須条件として、直接、それぞれのライセンス条項の名前を提示しリンクしてください。リンク付与が不可能な媒体の場合は（例：印刷物ほか）、読者の皆さんに openstreetmap.orgを読むよう（「OpenStreetMap」という文言を連絡先URLに置換してもよい）、また opendatacommons.org
+          をお勧めしてください。左の丸カッコ内の処理例ですと、地図の隅に著作権表示が印刷されます。
         attribution_example:
           alt: ウェブページに OpenStreetMap を記述する方法の例
           title: 権利表示の例
@@ -1938,9 +1955,10 @@ ja:
           BY</a>)、<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
           Vorarlberg</a>、Land Tirol (ライセンス <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
           BY AT with amendments</a>) によるデータを含みます。'
-        contributors_au_html: '<strong>オーストラリア</strong>: <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA
+        contributors_au_html: '<strong>オーストラリア</strong>: 行政管轄の境界（Administrative Boundaries）の組み入れもしくは採用した開発において&copy;<a
-          Australia Limited</a>を出典とするデータは<a href="https://creativecommons.org/licenses/by/4.0/">CC
+          href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">PSMA
-          BY 4.0</a>のもとオーストラリア連邦政府の許諾を得ています。'
+          Australia Limited</a>を出典とするデータは<a href="https://creativecommons.org/licenses/by/4.0/">クリエイティブ・コモンズ表示
+          4.0 国際 (CC BY 4.0)</a>のもとオーストラリア連邦政府の許諾を得ています。'
         contributors_ca_html: '<strong>カナダ</strong>: GeoBase&reg;、GeoGratis (&copy;
           Department of Natural Resources Canada)、CanVec (&copy; Department of Natural
           Resources Canada)、StatCan (Geography Division, Statistics Canada) によるデータを含みます。'
@@ -1971,8 +1989,8 @@ ja:
         infringement_1_html: 'OpenStreetMapの協力者は、著作権者から明確な許諾を得ずに、著作権のある情報源 (例: Google
           マップや印刷された地図) から決してデータを持ち込まないよう注意するものとします。'
         infringement_2_html: もし著作権のある素材がOpenStreetMapのデータベースや本サイトに不正に追加されたとお考えの場合は、<a
-          href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">却下手順</a>をお読みになるか、<a
+          href="https://wiki.osmfoundation.org/wiki/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ならびに拡大鏡のロゴおよびState of the MapはOpenStreetMap財団の登録商標です。商標の利用に関しては、<a
           href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">商標利用ポリシー</a>を参照ください。
@@ -2279,6 +2297,7 @@ ja:
       in: 'タグ:'
     index:
       public_traces: 公開GPSトレース
+      my_gps_traces: 自作のGPSトレース
       public_traces_from: '%{user}さんによる公開GPSトレース'
       description: 最近のGPSトレースのアップロードを参照
       tagged_with: (タグ %{tags} が付いているもの)
@@ -2311,7 +2330,7 @@ ja:
     require_admin:
       not_an_admin: この作業を行うには、管理者になる必要があります。
     setup_user_auth:
-      blocked_zero_hour: OpenStreetMapウィブサイトにて緊急のお知らせがあります。編集を保存するにはお知らせを読んでください。
+      blocked_zero_hour: OpenStreetMap Web サイトに緊急のメッセージがあります。まずメッセージを読まないと、編集内容を保存することができません。
       blocked: APIへのアクセスがブロックされました。Web インターフェイスからログインし直して詳細を確認してください。
       need_to_see_terms: あなたは一時的にAPIの利用を停止されています。ウェブインターフェイスにログインして協力者規約をご覧ください。同意しなくてもかまいませんが、必ずご覧ください。
     settings_menu:
@@ -2470,7 +2489,7 @@ ja:
       read_tou: 私は利用規約を読み終え、これに同意します
       consider_pd: 上記に加え、私の投稿をパブリック ドメインとします
       consider_pd_why: これは何ですか?
-      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       guidance_html: この規約の理解を助ける情報として、<a href="%{summary}">要約 (英語)</a> や <a href="%{translations}">非公式の翻訳</a>
         をご覧ください。
       continue: 続行
@@ -2541,6 +2560,7 @@ ja:
       deactivate_user: この利用者を無効化
       confirm_user: このユーザーを確認
       unconfirm_user: このユーザーへの承認を取り消す
+      unsuspend_user: このユーザーの権限停止を解除
       hide_user: この利用者を表示しない
       unhide_user: このユーザーを再表示
       delete_user: この利用者を削除
@@ -2803,6 +2823,7 @@ ja:
         reactivate: 再有効化
         comment_and_resolve: コメント & 解決
         comment: コメント
+        report_link_html: このメモに削除が必要な機密情報が含まれている場合は、%{link}してください。メモに関する他の問題については、すべてコメントを付けてご自分で解決してください。
     edit_help: 編集したい位置に移動してズームインしてから、ここをクリックしてください。
     directions:
       ascend: 上り坂

config/locales/kk-cyrl.yml

@@ -134,6 +134,7 @@ kk-cyrl:
         link text: бұл не?
       save changes button: Өзгерістерді сақтау
   browse:
+    closed: Жабық
     created_html: <abbr title='%{title}'>%{time}</abbr> жасалған
     closed_html: <abbr title='%{title}'>%{time}</abbr> жабылған
     created_by_html: <abbr title='%{title}'>%{time}</abbr> %{user} жасаған
@@ -146,10 +147,16 @@ kk-cyrl:
       comment: Пікірлер (%{count})
       osmchangexml: osmChange XML
       discussion: Талқылау
+    relation_member:
+      type:
+        node: Нүкте
     not_found:
       title: Табылмады
       type:
         node: нүкте
+    redacted:
+      type:
+        node: нүкте
     start_rjs:
       loading: Жүктелуде…
     tag_details:

config/locales/ko.yml

@@ -1996,8 +1996,10 @@ ko:
         title: 메일링 리스트
         description: 국소 또는 지역의 메일링 리스트의 넓은 범위에서 관심사에 대해 질문하거나 토론을 합니다.
       forums:
-        title: 포럼들
+        title: 포럼 (레거시)
         description: 게시판 스타일 인터페이스를 선호하는 것에 대한 질문과 토론입니다.
+      community:
+        url: https://community.openstreetmap.org/
       irc:
         title: IRC
         description: 다양한 주제에서 많은 다른 언어로 된 대화형 채트입니다.

config/locales/ku-Latn.yml

@@ -472,7 +472,7 @@ ku-Latn:
         ji nû ve hate aktîvkirin
       hidden_by_html: Ji aliyê %{user} ve </abbr> <abbr title='%{exact_time}'>%{when}
         hate veşartin
-      report: Vê nîşeyê gilî bike
+      report: vê nîşeyê gilî bike
     query:
       title: Taybetmendiyan Nîşan Bide
       introduction: Ji bo ku hûn taybetmendiyên din yên nêzîkî bibînin, bitikînin
@@ -2040,8 +2040,8 @@ ku-Latn:
           Belgekirinên di nexşeya me de, di bin lîsansa <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0) de hatiye lîsanskirin.
         credit_title_html: Em çawan wekî çavkaniyekê behsa OpenStreetMapê bikin
-        credit_1_html: Ji bo referansgirtinê divê tu wisa binivîsîː &ldquo;&copy;
+        credit_1_html: 'Li cihê ku daneya OpenStreetMapê bi kar bînî, divê van du
-          beşarên OpenStreetMapê &rdquo;.
+          tiştan bikî:'
         credit_2_1_html: Herwiha divê hûn zelal bikin ku daneyên me di bin lîsansa
           Open Database License de hatiye lîsanskirin, û eger karoyên nexşeya me were
           emilandin, diyar bikin ku ev kartografî jî bi CC BY-SA hatiye lîsanskirin.

config/locales/lb.yml

@@ -2015,7 +2015,7 @@ lb:
       mailing_lists:
         title: Mailing-Lëschten
       forums:
-        title: Forumen
+        title: Forumen (vereelzt)
       irc:
         title: IRC
       welcomemat:

config/locales/mk.yml

@@ -455,7 +455,7 @@ mk:
       reopened_by_html: Преактивирано од %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Преактивирано од анонимен <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Скриено од %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Пријави го јазолов
+      report: пријави го јазолов
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Пребарување на елементи
@@ -1478,6 +1478,7 @@ mk:
   issue_comments:
     create:
       comment_created: Коментарот е успешно создаден
+      issue_reassigned: Вашиот коментар беше создаден и проблемот беше преназначен
   reports:
     new:
       title_html: Пријава %{link}
@@ -2216,8 +2217,12 @@ mk:
         description: Поставете прашање или разговарајте за интересни прашања на широк
           опсег на тематски и регионални поштенски списоци.
       forums:
-        title: Форуми
+        title: Форуми (наследени)
         description: Прашања и разговори за оние кои претпочитаат да општат со објави.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Форум на заедницата
+        description: Заедничко место за разговори за OpenStreetMap.
       irc:
         title: IRC
         description: Разговор во живо на најразлични јазици и на многу теми.
@@ -3025,6 +3030,9 @@ mk:
         reactivate: Реактивирај
         comment_and_resolve: Коментирај и реши
         comment: Коментирај
+        report_link_html: Доколку оваа белешка содржи чувствителни информации кои
+          треба да се остранат, можете да %{link}. За сите други проблеми со белешката,
+          решете ги самите со коментар.
     edit_help: Поместете ја картата и приближете во местото што сакате да го уредите,
       па стиснете тука.
     directions:

config/locales/my.yml

@@ -8,6 +8,8 @@
 ---
 my:
   helpers:
+    file:
+      prompt: ဖိုင်ရွေးပါ
     submit:
       diary_comment:
         create: သိမ်းရန်
@@ -21,6 +23,9 @@ my:
       client_application:
         create: မှတ်ပုံတင်ရန်
         update: မွမ်းမံ
+      doorkeeper_application:
+        create: မှတ်ပုံတင်ရန်
+        update: မွမ်းမံ
       trace:
         create: တင်ရန်
         update: ပြောင်းလဲမှုများကို သိမ်းရန်
@@ -107,6 +112,12 @@ my:
   editor:
     remote:
       name: အဝေး ထိန်းချုပ်
+  auth:
+    providers:
+      none: တစ်ခုမှမဟုတ်
+      google: ဂူဂဲလ်
+      facebook: ဖေ့ဘုတ်
+      wikipedia: ဝီကီပီးဒီးယား
   api:
     notes:
       comment:
@@ -115,8 +126,14 @@ my:
       entry:
         comment: မှတ်ချက်
         full: မှတ်စု အပြည့်အစုံ
+  account:
+    deletions:
+      show:
+        confirm_delete: သေချာပါသလား
+        cancel: မလုပ်တော့ပါ
   accounts:
     edit:
+      title: အကောင့်ကို ပြင်ဆင်ရန်
       current email address: လက်ရှိ အီးမေးလ်လိပ်စာ
       save changes button: ပြောင်းလဲမှုများကို သိမ်းရန်
   browse:
@@ -268,7 +285,9 @@ my:
           grave_yard: သုဿန်
           hospital: ဆေးရုံ
           ice_cream: ရေခဲမုန့်
+          internet_cafe: အင်တာနက်ကဖေး
           kindergarten: မူလတန်းကျောင်း
+          language_school: ဘာသာစကားကျောင်း
           library: စာကြည့်တိုက်
           marketplace: စျေးတန်း
           monastery: ဘုန်းကြီးကျောင်း
@@ -299,6 +318,8 @@ my:
           viaduct: တောင်ကြားလမ်း
           "yes": တံတား
         building:
+          house: အိမ်
+          roof: ခေါင်မိုး
           "yes": အဆောက်ဦး
         craft:
           brewery: ဘီယာချက်စက်ရုံ
@@ -365,6 +386,7 @@ my:
           embankment: တာရိုး
           lighthouse: မီးပြတိုက်
           pipeline: ပိုက်လိုင်း
+          telescope: အဝေးကြည့်မှန်ပြောင်း
           tower: မျှော်စင်
           watermill: ရေဒလက်စက်
           water_well: ရေတွင်း

config/locales/nb.yml

@@ -8,6 +8,7 @@
 # Author: Dittaeva
 # Author: EvenT
 # Author: Event
+# Author: Gabriel Kielland
 # Author: Gustavf
 # Author: Haakon K
 # Author: Hansfn
@@ -1955,6 +1956,8 @@ nb:
         title: Forumer
         description: Spørsmål og diskusjoner for de som foretrekker et oppslagstavlelignende
           grensesnitt.
+      community:
+        url: https://community.openstreetmap.org/
       irc:
         title: IRC
         description: Interaktiv sludrekanal på flere ulike språk som dekker mange

config/locales/ne.yml

@@ -1,6 +1,7 @@
 # Messages for Nepali (नेपाली)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Bada Kaji
 # Author: Danieldegroot2
 # Author: Drjpoudel
 # Author: Haribanshi
@@ -10,6 +11,7 @@
 # Author: Njsubedi
 # Author: RajeshPandey
 # Author: पर्वत सुबेदी
+# Author: बडा काजी
 # Author: राम प्रसाद जोशी
 # Author: सरोज कुमार ढकाल
 # Author: हिमाल सुबेदी
@@ -302,7 +304,7 @@ ne:
       title: परिवर्नहरू
       title_user: '%{user}द्वरा गरिएका परिवर्तनहरू'
       title_friend: तपाईको मित्रहरूद्वारा गरिएका परिवर्तनहरू
-      title_nearby: तपाई नजिक हुनुभएका प्रयोगकर्ताहरूद्वारा गरिएका परिवर्तनहरू
+      title_nearby: तपाईं नजिक हुनुभएका प्रयोगकर्ताहरूद्वारा गरिएका परिवर्तनहरू
       empty: कुनै पनि परिवर्तनहरू भेटिएनन्।
       empty_area: यो क्षेत्रमा कुनै परिवर्तनहरू छैनन्।
       empty_user: यस प्रयोगकर्ताद्वारा कुनै परिवर्तनहरू गरिएका छैनन्।
@@ -374,7 +376,7 @@ ne:
         other: '%{count} टिप्पणीहरू'
       edit_link: यो प्रविष्टी सम्पादन गर्ने
       hide_link: यो प्रविष्टी लुकाउने
-      confirm: निश्चित गर्ने
+      confirm: निश्चित गर्नुहोस्
       report: यो प्रविष्टीको उजुरी गर्ने
     diary_comment:
       comment_from_html: '%{link_user}द्वारा %{comment_created_at}मा गरिएको टिप्पणी'
@@ -862,7 +864,7 @@ ne:
       greeting: नमस्ते,
   confirmations:
     confirm:
-      button: निश्चित गर्ने
+      button: निश्चित गर्नुहोस्
     confirm_email:
       heading: इमेल परिवर्तन भएको निश्चित गर्नुहोस्
       press confirm button: इमेल निश्चित गर्नको लागि निश्चितमा क्लिक गर्नुहोस् ।
@@ -1174,7 +1176,7 @@ ne:
       role:
         administrator: यी प्रयोगकर्ता प्रबन्धक हुनुहुन्छ
       comments: टिप्पणी
-      confirm: निश्चित गर्ने
+      confirm: निश्चित गर्नुहोस्
     go_public:
       flash success: तपाईंका सबै सम्पादनहरू सार्वाजनिक छन् , तपाईं अब सम्पादन लायक
         हुनु भयो ।
@@ -1191,15 +1193,15 @@ ne:
       heading: भूमिका प्रदान निश्चित गर्ने
       are_you_sure: भूमिका `%{role}' प्रयोगकर्ता `%{name}'लाई प्रदान गर्न निश्चित
         हुनुहुन्छ?
-      confirm: निश्चित गर्ने
+      confirm: निश्चित गर्नुहोस्
       fail: भूमिका `%{role}' प्रयोगकर्ता  `%{name}'लाई प्रदान गर्न सकिएन । कृपया प्रयोगकर्ता
         र भूमिका दुबै मान्य छन् भनि जाँच गर्नुहोस् ।
     revoke:
       title: भूमिका फिर्ता निश्चित गर्ने
       heading: भूमिका फिर्ता निश्चित गर्ने
-      are_you_sure: तपाईँ  भूमिका `%{role}' , `%{name} प्रोगकर्ताबाट फिर्ता लिने कुरामा
+      are_you_sure: तपाईं भूमिका `%{role}' , `%{name} प्रोगकर्ताबाट फिर्ता लिने कुरामा
         निश्चित हुनुहुन्छ'?
-      confirm: निश्चित गर्ने
+      confirm: निश्चित गर्नुहोस्
       fail: भूमिका `%{role}' ,`%{name}'बाट फिर्ता लिन सकिएन । प्रोगकर्ता नाम र भूमिका
         दुबै मान्य छन् भन्ने खुलाउनु होस् ।
   user_blocks:

config/locales/nl.yml

@@ -512,7 +512,7 @@ nl:
         geactiveerd door anoniem
       hidden_by_html: <abbr title='%{exact_time}'>%{when} ago</abbr> verborgen door
         %{user}
-      report: Deze opmerking rapporteren
+      report: deze opmerking rapporteren
     query:
       title: Objecten opvragen
       introduction: Klik op de kaart om nabije objecten te vinden.
@@ -1532,6 +1532,8 @@ nl:
   issue_comments:
     create:
       comment_created: Uw reactie is succesvol aangemaakt
+      issue_reassigned: Uw commentaar is aangemaakt en de probleemrapportage is opnieuw
+        toegewezen
   reports:
     new:
       title_html: Rapporteer %{link}
@@ -2289,9 +2291,13 @@ nl:
         description: Stel een vraag of bespreek interessante zaken op een hele reeks
           onderwerpsgebonden of regionale mailinglijsten.
       forums:
-        title: Forums
+        title: Forums (verouderd)
         description: Vragen en overleg voor als u liever met een interface in bulletin
           boardstijl werkt.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Gemeenschapsforum
+        description: Een gedeelde plek voor conversaties over OpenStreetMap.
       irc:
         title: IRC
         description: Interactieve chat in vele verschillende talen en over tal van
@@ -3099,6 +3105,9 @@ nl:
         reactivate: Opnieuw activeren
         comment_and_resolve: Reageren en oplossen
         comment: Reageren
+        report_link_html: Als deze opmerking gevoelige informatie bevat die verwijderd
+          moet worden, kun je %{link}. Als er andere problemen zijn, kun je een reactie
+          achterlaten en haar als opgelost markeren.
     edit_help: Verplaats de kaart en zoom in op een plaats die u wilt bewerken. Klik
       daarna hier.
     directions:

config/locales/pa.yml

@@ -52,12 +52,12 @@ pa:
       notifier: ਨੋਟੀਫਾਇਰ
       old_node: ਪੁਰਾਣੀ ਨੋਡ
       old_node_tag: ਪੁਰਾਣਾ ਨੋਡ ਟੈਗ
-      old_relation: ਪੁਰਾਣਾ ਨਾਤਾ
+      old_relation: ਪੁਰਾਣਾ ਸਬੰਧ
       old_relation_member: ਪੁਰਾਣਾ ਸਬੰਧ ਮੈਂਬਰ
       old_relation_tag: ਪੁਰਾਣਾ ਸਬੰਧ ਟੈਗ
-      old_way: ਪੁਰਾਣਾ ਢੰਗ
+      old_way: ਪੁਰਾਣਾ ਰਾਹ
-      old_way_node: ਪੁਰਾਣਾ ਢੰਗ ਨੋਡ
+      old_way_node: ਪੁਰਾਣਾ ਰਾਹ ਨੋਡ
-      old_way_tag: ਪੁਰਾਣਾ ਢੰਗ ਟੈਗ
+      old_way_tag: ਪੁਰਾਣਾ ਰਾਹ ਟੈਗ
       relation: ਸਬੰਧ
       relation_member: ਸਬੰਧ ਮੈਂਬਰ
       relation_tag: ਸਬੰਧ ਟੈਗ
@@ -80,7 +80,7 @@ pa:
       diary_entry:
         user: ਵਰਤੋਂਕਾਰ
         title: ਵਿਸ਼ਾ
-        latitude: ਲੰਬਕਾਰ
+        latitude: ਅਕਸ਼ਾਂਸ਼
         longitude: ਲੰਬਕਾਰ
         language: ਬੋਲੀ
       doorkeeper/application:
@@ -93,7 +93,7 @@ pa:
         visible: ਵਿਖਣਯੋਗ
         name: ਨਾਂ
         size: ਅਕਾਰ
-        latitude: ਵਿਧਕਾਰ
+        latitude: ਅਕਸ਼ਾਂਸ਼
         longitude: ਲੰਬਕਾਰ
         public: ਜਨਤਕ
         description: ਵੇਰਵਾ
@@ -112,7 +112,7 @@ pa:
         active: ਸਰਗਰਮ
         display_name: ਵਿਖਾਉਣ ਨਾਂ
         description: ਵੇਰਵਾ
-        home_lat: 'ਅਕਸ਼ਾਂਸ਼:'
+        home_lat: ਅਕਸ਼ਾਂਸ਼
         home_lon: 'ਰੇਖਾਂਸ਼:'
         languages: ਬੋਲੀਆਂ
         pass_crypt: ਪਛਾਣ-ਸ਼ਬਦ
@@ -193,14 +193,14 @@ pa:
         way: ਰਾਹ
         relation: ਸਬੰਧ
         changeset: ਚੇਂਜ਼ਸੈੱਟ
-        note: ਟਿੱਪਣੀ
+        note: ਨੋਟ
     timeout:
       type:
         node: ਨੋਡ
         way: ਰਾਹ
         relation: ਸਬੰਧ
         changeset: ਚੇਂਜ਼ਸੈੱਟ
-        note: ਟਿੱਪਣੀ
+        note: ਨੋਟ
     redacted:
       type:
         node: ਨੋਡ
@@ -250,7 +250,7 @@ pa:
     show:
       leave_a_comment: ਕੋਈ ਟਿੱਪਣੀ ਛੱਡੋ
       login_to_leave_a_comment_html: ਟਿੱਪਣੀ ਛੱਡਣ ਵਾਸਤੇ %{login_link}
-      login: ਦਾਖ਼ਲਾ
+      login: ਲੌਗਇਨ
     no_such_entry:
       title: ਅਜਿਹਾ ਕੋਈ ਡਾਇਰੀ ਇੰਦਰਾਜ ਨਹੀਂ
     diary_entry:
@@ -843,21 +843,21 @@ pa:
       no home location: ਤੁਸੀਂ ਆਪਣੇ ਘਰ ਦੀ ਸਥਿਤੀ ਨਹੀਂ ਦੱਸੀ ਹੈ।
   sessions:
     new:
-      title: ਦਾਖ਼ਲਾ
+      title: ਲੌਗਇਨ
-      heading: ਦਾਖ਼ਲਾ
+      heading: ਲੌਗਇਨ
       email or username: 'ਈਮੇਲ ਪਤਾ ਜਾਂ ਵਰਤੋਂਕਾਰ-ਨਾਂ:'
       password: 'ਪਛਾਣ-ਸ਼ਬਦ:'
       remember: ਮੈਨੂੰ ਯਾਦ ਰੱਖੋ
       lost password link: ਆਪਣਾ ਪਛਾਣ-ਸ਼ਬਦ ਗੁਆ ਦਿੱਤਾ?
-      login_button: ਦਾਖ਼ਲ ਹੋਵੋ
+      login_button: ਲੌਗਇਨ
       register now: ਹੁਣੇ ਰਜਿਸਟਰ ਕਰੋ
       new to osm: ਓਪਨ-ਸਟਰੀਟ-ਮੈਪ 'ਤੇ ਨਵੇਂ ਹੋ?
       create account minute: ਖਾਤਾ ਬਣਾਉ। ਸਿਰ਼ਫ ਇੱਕ ਮਿੰਟ ਲੱਗਦਾ ਹੈ।
       no account: ਖਾਤਾ ਨਹੀਂ ਹੈ?
     destroy:
-      title: ਲਾਗ ਆਊਟ
+      title: ਲੌਗਆਊਟ
       heading: OpenStreetMap ਤੋਂ ਬਾਹਰ ਜਾਓ
-      logout_button: ਵਿਦਾਈ
+      logout_button: ਲੌਗਆਊਟ
   site:
     about:
       next: ਅੱਗੇ
@@ -1022,6 +1022,7 @@ pa:
       uploaded: 'ਅੱਪਲੋਡ ਹੋਇਆ:'
       points: ਬਿੰਦੂ
       start_coordinates: 'ਸ਼ੁਰੂਆਤੀ ਗੁਣਕ:'
+      coordinates_html: '%{latitude}; %{longitude}'
       map: ਨਕਸ਼ਾ
       edit: ਸੋਧੋ
       owner: 'ਮਾਲਕ:'

config/locales/pl.yml

@@ -53,6 +53,7 @@
 # Author: Strebski
 # Author: Teiron
 # Author: The Polish
+# Author: Tsca
 # Author: Ty221
 # Author: WaldiSt
 # Author: Woytecr
@@ -342,8 +343,8 @@ pl:
           zostaną usunięte.
         delete_display_name: Twoja wyświetlana nazwa zostanie usunięta i będzie mogła
           być użyta przez inne konta.
-        retain_caveats: 'Jednak niektóre informacje o tobie będą zachowane na OpenStreetMap,
+        retain_caveats: 'Jednak niektóre informacje o tobie pozostaną zachowane na
-          nawet po usunięciu konta:'
+          OpenStreetMap nawet po usunięciu konta:'
         retain_edits: Twoje ewentualne zmiany w bazie danych mapy zostaną zachowane.
         retain_traces: Twoje przesłane ślady zostaną zachowane.
         retain_diary_entries: Twoje ewentualne wpisy do dziennika i komentarze pod
@@ -544,7 +545,7 @@ pl:
       reopened_by_html: Ponownie aktywowana przez %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Ponownie aktywowana anonimowo <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Ukryte przez %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Zgłoś tę uwagę
+      report: ją zgłosić
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Dane obiektów
@@ -3128,6 +3129,9 @@ pl:
         reactivate: Ponownie aktywuj
         comment_and_resolve: Skomentuj i rozwiąż
         comment: Dodaj komentarz
+        report_link_html: Jeśli ta uwaga zawiera wrażliwe informacje, które należy
+          usunąć, możesz %{link}. W przypadku wszystkich innych problemów z tą uwagą,
+          rozwiąż ją z odpowiednim komentarzem.
     edit_help: Proszę przesunąć mapę i przybliżyć modyfikowane położenie, a następnie
       kliknąć tutaj.
     directions:

config/locales/pt-BR.yml

@@ -302,10 +302,10 @@ pt-BR:
   account:
     deletions:
       show:
-        title: Eliminar minha Conta
+        title: Eliminar minha conta
         warning: Alerta! O processo de eliminação de contas é permanente, e não pode
           ser revertido.
-        delete_account: Eliminar Conta
+        delete_account: Eliminar conta
         delete_introduction: 'Você pode eliminar sua conta no OpenStreetMap usando
           o botão abaixo. Por favor observe os detalhes a seguir:'
         delete_profile: Suas informações de perfil, incluindo seu avatar, descrição,
@@ -506,7 +506,7 @@ pt-BR:
       reopened_by_html: Reaberto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Reaberto por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Ocultado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Denunciar esta nota
+      report: denunciar esta nota
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Consultar elementos
@@ -703,16 +703,16 @@ pt-BR:
           aerodrome: Aeródromo
           airstrip: Pista de pouso
           apron: Plataforma de estacionamento do aeroporto
-          gate: Portão do Aeroporto
+          gate: Portão do aeroporto
           hangar: Hangar
           helipad: Heliponto
           holding_position: Posição de estabelecimento
-          navigationaid: Auxílio à Navegação de Aviação
+          navigationaid: Auxílio à navegação de aviação
           parking_position: Posição de estacionamento
           runway: Pista de pouso
           taxilane: Faixa de táxi
           taxiway: Pista de Taxiamento
-          terminal: Terminal do Aeroporto
+          terminal: Terminal do aeroporto
           windsock: Biruta
         amenity:
           animal_boarding: Hotel para animais
@@ -792,9 +792,9 @@ pt-BR:
           pub: Pub
           public_bath: Banho público
           public_bookcase: Estante pública
-          public_building: Edifício Público
+          public_building: Edifício público
           ranger_station: Estação de patrulha
-          recycling: Posto de Reciclagem
+          recycling: Posto de reciclagem
           restaurant: Restaurante
           sanitary_dump_station: Estação de descarga sanitária
           school: Escola
@@ -824,17 +824,17 @@ pt-BR:
           "yes": Comodidade
         boundary:
           aboriginal_lands: Terras indígenas
-          administrative: Limite Administrativo
+          administrative: Limite administrativo
           census: Limite Censitário
-          national_park: Parque Nacional
+          national_park: Parque nacional
           political: Zona eleitoral
-          protected_area: Área Protegida
+          protected_area: Área protegida
           "yes": Limite
         bridge:
           aqueduct: Aqueduto
           boardwalk: Passeio à beira mar
-          suspension: Ponte Suspensa
+          suspension: Ponte suspensa
-          swing: Ponte Giratória
+          swing: Ponte giratória
           viaduct: Viaduto
           "yes": Ponte
         building:
@@ -1255,7 +1255,7 @@ pt-BR:
           "yes": Lugar
         railway:
           abandoned: Ferrovia Abandonada
-          buffer_stop: Para-choque de Via
+          buffer_stop: Para-choque de via
           construction: Ferrovia em Construção
           disused: Ferrovia Inativa
           funicular: Funicular
@@ -1278,7 +1278,7 @@ pt-BR:
           switch: Chave de Ferrovia
           tram: Trilho de Bonde
           tram_stop: Ponto de bonde
-          turntable: Girador Ferroviário
+          turntable: Girador ferroviário
           yard: Estação de classificação
         shop:
           agrarian: Loja agrária
@@ -1319,7 +1319,7 @@ pt-BR:
           deli: Delicatessen
           department_store: Loja de Departamento
           discount: Loja de Descontos
-          doityourself: Loja de Bricolagem
+          doityourself: Loja de bricolagem
           dry_cleaning: Lavanderia a Seco
           e-cigarette: Loja de cigarro eletrônico
           electronics: Loja de Eletroeletrônicos
@@ -1405,7 +1405,7 @@ pt-BR:
           artwork: Obra de arte
           attraction: Atração Turística
           bed_and_breakfast: Hospedagem Domiciliar
-          cabin: Cabana Turística
+          cabin: Cabana turística
           camp_pitch: Campo de acampamento
           camp_site: Local de Acampamento
           caravan_site: Local de Caravanas
@@ -2515,7 +2515,7 @@ pt-BR:
       in: em
     index:
       public_traces: Trilhas públicas de GPS
-      my_gps_traces: Minhas Trilhas GPS
+      my_gps_traces: Minhas trilhas GPS
       public_traces_from: Trilhas de GPS públicas de %{user}
       description: Procurar trilhas de GPS enviadas recentemente
       tagged_with: ' etiquetadas com %{tags}'

config/locales/pt-PT.yml

@@ -496,7 +496,7 @@ pt-PT:
       reopened_by_html: Reaberto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Reaberto por um anónimo <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Ocultada por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Denunciar esta nota
+      report: denunciar esta nota
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Consultar elementos
@@ -1272,7 +1272,7 @@ pt-PT:
           switch: Agulha ferroviária
           tram: Linha de elétrico
           tram_stop: Paragem de elétrico
-          turntable: Girador ferroviário
+          turntable: Rotunda ferroviária
           yard: Pátio de manobras ferroviário
         shop:
           agrarian: Loja agrícola
@@ -1523,6 +1523,7 @@ pt-PT:
   issue_comments:
     create:
       comment_created: O comentário foi criado com sucesso
+      issue_reassigned: O teu comentário foi criado e o problema foi reatribuído
   reports:
     new:
       title_html: Denunciar %{link}
@@ -1890,7 +1891,7 @@ pt-PT:
       cancel: Cancelar
       image: Imagem
       gravatar:
-        gravatar: Usar imagem Gravatar
+        gravatar: Usar Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar
         what_is_gravatar: O que é o Gravatar?
         disabled: O Gravatar foi desativado.
@@ -1899,7 +1900,7 @@ pt-PT:
       keep image: Manter a imagem atual
       delete image: Remover a imagem atual
       replace image: Substituir a imagem atual
-      image size hint: (as imagens quadradas com pelo menos 100x100 píxeis, funcionam
+      image size hint: (as imagens quadradas com, pelo menos, 100x100 píxeis funcionam
         melhor)
       home location: Localização principal
       no home location: Não definiste a tua localização principal.
@@ -2048,24 +2049,19 @@ pt-PT:
         credit_title_html: Como creditar o OpenStreetMap
         credit_1_html: 'Onde usar dados do OpenStreetMap, é necessário fazer as duas
           coisas seguintes:'
-        credit_2_1_html: "<ul>\n<li> Fornecer crédito ao OpenStreetMap exibindo o
+        credit_2_1_html: "<ul>\n<li> Atribuir os créditos ao OpenStreetMap exibindo
-          nosso aviso de direitos autorais.</li> \n<li> Deixar claro que os dados
+          o nosso aviso de direitos de autor.</li> \n<li> Deixar claro que os dados
-          estão disponíveis sob a Open Database License.</li> \n</ul>"
+          estão disponíveis sob a Licença Open Database.</li> \n</ul>"
-        credit_3_1_html: "Para o aviso de direitos autorais, temos requisitos diferentes
+        credit_3_1_html: Para o aviso de direitos de autor, temos vários requisitos
-          sobre como isso deve ser \nexibido, dependendo de como usa os nossos dados.
+          para a sua exibição, dependendo da forma como usa os nossos dados. Por exemplo,
-          Por exemplo, diferentes \nregras se aplicam sobre como mostrar o aviso de
+          aplicam-se regras diferentes para a exibição do aviso de direitos de autor
-          direitos de autor dependendo se\ncriou um mapa navegável, um mapa impresso
+          conforme usar um mapa navegável, um mapa impresso ou uma imagem estática.
-          ou uma imagem estática. Detalhes completos sobre os requisitos \n podem
+          Poderá encontrar toda a informação sobre os requisitos nas <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Diretrizes
-          ser encontrados nas\n <a href=\"https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines\">Diretrizes
+          de Atribuição</a>.
-          de atribuição</a> ."
+        credit_4_html: |-
-        credit_4_html: "Para deixar claro que os dados estão disponíveis sob a Licença
+          Para deixar claro que os dados estão disponíveis sob a Licença Open
-          Open\nDatabase, é possível criar um link para\n <a href=\"https://www.openstreetmap.org/copyright\">esta
+          Database, é possível criar uma ligação para <a href="https://www.openstreetmap.org/copyright">esta página de direitos de autor</a>.
-          página de direitos de autor</a>.\nAlternativamente, e como requisito, se
+          Em alternativa, e como requisito, se estiver a distribuir o OSM num formato de dados, pode nomear e ligar diretamente à(s) licença(s). Em plataformas multimédia onde as ligações não são possíveis (por exemplo, trabalhos impressos), sugerimos que direcione os seus utilizadores para openstreetmap.org (talvez expandindo 'OpenStreetMap' para este endereço completo) e para opendatacommons.org. Neste exemplo, os créditos aparecem no canto do mapa.
-          estiver distribuindo OSM num\nformato de dados, pode nomear e vincular diretamente
-          à(s) licença(s). Em mídia\nonde ligações não são possíveis (por exemplo,
-          trabalhos impressos), sugerimos que\ndirecione os seus leitores para openstreetmap.org
-          (talvez expandindo\n'OpenStreetMap' para este endereço completo) e para
-          opendatacommons.org. \nNeste exemplo, o crédito aparece no canto do mapa."
         attribution_example:
           alt: Exemplo de como indicar os créditos do OpenStreetMap numa página eletrónica
           title: Exemplo de atribuição
@@ -2497,7 +2493,7 @@ pt-PT:
       in: em
     index:
       public_traces: Rotas de GPS Públicas
-      my_gps_traces: Meus rastreamentos de GPS
+      my_gps_traces: As minhas rotas GPS
       public_traces_from: Rotas GPS públicas do utilizador %{user}
       description: Explorar as rotas GPS enviadas recentemente
       tagged_with: etiquetada com %{tags}
@@ -3079,6 +3075,9 @@ pt-PT:
         reactivate: Reabrir
         comment_and_resolve: Comentar e resolver
         comment: Comentar
+        report_link_html: Se esta nota contiver informação sensível que tenha de ser
+          removida, podes %{link}. Para qualquer outro problema com a nota, por favor,
+          resolve-a com um comentário.
     edit_help: Move o mapa, amplia-o no local que pretendes editar e clica aqui.
     directions:
       ascend: Ascenção

config/locales/ru.yml

@@ -571,7 +571,7 @@ ru:
       reopened_by_html: Переоткрыта %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Переоткрыта анонимно <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Скрыта %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Сообщить об этой заметке
+      report: пожаловаться на эту заметку
     query:
       title: Что здесь?
       introduction: Нажмите на карту, чтобы найти ближайшие объекты
@@ -715,7 +715,6 @@ ru:
       heading: Комментарии к записям в дневнике пользователя %{user}
       subheading_html: Комментарии к записям в дневнике, добавленные пользователем
         %{user}
-      no_comments: Никаких комментариев в дневнике
       post: Сообщение
       when: Когда
       comment: Комментарий
@@ -2276,8 +2275,12 @@ ru:
         description: Задайте вопрос или обсудите насущные вопросы в списке рассылок
           (количество активных пользователей зависит от языка).
       forums:
-        title: Форумы
+        title: Форумы (устаревшее)
         description: Вопросы и обсуждения для тех, кто предпочитает форумы для общения.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Форум сообщества
+        description: Общедоступное место для разговоров об OpenStreetMap.
       irc:
         title: IRC
         description: Интерактивный чат на разных языках и на разные темы.
@@ -2356,6 +2359,7 @@ ru:
           common:
           - Общественная земля
           - луг
+          - сад
           retail: Торговый район
           industrial: Промышленный район
           commercial: Коммерческий район
@@ -2995,7 +2999,6 @@ ru:
       title: Заметки, созданные или прокомментированный участником %{user}
       heading: Заметки участника %{user}
       subheading_html: Заметки, созданные или прокомментированные участником %{user}
-      no_notes: Нет заметок
       id: Идентификатор
       creator: Автор
       description: Описание

config/locales/sk.yml

@@ -496,7 +496,7 @@ sk:
       reopened_by_html: Opätovne aktivoval používateľ %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Opätovne aktivoval anonymný používateľ <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Skryl %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Nahlásiť túto poznámku
+      report: nahlásiť túto poznámku
     query:
       title: Prieskum prvkov
       introduction: Pre nájdenie okolitých prvkov kliknite na mapu.

config/locales/ta.yml

@@ -50,6 +50,7 @@ ta:
     errors:
       messages:
         invalid_email_address: செல்லுபடியாகும் மின்னஞ்சல் முகவரியாகத் தெரியவில்லை
+        email_address_not_routable: திசைதிருப்பக்கூடியது அல்ல
     models:
       acl: அனுமதிக் கட்டுப்பாட்டுப் பட்டியல்
       changeset: மாற்றங்கள்

config/locales/tr.yml

@@ -57,7 +57,7 @@ tr:
     dir: ltr
   time:
     formats:
-      friendly: '%e %B %Y saat %H:%M'
+      friendly: '%e %B %Y saat %H.%M'
   helpers:
     file:
       prompt: Dosya seç
@@ -102,7 +102,7 @@ tr:
       issue: Sorun
       language: Dil
       message: Mesaj
-      node: Düğüm
+      node: Nokta
       node_tag: Düğüm Etiketi
       notifier: Bildiren
       old_node: Eski Nokta
@@ -505,7 +505,7 @@ tr:
         yeniden etkin hâle getirildi.
       hidden_by_html: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
         gizlendi'
-      report: Bu notu bildir
+      report: bu notu bildir
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Sorgu Özellikleri
@@ -1532,6 +1532,7 @@ tr:
   issue_comments:
     create:
       comment_created: Yorumunuz başarıyla oluşturuldu
+      issue_reassigned: Yorumunuz oluşturuldu ve problem, aktarıldı
   reports:
     new:
       title_html: 'Bildir: %{link}'
@@ -2418,7 +2419,7 @@ tr:
           ya da bir ağaç olabilir.
         way_html: <strong>Yol</strong>, bir çizgi ya da alan, bir cadde, akarsu, göl
           ya da bina olabilir.
-        tag_html: <strong>Etiket</strong>, bir düğümün ya da yolun veri parçasıdır.
+        tag_html: <strong>Etiket</strong>, bir noktanın ya da yolun veri parçasıdır.
           Bu bir restoranın ismi ya da yolun hız sınırı olabilir.
       rules:
         title: Kuralları!
@@ -2710,7 +2711,7 @@ tr:
       about:
         header: Ücretsiz ve düzenlenebilir
         html: |-
-          <p>Diğer haritaların aksine, OpenStreetMap tamamıyla sizin gibi insanlar tarafından oluşturulur ve düzeltme, güncelleme, indirme ve kullanma herkes için ücretsizdir.</p>
+          <p>OpenStreetMap, diğer haritaların aksine tamamıyla sizin gibi kişiler tarafından oluşturulur ve düzenleme, güncelleme, indirme ve kullanma işlemleri herkes için ücretsizdir.</p>
           <p>Katkıda bulunmaya başlamak için kaydolun. Hesabınızın onaylanması için size bir e-posta göndereceğiz.</p>
       email address: 'E-posta Adresi:'
       confirm email address: E-posta Adresini Onayla
@@ -3098,6 +3099,9 @@ tr:
         reactivate: Yeniden etkinleştir
         comment_and_resolve: Yorum ve Çözüm
         comment: Yorum
+        report_link_html: Bu not, kaldırılması gereken hassas bilgiler içeriyorsa
+          %{link} bağlantısına tıklayınız. Notla ilgili diğer tüm sorunlar için lütfen
+          yorum yazarak çözmeye çalışınız.
     edit_help: Haritayı sürükleyip ve düzenleme yapmak istediğiniz konuma yakınlaştırdıktan
       sonra buraya tıklayın.
     directions:
@@ -3192,7 +3196,7 @@ tr:
           tenth: onuncu
       time: Zaman
     query:
-      node: Düğüm
+      node: Nokta
       way: Yol
       relation: İlişki
       nothing_found: Özellik bulunamadı

config/locales/tt.yml

@@ -10,10 +10,13 @@ tt:
     formats:
       friendly: '%e %B %Y сәгать %H:%M'
   helpers:
+    file:
+      prompt: Файлны сайлагыз
     submit:
       diary_comment:
         create: Саклау
       diary_entry:
+        create: Бастыру
         update: Яңарту
       issue_comment:
         create: Шәрехне өстәү
@@ -21,7 +24,10 @@ tt:
         create: Җибәрү
       client_application:
         create: Теркәлү
-        update: Үзгәртү
+        update: Яңарту
+      doorkeeper_application:
+        create: Теркәлү
+        update: Яңарту
       trace:
         create: Төяү
         update: Үзгәрешләрне саклау
@@ -62,13 +68,13 @@ tt:
       trace:
         user: Кулланучы
         visible: Күренүчәнлек
-        name: Исем
+        name: Файл исеме
         size: Зурлык
         latitude: Киңлек
         longitude: Озынлык
         description: Тасвир
-        gpx_file: 'GPX файлын төяү:'
+        gpx_file: GPX файлын төяү
-        tagstring: 'Тамгалар:'
+        tagstring: Тамгалар
       message:
         sender: Җибәрүче
         title: Тема
@@ -215,8 +221,8 @@ tt:
       my friends: Дусларым
   diary_entries:
     form:
-      location: 'Урын:'
+      location: Урын
-      use_map_link: Харитада күрсәтергә
+      use_map_link: Хаританы кулланырга
     index:
       title: Көндәлекләр
       title_friends: Дуслар көндәлекләре
@@ -247,7 +253,7 @@ tt:
       prefix:
         aeroway:
           aerodrome: Аэродром
-          apron: Перрон
+          apron: Аэропорт перроны
           gate: Утыруга чыгу
           hangar: Ангар
           helipad: Боралак мәйданчыгы

config/locales/uk.yml

@@ -533,7 +533,7 @@ uk:
       reopened_by_html: Відновлено %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Відновлено анонімом <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Приховано %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Поскаржитися на цю нотатку
+      report: поскаржитися на цю нотатку
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Отримати об’єкти
@@ -1559,6 +1559,7 @@ uk:
   issue_comments:
     create:
       comment_created: Коментар створено
+      issue_reassigned: Ваш коментар створено, а питання перепризначено
   reports:
     new:
       title_html: Скарга %{link}
@@ -3129,6 +3130,9 @@ uk:
         reactivate: Поновити
         comment_and_resolve: Прокоментувати та Опрацювати
         comment: Коментар
+        report_link_html: Якщо ця нотатка містить конфіденційну інформацію, яку потрібно
+          видалити, ви можете %{link}. Всі інші проблеми з нотаткою вирішуйте самостійно
+          в коментарях.
     edit_help: Перемістіть мапу і наблизьтесь до місця, яке ви бажаєте змінити, потім
       клацніть тут.
     directions:

config/locales/vi.yml

@@ -467,7 +467,7 @@ vi:
       reopened_by_html: Mở lại bởi %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Mở lại vô danh <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Ẩn bởi %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Báo cáo ghi chú này
+      report: báo cáo ghi chú này
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Thăm dò Yếu tố
@@ -1403,6 +1403,7 @@ vi:
   issue_comments:
     create:
       comment_created: Bình luận của bạn đã được tạo ra thành công
+      issue_reassigned: Đã tạo bình luận của bạn và chỉ định lại vấn đề
   reports:
     new:
       title_html: Báo cáo %{link}
@@ -2199,6 +2200,7 @@ vi:
           common:
           - Đất công
           - bãi cỏ
+          - vườn
           retail: Khu vực buôn bán
           industrial: Khu vực công nghiệp
           commercial: Khu vực thương mại
@@ -2354,6 +2356,7 @@ vi:
       in: trong
     index:
       public_traces: Tuyến đường GPS công khai
+      my_gps_traces: Tuyến GPS của Tôi
       public_traces_from: Tuyến đường GPS công khai của %{user}
       description: Xem những tuyến đường GPS được tải lên gần đây
       tagged_with: ' có thẻ %{tags}'
@@ -2642,6 +2645,8 @@ vi:
       activate_user: Kích hoạt Tài khoản Này
       deactivate_user: Vô hiệu hóa Tài khoản Này
       confirm_user: Xác nhận Người dùng Này
+      unconfirm_user: Bỏ Xác nhận Người dùng Này
+      unsuspend_user: Bỏ cấm Người dùng Này
       hide_user: Ẩn Tài khoản Này
       unhide_user: Hiện Tài khoản Này
       delete_user: Xóa Tài khoản Này
@@ -2926,6 +2931,9 @@ vi:
         reactivate: Mở lại
         comment_and_resolve: Bình luận & Giải quyết
         comment: Bình luận
+        report_link_html: Nếu ghi chú này chứa thông tin nhạy cảm có thể cần xóa,
+          bạn có thể %{link}. Còn nếu ghi chú có vấn đề khác, xin vui lòng giải quyết
+          lấy bằng cách để lại lời bình luận.
     edit_help: Di chuyển bản đồ và phóng to một vị trí mà bạn muốn sửa đổi, rồi nhấn
       chuột vào đây.
     directions:

config/locales/yi.yml

@@ -59,6 +59,10 @@ yi:
     remote:
       name: ווייטקאנטראל
       description: ווייטקאנטראל (JOSM אדער Merkaartor)
+  account:
+    deletions:
+      show:
+        cancel: אַנולירן
   browse:
     created: געשאַפֿן
     closed: געשלאסן
@@ -70,6 +74,9 @@ yi:
     view_history: ווייזן היסטאָריע
     view_details: ווייזן פרטים
     location: 'לאקאציע:'
+  changesets:
+    changeset_paging_nav:
+      showing_page: בלאַט %{page}
   geocoder:
     search_osm_nominatim:
       prefix:
@@ -103,6 +110,12 @@ yi:
       destroy_button: אויסמעקן
     sent_message_summary:
       destroy_button: אויסמעקן
+  preferences:
+    edit:
+      cancel: אַנולירן
+  profiles:
+    edit:
+      cancel: אַנולירן
   sessions:
     new:
       password: 'פאַסווארט:'
@@ -114,6 +127,10 @@ yi:
       questions:
         title: שאלות?
   traces:
+    edit:
+      cancel: אַנולירן
+    trace_paging_nav:
+      showing_page: בלאַט %{page}
     trace:
       public: עפֿנטלעך
   users:
@@ -122,8 +139,17 @@ yi:
       continue: אײַנשרייבן
     terms:
       legale_select: 'וואוין־לאנד:'
+  user_role:
+    grant:
+      confirm: באַשטעטיקן
+    revoke:
+      confirm: באַשטעטיקן
+  user_blocks:
+    blocks:
+      showing_page: בלאַט %{page}
   javascripts:
     share:
+      cancel: אַנולירן
       image: בילד
       link: לינק אדער HTML
       long_link: לינק

config/locales/zh-CN.yml

@@ -93,7 +93,7 @@ zh-CN:
         create: 发布
         update: 更新
       issue_comment:
-        create: 添加批注
+        create: 添加评论
       message:
         create: 发送
       client_application:
@@ -470,8 +470,8 @@ zh-CN:
         relation: 关系
     start_rjs:
       feature_warning: 正在载入 %{num_features} 个要素，这可能使您的浏览器变慢或失去响应。您确定想要显示该数据吗？
-      load_data: 载入数据
+      load_data: 加载数据
-      loading: 正在载入...
+      loading: 加载中…
     tag_details:
       tags: 标签
       wiki_link:
@@ -531,7 +531,7 @@ zh-CN:
       no_more: 未找到更多变更集。
       no_more_area: 该区域内没有更多变更集。
       no_more_user: 无该用户的更多修改集合。
-      load_more: 载入更多
+      load_more: 加载更多
     timeout:
       sorry: 抱歉，您所请求的变更集列表检索时间过长。
   changeset_comments:
@@ -636,7 +636,7 @@ zh-CN:
       title: '%{user} 已添加日记评论'
       heading: '%{user} 的日记评论'
       subheading_html: '%{user} 已添加日记评论'
-      no_comments: 没有日记留言
+      no_comments: 没有日记评论
       post: 发布
       when: 时间
       comment: 评论
@@ -1516,6 +1516,7 @@ zh-CN:
   issue_comments:
     create:
       comment_created: 已成功创建评论
+      issue_reassigned: 已创建您的评论，并重新分配问题
   reports:
     new:
       title_html: 举报%{link}
@@ -2104,8 +2105,12 @@ zh-CN:
         title: 邮件列表
         description: 询问问题或在广泛或局部的邮件列表中讨论有趣事件
       forums:
-        title: 论坛
+        title: 论坛（旧版）
         description: 面向更喜欢电子公告栏样式界面的用户的问题和讨论。
+      community:
+        url: https://community.openstreetmap.org/
+        title: 社区论坛
+        description: 用于讨论 OpenStreetMap 的共享场所。
       irc:
         title: IRC
         description: 在很多不同的语言和在很多话题间交互聊天。
@@ -2354,7 +2359,7 @@ zh-CN:
       allow_to: 允许客户应用程序：
       allow_read_prefs: 读取您的用户首选项。
       allow_write_prefs: 修改您的用户首选项。
-      allow_write_diary: 创建日记文章，评论和交朋友。
+      allow_write_diary: 创建日记，评论和交朋友。
       allow_write_api: 修改地图。
       allow_read_gpx: 读取您的私人 GPS 轨迹。
       allow_write_gpx: 上传 GPS 轨迹。
@@ -2375,7 +2380,7 @@ zh-CN:
     scopes:
       read_prefs: 阅读用户首选项
       write_prefs: 修改用户首选项
-      write_diary: 创建日记条目、评论和交朋友
+      write_diary: 创建日记、评论和交朋友
       write_api: 修改地图
       read_gpx: 读取私人GPS轨迹
       write_gpx: 上传GPS轨迹
@@ -2831,6 +2836,7 @@ zh-CN:
         reactivate: 重启
         comment_and_resolve: 评论与解决
         comment: 评论
+        report_link_html: 如果此注记包含需要被移除的敏感信息，您可以%{link}。对于注记的所有其他问题，您可以依据评论内容来自行处理。
     edit_help: 移动地图并在您想编辑的位置放大，然后点击这里。
     directions:
       ascend: 上升

config/locales/zh-HK.yml

@@ -7,10 +7,10 @@
 # Author: LuciferianThomas
 # Author: StarrySky
 ---
-zh-hk:
+zh-HK:
   time:
     formats:
-      friendly: '%Y年%m月%e日 %H:%M'
+      friendly: '%Y年%-m月%-d日%H:%M'
   helpers:
     file:
       prompt: 選擇檔案
@@ -49,7 +49,7 @@ zh-hk:
       changeset: 變更集
       changeset_tag: 變更集標籤
       country: 國家
-      diary_comment: 日記註解
+      diary_comment: 日記評論
       diary_entry: 日記項目
       friend: 朋友
       issue: 問題
@@ -105,11 +105,13 @@ zh-hk:
         name: 名稱
         redirect_uri: 重新導向 URI
         confidential: 保密的應用程式？
+        scopes: 權限
       friend:
         user: 用戶
         friend: 朋友
       trace:
         user: 用戶
+        visible: 能見度
         name: 檔案名稱
         size: 大小
         latitude: 緯度
@@ -124,19 +126,39 @@ zh-hk:
         title: 主題
         body: 內文
         recipient: 收件者
+      redaction:
+        title: 標題
+        description: 描述
       report:
+        category: 選擇您舉報的原因
         details: 請就這問題提供多點詳情（必需）。
       user:
+        auth_provider: 認證提供者
+        auth_uid: 認證UID
         email: 電郵
+        email_confirmation: 電郵確認
+        new_email: 新電郵地址
         active: 活躍
         display_name: 顯示名稱
-        description: 描述
+        description: 個人檔案描述
-        languages: 語言
+        home_lat: 緯度
+        home_lon: 經度
+        languages: 偏好的語言
+        preferred_editor: 偏好的編輯軟件
         pass_crypt: 密碼
         pass_crypt_confirmation: 確認密碼
     help:
+      doorkeeper/application:
+        redirect_uri: 每個URI位址各開一行輸入
       trace:
         tagstring: 以逗號分隔
+      user_block:
+        reason: 使用者被封鎖的理由。請盡可能保持平靜和理性的態度，寫下有關事件狀況你所能夠提供最詳盡的細節，並考慮到這訊息會公開給公眾讀取。謹記並非所有使用者都能夠明白社群的專用術語，所以請嘗試使用通俗的表達方式。
+        needs_view: 是否需要使用者先登入後才讓此封鎖得以清除？
+      user:
+        email_confirmation: 閣下的電郵地址並不會被公開展示，請參閱我們的<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
+          title="OSMF privacy policy including section on email addresses">私隱政策</a>頁面以獲取進一步的資訊。
+        new_email: （永遠不會公開展示）
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -183,7 +205,7 @@ zh-hk:
       description: iD (瀏覽器內的編輯器)
     remote:
       name: 遙遠控制
-      description: 遙遠控制 (JOSM 或 Merkaartor)
+      description: 遙遠控制 (JOSM、Potlatch、Merkaartor)
   auth:
     providers:
       none: 無
@@ -204,11 +226,64 @@ zh-hk:
         closed_at_by_html: 已由%{user}於%{when}解決
         reopened_at_html: 於%{when}重新開啟
         reopened_at_by_html: 由%{user}於%{when}重新開啟
+      rss:
+        title: OpenStreetMap註記
       entry:
         comment: 評論
+  account:
+    deletions:
+      show:
+        title: 刪除我的帳號
+        warning: 警告！帳號刪除程序不可逆轉，無法復原。
+        delete_account: 刪除帳號
+        delete_introduction: 您可以用以下按鈕來刪除閣下的OpenStreetMap帳號。請注意這些細節：
+        delete_profile: 您的個人檔案資訊，包含頭像圖片、描述、住家位置，將會被刪除。
+        delete_display_name: 您的顯示名稱將會被刪除，並且可以被其他帳號重新使用。
+        retain_caveats: 但，在刪除帳號後，OpenStreetMap內依然會保留一些關於閣下的資料，包括：
+        retain_edits: 如果您曾經編輯過地圖數據庫的話，這些編輯將會被保留。
+        retain_traces: 您曾經上載過軌跡的話，如有的話也會被保留。
+        retain_diary_entries: 如果您有日記和日記評論的話，會被保留但會隱藏起來。
+        retain_notes: 您如曾在地圖上的註記和對註記所發表的評論會被保留，但會隱藏起來。
+        retain_changeset_discussions: 您的變更集的討論，如有的話將會被保留。
+        retain_email: 您的電郵地址會繼續保留下來。
+        confirm_delete: 您確定嗎？
+        cancel: 取消
   accounts:
     edit:
+      title: 編輯帳號
       my settings: 我的設定
+      current email address: 現在的電郵地址
+      external auth: 外部認證
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: 這是什麼？
+      public editing:
+        heading: 公開編輯
+        enabled: 已啟用。並非匿名而可以編輯資料。
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: 這是什麼？
+        disabled: 已停用而不能編輯資料，所有以往的編輯為匿名。
+        disabled link text: 為什麼我不能編輯？
+      public editing note:
+        heading: 公開編輯
+        html: 目前您的編輯是匿名的，人們不能發送訊息給您或看到您的位置。要顯示你的編輯以及讓別人能透過網站與您聯繫，請點選下面的按鈕。<b>自從0.6
+          API更新，只有公開使用者可以編輯地圖資料</b>。（<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">了解原因</a>）。<ul><li>成為公開使用者不會令您的電郵地址被透露。</li><li>這個動作不能逆轉，所有新的使用者現在都預設為公開的。</li></ul>
+      contributor terms:
+        heading: 貢獻者條款
+        agreed: 您已同意新的貢獻者條款。
+        not yet agreed: 您尚未同意新的貢獻者條款。
+        review link text: 請在有空時按此連結查閱並接受新的貢獻者條款。
+        agreed_with_pd: 您亦同意將您的編輯放到公共領域。
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
+        link text: 這是什麼？
+      save changes button: 儲存變更
+      make edits public button: 將我所有的編輯設為公開
+      delete_account: 刪除帳號……
+    update:
+      success_confirm_needed: 使用者資訊更新成功。請檢查電郵，以確認新電郵地址。
+      success: 使用者資訊更新成功。
+    destroy:
+      success: 帳號已刪除。
   browse:
     version: 版本
     in_changeset: 變更集
@@ -222,6 +297,8 @@ zh-hk:
     changeset:
       title: 變更集：%{id}
       belongs_to: 製作者
+      changesetxml: 變更集XML
+      osmchangexml: osmChange格式XML
       feed:
         title: 變更集 %{id}
     relation_member:
@@ -234,17 +311,25 @@ zh-hk:
         node: 節點
         way: 路徑
         changeset: 變更集
+        note: 註記
     timeout:
       type:
         node: 節點
         way: 路徑
         changeset: 變更集
+        note: 註記
     redacted:
       type:
         node: 節點
         way: 路徑
     start_rjs:
       feature_warning: 正在載入%{num_features}項地圖特徵，可能會拖慢您的瀏覽器或導致瀏覽器未能回應。您是否肯定想要顯示這些資料？
+    note:
+      title: 註記：%{id}
+      new_note: 新增註記
+      open_title: 未解決的註記：#%{note_name}
+      closed_title: 已解決的註記：#%{note_name}
+      report: 舉報此註記
     query:
       title: 查詢地圖特徴
       introduction: 點擊地圖以尋找附近的地圖特徵。
@@ -277,7 +362,7 @@ zh-hk:
       no nearby users: 附近還沒有已加入製圖的用戶。
   diary_entries:
     form:
-      location: 位置：
+      location: 位置
       use_map_link: 使用地圖
     index:
       title: 用戶日記
@@ -318,6 +403,9 @@ zh-hk:
     remove_friend:
       heading: 刪除好友%{user}？
   geocoder:
+    search:
+      title:
+        ca_postcode_html: 來自 <a href="https://geocoder.ca/">Geocoder.CA</a> 的結果
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -334,8 +422,8 @@ zh-hk:
         aeroway:
           aerodrome: 機場
           airstrip: 飛機跑道
-          apron: 停機坪
+          apron: 機場停機坪
-          gate: 閘口
+          gate: 機場閘口
           hangar: 機庫
           helipad: 直升機坪
           holding_position: 等待位置
@@ -344,7 +432,7 @@ zh-hk:
           runway: 跑道
           taxilane: 滑行道
           taxiway: 滑行道
-          terminal: 客運大樓
+          terminal: 機場客運大樓
           windsock: 布製風標
         amenity:
           animal_boarding: 動物寄養
@@ -749,7 +837,7 @@ zh-hk:
           mineshaft: 礦井
           monitoring_station: 監控站台
           petroleum_well: 油井
-          pier: 碼頭
+          pier: 棧橋/碼頭（Pier）
           pipeline: 管線
           pumping_station: 泵站
           reservoir_covered: 有蓋蓄水槽
@@ -812,7 +900,14 @@ zh-hk:
           reef: 礁
           ridge: 山脊
           rock: 獨立岩
+          sand: 沙地
+          stone: 岩石
+          strait: 海峽
+          tree: 樹木
+          valley: 山谷
           volcano: 火山
+          water: 水
+          wetland: 濕地
           "yes": 自然特徵
         office:
           travel_agent: 旅行社
@@ -881,7 +976,7 @@ zh-hk:
           fishing: 釣魚用品店
           florist: 花店
           hairdresser: 理髮店
-          hifi: Hi-Fi
+          hifi: Hi-Fi店
           houseware: 生活用品店
           ice_cream: 冰淇淋店
           interior_decoration: 室內裝潢
@@ -893,15 +988,19 @@ zh-hk:
           mobile_phone: 手機店
           optician: 視光師
           organic: 有機食品店
+          outdoor: 戶外用品店
           pet: 寵物店
           seafood: 海鮮店
           second_hand: 二手商店
           shoes: 鞋店
+          sports: 運動用品店
           stationery: 文具店
           supermarket: 超級市場
+          tattoo: 紋身店
           tobacco: 煙草店
           toys: 玩具店
           travel_agency: 旅行社
+          vacant: 空置店舖
           "yes": 商店
         tourism:
           museum: 博物館
@@ -940,12 +1039,17 @@ zh-hk:
       resolve: 解決
       ignore: 忽略
       reopen: 重新開啟
+    helper:
+      reportable_title:
+        note: 註記#%{note_id}
   reports:
     new:
       categories:
         user:
           spam_label: 此用戶個人檔案為/含有垃圾信息
           threat_label: 此用戶個人檔案含有威脅或恐嚇內容
+        note:
+          spam_label: 此註記是垃圾訊息
     create:
       provide_details: 請提供所需要的詳情
   layouts:
@@ -1015,6 +1119,8 @@ zh-hk:
     destroy:
       title: 登出
   site:
+    index:
+      createnote: 添加註記
     edit:
       not_public: 您尚未把編輯公開。
       not_public_description_html: 您不這樣設定的話就將再無法編輯地圖。您可以在%{user_page}將閣下的編輯設為公開。
@@ -1107,6 +1213,9 @@ zh-hk:
   oauth:
     authorize:
       allow_read_prefs: 讀取您的用戶設定。
+      allow_write_notes: 修改註記。
+    scopes:
+      write_notes: 修改註記
   oauth_clients:
     show:
       requests: 向用戶要求下列權限：
@@ -1119,7 +1228,7 @@ zh-hk:
     new:
       title: 註冊
       no_auto_account_create: 很不幸地我們目前無法為您自動建立帳號。
-      contact_support_html: 請聯絡<a href="%{support}">網站管理員</a>以安排建立帳號，我們會儘快嘗試並處理相關要求。
+      contact_support_html: 請聯絡<a href="%{support}">支援人員</a>以安排建立帳號，我們會儘快嘗試並處理相關要求。
       about:
         header: 自由而可編輯
       email address: 電郵地址：
@@ -1148,7 +1257,9 @@ zh-hk:
       title: 沒有這用戶
       body: 抱歉，沒有名為%{user}的用戶。請檢查您的拼寫，或者您可能按到了錯誤的連結。
     show:
+      my notes: 我的註記
       my settings: 我的設定
+      notes: 地圖註記
       user location: 用戶位置
       report: 舉報此用戶
     index:
@@ -1156,6 +1267,11 @@ zh-hk:
       heading: 用戶
     auth_association:
       option_2: 如果您已經有帳號，您可以用該帳號的用戶名稱和密碼登入，然後到用戶設定中把您的ID和帳號關聯到一起。
+  notes:
+    index:
+      title: 由%{user}提交或評論過的註記
+      heading: '%{user}的註記'
+      no_notes: 沒有註記
   javascripts:
     share:
       embed: HTML
@@ -1175,13 +1291,17 @@ zh-hk:
         opnvkarte: ÖPNVKarte
       layers:
         header: 地圖圖層
+        notes: 地圖註記
         title: 圖層
     site:
+      createnote_tooltip: 在地圖加入註記
+      createnote_disabled_tooltip: 放大以在地圖加入註記
       queryfeature_tooltip: 查詢地圖特徴
       queryfeature_disabled_tooltip: 放大以查詢地圖特徴
     query:
       nothing_found: 沒找到地圖特徵
     context:
+      add_note: 在此加入註記
       query_features: 查詢地圖特徴
       centre_map: 將地圖置中於此
 ...

config/locales/zh-TW.yml

@@ -1484,6 +1484,7 @@ zh-TW:
   issue_comments:
     create:
       comment_created: 您的評論已成功建立
+      issue_reassigned: 已建立您的評論，並重新分配問題
   reports:
     new:
       title_html: 回報 %{link}
@@ -2106,8 +2107,12 @@ zh-TW:
         title: 郵件論壇
         description: 在不同主題或是地區的郵件論壇問問題或是討論有趣的事物。
       forums:
-        title: 論壇
+        title: 論壇（舊版）
         description: 給習慣論壇型式的地方問問題和討論
+      community:
+        url: https://community.openstreetmap.org/
+        title: 社群論壇
+        description: 討論有關 OpenStreetMap 的分享場所。
       irc:
         title: IRC
         description: 使用各種不同語言在各種主題聊天互動。
@@ -2834,6 +2839,7 @@ zh-TW:
         reactivate: 重新開啟
         comment_and_resolve: 評論並解決
         comment: 評論
+        report_link_html: 如果此註記含有需要移除的敏感資訊，您可以%{link}。對於註記的所有其他問題，您可以依據評論內容來自行處理。
     edit_help: 將地圖移至你想編輯的位置並放大，然後按這裡。
     directions:
       ascend: 上升

config/settings.yml

@@ -138,3 +138,5 @@ smtp_tls_verify_mode: "none"
 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null
+# Matomo settings for analytics
+#matomo:

lib/country.rb

@@ -19,7 +19,7 @@ class Country
 
   def self.load_countries
     countries = {}
-    xml = REXML::Document.new(File.read(Rails.root.join("config/countries.xml")))
+    xml = REXML::Document.new(Rails.root.join("config/countries.xml").read)
 
     xml.elements.each("geonames/country") do |ele|
       code = ele.get_text("countryCode").to_s

lib/nominatim.rb

@@ -8,7 +8,7 @@ module Nominatim
     language ||= http_accept_language.user_preferred_languages.join(",")
 
     Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do
-      url = "https://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
+      url = "#{Settings.nominatim_url}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
 
       begin
         response = Timeout.timeout(4) do

script/statistics

@@ -36,7 +36,7 @@ begin
 
     Trace.where(:inserted => true).group(:user_id).order("sum_size DESC").limit(50).sum(:size).each do |user, count|
       display_name = User.find(user).display_name.gsub("@", " at ").gsub(".", " dot ")
-      puts "<tr><td><a href=\"/user/#{display_name}\">#{display_name}</a></td><td>#{count}</td></tr>"
+      puts "<tr><td><a href=\"https://www.openstreetmap.org/user/#{display_name}\">#{display_name}</a></td><td>#{count}</td></tr>"
     end
 
     puts "</table>"
@@ -75,7 +75,7 @@ begin
         else
           display_name = User.find(column[0]).display_name.gsub("@", " at ").gsub(".", " dot ")
           count = column[1]
-          puts "<td>#{count} <a href=\"/user/#{display_name}\">#{display_name}</a></td>"
+          puts "<td>#{count} <a href=\"https://www.openstreetmap.org/user/#{display_name}\">#{display_name}</a></td>"
         end
       end
       puts "</tr>"

test/models/trace_test.rb

@@ -166,14 +166,14 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_large_picture
-    picture = File.read(Rails.root.join("test/gpx/fixtures/a.gif"), :mode => "rb")
+    picture = Rails.root.join("test/gpx/fixtures/a.gif").read(:mode => "rb")
     trace = create(:trace, :fixture => "a")
 
     assert_equal picture, trace.large_picture
   end
 
   def test_icon_picture
-    picture = File.read(Rails.root.join("test/gpx/fixtures/a_icon.gif"), :mode => "rb")
+    picture = Rails.root.join("test/gpx/fixtures/a_icon.gif").read(:mode => "rb")
     trace = create(:trace, :fixture => "a")
 
     assert_equal picture, trace.icon_picture