From: Anton Khorev <tony29@yandex.ru>
Date: Mon, 12 Sep 2022 22:52:23 +0000 (+0300)
Subject: Merge tooltip fixes/tests
X-Git-Tag: live~1953^2~5
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e409e83b4886ce918c64f5c4cd7fa30cbc1ba14f?hp=31a39d3479462ced8127f0f12e3f0133ce39263a

Merge tooltip fixes/tests
---

diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index e556dfa72..696b2cfbd 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.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
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index cc2420730..6f88614ab 100644
--- a/.github/workflows/docker.yml
+++ b/.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 web bundle exec rake i18n:js:export
+        docker-compose run --rm web bundle exec rails db:migrate
+        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: |
diff --git a/.gitignore b/.gitignore
index 73316769e..75e9eb59e 100644
--- a/.gitignore
+++ b/.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
diff --git a/Gemfile b/Gemfile
index 9f4f745ff..020cc9166 100644
--- a/Gemfile
+++ b/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"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4de4c7996..925d57d06 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,79 +3,79 @@ GEM
   specs:
     aasm (5.3.0)
       concurrent-ruby (~> 1.0)
-    actioncable (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
+    actioncable (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      activejob (= 7.0.3.1)
-      activerecord (= 7.0.3.1)
-      activestorage (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
+    actionmailbox (7.0.4)
+      actionpack (= 7.0.4)
+      activejob (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      actionview (= 7.0.3.1)
-      activejob (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
+    actionmailer (7.0.4)
+      actionpack (= 7.0.4)
+      actionview (= 7.0.4)
+      activejob (= 7.0.4)
+      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)
-      actionview (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
+    actionpack (7.0.4)
+      actionview (= 7.0.4)
+      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)
-      actionpack (= 7.0.3.1)
-      activerecord (= 7.0.3.1)
-      activestorage (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
+    actiontext (7.0.4)
+      actionpack (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.3.1)
-      activesupport (= 7.0.3.1)
+    actionview (7.0.4)
+      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)
-      activesupport (= 7.0.3.1)
+    activejob (7.0.4)
+      activesupport (= 7.0.4)
       globalid (>= 0.3.6)
-    activemodel (7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activerecord (7.0.3.1)
-      activemodel (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
     activerecord-import (1.4.0)
       activerecord (>= 4.2)
-    activestorage (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      activejob (= 7.0.3.1)
-      activerecord (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
+    activestorage (7.0.4)
+      actionpack (= 7.0.4)
+      activejob (= 7.0.4)
+      activerecord (= 7.0.4)
+      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)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      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-sdk-core (3.131.3)
+    aws-partitions (1.628.0)
+    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)
-      actionview (>= 4.0)
-      activesupport (>= 4.0)
+    better_html (2.0.1)
+      actionview (>= 6.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)
-      html_tokenizer
+      better_html (>= 2.0.1)
       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-net_http (~> 2.0)
+    faraday (2.5.2)
+      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)
-    msgpack (1.5.4)
+    minitest (5.16.3)
+    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)
-    puma (5.6.4)
+    public_suffix (5.0.0)
+    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)
-      actioncable (= 7.0.3.1)
-      actionmailbox (= 7.0.3.1)
-      actionmailer (= 7.0.3.1)
-      actionpack (= 7.0.3.1)
-      actiontext (= 7.0.3.1)
-      actionview (= 7.0.3.1)
-      activejob (= 7.0.3.1)
-      activemodel (= 7.0.3.1)
-      activerecord (= 7.0.3.1)
-      activestorage (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
+    rails (7.0.4)
+      actioncable (= 7.0.4)
+      actionmailbox (= 7.0.4)
+      actionmailer (= 7.0.4)
+      actionpack (= 7.0.4)
+      actiontext (= 7.0.4)
+      actionview (= 7.0.4)
+      activejob (= 7.0.4)
+      activemodel (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      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)
-      actionpack (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
+    railties (7.0.4)
+      actionpack (= 7.0.4)
+      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)
-    selenium-webdriver (4.3.0)
+    secure_headers (6.4.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)
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..c1ad6e5ac
--- /dev/null
+++ b/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.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 740990fb3..89f60847f 100644
--- a/app/assets/javascripts/application.js
+++ b/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
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index f0b96f59f..5ba36a455 100644
--- a/app/assets/javascripts/index.js
+++ b/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);
         }
       }
     });
diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 1140515f5..61319f7b4 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -48,20 +48,20 @@ OSM.initializeBrowse = function (map) {
 
   function displayFeatureWarning(count, limit, add, cancel) {
     $("#browse_status").html(
-      $("<div>")
-        .append(
-          $("<h2>")
-            .text(I18n.t("browse.start_rjs.load_data"))
-            .prepend($("<span class='icon close'></span>").click(cancel)))
-        .append(
-          $("<div>")
-            .append(
-              $("<p class='alert alert-warning clearfix'></p>")
-                .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })))
-            .append(
-              $("<input type='submit' class='btn btn-primary'>")
-                .val(I18n.t("browse.start_rjs.load_data"))
-                .click(add))));
+      $("<div>").append(
+        $("<div class='d-flex'>").append(
+          $("<div class='flex-grow-1 text-break'>").append(
+            $("<h2>")
+              .text(I18n.t("browse.start_rjs.load_data"))),
+          $("<div>").append(
+            $("<button type='button' class='btn-close mt-1'>")
+              .click(cancel))),
+        $("<div>").append(
+          $("<p class='alert alert-warning'></p>")
+            .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })),
+          $("<input type='submit' class='btn btn-primary'>")
+            .val(I18n.t("browse.start_rjs.load_data"))
+            .click(add))));
   }
 
   var dataLoader;
diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 5040e7f3e..c5bd31940 100644
--- a/app/assets/javascripts/index/directions.js
+++ b/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=\"#\">" +
-        "<span class=\"icon close\"></span></a>" + I18n.t("javascripts.directions.directions") +
-        "</h2><p>" +
+      var distanceText = $("<p>").append(
         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) {
-        e.preventDefault();
+      directionsCloseButton.on("click", function () {
         map.removeLayer(polyline);
         $("#sidebar_content").html("");
         map.setSidebarOverlaid(true);
diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js
index 9a09c1009..11d600316 100644
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/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) {
diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index 7f0fdf848..c20d342c5 100644
--- a/app/assets/javascripts/index/history.js
+++ b/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()
diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js
index e170ff352..6a3400d34 100644
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -1,38 +1,11 @@
 L.OSM.key = function (options) {
-  var control = L.control(options);
-
-  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")));
+  var control = L.OSM.sidebarPane(options, "key", null, "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;
diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index faca07e3c..d762696a1 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/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-original-title", disabled ?
+          item.attr("data-bs-original-title", disabled ? // has additional bug when zooming out from enabled state
             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;
diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index db9839390..f6ab47cf2 100644
--- a/app/assets/javascripts/leaflet.share.js
+++ b/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) {
-    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")));
-
+  control.onAddPane = function (map, button, $ui) {
     // 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;
diff --git a/app/assets/javascripts/leaflet.sidebar-pane.js b/app/assets/javascripts/leaflet.sidebar-pane.js
new file mode 100644
index 000000000..8403c7bc3
--- /dev/null
+++ b/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;
+};
diff --git a/app/assets/javascripts/matomo.js b/app/assets/javascripts/matomo.js
new file mode 100644
index 000000000..34af54ce7
--- /dev/null
+++ b/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);
+      });
+    });
+  });
+}
diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 3e2e7c866..f82516632 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -3,8 +3,8 @@
 //= require qs/dist/qs
 
 OSM = {
-<% if defined?(PIWIK) %>
-  PIWIK:                   <%= PIWIK.to_json %>,
+<% if defined?(Settings.matomo) %>
+  MATOMO:                  <%= Settings.matomo.to_json %>,
 <% end %>
 
   MAX_REQUEST_AREA:        <%= Settings.max_request_area.to_json %>,
diff --git a/app/assets/javascripts/piwik.js b/app/assets/javascripts/piwik.js
deleted file mode 100644
index 5353a99ac..000000000
--- a/app/assets/javascripts/piwik.js
+++ /dev/null
@@ -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);
-      });
-    });
-  });
-}
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 8d3da8f7e..ce83a1d93 100644
--- a/app/assets/stylesheets/common.scss
+++ b/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 */
diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 48d3505dc..02f00ff7f 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/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
 
diff --git a/app/controllers/issue_comments_controller.rb b/app/controllers/issue_comments_controller.rb
index 3a6b357f9..7b935665f 100644
--- a/app/controllers/issue_comments_controller.rb
+++ b/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]
-    redirect_to @issue, :notice => notice
+
+    if params[:reassign]
+      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
diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb
index e098a8acc..dcf0d8b64 100644
--- a/app/controllers/preferences_controller.rb
+++ b/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
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index b48d08ad2..4005176ce 100644
--- a/app/controllers/profiles_controller.rb
+++ b/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
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 30cb9da7c..6d05e6a57 100644
--- a/app/controllers/reports_controller.rb
+++ b/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
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6215403c9..933cec53d 100644
--- a/app/controllers/users_controller.rb
+++ b/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
 
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 7bbe65ec5..33fcc7465 100644
--- a/app/mailers/user_mailer.rb
+++ b/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
 
diff --git a/app/views/application/_sidebar_header.html.erb b/app/views/application/_sidebar_header.html.erb
index da1f6bf45..87d0b8955 100644
--- a/app/views/application/_sidebar_header.html.erb
+++ b/app/views/application/_sidebar_header.html.erb
@@ -3,8 +3,6 @@
     <h2><%= title %></h2>
   </div>
   <div>
-    <a class="geolink" href="<%= root_path %>">
-      <span class="icon close"></span>
-    </a>
+    <a class="geolink d-block btn-close mt-1" href="<%= root_path %>"></a>
   </div>
 </div>
diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index a4b8b2642..8aa5b64c7 100644
--- a/app/views/browse/_common_details.html.erb
+++ b/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 %>
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 0861ed30f..4045c0b48 100644
--- a/app/views/browse/changeset.html.erb
+++ b/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>
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index af859651e..fb186e55e 100644
--- a/app/views/browse/note.html.erb
+++ b/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>
diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index a47a99d33..a59c85ec4 100644
--- a/app/views/changesets/_changeset.html.erb
+++ b/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">
-    <a class="changeset_id text-dark" href="<%= changeset_path(changeset) %>">
-      <%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %>
+  <p class="fst-italic">
+    <a class="changeset_id text-dark stretched-link" href="<%= changeset_path(changeset) %>">
+      <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 %>
diff --git a/app/views/layouts/_banner.html.erb b/app/views/layouts/_banner.html.erb
index bd0c90227..2751a5458 100644
--- a/app/views/layouts/_banner.html.erb
+++ b/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 %>
diff --git a/app/views/layouts/_meta.html.erb b/app/views/layouts/_meta.html.erb
index 2052b1d64..3517673ac 100644
--- a/app/views/layouts/_meta.html.erb
+++ b/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] -%>
-<%= tag.meta :name => "piwik-goal", :content => flash[:piwik_goal] %>
+<% if flash[:matomo_goal] -%>
+<%= tag.meta :name => "matomo-goal", :content => flash[:matomo_goal] %>
 <% end -%>
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index c2501b95b..9ce1265b4 100644
--- a/app/views/layouts/_search.html.erb
+++ b/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>
 
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index ca59f5763..7c921658d 100644
--- a/app/views/layouts/site.html.erb
+++ b/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) -%>
-    <noscript><p><img src="<%= request.protocol %><%= PIWIK["location"] %>/piwik.php?idsite=<%= PIWIK["site"] %>" class="piwik" alt="" /></p></noscript>
+    <% if defined?(Settings.matomo) -%>
+    <noscript><p><img src="<%= request.protocol %><%= Settings.matomo["location"] %>/matomo.php?idsite=<%= Settings.matomo["site"] %>" class="matomo" alt="" /></p></noscript>
     <% end -%>
   </body>
 </html>
diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index 640c59773..414381101 100644
--- a/app/views/site/help.html.erb
+++ b/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">
diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index 74e096dd1..832187b79 100644
--- a/app/views/traces/_trace.html.erb
+++ b/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>
diff --git a/config/eslint.json b/config/eslint.json
index 22ecdd3db..3b878d48a 100644
--- a/config/eslint.json
+++ b/config/eslint.json
@@ -11,7 +11,7 @@
     "I18n": "readonly",
     "L": "readonly",
     "OSM": "writable",
-    "Piwik": "readonly",
+    "Matomo": "readonly",
     "Qs": "readonly",
     "updateLinks": "readonly"
   },
diff --git a/config/initializers/brotli.rb b/config/initializers/brotli.rb
new file mode 100644
index 000000000..9e8125b14
--- /dev/null
+++ b/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
diff --git a/config/initializers/config.rb b/config/initializers/config.rb
index e51281e11..7fc488635 100644
--- a/config/initializers/config.rb
+++ b/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"
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 8dce1c870..a2df9167f 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -1,486 +1,486 @@
 # frozen_string_literal: true
 
-Rails.application.reloader.to_prepare do
-  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.
-    resource_owner_authenticator do
-      current_user
-    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"
+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.
+  resource_owner_authenticator do
+    current_user
+  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
diff --git a/config/initializers/piwik.rb b/config/initializers/piwik.rb
deleted file mode 100644
index 1b9fa73c1..000000000
--- a/config/initializers/piwik.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require "yaml"
-
-if File.exist?(piwik_file = File.expand_path("../piwik.yml", __dir__))
-  PIWIK = YAML.load_file(piwik_file)
-end
diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index 97952f7cb..53ab76808 100644
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -18,9 +18,9 @@ csp_policy = {
   :report_uri => []
 }
 
-csp_policy[:connect_src] << PIWIK["location"] if defined?(PIWIK)
-csp_policy[:img_src] << PIWIK["location"] if defined?(PIWIK)
-csp_policy[:script_src] << PIWIK["location"] if defined?(PIWIK)
+csp_policy[:connect_src] << Settings.matomo["location"] if defined?(Settings.matomo)
+csp_policy[:img_src] << Settings.matomo["location"] if defined?(Settings.matomo)
+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)
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 1279c4504..a1b90a231 100644
--- a/config/locales/be-Tarask.yml
+++ b/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: Запаведнік
-          construction: Будаўніцтва
+          conservation: Запаведная зона
+          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: |-
-          Мы патрабуем, каб
-          Вы пазначалі &ldquo;&copy; удзельнікі OpenStreetMap&rdquo;.
-        credit_2_1_html: Мусіце таксама яўна пазначыць, што зьвесткі даступныя паводле
-          ліцэнзіі Open Database, а калі карыстаецеся нашымі кавалкамі мапаў, што
-          картаграфія ліцэнзаваная паводле CC BY-SA. Гэта можна зрабіць, спаслаўшыся
-          на <a href="https://www.openstreetmap.org/copyright">гэтую старонку правоў</a>.
-          Калі вы распаўсюджваеце OSM у фармаце зьвестак, вы мусіце разьмяшчаць наўпроставую
-          спасылку на ліцэнзіі. Калі вы выкарыстоўваеце носьбіты, дзе выкарыстаньне
-          спасылак немагчымае (напрыклад, друкаваныя працы), мы прапануем накіроўваць
-          вашых чытачоў на www.openstreetmap.org (магчымае выкарыстаньне поўнага адрасу
-          &lsquo;OpenStreetMap&rsquo;), на opendatacommons.org і, пры неабходнасьці,
-          на www.creativecommons.org.
-        credit_3_1_html: Фрагмэнты мапы ў &ldquo;стандартным стылі&rdquo; на www.openstreetmap.org
-          - гэта прадукт OpenStreetMap Foundation з выкарыстаньнем дадзеных OpenStreetMap
-          згодна з Open Database ліцэнзіяй. Пры выкарыстанні гэтага стылю мапы патрабуецца
-          такая ж спасылка, як і для дадзеных Open Database.
+        credit_1_html: 'Карыстаючыся зьвесткамі OpenStreetMap, вы павінны выканаць
+          дзьве ўмовы:'
+        credit_2_1_html: |-
+          <ul>
+            <li>Згадаць OpenStreetMap, пазначыўшы нашую нататку пра аўтарскае права.</li>
+            <li>Выразна зазначыць, што зьвесткі даступныя пад ліцэнзіяй Open Database License.</li>
+          </ul>
+        credit_3_1_html: Для паведамленьня пра аўтарскія правы маем розныя патрабаваньні
+          ў залежнасьці ад таго, як вы карыстаецеся нашымі зьвесткамі. Напрыклад,
+          калі вы стварылі праглядальную мапу, друкаваную мапу ці статычную выяву,
+          будуць дзейнічаць розныя правілы. Дэтальнае апісаньне патрабаваньняў можна
+          знайсьці на <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Кіраўніцтве
+          атрыбуцыямі</a>.
         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: Павялічыць маштаб мапы для рэдагаваньня
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 306494269..2a5395381 100644
--- a/config/locales/be.yml
+++ b/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: 'Бачнасць:'
-        tagstring: 'Тэгі:'
+        visibility: Бачнасць
+        tagstring: Тэгі
       message:
         sender: Ад
         title: Тэма
@@ -127,14 +129,16 @@ be:
         details: Просьба прадставіць некаторыя падрабязнасці аб праблеме (абавязкова).
       user:
         email: Электронная пошта
-        new_email: 'Новы адрас электроннай пошты:'
+        new_email: Новы адрас электроннай пошты
         active: Актыўны
         display_name: Бачнае імя
         description: Апісанне
-        home_lat: 'Шырата:'
-        home_lon: 'Даўгата:'
-        languages: Мовы
+        home_lat: Шырата
+        home_lon: Даўгата
+        languages: Пераважныя мовы
+        preferred_editor: Пераважны рэдактар
         pass_crypt: Пароль
+        pass_crypt_confirmation: Пацвердзіце пароль
     help:
       trace:
         tagstring: падзеленыя коскамі
@@ -250,8 +254,8 @@ be:
     edit:
       title: Правіць рахунак
       my settings: Мае настройкі
-      current email address: 'Бягучы адрас электроннай пошты:'
-      external auth: 'Знешняя Аўтэнтыфікацыя:'
+      current email address: Бягучы адрас электроннай пошты
+      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: Пстрыкніце на карце, каб атрымаць звесткі пра аб'екты паблізу.
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 59bcd999a..65e68cc70 100644
--- a/config/locales/bg.yml
+++ b/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: Име (Задължително)
-        url: Основно приложение URL(Задължително)
+        name: Име (задължително)
+        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: Перон
-          gate: Врата
+          apron: Самолетна писта
+          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: Отхвърли
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 682669473..566b1d115 100644
--- a/config/locales/bn.yml
+++ b/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: তৈরি হয়েছে
-      status: স্থিতি
+      created: 'তৈরি হয়েছে:'
+      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)
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 94065f6fd..0e0ef0aed 100644
--- a/config/locales/br.yml
+++ b/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
-        two: war-dro 2 eurvezh 'zo
-        few: war-dro %{count} eurvezh 'zo
-        many: war-dro %{count} eurvezh 'zo
-        other: war-dro %{count} eurvezh 'zo
+        one: war-dro un eurvezh zo
+        two: war-dro 2 eurvezh zo
+        few: war-dro %{count} eurvezh zo
+        many: 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ù
-          gate: Dor
+          apron: Roudenn Aerborzh
+          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>
-        m'hoc'h eus c'hoant da gaozeal diwar-benn an dra-se.
+        arvarus.<br />Kit e darempred gant ar <a href="%{webmaster}">support</a> m'hoc'h
+        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
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 1e8f9f49b..cfadccc42 100644
--- a/config/locales/cs.yml
+++ b/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ů
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 262286811..09ebd14a4 100644
--- a/config/locales/da.yml
+++ b/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
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 761aa0102..9bab1f3d1 100644
--- a/config/locales/de.yml
+++ b/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:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 55aeb8d72..30640be9a 100644
--- a/config/locales/en-GB.yml
+++ b/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
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3c8f09a48..55bd1c0a8 100644
--- a/config/locales/en.yml
+++ b/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"
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index f1f0454ab..882b880ad 100644
--- a/config/locales/eo.yml
+++ b/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:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 267017323..6fb4fe5f0 100644
--- a/config/locales/es.yml
+++ b/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
-      my_traces: Mis rastros
-      traces_from: Trazos Públicos de %{user}
+      all_traces: Todas las trazas
+      my_traces: Mis trazas
+      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
-      write_gpx: subir trazas de GPS
+      read_gpx: Leer sus trazas de GPS privadas
+      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
diff --git a/config/locales/et.yml b/config/locales/et.yml
index b80f4135f..06645d7fc 100644
--- a/config/locales/et.yml
+++ b/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: |-
-          Nõuame, et kasutad omistamiseks teksti &ldquo;&copy; OpenStreetMapi
-          kaastöölised&rdquo;.
+        credit_1_html: 'Seal, kus kasutad OpenStreetMapi andmeid, tuleb sul teha kaht
+          järgmist asja:'
         credit_2_1_html: |-
-          Samuti pead selgelt välja tooma, et andmed kuuluvad litsentsi Open
-          Database License alla ja kui kasutatakse kaardipaane, siis et kujutised
-          kuuluvad litsentsi CC BY-SA alla. Üks võimalus selleks on linkida
-          <a href="https://www.openstreetmap.org/copyright">siia autoriõiguse leheküljele</a>.
-          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.
+          <ul>
+            <li>Viidata OpenStreetMapile, kuvades meie autoriõiguse teatist.</li>
+            <li>Näidata selgelt, et andmed on saadaval litsentsi Open Database License all.</li>
+          </ul>
         credit_3_1_html: |-
-          Standardse kujundusega kaardipaanid asukohas www.openstreetmap.org on
-          litsentsi Open Database License alla kuuluvatest andmetest loodud teos,
-          mille autor on OpenStreetMap Foundation. Kui kasutad neid kaardipaane,
-          siis tuleb need autorile omistada samamoodi nagu kaardiandmed.
+          Nõuded selle kohta, kuidas autoriõiguse teatist kuvada, sõltuvad sellest,
+          kuidas andmeid kasutad. Näiteks kohalduvad erinevad reeglid sõltuvalt
+          sellest, kas oled teinud sirvitava kaardi, trükikaardi või staatilise pildi.
+          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äiteks:
+          Näitamaks selgelt, et andmed on saadaval litsentsi Open
+          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:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 01875b459..469517c9a 100644
--- a/config/locales/fa.yml
+++ b/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: ثبت نام
-        update: روزآمدسازی
+        create: نام‌نویسی
+        update: به‌روز رسانی
       doorkeeper_application:
-        create: ثبت‌نام
-        update: روزآمدسازی
+        create: نام‌نویسی
+        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: |-
-          بایسته است که این‌گونه از ما یاد کنید:
-          &ldquo;&copy;مشارکت‌کنندگان OpenStreetMap&rdquo;.
-        credit_2_1_html: همچنین باید روشن کنید که داده‌ها تحت پروانهٔ پایگاه‌دادهٔ
-          باز (Open Database License) قرار دارند و اگر کاشی‌های نقشهٔ ما را استفاده
-          کردید باید به‌روشنی بیان کنید که نقشه‌نگاری‌ها تحت پروانهٔ CC BY-SA است.
-          این کار را با پیونددادن به <a href="https://www.openstreetmap.org/copyright">
-          این صفحهٔ حق‌نشر</a> انجام دهید. به‌عنوان جایگزین، می‌توانید با نام و پیوند
-          مستقیماً به پروانه(ها) ارجاع بدهید (اگر OSM را در قالب داده توزیع می‌کنید
-          انجام این کار ضروری است). در رسانه‌هایی که درج پیوند ممکن نیست ( مثلاً کارهای
-          چاپی)، توصیه می‌کنیم که خوانندگان خود را به  openstreetmap.org (شاید با
-          گسترش OpenStreetMap به این نشانی کامل)، به opendatacommons.org و در صورت
-          تناسب به creativecommons.org هدایت کنید.
+        credit_1_html: 'جایی که دارید از داده‌های اوپن‌استریت‌مپ استفاده می‌کنید،
+          لازم است دو کار زیر را انجام دهید:'
+        credit_2_1_html: |-
+          <ul>
+            <li>ارائهٔ اعبار به اوپن‌استریت‌مپ با نمایش اطلاعیهٔ کپی‌رایت‌مان.</li>
+            <li>مشخص کنید که داده‌ها تحت پروانهٔ آزاد پایگاه داده هستند.</li>
+          </ul>
         credit_3_1_html: کاشی‌های نقشه با «سبک استاندارد» در www.openstreetmap.org
           کار تولیدی (Produced Work) محسوب می‌شوند که بنیاد اوپن‌استریت‌مپ با استفاده
           از دادهٔ اوپن‌استریت‌مپ تحت پروانهٔ پایگاه‌دادهٔ باز (ODbL) ساخته‌است. هنگام
@@ -2101,10 +2097,10 @@ fa:
       no_iframe_support: مرورگر شما فریم‌های HTML را، که برای این ویژگی لازم است،
         پشتیبانی نمی‌کند.
     export:
-      title: برون‌برد
-      area_to_export: محدوده برای برون‌برد
+      title: برون‌ریزی
+      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: 'اگر برون‌برد بالا انجام نشد، لطفاً یکی از منابع زیر را استفاده کنید:'
-        body: این محدوده برای برون‌برد در قالب OpenStreetMap XML خیلی بزرگ است. لطفاً
-          بزرگنمایی کنید یا منطقهٔ کوچکتری را انتخاب کنید، یا برای دریافت داده‌های
+        advice: 'اگر برون‌ریزی بالا انجام نشد، لطفاً یکی از منابع زیر را استفاده کنید:'
+        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: برای افزودن یادداشت به نقشه بزرگنمایی کنید
-      map_notes_zoom_in_tooltip: برای دیدن یادداشت‌های نقشه بزرگنمایی کنید
-      map_data_zoom_in_tooltip: برای دیدن دادهٔ نقشه بزرگنمایی کنید
+      createnote_disabled_tooltip: برای افزودن یادداشت به نقشه بزرگ‌نمایی کنید
+      map_notes_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: فراز
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 921658025..7fa7cbcb3 100644
--- a/config/locales/fi.yml
+++ b/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
-      vapaasti avoimen lisenssin ansiosta.
+    intro_text: OpenStreetMap on vapaaehtoisten luoma maailmankartta, jota voi käyttää
+      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}.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e14289535..be1781fb7 100644
--- a/config/locales/fr.yml
+++ b/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
-          des amis
+        allow_write_diary: créer des entrées de carnet, des commentaires et des liens
+          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
-      introduction: Cliquer sur la carte pour trouver les objets à proximité.
+      title: Interroger les objets
+      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.
-        Veuillez attendre un peu avant d’essayer de déclarer de nouveaux amis.
+      limit_exceeded: Vous avez récemment déclaré beaucoup d’utilisateurs comme ami(e)s.
+        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_watershed: Bassin versant de réservoir
+          reservoir: Bassin de retenue
+          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}
-        avec la description %{trace_description} et les balises suivantes : %{tags}'
-      description_with_no_tags_html: Il semblerait que votre fichier GPX %{trace_name}
-        avec la description %{trace_description} et sans balises
+      description_with_tags_html: 'Cela ressemble à votre fichier GPX « %{trace_name} »
+        avec la description « %{trace_description}«» et les balises suivantes : %{tags}'
+      description_with_no_tags_html: Cela ressemble à votre fichier GPX « %{trace_name} »
+        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
-          de changements'
-        subject_other: '[OpenStreetMap] %{commenter} a commenté un ensemble de changements
+        subject_own: '[OpenStreetMap] %{commenter} a commenté un de vos groupes de
+          modifications'
+        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
-        avant d’essayer d’en envoyer de nouveaux.
+      limit_exceeded: Vous avez récemment envoyé beaucoup de messages. Veuillez attendre
+        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: |-
-          Si vous voulez juste une petite correction et n’avez pas le temps de vous
-          enregistrer sur le projet et d’apprendre à effectuer les modifications, il est facile d’ajouter une note.
+        paragraph_1_html: Si vous voulez juste une petite correction et n’avez pas
+          le temps de vous inscrire sur le projet et d’apprendre à effectuer des modifications,
+          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}
-      heading: Modifier la trace %{name}
+      title: Modification de 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
-      delete_trace: Supprimer cette piste
+      edit_trace: Modifier cette trace
+      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
-      newer: Nouvelles traces
+      older: Traces plus anciennes
+      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
-        commentaires et ajouter des amis ;
+      allow_write_diary: créer des entrées dans votre carnet, faire des commentaires
+        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
-        le standard %{oauth} ? Vous devez enregistrer votre application web avant
-        qu’elle ne puisse faire des requêtes OAuth sur ce service.
+      no_apps_html: Avez-vous une application que vous aimeriez inscrire pour son
+        utilisation avec nous via le standard %{oauth} ? Vous devez inscrire votre
+        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
-        pour utiliser avec nous via le standard %{oauth2} ? Vous devez enregistrer
+      no_applications_html: Avez-vous une application que vous aimeriez inscrire pour
+        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é
-        de vous créer un compte automatiquement.
+      no_auto_account_create: Malheureusement, nous ne sommes actuellement pas en
+        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
-        le bouton Continuer.
+        d’utilisation ; une fois cela fait, cochez les deux cases et appuyez alors
+        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
-      body: Désolé, il n’y a aucun utilisateur avec le nom %{user}. Veuillez vérifier
-        l’orthographe, ou bien le lien que vous avez cliqué n’est pas correct.
+      heading: L’utilisateur ou l’utilisatrice « %{user} » n’existe pas
+      body: Désolé, il n’y a aucun(e) utilisateur ou utilisatrice avec le nom « %{user} ».
+        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
-        doit être bloqué(e) sur l’API ?
+      period: Pendant combien de temps, à partir de maintenant, l’utilisateur ou l’utilisatrice
+        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_foot: À pied (OSRM)
+        fossgis_osrm_car: En voiture (OSRM)
+        fossgis_osrm_foot: À pied (<em>OSRM<em>)
         graphhopper_bicycle: À vélo (GraphHopper)
-        graphhopper_car: En voiture (GraphHopper)
-        graphhopper_foot: À pied (<i>GraphHopper</i>)
+        graphhopper_car: En voiture (<em>GraphHopper<em>)
+        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
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 14c800a9a..5a9077b35 100644
--- a/config/locales/fy.yml
+++ b/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:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index b93eecfae..b6f84e14e 100644
--- a/config/locales/he.yml
+++ b/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: מעלה
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index d79c826a9..71faa5bd2 100644
--- a/config/locales/hi.yml
+++ b/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: दूरी
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 4b8f7ff18..32316271f 100644
--- a/config/locales/hu.yml
+++ b/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.
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 94f43dd3f..ec0b82780 100644
--- a/config/locales/ia.yml
+++ b/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:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index d5ce073a2..2e2c52bf8 100644
--- a/config/locales/id.yml
+++ b/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
-        update: Simpan Redaksi
+        create: Membuat redaksi
+        update: Simpan redaksi
       trace:
-        create: Upload
+        create: Unggah
         update: Simpan Perubahan
       user_block:
-        create: Buat blokir
-        update: Perbarui blokir
+        create: Buat blok
+        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_tag: Tag node/titik
-      notifier: Pemberitahuan
-      old_node: Node/Titik Lama
-      old_node_tag: Tag Node/Titik Lama
+      node: Titik noda
+      node_tag: Tag titik noda
+      notifier: Pemberitahu
+      old_node: Titik noda 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;
-          Kontributor OpenStreetMap&rdquo;.
-        credit_2_1_html: Anda juga harus memperjelas bahwa data tersedia di bawah
-          Lisensi Database Terbuka, dan jika menggunakan tiles peta kami, kartografi
-          berlisensi sebagai CC-BY-SA. Anda dapat melakukannya dengan menghubungkan
-          ke <a href="http://www.openstreetmap.org/copyright">halaman hak cipta</a>.
-          Alternatifnya, dan sebagai sebuah persyaratan jika Anda mendistribusikan
-          OSM dalam bentuk data, Anda dapat menamakan dan menghubungkannya langsung
-          pada lisensinya. Pada media yang tidak memungkinkan tautan (misalnya hasil
-          cetak), kami menyarankan Anda untuk mengarahkan pembaca Anda pada openstreetmap.org
-          (mungkin dengan memperluas halaman 'OpenStreetMap' secara penuh), untuk
-          opendatacommons.org, dan jika relevan, untuk creativecommons.org.
-        credit_3_1_html: |-
-          Tile peta dalam &ldquo;gaya standar&rdquo; di www.openstreetmap.org adalah
-          Karya Produksi oleh OpenStreetMap Foundation menggunakan data OpenStreetMap
-          di bawah Open Database License. Ketika menggunakan gaya peta ini, atribusi yang sama diharuskan untuk data peta.
-        credit_4_html: |-
-          Untuk peta elektronik dapat ditelusuri, kredit harus muncul di sudut peta.
-          Sebagai contoh:
+        credit_1_html: 'Ketika Anda menggunakan data OpenStreetMap, Anda diwajibkan
+          untuk melakukan dua hal berikut:'
+        credit_2_1_html: "<ul>\n  <li> Berikan kredit kepada OpenStreetMap dengan
+          menampilkan pemberitahuan hak cipta kami.</li> \n  <li> Jelaskan bahwa data
+          tersedia di bawah Lisensi Open Database.</li> \n</ul>"
+        credit_3_1_html: Untuk pemberitahuan hak cipta, kami memiliki persyaratan
+          yang berbeda tentang bagaimana ini harus ditampilkan, tergantung pada bagaimana
+          Anda menggunakan data kami. Misalnya, aturan yang berbeda berlaku tentang
+          cara menampilkan pemberitahuan hak cipta bergantung pada apakah Anda membuat
+          peta yang dapat dijelajahi, peta yang dicetak, atau gambar statis. Detail
+          lengkap tentang persyaratan dapat ditemukan di <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Pedoman
+          Atribusi</a> .
+        credit_4_html: 'Untuk memperjelas bahwa data tersedia di bawah Lisensi Open
+          Database, Anda dapat menautkan ke <a href="http://www.openstreetmap.org/copyright">halaman
+          hak cipta</a>. Cara lainnya, dan diwajibkan jika Anda mendistribusikan OSM
+          dalam bentul data, Anda bisa menyebut nama dan tautan ke lisensi. Dalam
+          media yang tidak memungkinkan tautan (contohnya: karya cetak), kami menyarankan
+          Anda mengarahkan pembaca Anda ke openstreetmap.org (mungkin dengan memperluas
+          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
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 224a8e586..668628eeb 100644
--- a/config/locales/is.yml
+++ b/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:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 0b63e0420..853c113fc 100644
--- a/config/locales/it.yml
+++ b/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:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 5194c46f3..6cbdd9592 100644
--- a/config/locales/ja.yml
+++ b/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_2_1_html: あなたはデータが Open Database License に基づいて提供されていること、そして地図タイルを使用する場合は、地図画像が
-          CC BY-SA としてライセンスされていることを明確にしなければなりません。<a href="https://www.openstreetmap.org/copyright">著作権表示ページ</a>にリンクすることでこれを表現することができます。また、データの形式でOpenStreetMapを配布する場合の要件として、名前を表示の上、ライセンスに直接リンクすることができます。リンクを張れないメディア（印刷など）の場合は、openstreetmap.org（OpenStreetMapをアドレスとして展開した形）、opendatacommons.org、さらに関連がある場合はcreativecommons.orgへ読者を誘導することをお勧めします。
+        credit_1_html: OpenStreetMap を使う場所では、以下の2つの条件を必ず守ってください。
+        credit_2_1_html: |-
+          <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）です。もし皆さんがこれらのタイルを利用する場合は、以下の継承を表示してください。
-          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;。
+          <!-- 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;。 -->著作権表示に関しては、皆さんが私たちのデータをどう使われるかによって、その表示要件が異なります。たとえば皆さんが新しく作成した地図は利用者が動かせるかどうか（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
-          Australia Limited</a>を出典とするデータは<a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>のもとオーストラリア連邦政府の許諾を得ています。'
+        contributors_au_html: '<strong>オーストラリア</strong>: 行政管轄の境界（Administrative Boundaries）の組み入れもしくは採用した開発において&copy;<a
+          href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">PSMA
+          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="http://dmca.openstreetmap.org">オンライン却下のページ</a>から直接申し立てを行ってください。
+          href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">却下手順</a>をお読みになるか、<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: 上り坂
diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 900fb3328..7c3568b3c 100644
--- a/config/locales/kk-cyrl.yml
+++ b/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:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 72b9426af..164b88fb9 100644
--- a/config/locales/ko.yml
+++ b/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: 다양한 주제에서 많은 다른 언어로 된 대화형 채트입니다.
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index b5a7b3334..aba322b3a 100644
--- a/config/locales/ku-Latn.yml
+++ b/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;
-          beşarên OpenStreetMapê &rdquo;.
+        credit_1_html: 'Li cihê ku daneya OpenStreetMapê bi kar bînî, divê van du
+          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.
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 350c0c22d..dc16dfd24 100644
--- a/config/locales/lb.yml
+++ b/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:
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index cb7026957..36efe0108 100644
--- a/config/locales/mk.yml
+++ b/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:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 0b2cb28fe..86981247d 100644
--- a/config/locales/my.yml
+++ b/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: ရေတွင်း
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 7bc393f02..f2aef8605 100644
--- a/config/locales/nb.yml
+++ b/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
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 84913c77e..78d761103 100644
--- a/config/locales/ne.yml
+++ b/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:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 7e7e9d6a4..c3b29ff06 100644
--- a/config/locales/nl.yml
+++ b/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:
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index be222edae..85c6a2b90 100644
--- a/config/locales/pa.yml
+++ b/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_node: ਪੁਰਾਣਾ ਢੰਗ ਨੋਡ
-      old_way_tag: ਪੁਰਾਣਾ ਢੰਗ ਟੈਗ
+      old_way: ਪੁਰਾਣਾ ਰਾਹ
+      old_way_node: ਪੁਰਾਣਾ ਰਾਹ ਨੋਡ
+      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: ਦਾਖ਼ਲਾ
-      heading: ਦਾਖ਼ਲਾ
+      title: ਲੌਗਇਨ
+      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: 'ਮਾਲਕ:'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index a94175ca4..a52d7f656 100644
--- a/config/locales/pl.yml
+++ b/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,
-          nawet po usunięciu konta:'
+        retain_caveats: 'Jednak niektóre informacje o tobie pozostaną zachowane na
+          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:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 9ff0b42a3..f04a15e1f 100644
--- a/config/locales/pt-BR.yml
+++ b/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
-          swing: Ponte Giratória
+          suspension: Ponte suspensa
+          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}'
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 4fafb890d..2586145be 100644
--- a/config/locales/pt-PT.yml
+++ b/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
-          nosso aviso de direitos autorais.</li> \n<li> Deixar claro que os dados
-          estão disponíveis sob a Open Database License.</li> \n</ul>"
-        credit_3_1_html: "Para o aviso de direitos autorais, temos requisitos diferentes
-          sobre como isso deve ser \nexibido, dependendo de como usa os nossos dados.
-          Por exemplo, diferentes \nregras se aplicam sobre como mostrar o aviso de
-          direitos de autor dependendo se\ncriou um mapa navegável, um mapa impresso
-          ou uma imagem estática. Detalhes completos sobre os requisitos \n podem
-          ser encontrados nas\n <a href=\"https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines\">Diretrizes
-          de atribuição</a> ."
-        credit_4_html: "Para deixar claro que os dados estão disponíveis sob a Licença
-          Open\nDatabase, é possível criar um link para\n <a href=\"https://www.openstreetmap.org/copyright\">esta
-          página de direitos de autor</a>.\nAlternativamente, e como requisito, se
-          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."
+        credit_2_1_html: "<ul>\n<li> Atribuir os créditos ao OpenStreetMap exibindo
+          o nosso aviso de direitos de autor.</li> \n<li> Deixar claro que os dados
+          estão disponíveis sob a Licença Open Database.</li> \n</ul>"
+        credit_3_1_html: Para o aviso de direitos de autor, temos vários requisitos
+          para a sua exibição, dependendo da forma como usa os nossos dados. Por exemplo,
+          aplicam-se regras diferentes para a exibição do aviso de direitos de autor
+          conforme usar um mapa navegável, um mapa impresso ou uma imagem estática.
+          Poderá encontrar toda a informação sobre os requisitos nas <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Diretrizes
+          de Atribuição</a>.
+        credit_4_html: |-
+          Para deixar claro que os dados estão disponíveis sob a Licença Open
+          Database, é possível criar uma ligação para <a href="https://www.openstreetmap.org/copyright">esta página de direitos de autor</a>.
+          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.
         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
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9f458edc6..6a3133efd 100644
--- a/config/locales/ru.yml
+++ b/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: Описание
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 3e11c1357..d073d3b54 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -31,6 +31,7 @@ sc:
         update: Agiorna
       redaction:
         create: Crea una revisione
+        update: Sarva sa cuadura
       trace:
         create: Càrriga
         update: Sarva sas modìficas
@@ -41,14 +42,21 @@ sc:
     errors:
       messages:
         invalid_email_address: non paret èssere un'indiritzu de posta eletrònica vàlidu
+        email_address_not_routable: non si podet incarrerare
     models:
       acl: Lista de Controllu de Atzessu
+      changeset: Annantu de modìficas
+      changeset_tag: Eticheta de su grupu de modìficas
       country: Istadu
+      diary_comment: Cummentu in su diàriu
+      diary_entry: Intrada in su diàriu
       friend: Amigu
+      issue: Problema
       language: Limba
       message: Messàgiu
       node: Nodu
       node_tag: Etichetta de su nodu
+      notifier: Notificadore
       old_node: Nodu betzu
       old_node_tag: Etichetta betza de su nodu
       old_relation: Relata betza
@@ -60,37 +68,48 @@ sc:
       relation: Relata
       relation_member: Membru de sa relata
       relation_tag: Eticheta de sa relata
+      report: Informe
       session: Sessione
       trace: Sestadu
       tracepoint: Puntu de su sestadu
       tracetag: Eticheta de su sestadu
-      user: Impreadore
-      user_preference: Preferèntzias de s'impreadore
-      user_token: Còdighe de s'impreadore
+      user: Utente
+      user_preference: Preferèntzias de s'utente
+      user_token: Còdighe de s'utente
       way: Caminu
       way_node: Nodu de su caminu
       way_tag: Eticheta de sa bia
     attributes:
       client_application:
+        name: Nùmene (obligatòriu)
+        url: URL printzipale de s'aplicatzione (obligatòriu)
+        callback_url: URL de torrada
         support_url: URL de apògiu
+        allow_read_prefs: lèghere sas preferèntzias tuas de utente
+        allow_write_prefs: modificare sas preferèntzias tuas de utente.
         allow_write_diary: iscrii pàginas de cuotidianu, cumentus e fai amigus
         allow_write_api: modìfica sa mapa
+        allow_read_gpx: lèghere sas rastas GPS privadas issoro
+        allow_write_gpx: carrigare rastas GPS
+        allow_write_notes: modificare sas notas
       diary_comment:
         body: Corpus
       diary_entry:
-        user: Impreadore
+        user: Utente
         title: 'Sugetu:'
         latitude: Latitùdine
         longitude: Longitùdine
         language: Limba
       doorkeeper/application:
         name: Nùmene
+        redirect_uri: Torrare a indiritzare URIs
+        confidential: Aplicatzione cunfidentziale?
         scopes: Permissus
       friend:
-        user: Impreadore
+        user: Utente
         friend: Amigu
       trace:
-        user: Impreadore
+        user: Utente
         visible: Visìbile
         name: Nùmene de su documentu
         size: Mannesa
@@ -111,7 +130,10 @@ sc:
         description: Descritzione
       report:
         category: Scèbera unu motivu po sa denùntzia bostra
+        details: Fruni prus detàllios subra de su problema (obligatòriu).
       user:
+        auth_provider: Frunidore de autenticatzione
+        auth_uid: UID de autenticatzione
         email: E-lìtera
         email_confirmation: Cunfirma de su curreu eletrònicu
         new_email: Indiritzu nou de su curreu eletrònicu
@@ -121,6 +143,7 @@ sc:
         home_lat: Latitùdine
         home_lon: Longitùdine
         languages: Limbas preferidas
+        preferred_editor: Editore preferidu
         pass_crypt: Crae
         pass_crypt_confirmation: Cunfirma sa password
     help:
@@ -128,10 +151,66 @@ sc:
         confidential: S'aplicatzione at a èssere impreada ue su segretu de su cliente
           potzat èssere mantentu cunfidentziale (sas aplicatziones nadias de telefoneddu
           e sas aplicatziones de una pàgina sola non sunt cunfidentziales)
+        redirect_uri: Imprea una lìnia pro URI
+      trace:
+        tagstring: separadu dae vìrgulas
+      user_block:
+        reason: Sa resone de su blocu de s'utente. Chirca de mantènnere sa calma e
+          de abarrare resonile su prus chi podes, frunende su nùmeru de detàllios
+          prus mannu chi podes subra de sa situatzione e ammentende·ti chi su messàgiu
+          at a èssere visìbile in manera pùblica. Tene in contu chi non totu sos utentes
+          cumprendent su suspu de sa comunidade, duncas chirca de impreare tèrmines
+          comunes.
+        needs_view: S'utente tenet bisòngiu de s'autenticare in antis chi custu blocu
+          bèngiat iscantzelladu?
+      user:
+        email_confirmation: S'indiritzu tuo no est ammustradu a manera pùblica, pòmpia·ti
+          sa<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="Normas
+          subra de sa riservadesa de sa OSMF cun incluida sa setzione subra de sos
+          indiritzos de posta eletrònica">polìtica subra de sa riservadesa</a> pro
+          àteras informatziones.
+        new_email: (mai ammustradu a manera pùblica)
   datetime:
     distance_in_words_ago:
+      about_x_hours:
+        one: pagu prus o mancu 1 ora a como
+        other: pagu prus o mancu %{count} oras a como
+      about_x_months:
+        one: pagu prus o mancu 1 mese a como
+        other: pagu prus o mancu %{count} meses a como
+      about_x_years:
+        one: pagu prus o mancu 1 annu a como
+        other: pagu prus o mancu %{count} annos a como
+      almost_x_years:
+        one: belle 1 annu a como
+        other: belle %{count} annos a como
       half_a_minute: mesu minutu a como
+      less_than_x_seconds:
+        one: prus pagu de 1 segundu a como
+        other: prus pagu de %{count} segundos a como
+      less_than_x_minutes:
+        one: prus pagu de 1 minutu a como
+        other: prus pagu de %{count} minutos a como
+      over_x_years:
+        one: prus de 1 annu a como
+        other: prus de %{count} annos a como
+      x_seconds:
+        one: 1 segundu a como
+        other: '%{count} segundos a como'
+      x_minutes:
+        one: 1 minutu a como
+        other: '%{count} minutos a como'
+      x_days:
+        one: 1 die a como
+        other: '%{count} dies a como'
+      x_months:
+        one: 1 mese a como
+        other: '%{count} meses a como'
+      x_years:
+        one: 1 annu a como
+        other: '%{count} annos a como'
   editor:
+    default: Predefinidu (in custu momentu %{name})
     id:
       name: |2-
 
@@ -156,41 +235,164 @@ sc:
         opened_at_by_html: Creadu %{when} dae %{user}
         commented_at_html: Agiornadu %{when}
         commented_at_by_html: Agiornadu %{when} dae %{user}
+        closed_at_html: Risòlvidu %{when}
+        closed_at_by_html: Risòlvidu %{when} dae %{user}
         reopened_at_html: Torradu a ativare %{when}
         reopened_at_by_html: Torradu a ativare %{when} dae %{user}
       rss:
         title: Notas de OpenStreetMap
+        description_area: Una lista de notas, cummentadas o tancadas in s'àrea tua
+          [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
+        description_item: Unu flussu de informatziones rss pro sa nota %{id}
+        opened: nota noa (a curtzu de %{place})
+        commented: cummentu nou (a curtzu de %{place})
+        closed: nota serrada ( a curtzu de %{place})
+        reopened: nota torrada a ativare (a curtzu de %{place})
       entry:
         comment: Cummentu
         full: Nota intrea
+  account:
+    deletions:
+      show:
+        title: Iscantzella su contu meu
+        warning: Dae cara! Su protzessu de iscantzelladura de su contu est finale,
+          e non si podet annullare.
+        delete_account: Iscantzella su contu
+        delete_introduction: 'Podes iscantzellare su contu tuo de OpenStreetMap impreende
+          su butone inoghe in suta. Tene in contu sos detàllios chi sighint:'
+        delete_profile: Sas informatziones de su profilu tuo, chi incluint s'àvatar
+          tuo, sa descritzione tua e sa positzione de domo tua s'ant a iscantzellare.
+        delete_display_name: Su nùmene ammustradu tuo s'at a iscantzellare, e àteros
+          contos l'ant a pòdere impreare.
+        retain_caveats: 'Nointames custu, unas cantas informatziones chi ti pertocant
+          ant a s''ant a cunservare in OpenStreetMap, fintzas a pustis de s''iscantzelladura
+          de su contu tuo:'
+        retain_edits: Sas modìficas tuas a sa base de datos de sa mapa, si nd'as fatu,
+          s'ant a cunservare.
+        retain_traces: Sas rastas carrigadas tuas, si bi nde sunt, s'ant a cunservare.
+        retain_diary_entries: Sas boghes e sos cummentos in su diàriu, si bi nd'at,
+          ant a èssere cunservados ma cuados a sa vista.
+        retain_notes: Sas notas de sa mapa e sos cummentos a sas notas, si bi nd'at,
+          ant a èssere cunservados ma cuados a sa vista.
+        retain_changeset_discussions: Sos arresonos tuos in sos annantos de modìficas,
+          si bi nd'at, s'ant a cunservare.
+        retain_email: S'indiritzu tuo de posta eletrònica s'at a cunservare.
+        confirm_delete: Seguru ses?
+        cancel: Annulla
   accounts:
     edit:
+      title: Modìfica su profilu
+      my settings: Preferèntzias meas
+      current email address: Indiritzu de posta eletrònica atuale
+      external auth: Autenticatzione esterna
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: ite est custu?
+      public editing:
+        heading: Modificatzione pùblica
+        enabled: Abilitada. No anònimu e podet modificare datos.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: ite est custu?
+        disabled: Inabilitadu e chene permissu de mudare sos datos; totu sas modìficas
+          antepostas sunt anònimas.
+        disabled link text: pro ite non potzo fàghere modìficas?
+      public editing note:
+        heading: Modificatzione pùblica
+        html: In custu momentu sas modìficas tuas sunt anònimas e sa gente non ti
+          podet imbiare messàgios o bìdere sa positzione tua. Pro ammustrare su chi
+          as modificadu e permìtere a sa gente de ti cuntatare pro mèdiu de su situ
+          web incarca su butone inoghe in suta.. <b>Dae su cambiamentu 0.6 de s'API,
+          petzi sos utentes pùblicos podent modificare sos datos de sa mapa</b>. (<a
+          href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">impara su proite</a>).<ul><li>S'indiritzu
+          de posta eletrònica tuo no at a èssere riveladu divenende pùblicu.</li><li>Custa
+          atzione non si podet annullare e totu sos utentes noos como sunt pùblicos
+          comente impostatzione predefinida.</li></ul>
       contributor terms:
         heading: Règulas po contribuire
+        agreed: As atzetadu sos tèrmines noos de collaboratzione.
+        not yet agreed: No as galu atzetadu sos tèrmines noos de collaboratzione.
+        review link text: Cando podes pro praghere sighi custu ligàmene pro revisionare
+          e atzetare sas cunditziones noas pro sa contributzione.
+        agreed_with_pd: As fintzas decraradu chi cunsìderas sas modìficas tuas de
+          domìniu pùblicu.
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
+        link text: ite est custu?
       save changes button: Sarva sas modìficas
       make edits public button: Fais totu sas modìficas meas pùblicas
       delete_account: Boga su contu...
+    update:
+      success_confirm_needed: Informatziones de s'utente atualizadas. Controlla s'indiritzu
+        de posta eletrònica tuo pro cunfirmare s'indiritzu de posta nou tuo.
+      success: Informatzione de s'utente atualizadas.
     destroy:
       success: Contu bogau.
   browse:
     created: Creadu
     closed: Serradu
+    created_html: Creadu <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Serradu <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Creadu <abbr title='%{title}'>%{time}</abbr> dae %{user}
+    deleted_by_html: Iscantzelladu <abbr title='%{title}'>%{time}</abbr> dae %{user}
+    edited_by_html: Modificadu <abbr title='%{title}'>%{time}</abbr> dae %{user}
+    closed_by_html: Serradu <abbr title='%{title}'>%{time}</abbr> dae %{user}
     version: Versione
+    in_changeset: Annantu de modìficas
     anonymous: anònimu
+    no_comment: (perunu cummentu)
     part_of: Parte de
+    part_of_relations:
+      one: 1 relatzione
+      other: '%{count} relatziones'
+    part_of_ways:
+      one: 1 lìnia
+      other: '%{count} lìnias'
     download_xml: Iscàrriga XML
     view_history: Càstia Istòria
     view_details: Mustra Detàllios
     location: 'Logu:'
     changeset:
+      title: 'Annantu de modìficas: %{id}'
       belongs_to: Autore
+      node: Nodos (%{count})
+      node_paginated: Nodos (%{x}-%{y} de %{count})
+      way: Lìnias (%{count})
+      way_paginated: Lìnias (%{x}-%{y} de %{count})
+      relation: Relatziones (%{count})
+      relation_paginated: Relatziones (%{x}-%{y} de %{count})
+      comment: Cummentos (%{count})
+      hidden_commented_by_html: Cummentu cuadu de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Cummentu de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      changesetxml: XML de s'annantu de modìficas
+      osmchangexml: XML in formadu osmChange
+      feed:
+        title: Annantu de modìficas %{id}
+        title_comment: Grupu de modìficas %{id} - %{comment}
       join_discussion: Intra pro t'aunire a s'arresonu
       discussion: Arresonu
+      still_open: Annantu de modìficas galu abertu - s'arresonu s'at a abèrrere cando
+        s'annantu de modìficas s'at a serrare.
+    node:
+      title_html: 'Nodu: %{name}'
+      history_title_html: 'Istòria de su nodu: %{name}'
     way:
+      title_html: 'Lìnia: %{name}'
+      history_title_html: 'Istòria de sa lìnia: %{name}'
       nodes: Nodos
+      nodes_count:
+        one: 1 nodu
+        other: '%{count} nodos'
+      also_part_of_html:
+        one: parte de sa lìnia %{related_ways}
+        other: parte de sas lìnias %{related_ways}
     relation:
+      title_html: 'Relatzione: %{name}'
+      history_title_html: 'Istòria de sa relatzione: %{name}'
       members: Membros
+      members_count:
+        one: 1 membru
+        other: '%{count} membros'
     relation_member:
+      entry_role_html: '%{type} %{name} comente %{role}'
       type:
         node: Nodu
         way: Caminu
@@ -200,16 +402,22 @@ sc:
       entry_role_html: Relata %{relation_name} (as %{relation_role})
     not_found:
       title: No agatadu
+      sorry: 'No at fatu a agatare %{type} #%{id}'
       type:
         node: nodu
         way: caminu
         relation: relata
+        changeset: annantu de modìficas
         note: nota
     timeout:
+      title: Errore de lìmite de tempus de isetu barigadu
+      sorry: S'est istentadu tropu a otènnere sos datos pro sa casta %{type} cun s'identificadore
+        %{id}.
       type:
         node: nodu
         way: caminu
         relation: relata
+        changeset: annantu de modìficas
         note: nota
     redacted:
       redaction: Revisione %{id}
@@ -221,14 +429,43 @@ sc:
         way: caminu
         relation: relata
     start_rjs:
+      feature_warning: Carrighende %{num_features} funtzionalidades, chi diant pòdere
+        fàghere in manera chi su navigadore siat lentu o non rispondat. Ses seguru
+        de bòlere ammustrare custos datos?
       load_data: Càrriga Datos
       loading: Carrigamentu...
     tag_details:
       tags: Etichetas
+      wiki_link:
+        key: Sa pàgina de descritzione de sa wiki pro s'eticheta %{key}
+        tag: Sa pàgina de descritzione de sa wiki pro s'eticheta %{key}=%{value}
+      wikidata_link: S'elementu %{page} in Wikidata
+      wikipedia_link: S'artìculu %{page} in Wikipedia
+      wikimedia_commons_link: S'elementu %{page} in Wikimedia Commons
+      telephone_link: Muti a su %{phone_number}
+      colour_preview: Anteprima de su colore %{colour_value}
     note:
       title: 'Nota: %{id}'
       new_note: Nota noa
       description: Descritzione
+      open_title: 'Nota non risòlvida #%{note_name}'
+      closed_title: 'Nota risòlvida #%{note_name}'
+      hidden_title: 'Nota cuada #%{note_name}'
+      opened_by_html: Creada dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Creada dae un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Cummentu de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Cummentu de un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Risòlvida dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Risòlvida dae un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Torrada a ativare dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Torrada a ativare dae un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Cuada dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: sinnala custa nota
+    query:
+      title: Chirca de elementos
+      introduction: Incarca in sa mapa pro agatare elementos a curtzu.
+      nearby: Elementos a curtzu
+      enclosing: Elementos chi inserrant custu puntu
   changesets:
     changeset_paging_nav:
       showing_page: Pàgina %{page}
@@ -236,66 +473,195 @@ sc:
       previous: « Pretzedente
     changeset:
       anonymous: Anònimu
+      no_edits: (peruna modìfica)
+      view_changeset_details: Pòmpia sos detàllios de s'annantu de modìficas
     changesets:
       id: ID
+      saved_at: Sarvadu su
       user: Impitadore
       comment: Cummentu
       area: Àrea
     index:
-      title: Trumas de modìficas
+      title: Annantos de modìficas
       title_user: Trumas de modìficas de %{user}
-      title_friend: Trumas de modìficas de sos amigus meus
+      title_friend: Annantos de modìficas de sos amigos meos
       title_nearby: Trumas de modìficas de utentes acanta
+      empty: Perunu annantu de modìficas agatadu.
+      empty_area: Perunu grupu de modìficas in custa àrea.
+      empty_user: Perunu annantu de modìficas de custu utente.
+      no_more: Perunu àteru grupu de modìficas agatadu.
+      no_more_area: Perunu àteru annantu de modìficas in custa àrea.
+      no_more_user: Perunu àteru grupu de modìficas de custu utente.
       load_more: Càrriga·nde prus
+    timeout:
+      sorry: S'elencu de annantos de modìficas chi as pedidu at bisongiadu de tropu
+        tempus pro lu recuperare.
+  changeset_comments:
+    comment:
+      comment: 'Cummentu nou a s''annantu de modìficas #%{changeset_id} de %{author}'
+      commented_at_by_html: Atualizadu %{when} dae %{user}
+    comments:
+      comment: 'Cummentu nou a s''annantu de modìficas #%{changeset_id} de %{author}'
+    index:
+      title_all: Arresonu subra su grupu de modìficas de OpenStreetMap
+      title_particular: 'Arresonu de s''annantu de modìficas de OpenStreetMap #%{changeset_id}'
+    timeout:
+      sorry: S'elencu de grupos de modìficas chi as pedidu at bisongiadu de tropu
+        tempus pro lu recuperare.
   dashboards:
+    contact:
+      km away: ' a %{count} km de distàntzia'
+      m away: ' a %{count} m de distàntzia'
     popup:
+      your location: Sa positzione tua
+      nearby mapper: Mapadore a curtzu
       friend: Amigu
     show:
       title: Sa dashboard mea
+      no_home_location_html: '%{edit_profile_link} e imposta sa positzione de domo
+        tua pro bìdere sos utentes a curtzu.'
       edit_your_profile: Modìfica su profìlu tuu
       my friends: Amigus meus
+      no friends: No as galu annantu perunu amigu.
+      nearby users: Àteros utentes a curtzu
+      no nearby users: Non b'at perunu àteru utente chi ammitat de mapare a curtzu
+        a inoghe.
+      friends_changesets: annantos de modìficas de sos amigos
+      friends_diaries: intradas de diàriu de sos amigos
+      nearby_changesets: annantos de modìficas de utentes a curtzu
+      nearby_diaries: intradas de diàriu de utentes a curtzu
   diary_entries:
+    new:
+      title: Intrada de diàriu noa
     form:
       location: Logu
+      use_map_link: Imprea sa mapa
     index:
+      title: Diàrios de sos utentes
+      title_friends: Diàrios de sos amigos
+      title_nearby: Diàrios de sos utentes a curtzu
+      user_title: Diàriu de %{user}
+      in_language_title: Intradas de diàriu in %{language}
+      new: Intrada de diàriu noa
+      new_title: Cumpone un'intrada noa in su diàriu de utente meu
       my_diary: Cuotidianu meu
+      no_entries: Peruna intrada in su diàriu
+      recent_entries: Intradas reghentes in su diàriu
+      older_entries: Intradas prus antigas
+      newer_entries: Intradas prus noas
+    edit:
+      title: Modìfica s'intrada de su diàriu
+      marker_text: Positzione de s'intrada de su diàriu
     show:
+      title: Diàriu de %{user} | %{title}
+      user_title: Diàriu de %{user}
       leave_a_comment: Lassa unu cummentu
+      login_to_leave_a_comment_html: '%{login_link} pro lassare unu cummentu'
       login: Intra
+    no_such_entry:
+      title: In su diàriu non b'at peruna intrada gasi
+      heading: 'Non b''at peruna intrada cun s''id: %{id}'
+      body: Non b'at peruna intrada o cummentu in su diàriu cun s'id %{id}. Verìfica
+        s'ortografia tua. O forsis su ligàmene chi as incarcadu est isballiadu.
     diary_entry:
+      posted_by_html: Publicadu dae %{link_user} su %{created} in %{language_link}.
+      updated_at_html: Ùrtimu agiornamentu su %{updated}.
+      comment_link: Cummenta custa intrada
+      reply_link: Imbia unu messàgiu a s'autore
+      edit_link: Modìfica custa intrada
+      hide_link: Cua custa intrada
+      unhide_link: Ammustra custa intrada
       confirm: Cunfirma
+      report: Sinnala custa intrada
     diary_comment:
+      comment_from_html: Cummentu dae %{link_user} de su %{comment_created_at}
+      hide_link: Cua custu cummentu
+      unhide_link: Ammustra custu cummentu
       confirm: Cunfirma
+      report: Sinnala custu cummentu
     location:
       location: 'Logu:'
+      view: Ammustra
       edit: Càmbia
+    feed:
+      user:
+        title: Intradas de diàriu de OpenStreetMap de %{user}
+        description: Intradas de diàriu reghentes de OpenStreetMap de %{user}
+      language:
+        title: Intradas de diàriu de OpenStreetMap in %{language_name}
+        description: Intradas de diàriu reghentes de sos utentes de OpenStreetMap
+          in %{language_name}
+      all:
+        title: Intradas de diàriu de OpenStreetMap
+        description: Intradas de diàriu reghentes de sos utentes de OpenStreetMap
     comments:
+      title: Cummentos de su diàriu annantos dae %{user}
+      heading: Cummentos de su diàriu de %{user}
+      subheading_html: Cummentos de su diàriu annantos dae %{user}
+      no_comments: Perunu cummentu a su diàriu
+      post: Publicatzione
       when: Cando
       comment: Cummentu
       newer_comments: Cummentos prus noos
       older_comments: Cummentos prus antigos
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Aplicatzione registrada.
+  friendships:
+    make_friend:
+      heading: Annànghere %{user} a sos amigos?
+      button: Annanghe a sos amigos
+      success: '%{name} como est amigu tuo!'
+      failed: Annanta de %{name} a sos amigos fallida.
+      already_a_friend: Ses giai amigu de %{name}.
+      limit_exceeded: In custu ùrtimu perìodu as annantu utentes medas a sos amigos
+        tuos. Iseta unu pagu in antis de proare a nde annànghere àteros.
+    remove_friend:
+      heading: Bogare %{user} dae sos amigos?
+      button: Boga dae sos amigos
+      success: '%{name} est istadu bogadu dae sos amigos tuos.'
+      not_a_friend: '%{name} no est unu de sos amigos tuos.'
   geocoder:
+    search:
+      title:
+        latlon_html: Resurtados <a href="https://openstreetmap.org/">internos</a>
+        ca_postcode_html: Resurtados dae <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim_html: Resurtados dae <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+          Nominatim</a>
+        geonames_html: Resurtados dae <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim_reverse_html: Resurtados dae <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+          Nominatim</a>
+        geonames_reverse_html: Resurtados dae <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
       prefix:
         aerialway:
           cable_car: Funivia
           chair_lift: Ascensore carrotzina
           drag_lift: Sciovia
+          gondola: Telecabina
           magic_carpet: Cinta Trasportadora
           platter: Sciovia a piatellu
           pylon: Turre de sa funivia
           station: Istatzione sciovia
           t-bar: Sciovia a àncora
+          "yes": Isciovia
         aeroway:
           aerodrome: Aeròdromu
+          airstrip: Aeròdromu
+          apron: Àrea de arreada de aeroportu
           gate: Gate de aeroportu
           hangar: Hangar
           helipad: Eliportu
+          holding_position: Positzione de isetu
+          navigationaid: Agiudu de navigatzione aèrea
           parking_position: Positzione parchègiu
           runway: Pista
           taxilane: Carrera de rullàgiu
           taxiway: Carrera de furriada
           terminal: Terminal de aeroportu
+          windsock: Màniga a bentu
         amenity:
           animal_boarding: Domo po animales
           animal_shelter: Imbaru pro animales
@@ -307,6 +673,8 @@ sc:
           bench: Panchita/banchina
           bicycle_parking: Parchègiu pro Bitzicletas
           bicycle_rental: Afitu de Bitzicletas
+          bicycle_repair_station: Istatzione de acontzadura de bitzicletas
+          biergarten: Birreria a s'abertu
           blood_bank: Bancu de sàmbene
           boat_rental: Afitu de Imbarcatziones
           brothel: Casinu
@@ -332,7 +700,8 @@ sc:
           drinking_water: Abba Potàbile
           driving_school: Autoiscola
           embassy: Ambasciada
-          fast_food: Fast Food
+          events_venue: Sala pro eventos
+          fast_food: Màndigu lestru (Fast Food)
           ferry_terminal: Terminale navios
           fire_station: Pompieres
           food_court: Corte de màndigu (Food court)
@@ -344,12 +713,16 @@ sc:
           hospital: Ispidale
           hunting_stand: Posta de cassa
           ice_cream: Geladeria
+          internet_cafe: Ìnternet cafè
           kindergarten: Parcu de giogos
           language_school: Iscola de limbas
           library: Biblioteca
+          loading_dock: Dàrsena de càrriga
           love_hotel: Love hotel
           marketplace: Mercadu
+          mobile_money_agent: Agente de dinare mòbile
           monastery: Monastèriu
+          money_transfer: Tramudòngiu de dinare
           motorcycle_parking: Parchègiu pro Mototzicletas
           music_school: Iscola de mùsica
           nightclub: Locale noturnu
@@ -357,6 +730,7 @@ sc:
           parking: Parchègiu
           parking_entrance: Intrada de su Parchègiu
           parking_space: Parchègiu
+          payment_terminal: Terminale de pagamentu
           pharmacy: Apotecaria
           place_of_worship: Logu de cultu
           police: Politzia
@@ -367,8 +741,10 @@ sc:
           public_bath: Còmudu pùblicu
           public_bookcase: Libreria pùblica
           public_building: Telèfonu Pùblicu
+          ranger_station: Istatzione de sas guàrdias forestales
           recycling: Puntu de Retziclàgiu
           restaurant: Ristorante
+          sanitary_dump_station: Istatzione de discàrriga sanitària
           school: Iscola
           shelter: Imbaru
           shower: Dòtzia
@@ -381,16 +757,25 @@ sc:
           theatre: Teatru
           toilets: Còmodu
           townhall: Munitzìpiu
+          training: Istrutura de annestru
           university: Universidade
+          vehicle_inspection: Tzentru de revisiones
           vending_machine: Distribudore automàticu
           veterinary: Chirurgia veterinària
           village_hall: Munitzìpiu
           waste_basket: Cuntenidore de Arga
           waste_disposal: Cuntenidore de Arga
+          waste_dump_site: Muntonàrgiu
+          watering_place: Abbadòrgiu
           water_point: Puntu de abba
+          weighbridge: Bilàntzia a ponte
+          "yes": Servìtziu
         boundary:
+          aboriginal_lands: Terras aborìgenas
           administrative: Lìmite Amministrativu
+          census: Làcana de tzensimentu
           national_park: Parcu Natzionale
+          political: Distretu eletorale
           protected_area: Àrea amparada
           "yes": Làcana
         bridge:
@@ -403,52 +788,120 @@ sc:
         building:
           apartment: Aposentu
           apartments: Aposentus
+          barn: Òrriu
           bungalow: Bungalow
+          cabin: Pinnetu
           chapel: Capella
           church: Crésia
+          civic: Edifìtziu tzìvicu
+          college: Edifìtziu universitàriu
+          commercial: Edifìtziu cummertziale
+          construction: Edifìtziu in fràigu
+          detached: Domo unifamiliare
+          dormitory: Dormitòriu
+          duplex: Domo dòpia (duplex)
+          farm: Domo de fatoria
+          farm_auxiliary: Fràigu ausiliàriu de una fatoria
+          garage: Garàgiu
+          garages: Garàgios
+          greenhouse: Serra
           hangar: Hangar
           hospital: Ospidale
+          hotel: Edifìtziu de un'albergu
           house: Domo
+          houseboat: Domo chi gallègiat
           hut: Barraca
+          industrial: Edifìtziu industriale
+          kindergarten: Edifìtziu de un'asilu
+          manufacture: Edifìtziu de una fàbrica
+          office: Ufìtzios
+          public: Edifìtziu pùblicu
+          residential: Edifìtziu residentziale
+          retail: Edifìtziu cummertziale
+          roof: Coberta
+          ruins: Edifìtziu in ruinas
+          school: Edifìtziu iscolàsticu
+          semidetached_house: Domo bifamiliare
+          service: Edifìtziu de servìtziu
+          shed: Capannone
+          stable: Istalla
+          static_caravan: Caravana
+          temple: Edifìtziu de unu tèmpiu
+          terrace: Domos a ischiera
+          train_station: Istatzione ferroviària
           university: Edifìtziu universitàriu
           warehouse: Magasinu
           "yes": Edifitziu
+        club:
+          scout: Base scout
+          sport: Tzìrculu isportivu
+          "yes": Tzìrculu
         craft:
+          beekeeper: Mojaresu
+          blacksmith: Mastru de ferru
           brewery: Fàbrica de birra
           carpenter: Mastru de linna
+          caterer: Servìtziu de ristorazione
+          confectionery: Cofituria
+          dressmaker: Draperi
           electrician: Eletritzista
+          electronics_repair: Acontzadura de trastes eletrònicos
           gardener: Giardinere
+          glaziery: Bidraju
+          handicraft: Artesania
+          hvac: Fabricante de climatizadores
+          metal_construction: Azienda metalmecànica
           painter: Pintore
           photographer: Fotògrafu
           plumber: Idràulicu
+          roofer: Fraigadore de cobertas
+          sawmill: Segheria
           shoemaker: Cartzeraju
+          stonemason: Picapedreri
           tailor: Draperi
+          window_construction: Fraigadore de ventanas
+          winery: Cantina de binos
           "yes": Butega de artesania
         emergency:
+          access_point: Puntu de atzessu
           ambulance_station: Istatzione ambulàntzias
           assembly_point: Puntu de reunione
           defibrillator: Defibrillatore
+          fire_extinguisher: Estintore
+          fire_water_pond: Riserva de abba anti-fogos
           landing_site: Logu de aterràgiu de emergèntzia
+          life_ring: Sarvagente
           phone: Telèfonu de Emergèntzias
+          siren: Sirena de emergèntzia
+          suction_point: Puntu de aspiratzione de emergèntzia
           water_tank: Depòsitu de Abba de Emergèntzia
         highway:
           abandoned: Ferrovia abbandonada
           bridleway: Caminu pro caddos
+          bus_guideway: Corsia de postales a ghia vinculada
           bus_stop: Firmada de su Postale
           construction: Caminu in costrutzione
+          corridor: Passadissu
+          crossing: Coladòrgiu
           cycleway: Pista Tziclàbile
           elevator: Ascensore
           emergency_access_point: Logu de intrada de emergèntzia
+          emergency_bay: Pratzita de pàsida
+          footway: Caminera pedonale
           ford: Badu
           give_way: Sinnale de Tzèdere su Passu
           living_street: Carrera Residentziale
+          milestone: Perda miliare
           motorway: Autostrada
           motorway_junction: Nodu Viàriu
+          motorway_link: Autostrada
           passing_place: Logu de coladòrgiu
           path: Caminu
+          pedestrian: Caminu pedonale
           platform: Andana pro postale o tramvia
           primary: Caminu printzipale
           primary_link: Caminu printzipale
+          proposed: Caminu propostu
           raceway: Tzircùitu automobilìsticu
           residential: Carrera residentziale
           rest_area: Àrea de Pasu
@@ -456,6 +909,7 @@ sc:
           secondary: Carrera segundària
           secondary_link: Carrera segundària
           service: Carrera de Servìtziu
+          services: Istatzione de servìtziu
           speed_camera: Autovelox
           steps: Iscalinos
           stop: Signale de istop
@@ -463,28 +917,46 @@ sc:
           tertiary: Carrera Tertziària
           tertiary_link: Carrera Tertziària
           track: Sestadu
+          traffic_mirror: Ispigru de tràficu
+          traffic_signals: Semàforu
+          trailhead: Intrada de un'àndala
+          trunk: Superstrada
+          trunk_link: Superstrada
           turning_loop: Rotonda de cambiamentu de sensu
           unclassified: Carrera senza classificatzione
           "yes": Carrera
         historic:
+          aircraft: Aeroplanu istòricu
           archaeological_site: Sìtiu Archeològicu
+          bomb_crater: Cratere de bomba istòricu
           battlefield: Campu de Batalla
           boundary_stone: Pedra de làcana
+          building: Edifìtziu istòricu
+          bunker: Bunker
+          cannon: Cannone istòricu
           castle: Casteddu
+          charcoal_pile: Carbonera istòrica
           church: Crèsia
           city_gate: Porta de sa Tzitade
           citywalls: Murallas de sa Tzitade
           fort: Forte
           heritage: Patrimoniu de s'umanidade
+          hollow_way: Caminu afundadu
           house: Domo
           manor: Villa
           memorial: Memoriale
+          milestone: Perda miliare istòrica
+          mine: Mina
+          mine_shaft: Putzu mineràriu
           monument: Monumentu
+          railway: Ferrovia istòrica
           roman_road: Carreggiada romana
           ruins: Ruinas
+          rune_stone: Perda rùnica
           stone: Pedra
           tomb: Tumba
           tower: Turre
+          wayside_chapel: Capella votiva
           wayside_cross: Rughe istòrica
           wayside_shrine: Tabernàculu istòricu
           wreck: Relitu
@@ -493,7 +965,9 @@ sc:
           "yes": Giuntura de su caminu
         landuse:
           allotments: Giardinos familiares
+          aquaculture: Abbacultura
           basin: Batzinu
+          brownfield: Terrinu abbandonadu
           cemetery: Campusantu
           commercial: Zona Cummertziale
           conservation: Ispàtziu de cunservatzione
@@ -503,24 +977,37 @@ sc:
           forest: Litu
           garages: Garàgios
           grass: Erva
+          greenfield: Terrinu egadu
           industrial: Zona Industriale
           landfill: Muntonàrgiu
           meadow: Pradu
           military: Zona Militare
+          mine: Miniera
           orchard: Frutedu
+          plant_nursery: Vivaju
           quarry: Cava
           railway: Ferrovia
           recreation_ground: Zona de recreu
+          religious: Terrinu religiosu
           reservoir: Batzinu
+          reservoir_watershed: Presetu de unu serbatoju de abba
           residential: Àrea residentziale
           retail: Àrea cummertziale
           village_green: Àrea birde comune de sa bidda
           vineyard: Bìngia
           "yes": Impreu de su terrinu
         leisure:
+          adult_gaming_centre: Sala de giogos pro adultos
+          amusement_arcade: Sala de giogos
+          bandstand: Chioscu de sa mùsica
           beach_resort: Cumplessu turìsticu de marina
+          bird_hide: Logu pro pompiare pugiones
+          bleachers: Gradinadas
+          bowling_alley: Sala de bowling
           common: Terrinu comunale
+          dance: Sala de ballu
           dog_park: Parcu pro sos Canes
+          firepit: Brasieri
           fishing: Àrea de Pisca
           fitness_centre: Palestra
           fitness_station: Palestra a s'abertu
@@ -531,7 +1018,10 @@ sc:
           marina: Marina (portu minore)
           miniature_golf: Minigolf
           nature_reserve: Reserva naturale
+          outdoor_seating: Logos pro si sètzere in foras
           park: Parcu
+          picnic_table: Mesa de picnic
+          pitch: Campu isportivu
           playground: Parcu pro Pitzinnos
           recreation_ground: Zona de recreu
           resort: Cumplessu turìsticu
@@ -545,28 +1035,51 @@ sc:
           "yes": Tempus lìberu
         man_made:
           adit: Intrada de una galleria minerària
+          advertising: Publitzidade
+          antenna: Antenna
+          avalanche_protection: Protetzione anti-valanga
           beacon: Sinnale marinu
+          beam: Trae
+          beehive: Moju
           breakwater: Paraundas
           bridge: Ponte
+          bunker_silo: Bunker
+          cairn: Tùmulu (cairn)
           chimney: Fumajolu
+          clearcut: Padente isboscadu
+          communications_tower: Torre de comunicatziones
           crane: Grue
+          cross: Rughe
+          dolphin: Puntu de ormègiu
           dyke: Àrgine
+          embankment: Terraprenu
           flagpole: Palu de bandera
           gasometer: Gasòmetru
           groyne: Paraundas (Groyne)
           kiln: Furru (kiln)
           lighthouse: Faru
+          manhole: Tumbinu
           mast: Àrbore (de sa nave)
+          mine: Miniera
+          mineshaft: Putzu mineràriu
           monitoring_station: Istatzione de cuntrollu
           petroleum_well: Putzu petrolìferu
           pier: Pontinu
           pipeline: Tubadura
+          pumping_station: Istatzione de pompàgiu
+          reservoir_covered: Serbatoju cobertu
           silo: Lòssia
+          snow_cannon: Cannone de nie
+          snow_fence: Cresura pro sa nie
           storage_tank: Serbatòiu
+          street_cabinet: Tzentralina
           surveillance: Videobardiamentu
+          telescope: Telescòpiu
           tower: Turre
+          utility_pole: Palu de suportu
           wastewater_plant: Depuradore
           watermill: Mulinu a abba
+          water_tap: Càntaru de s'abba
           water_tower: Turre ìdrica
           water_well: Putzu petrolìferu
           water_works: Istrutura idràulica
@@ -576,23 +1089,32 @@ sc:
         military:
           airfield: Aeroportu militare
           barracks: Caserma
+          bunker: Bunker
+          checkpoint: Puntu de controllu
+          trench: Trintzea
           "yes": Militare
         mountain_pass:
           "yes": Coladòrgiu montanu
         natural:
+          atoll: Atollu
+          bare_rock: Roca nuda
           bay: Baja
           beach: Marina
           cape: Cabu
           cave_entrance: Intrada de sa gruta
           cliff: Iscameddu
+          coastline: Costera
           crater: Cratere
           dune: Duna
+          fell: Fell (ambiente de monte)
           fjord: Costera
           forest: Litu
+          geyser: Geyser
           glacier: Niera
           grassland: Pradu
           heath: Ghiddostraju
           hill: Montigru
+          hot_spring: Fonte termale
           island: Ìsula
           isthmus: Istmu
           land: Terra
@@ -607,28 +1129,45 @@ sc:
           rock: Roca
           saddle: Sedda
           sand: Arena
+          scree: Giarrone
           scrub: Prunitzàrgiu
+          shingle: Praja de perdas de riu
           spring: Bena
           stone: Pedra
           strait: Astrintura
           tree: Àrbore
+          tree_row: Fila de àrbores
+          tundra: Tundra
           valley: Badde
           volcano: Vulcanu
           water: Abba
           wetland: Paule
           wood: Buscu
+          "yes": Elementu naturale
         office:
           accountant: Contàbile
           administrative: Amministratzione
+          advertising_agency: Agentzia publitzitària
           architect: Architetu
           association: Assòtziu
           company: Azienda
+          diplomatic: Ufìtziu diplomàticu
           educational_institution: Istitutzione educativa
           employment_agency: Agèntzia pro su traballu
+          energy_supplier: Ufìtziu de fornidura elètrica
           estate_agent: Butega immobiliare
+          financial: Ufìtziu finantziàriu
           government: Ufìtziu guvernativu
+          insurance: Ufìtziu de asseguratziones
           it: Ufìtziu IT
           lawyer: Abogadu
+          logistics: Ufìtziu logìsticu
+          newspaper: Ufìtziu de redatzione de unu cuotidianu
+          ngo: Ufìtziu de una ONG
+          notary: Notaju
+          religion: Ufìtziu religiosu
+          research: Ufìtziu de chirca
+          tax_advisor: Consulente fiscale
           telecommunication: Ufìtziu de telecomunicatziones
           travel_agent: Agèntzia de biàgios
           "yes": Ufìtziu
@@ -636,6 +1175,7 @@ sc:
           allotments: Giardinos familiares
           archipelago: Artzipèlagu
           city: Tzitade
+          city_block: Isoladu urbanu
           country: Paisu
           county: Contea
           farm: Fatoria
@@ -648,6 +1188,7 @@ sc:
           locality: Localidade
           municipality: Munitzìpiu
           neighbourhood: Bighinadu
+          plot: Lotu de terrinu
           postcode: Còdighe postale
           quarter: Bighinadu
           region: Regione
@@ -661,105 +1202,210 @@ sc:
           "yes": Logu
         railway:
           abandoned: Ferrovia abbandonada
+          buffer_stop: Paraurti ferroviàriu
           construction: Ferrandeu in costrutzione
           disused: Ferrandeu in disavesu
+          funicular: Funiculare
           halt: Firmada de sos trenos
           junction: Nodu ferruviàriu
           level_crossing: passagiù a livellu
           light_rail: Trenu lèbiu
+          miniature: Ferrovia in miniadura
           monorail: Monorotàia
           narrow_gauge: Ferrovia abbandonada
+          platform: Banchina ferroviària
+          preserved: Ferrovia cunservada
+          proposed: Ferrovia proposta
           rail: Caminu de ferru
+          spur: Mascada ferroviària curtza
+          station: Istatzione ferroviària
+          stop: Firmada de sa ferrovia
           subway: Metropolitana
           subway_entrance: Intrada de sa metropolitana
+          switch: Cuncàmbios ferroviàrios
+          tram: Tramvia
           tram_stop: Firmada de su tram
+          turntable: Prataforma chi girat
+          yard: Zona de manovra ferroviària
         shop:
+          agrarian: Butega agrària
           alcohol: Licorista
           antiques: Anticuàriu
+          appliance: Butega de eletrodomèsticos
           art: Butega de arte
+          baby_goods: Butega de artìculos pro crios
+          bag: Butega de bursas
           bakery: Paneteri
+          bathroom_furnishing: Arredu de bagnu
           beauty: Salone de bellesa
+          bed: Produtos pro su letu
           beverages: Butega de bèvidas
           bicycle: Butega de bitzicletas
           bookmaker: Iscummissas
           books: Libreria
           boutique: Boutique
           butcher: Carnitzeria
+          car: Butega de màchinas
           car_parts: Cantos de ricàmbiu pro automòbiles
           car_repair: Riparatzione màchina
+          carpet: Butega de tapetes
+          charity: Butega de benefitzèntzia
+          cheese: Butega de casu
+          chemist: Potecaria
+          chocolate: Tziculateria
           clothes: Butega de bestires
           coffee: Butega de cafei
           computer: Butega de informàtica
+          confectionery: Butega de durches
           convenience: Buteghedda
           copyshop: Copisteria
+          cosmetics: Butega de cosmèticos
+          craft: Butega de artìculos pro s'artesania
+          curtain: Butega de tendas
+          dairy: Lateria
           deli: Gastronomia
           department_store: Supermercadu
+          discount: Butega de artìculos iscontados (discount)
           doityourself: Butega de bricolage
           dry_cleaning: Sabunadura "a sicu"
+          e-cigarette: Butega de sigaretas eletrònicas
           electronics: Butega de eletrònica
+          erotic: Butega eròtica
           estate_agent: Butega immobiliare
+          fabric: Butega de tessutos
+          farm: Butega de produtos agrìculos
+          fashion: Butega de moda
+          fishing: Butega de trastes de pisca
           florist: Froraju
           food: Alimentares
+          frame: Butega de curnisas
           funeral_directors: Pompas fùnebres
           furniture: Mòbiles
+          garden_centre: Tzentru de giardinàgiu
+          gas: Butega de combustìbile
           general: Empòriu
           gift: Butega de donos
+          greengrocer: Butega de fruteri
+          grocery: Fruteri
           hairdresser: Pilucheri
           hardware: Ferramenta
+          health_food: Butega de alimentos pro sa salude
+          hearing_aids: Butega de aparèchios acùsticos
+          herbalist: Erbolàriu
+          hifi: Butega de Hi-Fi
+          houseware: Butega de artìculos pro sa domo
+          ice_cream: Gelateria
           interior_decoration: Decoradura de internos
           jewelry: Butega de prendas
+          kiosk: Chioscu
+          kitchen: Butega de coghina
           laundry: Samunadòrgiu
+          locksmith: Mastru de ferru
           lottery: Loteria
           mall: Tzentru cummertziale
           massage: Messàgiu
+          medical_supply: Butega de artìculos mèigos
+          mobile_phone: Butega de telèfonos mòbiles
+          money_lender: Imprestadore de dinare
           motorcycle: Butega de mototzicletas
+          motorcycle_repair: Butega de acontzadura de mototzicletas
+          music: Butega de mùsica
+          musical_instrument: Istrumentos musicales
           newsagent: Agentzia de imprenta
+          nutrition_supplements: Integradores alimentares
           optician: Òticu
+          organic: Butega de alimentos biològicos
+          outdoor: Butega de artìculos pro s'atividade a s'abertu
           paint: Butega de Pinturas
+          pastry: Pastisseria
           pawnbroker: Monte de piedade
+          perfumery: Butega de profumos
+          pet: Butega de animales
+          pet_grooming: Toeletadura pro animales domèsticos
           photo: Fotògrafu
+          seafood: Pischeria
           second_hand: Ogetos de segunda manu
+          sewing: Mertzeria
+          shoes: Butega de iscarpas
+          sports: Butega de isport
+          stationery: Cartoleria
+          storage_rental: Afitu de depòsitos
           supermarket: Supermercadu
           tailor: Draperi
+          tattoo: Butega de tatuàgios
+          tea: Butega de te
+          ticket: Billeteria
           tobacco: Istancu
+          toys: Butega de giogos
           travel_agency: Agèntzia de biàgios
           tyres: Butega de pneumàticos
+          vacant: Logu pro butega bòidu
           variety_store: Butega de ogetos baratos
+          video: Butega de vìdeos
+          video_games: Butega de video-giogos
+          wholesale: Butega a s'ingrussu
           wine: Butega de binos
           "yes": Butega
         tourism:
           alpine_hut: Pinnetu alpinu
+          apartment: Apartamentu pro vacàntzias
           artwork: Òpera de arte
           attraction: Atratzione
           bed_and_breakfast: Bed and Breakfast
           cabin: Cabina turìstica
+          camp_pitch: Pratzita de campègiu
           camp_site: Campègiu
           caravan_site: Campeggio pro roulotte
+          chalet: Masu (Chalet)
           gallery: Galleria
           guest_house: Pensione
           hostel: Ostellu
+          hotel: Albergu
           information: Informatziones
+          motel: Motel
           museum: Museu
           picnic_site: Àrea de recreu
           theme_park: Parcu temàticu
           viewpoint: Puntu panoràmicu
+          wilderness_hut: Imbaru rurale
+          zoo: Zoo
         tunnel:
+          building_passage: Coladòrgiu peri unu fràigu
+          culvert: Canale suta terra
           "yes": Galleria
         waterway:
+          artificial: Cursu de abba artifitziale
           boatyard: Cantiere navale
           canal: Canale
           dam: Diga
+          derelict_canal: Canale abbandonadu
+          ditch: Fossu
+          dock: Dàrsena
+          drain: Canale de drenàgiu
+          lock: Serrada (isbarramentu idràulicu)
           lock_gate: Ghenna de serradura
           mooring: Ormègiu
           rapids: Tràinos
           river: Riu
           stream: Traghinu/Trainu
+          wadi: Uadì
           waterfall: Istrampu
           weir: Nassàrgiu
+          "yes": Cursu de abba
       admin_levels:
         level2: Làcana Aministrativa 2u Livellu - Istadu Natzionale
         level3: Làcana de regione
+        level4: Làcana de 4u livellu (regione, provìntzia o istadu federadu de unu
+          paisu)
         level5: Làcana aministrativa su de 5 livellus - àrea regionale
+        level6: Làcana de 6u livellu - suta-regionale (provìntzia, tzitade metropolitana
+          o contea)
+        level7: Làcana de 7u livellu - subra-munitzipale (unione de comunes, comunidade
+          montana)
+        level8: Làcana munitzipale (livellu 8)
+        level9: Làcana de 9u livellu - sutamunitzipale (distretu tzitadinu)
+        level10: Làcana de livellu 10 (bighinadu)
+        level11: Làcana de trighìngiu
       types:
         cities: Tzitades
         towns: Tzitadinas
@@ -770,59 +1416,176 @@ sc:
   issues:
     index:
       title: Problemas
+      select_status: Seletziona un'istadu
+      select_type: Seletziona una casta
+      select_last_updated_by: Seletzionare s'ùrtima atualizatzione de
+      reported_user: Utente sinnaladu
+      not_updated: No atualizadu
       search: Chirca
+      search_guidance: 'Chirca problemas:'
+      user_not_found: S'utente no esistit
+      issues_not_found: Perunu problema de custa casta agatadu
       status: Istadu
-      reports: Raportos
+      reports: Informes
       last_updated: Ùrtimu agiornamentu
-      link_to_reports: Abbàida su raportu
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> dae %{user}
+      link_to_reports: Abbàida sos informes
+      reports_count:
+        one: 1 sinnalatzione
+        other: '%{count} sinnalatziones'
+      reported_item: Elementu sinnaladu
+      states:
+        ignored: Ignoradu
+        open: Abertu
+        resolved: Risoltu
+    update:
+      new_report: Sa sinnalatzione tua est istada registrada
+      successful_update: Sa sinnalatzione tua est istada atualizada
+      provide_details: Fruni sos detàllios pedidos
+    show:
+      title: '%{status} Problema #%{issue_id}'
+      report_created_at: Sinnaladu pro sa prima borta su %{datetime}
+      last_resolved_at: Risoltu pro s'ùrtima borta su %{datetime}
+      last_updated_at: Ùrtima atualizatzione de %{displayname} su %{datetime}
+      resolve: Risolve
+      ignore: Ignora
+      reopen: Torra a abèrrere
+      reports_of_this_issue: Sinnalatziones de custu problema
+      read_reports: Leghe sas sinnalatziones
+      new_reports: Sinnalatziones noas
+      other_issues_against_this_user: Àteras sinnalatziones contra a custu utente
+      no_other_issues: Non b'at perunu àteru problema chi pertochet a custu utente.
+      comments_on_this_issue: Cummentos subra de custu problema
+    resolve:
+      resolved: S'istadu de su problema est istadu impostadu comente ‘Risoltu'
+    ignore:
+      ignored: S'istadu de su problema est istadu impostadu comente ‘Ignoradu'
+    reopen:
+      reopened: S'istadu de su problema est istadu impostadu comente ‘Abertu'
+    comments:
+      comment_from_html: Cummentu de %{user_link} de su %{comment_created_at}
+      reassign_param: Torrare a assignare su problema?
+    reports:
+      reported_by_html: Sinnaladu comente %{category} dae %{user} su %{updated_at}
+    helper:
+      reportable_title:
+        diary_comment: '%{entry_title}, cummentu #%{comment_id}'
+        note: 'Nota #%{note_id}'
+  issue_comments:
+    create:
+      comment_created: Su cummentu tuo est istadu creadu
+      issue_reassigned: Su cummentu tuo est istadu creadu e su problema est istadu
+        torradu a assignare
   reports:
     new:
+      title_html: Sinnala %{link}
+      missing_params: Non faghet a creare una sinnalatzione noa
+      disclaimer:
+        intro: 'In antis de imbiare sa sinnalatzione tua a sos moderadores de su situ
+          web assegura·ti chi:'
+        not_just_mistake: Sias seguru chi su problema non siat petzi una faddina
+        unable_to_fix: Non sias in gradu de acontzare su problema a sa sola o cun
+          s'agiudu de sos membros de sa comunidade tua
+        resolve_with_user: Apas giai proadu a risòlvere su problema cun s'utente in
+          chistione
       categories:
         diary_entry:
+          spam_label: Custa intrada de diàriu est/cuntenet arga
+          offensive_label: Custa intrada de diàriu est ofensiva/truzosa
+          threat_label: Custa intrada de diàriu cuntenet una minetza
           other_label: Àteru
         diary_comment:
+          spam_label: Custu cummentu a su diàriu est/cuntenet arga
+          offensive_label: Custu cummentu a su diàriu est ofensivu/truzosu
+          threat_label: Custu cummentu a su diàriu cuntenet una minetza
           other_label: Àteru
         user:
+          spam_label: Custu profilu de utente est/cuntenet arga
+          offensive_label: Custu profilu de utente est ofensivu/truzosu
+          threat_label: Custu profilu de utente cuntenet una minetza
+          vandal_label: Custu utente est unu vàndalu
           other_label: Àteru
         note:
           spam_label: Custa nota est àliga
+          personal_label: Custa nota cuntenet datos personales
+          abusive_label: Custa nota est ingiuliosa
           other_label: Àteru
+    create:
+      successful_report: Sa sinnalatzione tua est istada registrada
+      provide_details: Fruni sos detàllios pedidos
   layouts:
     logo:
       alt_text: Logotipu de OpenStreetMap
+    home: Bae a sa positzione de incumintzu
     logout: Essi
     log_in: Intra
+    log_in_tooltip: Intra cun unu contu chi esistit
     sign_up: Iscrie·ti
     start_mapping: Cumintzat a mapare
+    sign_up_tooltip: Crea unu contu pro modificare
     edit: Modìfica
     history: Cronologia
     export: Esporta
     issues: Problemas
     data: Datos
+    export_data: Esporta sos datos
     gps_traces: Trassas GPS
+    gps_traces_tooltip: Amministra sas rastas GPS
+    user_diaries: Diàrios de sos utentes
+    user_diaries_tooltip: Pòmpia sos diàrios de sos utentes
+    edit_with: Modìfica cun %{editor}
+    tag_line: Sa mapa wiki lìbera de su mundu
     intro_header: Bene benius in OpenStreetMap!
     intro_text: OpenStreetMap est una mapa de su mundu, creadu dae persones comente
       tue e de impreu lìberu suta una litzèntzia aberta.
+    intro_2_create_account: Crea unu contu de utente
+    hosting_partners_html: S'allògiu est a càrrigu de %{ucl}, %{fastly}, %{bytemark}
+      e de àteros %{partners}.
+    partners_ucl: UCL
+    partners_fastly: Fastly
+    partners_bytemark: Bytemark Hosting
+    partners_partners: sòtzios
     tou: Conditziones de impreu
+    osm_offline: In custu momentu sa base de datos de OpenStreetMap est foras de lìnia,
+      ca sunt faghende traballos essentziales de mantenimentu.
+    osm_read_only: In custu momentu sa base de datos de OpenStreetMap est in modalidade
+      de leghidura ebbia, ca sunt faghende traballos essentziales de mantenimentu.
+    donate: Agiuda a OpenStreetMap %{link} a su Fundu de Modernizatzione de s'Hardware.
     help: Agiudu
     about: Informatziones
     copyright: Deretu de autore
     community: Comunidade
+    community_blogs: Blogs de sa comunidade
+    community_blogs_title: Blogs de sos membros de sa comunidade de OpenStreetMap
     foundation: Fundatzione
     foundation_title: Sa Fundatzione OpenStreetMap
+    make_a_donation:
+      title: Agiuda a OpenStreetMap cun una donatzione econòmica
+      text: Faghe una donatzione
     learn_more: Leghe àteru
     more: Àteru
   user_mailer:
     diary_comment_notification:
+      subject: '[OpenStreetMap] %{user} at cummentadu un''intrada de su diàriu'
       hi: Salude %{to_user},
       header: '%{from_user} at cummentadu s''intrada cuotidiana de OpenStreetMap cun
         su tema %{subject}:'
+      header_html: '%{from_user} at cummentadu s''intrada de su diàriu de OpenStreetMap
+        cun s''ogetu %{subject}:'
       footer: Podes lèghere su cummentu fintzas in %{readurl} e cummentare in %{commenturl}
         o rispònnere in %{replyurl}
+      footer_html: Podes lèghere su cummentu tuo fintzas in %{readurl} e cummentare
+        in %{commenturl} o mandare unu messàgiu a s'autore in %{replyurl}
     message_notification:
+      subject: '[OpenStreetMap] %{message_title}'
       hi: Salude %{to_user},
       header: '%{from_user} at imbiadu unu messàgiu a traessu de OpenStreetMap cun
         su tema %{subject}:'
+      header_html: '%{from_user} t''at imbiadu unu messàgiu pro mèdiu OpenStreetMap
+        cun s''ogetu %{subject}:'
+      footer: Podes lèghere su messàgiu fintzas in %{readurl} e podes imbiare unu
+        messàgiu a s'autore in %{replyurl}
       footer_html: Podes lèghere su messàgiu fintzas in %{readurl} e podes rispònnere
         in %{replyurl}
     friendship_notification:
@@ -830,10 +1593,20 @@ sc:
       subject: '[OpenStreetMap] %{user} t''at annànghidu a sa lista de amigos'
       had_added_you: '%{user} t''at annantu comente a amigu in OpenStreetMap.'
       see_their_profile: Podes bìdere su profilu suo in %{userurl}.
+      see_their_profile_html: Podes bìdere su profilu suo in %{userurl}.
       befriend_them: Lu/a podes fintzas annànghere comente a amigu/a in %{befriendurl}.
+      befriend_them_html: Lu podes fintzas annànghere comente amigu in %{befriendurl}.
+    gpx_description:
+      description_with_tags_html: 'Paret s''archìviu GPX tuo %{trace_name} cun sa
+        descritzione %{trace_description} e sas etichetas chi sighint: %{tags}'
+      description_with_no_tags_html: Paret s'archìviu GPX tuo %{trace_name} cun sa
+        descritzione %{trace_description} e chene etichetas
     gpx_failure:
       hi: Salude %{to_user},
       failed_to_import: 'non si podet importare. Sa faddina est istada:'
+      more_info_html: Podes agatare àteras informatzione subra sos fallimentos de
+        importatzione de sos GPX e de comente los evitare in %{url}.
+      import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       subject: '[OpenStreetMap] Faddina de importatzione de GPX'
     gpx_success:
       hi: Salude %{to_user},
@@ -848,28 +1621,139 @@ sc:
       confirm: 'Primu de totu, depimus cunfirmare chi custa petitzione de creatzione
         de contu est bostra; si l''est, incarcades subra su ligàmene imbeniente pro
         la cunfirmare:'
+      welcome: A pustis de àere cunfirmadu su contu tuo t'amus a frunire unas cantas
+        informatziones additzionales pro ti permìtere de incumintzare.
     email_confirm:
       subject: '[OpenStreetMap] Cunfirma s''indiritzu de posta'
       greeting: Salude,
       hopefully_you: Calicunu (isperamus tue matessi) cheret cambiare s'indiritzu
         eletrònicu tuo dae %{server_url} cun %{new_address}.
+      click_the_link: Si ses istadu tue incarca in su ligàmene inoghe in suta pro
+        cunfirmare sa modìfica.
     lost_password:
+      subject: '[OpenStreetMap] Dimanda de riprìstinu de sa crae de intrada'
       greeting: Salude,
+      hopefully_you: Calicunu (forsis tue) at pedidu de ripristinare sa crae de intrada
+        de su contu de openstreetmap.org assotziadu a custu indiritzu de posta eletrònica.
+      click_the_link: Si ses istadu tue incarca in su ligàmene inoghe in suta pro
+        ripristinare sa crae de intrada tua.
     note_comment_notification:
+      anonymous: Un'utente anònimu
       greeting: Salude,
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} at cummentadu una de sas notas
+          tuas'
+        subject_other: '[OpenStreetMap] %{commenter} at cummentadu una nota chi t''interessat'
+        your_note: '%{commenter} at lassadu unu cummentu a una de sas notas tuas in
+          sa mapa a curtzu a %{place}.'
+        your_note_html: '%{commenter} at lassadu unu cummentu a una de sas notas tuas
+          in sa mapa a curtzu a %{place}.'
+        commented_note: '%{commenter} at lassadu unu cummentu a una de sas notas in
+          sa mapa chi as cummentadu. Sa nota est a curtzu a %{place}.'
+        commented_note_html: '%{commenter} at lassadu unu cummentu a una de sas notas
+          in sa mapa chi as cummentadu. Sa nota est a curtzu a %{place}.'
+      closed:
+        subject_own: '[OpenStreetMap] %{commenter} at risòlvidu una de sas notas tuas'
+        subject_other: '[OpenStreetMap] %{commenter} at risòlvidu una nota chi t''interessat'
+        your_note: '%{commenter} at risòlvidu una de sas notas tuas in sa mapa a curtzu
+          a %{place}.'
+        your_note_html: '%{commenter} at risòlvidu una de sas notas tuas in sa mapa
+          a curtzu a %{place}.'
+        commented_note: '%{commenter} at risòlvidu una de sas notas in sa mapa chi
+          aias cummentadu. Sa nota est a curtzu a %{place}.'
+        commented_note_html: '%{commenter} at risòlvidu una de sas notas in sa mapa
+          chi aias cummentadu. Sa nota est a curtzu a %{place}.'
+      reopened:
+        subject_own: '[OpenStreetMap] %{commenter} at torradu a ativare una de sas
+          notas tuas'
+        subject_other: '[OpenStreetMap] %{commenter} at torradu a ativare una nota
+          chi t''interessat'
+        your_note: '[OpenStreetMap] %{commenter} at torradu a ativare una de sas notas
+          de sa mapa tuas a curtzu a %{place}.'
+        your_note_html: '[OpenStreetMap] %{commenter} at torradu a ativare una de
+          sas notas de sa mapa tuas a curtzu a %{place}.'
+        commented_note: '[OpenStreetMap] %{commenter} at torradu a ativare una de
+          sas notas de sa mapa chi as cummentadu. Sa nota est a curtzu a %{place}.'
+        commented_note_html: '[OpenStreetMap] %{commenter} at torradu a ativare una
+          de sas notas de sa mapa chi as cummentadu. Sa nota est a curtzu a %{place}.'
+      details: Podes agatare detàllios in prus subra de sa nota in %{url}.
+      details_html: Podes agatare detàllios in prus subra de sa nota in %{url}.
     changeset_comment_notification:
       hi: Salude %{to_user},
       greeting: Salude,
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} at cummentadu unu de sos annantos
+          de modìficas tuos'
+        subject_other: '[OpenStreetMap] %{commenter} at cummentadu un''annantu de
+          modìficas chi t''interessat'
+        your_changeset: '%{commenter} at lassadu unu cummentu a sas %{time} a unu
+          de sos annantos de modìficas tuos'
+        your_changeset_html: '%{commenter} at lassadu unu cummentu a sas %{time} a
+          unu de sos annantos de modìficas tuos'
+        commented_changeset: '%{commenter} at lassadu unu cummentu a sas %{time} a
+          unu de sos annantos de modìficas chi ses sighende creadu dae %{changeset_author}'
+        commented_changeset_html: '%{commenter} at lassadu unu cummentu a sas %{time}
+          a unu de sos annantos de modìficas chi ses sighende creadu dae %{changeset_author}'
+        partial_changeset_with_comment: cun su cummentu '%{changeset_comment}'
+        partial_changeset_with_comment_html: cun su cummentu '%{changeset_comment}'
+        partial_changeset_without_comment: chene cummentos
+      details: Podes agatare detàllios in prus subra de s'annantu de modìficas in
+        %{url}.
+      details_html: Podes agatare detàllios in prus subra de s'annantu de modìficas
+        in %{url}.
+      unsubscribe: Pro annullare s'iscritzione a sas atualizatzione de custu annantu
+        de modìficas bìsita %{url} e incarca in "Annulla s'iscritzione".
+      unsubscribe_html: Pro annullare s'iscritzione a sas atualizatzione de custu
+        annantu de modìficas bìsita %{url} e incarca in "Annulla s'iscritzione".
   confirmations:
     confirm:
+      heading: Controlla sa posta eletrònica tua!
+      introduction_1: T'amus imbiadu una lìtera eletrònica de cunfirma.
+      introduction_2: Cunfirma su contu tuo incarchende in su ligàmene in sa lìtera
+        eletrònica chi t'amus imbiadu e as a pòdere incumintzare a modificare sa mapa.
+      press confirm button: Incarca su butone de cunfirma inoghe in suta pro ativare
+        su contu tuo.
       button: Cunfirma
+      success: As cunfirmadu su contu tuo, gràtzias pro t'èssere registradu!
+      already active: Custu contu est istadu giai cunfirmadu.
+      unknown token: Custu còdighe de cunfirma est iscadidu o no esistet.
+      reconfirm_html: Si tenes bisòngiu chi ti torremus a imbiare sa lìtera de cunfirma,
+        <a href="%{reconfirm}">incarca inoghe</a>.
+    confirm_resend:
+      failure: Utente %{name} no agatadu.
     confirm_email:
+      heading: Cunfirma una modìfica de indiritzu de posta eletrònica
+      press confirm button: Incarca su butone de cunfirma inoghe in suta pro cunfirmare
+        s'indiritzu de posta nou tuo.
       button: Cunfirma
+      success: As cunfirmadu su cambiamentu de s'indiritzu de posta eletrònica tuo!
+      failure: Un'indiritzu de posta eletrònica est istadu giai cunfirmadu cun custu
+        getone de autenticatzione.
+      unknown_token: Custu còdighe de cunfirma est iscadidu o no esistet.
+    resend_success_flash:
+      confirmation_sent: T'amus imbiadu una nota de cunfirma a %{email}, e cando as
+        a cunfirmare su contu tuo as a pòdere incumintzare a mapare.
+      whitelist: Si impreas unu sistema anti-arga chi imbiat rechestas de cunfirma
+        tando assegura·ti de annànghere %{sender} a sa lista bianca tua, dae chi no
+        amus a pòdere rispòndere a peruna rechesta de cunfirma.
   messages:
     inbox:
+      title: Posta in intrada
+      my_inbox: Posta in intrada mea
+      my_outbox: Posta in essida mea
+      messages: Tenes %{new_messages} e %{old_messages}
+      new_messages:
+        one: '%{count} messàgiu nou'
+        other: '%{count} messàgios noos'
+      old_messages:
+        one: '%{count} messàgiu betzu'
+        other: '%{count} messàgios betzos'
       from: Dae
       subject: 'Sugetu:'
       date: Data
+      no_messages_yet_html: Non tenes galu messàgios. Proite non chircas a calicuna
+        de sas %{people_mapping_nearby_link}?
+      people_mapping_nearby: persones chi mapant a curtzu a tie
     message_summary:
       unread_button: Sinna comente no lèghidu
       read_button: Sinna comente lèghidu
@@ -880,13 +1764,34 @@ sc:
       send_message_to_html: Imbia unu messàgiu nou a %{name}
       subject: 'Sugetu:'
       body: Corpus
+      back_to_inbox: Torra a sa posta in intrada
     create:
       message_sent: Messàgiu imbiadu
+      limit_exceeded: In custos ùrtimos tempos as imbiadu messàgios medas. Iseta unu
+        pagu in antis de proare a nd'imbiare àteros.
+    no_such_message:
+      title: Non b'at perunu messàgiu gasi
+      heading: Non b'at perunu messàgiu gasi
+      body: Non b'at perunu messàgiu cun custu id.
     outbox:
+      title: Posta in essida
+      my_inbox: Posta in intrada mea
+      my_outbox: Posta in essida mea
+      messages:
+        one: Tenes %{count} messàgiu imbiadu
+        other: Tenes %{count} messàgios imbiados
       to: Cara a
       subject: 'Sugetu:'
       date: Data
+      no_sent_messages_html: Non tenes galu messàgios imbiados. Proite non chircas
+        a calicuna de sas %{people_mapping_nearby_link}?
+      people_mapping_nearby: persones chi mapant a curtzu a tie
+    reply:
+      wrong_user: Ti ses autenticadu comente `%{user}', ma su messàgiu a su cale cheres
+        rispòndere no est istadu imbiadu a cussu utente. Faghe s'atzessu comente s'utente
+        curretu pro li torrare risposta.
     show:
+      title: Leghe su messàgiu
       from: Dae
       subject: 'Sugetu:'
       date: Data
@@ -895,16 +1800,161 @@ sc:
       destroy_button: Cantzella
       back: In palas
       to: Cara a
+      wrong_user: Ti ses autenticadu comente `%{user}', ma su messàgiu chi as pedidu
+        de pòdere lèghere no est istadu imbiadu a cussu utente. Faghe s'atzessu comente
+        s'utente curretu pro lu lèghere.
     sent_message_summary:
       destroy_button: Cantzella
+    mark:
+      as_read: Messàgiu marcadu comente lèghidu
+      as_unread: Messàgiu marcadu comente non lèghidu
     destroy:
       destroyed: Messàgiu iscantzelladu
+  passwords:
+    lost_password:
+      title: Crae de intrada pèrdida
+      heading: Ais ismentigadu sa crae de intrada?
+      email address: 'Indiritzu de posta eletrònica:'
+      new password button: Riprìstina sa crae de intrada
+      help_text: Inserta s'indiritzu de posta chi as impreadu pro ti registrare, l'amus
+        a imbiare unu ligàmene chi as a pòdere impreare pro ripristinare sa crae de
+        intrada tua.
+      notice email on way: Nos dispraghet chi l'apas pèrdida :-( ma t'amus imbiadu
+        unu messàgiu de posta eletrònica pro chi la potzas ripristinare.
+      notice email cannot find: A dolu mannu non semus resèssidos a agatare custu
+        indiritzu de posta eletrònica.
+    reset_password:
+      title: Riprìstina sa crae de intrada
+      heading: Riprìstina sa crae de intrada pro %{user}
+      reset: Riprìstina sa crae de intrada
+      flash changed: Sa crae de intrada tua est istada mudada.
+      flash token bad: No amus agatadu custu getone, proa a verificare s'URL.
+  preferences:
+    show:
+      title: Preferèntzias meas
+      preferred_editor: Editore preferidu
+      preferred_languages: Limbas preferidas
+      edit_preferences: Modìfica sas preferèntzias
+    edit:
+      title: Modìfica sas preferèntzias
+      save: Atualiza sas preferèntzias
+      cancel: Annulla
+    update:
+      failure: No at fatu a atualizare sas preferèntzias.
+    update_success_flash:
+      message: Preferèntzias atualizadas.
+  profiles:
+    edit:
+      title: Modìfica su profilu
+      save: Atualiza su profilu
+      cancel: Annulla
+      image: Immàgine
+      gravatar:
+        gravatar: Imprea Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Ite est Gravatar?
+        disabled: Gravatar est istadu inabilitadu.
+        enabled: Sa visualizatzione de su Gravatar tuo est istada abilitada.
+      new image: Annanghe un'immàgine
+      keep image: Mantene s'immàgine atuale
+      delete image: Boga s'immàgine atuale
+      replace image: Remplasa s'immàgine atuale
+      image size hint: (sas immàgines cuadradas de a su nessi 100x100 funtzionant
+        mègius)
+      home location: Positzione de incumintzu
+      no home location: No as insertadu sa positzione de incumintzu tua.
+      update home location on click: Atualizare sa positzione de incumintzu incarchende
+        in sa mapa?
+    update:
+      success: Profilu atualizadu.
+      failure: Non s'est pòdidu atualizare su profilu.
   sessions:
     new:
       title: Intra
       heading: Intra
+      email or username: 'Indiritzu de posta o nùmene de utente:'
+      password: 'Crae:'
+      openid_html: '%{logo} OpenID:'
+      remember: Ammenta·ti de mene
+      lost password link: Ais pèrdidu sa crae de intrada tua?
       login_button: Intra
+      register now: Registra·ti como
+      with username: 'Tenes giai unu contu de OpenStreetMap? Intra cun su nùmene utente
+        tuo e sa crae de intrada tua:'
+      with external: 'In alternativa, intra impreende unu servìtziu esternu:'
+      new to osm: Ses nou in OpenStreetMap?
+      to make changes: Pro fàghere modìficas a sos datos de OpenStreetMap, depes tènnere
+        unu contu.
+      create account minute: Crea unu contu. Bi bolet petzi unu minutu.
+      no account: Non tenes unu contu?
+      account not active: Su contu tuo no est galu ativu.<br />Imprea su ligàmene
+        in sa lìtera eletrònica de cunfirma pro ativare su contu tuo, o <a href="%{reconfirm}">pedi
+        una lìtera de cunfirma noa</a>.
+      account is suspended: Su contu tuo est istadu suspèndidu pro neghe de atividades
+        suspetas.<br />Cuntata <a href="%{webmaster}">s'assistèntzia</a> si nde cheres
+        chistionare.
+      auth failure: Non podes intrare cun custos detàllios.
+      openid_logo_alt: Intra cun un'OpenID
+      auth_providers:
+        openid:
+          title: Intra cun OpenID
+          alt: Intra cun un'URL de OpenID
+        google:
+          title: Intra cun Google
+          alt: Intra cun un'OpenID de Google
+        facebook:
+          title: Intra cun Facebook
+          alt: Intra cun unu contu de Facebook
+        windowslive:
+          title: Intra cun Windows Live
+          alt: Intra cun unu contu de Windows Live
+        github:
+          title: Intra cun GitHub
+          alt: Intra cun unu contu de GitHub
+        wikipedia:
+          title: Intra cun Wikipedia
+          alt: Intra cun unu contu de Wikipedia
+        wordpress:
+          title: Intra cun Wordpress
+          alt: Intra cun un'OpenID de Wordpress
+        aol:
+          title: Intra cun AOL
+          alt: Intra cun un'OpenID de AOL
+    destroy:
+      title: Essi
+      heading: Essi dae OpenStreetMap
+      logout_button: Essi
+  shared:
+    markdown_help:
+      title_html: Analizadu cun <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
+      headings: Intestatziones
+      heading: Intestatzione
+      subheading: Sutatìtulu
+      unordered: Lista no ordinada
+      ordered: Lista ordinada
+      first: Primu elementu
+      second: Segundu elementu
+      link: Ligàmene
+      text: Testu
+      image: Immàgine
+      alt: Testu alternativu
+      url: URL
+    richtext_field:
+      edit: Modìfica
+      preview: Antiprima
   site:
+    about:
+      next: Imbeniente
+      copyright_html: <span>&copy;</span>Contribuidores<br>de OpenStreetMap
+      used_by_html: '%{name} frunit datos cartogràficos a mìgias de sitos web, aplicatziones
+        pro telefoneddos e dispositivos fìsicos'
+      lede_text: OpenStreetMap est fraigadu dae una comunidade de mapadores chi frunint
+        e agiornant datos subra de caminos, camineras, cafeterias, istatziones de
+        ferrovia e meda de prus in totu su mundu.
+      local_knowledge_title: Connoschèntzia locale
+      local_knowledge_html: |-
+        OpenStreetMap daet valore a sa connoschèntzia locale. Sos collaboradores impreant immàgines aèreas, dispositivos GPS e mapas clàssicas de su terrinu pro verificare chi OSM
+        siat pretzisas e atualizadas.
     index:
       createnote: Annanghe una nota
     export:
@@ -989,14 +2039,14 @@ sc:
       rules:
         title: Règulas!
       add_a_note:
-        title: No Time To Edit? Annanghe una nota!
+        title: Non tenes tempus pro fàghere modìficas? Annanghe una nota!
   traces:
     new:
       visibility_help: ite cheret nàrrere?
       help: Agiudu
     create:
-      upload_failed: Sorry, the GPX upload failed. An administrator has been alerted
-        to the error. Torra·bi a proare.
+      upload_failed: Su carrigamentu de su GPX est fallidu. Un'amministradore est
+        istadu avisadu de s'errore. Torra·bi a proare.
     edit:
       visibility_help: ite cheret nàrrere?
     trace_optionals:
@@ -1025,6 +2075,7 @@ sc:
       legale_names:
         france: Frantza
         italy: Itàlia
+        rest_of_world: Restu de su mundu
     show:
       my profile: Su profilu meu
       edits: Modìficas
@@ -1071,7 +2122,7 @@ sc:
       show:
         comment: Cummentu
         subscribe: Sutaiscrie·ti
-        unsubscribe: Annulla sa sutiscritzione
+        unsubscribe: Annulla s'iscritzione
         hide_comment: cua
         unhide_comment: ammustra
     notes:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 2931bceb8..2b86107c1 100644
--- a/config/locales/sk.yml
+++ b/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.
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index bf294e77b..33b342259 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -50,6 +50,7 @@ ta:
     errors:
       messages:
         invalid_email_address: செல்லுபடியாகும் மின்னஞ்சல் முகவரியாகத் தெரியவில்லை
+        email_address_not_routable: திசைதிருப்பக்கூடியது அல்ல
     models:
       acl: அனுமதிக் கட்டுப்பாட்டுப் பட்டியல்
       changeset: மாற்றங்கள்
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index de49df266..2ca9126b6 100644
--- a/config/locales/tr.yml
+++ b/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ı
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 07546f8fd..62d496251 100644
--- a/config/locales/tt.yml
+++ b/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 файлын төяү:'
-        tagstring: 'Тамгалар:'
+        gpx_file: GPX файлын төяү
+        tagstring: Тамгалар
       message:
         sender: Җибәрүче
         title: Тема
@@ -215,8 +221,8 @@ tt:
       my friends: Дусларым
   diary_entries:
     form:
-      location: 'Урын:'
-      use_map_link: Харитада күрсәтергә
+      location: Урын
+      use_map_link: Хаританы кулланырга
     index:
       title: Көндәлекләр
       title_friends: Дуслар көндәлекләре
@@ -247,7 +253,7 @@ tt:
       prefix:
         aeroway:
           aerodrome: Аэродром
-          apron: Перрон
+          apron: Аэропорт перроны
           gate: Утыруга чыгу
           hangar: Ангар
           helipad: Боралак мәйданчыгы
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index be9df22ec..bccc6099c 100644
--- a/config/locales/uk.yml
+++ b/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:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index fa1324d7a..020dcb446 100644
--- a/config/locales/vi.yml
+++ b/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:
diff --git a/config/locales/yi.yml b/config/locales/yi.yml
index c9ef3eadb..7ff1e7a0c 100644
--- a/config/locales/yi.yml
+++ b/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: לינק
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 102447755..9304a98f1 100644
--- a/config/locales/zh-CN.yml
+++ b/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: 载入数据
-      loading: 正在载入...
+      load_data: 加载数据
+      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: 上升
diff --git a/config/locales/zh-hk.yml b/config/locales/zh-HK.yml
similarity index 84%
rename from config/locales/zh-hk.yml
rename to config/locales/zh-HK.yml
index b2ea1ba74..cc9335fea 100644
--- a/config/locales/zh-hk.yml
+++ b/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: 描述
-        languages: 語言
+        description: 個人檔案描述
+        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: 停機坪
-          gate: 閘口
+          apron: 機場停機坪
+          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: 將地圖置中於此
 ...
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 27fee15cc..202dbef98 100644
--- a/config/locales/zh-TW.yml
+++ b/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: 上升
diff --git a/config/settings.yml b/config/settings.yml
index 0e73d2b02..9ff8a653b 100644
--- a/config/settings.yml
+++ b/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:
diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml
index 5b6194aba..3b61d6145 100644
--- a/config/wiki_pages.yml
+++ b/config/wiki_pages.yml
@@ -19,18 +19,22 @@ bg:
   key:
     building: Bg:Key:building
     lanes: Bg:Key:lanes
+    name:bg: Bg:Key:name:bg
   tag:
     barrier=guard_rail: Bg:Tag:barrier=guard rail
     building=chapel: Bg:Tag:building=chapel
     natural=heath: Bg:Tag:natural=heath
     railway=crossing: Bg:Tag:railway=crossing
     railway=level_crossing: Bg:Tag:railway=level crossing
+    shop=sewing: Bg:Tag:shop=sewing
 br:
   key:
     highway: Br:Key:highway
 ca:
   key:
+    aerialway: Ca:Key:aerialway
     amenity: Ca:Key:amenity
+    bicycle: Ca:Key:bicycle
     board:title: Ca:Key:board:title
     building: Ca:Key:building
     contact:facebook: Ca:Key:contact:facebook
@@ -41,6 +45,7 @@ ca:
     openplaques:id: Ca:Key:openplaques:id
     operator:type: Ca:Key:operator:type
     phone: Ca:Key:phone
+    polling_station: Ca:Key:polling station
     roller_coaster: Ca:Key:roller coaster
     roundtrip: Ca:Key:roundtrip
     wikidata: Ca:Key:wikidata
@@ -66,34 +71,61 @@ ca:
     aerialway=zip_line: Ca:Tag:aerialway=zip line
     aeroway=apron: Ca:Tag:aeroway=apron
     aeroway=gate: Ca:Tag:aeroway=gate
+    aeroway=hangar: Ca:Tag:aeroway=hangar
     aeroway=helipad: Ca:Tag:aeroway=helipad
     aeroway=heliport: Ca:Tag:aeroway=heliport
+    aeroway=highway_strip: Ca:Tag:aeroway=highway strip
     aeroway=holding_position: Ca:Tag:aeroway=holding position
     aeroway=navigationaid: Ca:Tag:aeroway=navigationaid
     aeroway=terminal: Ca:Tag:aeroway=terminal
     aeroway=windsock: Ca:Tag:aeroway=windsock
     airmark=beacon: Ca:Tag:airmark=beacon
+    amenity=atm: Ca:Tag:amenity=atm
+    amenity=baby_hatch: Ca:Tag:amenity=baby hatch
+    amenity=bank: Ca:Tag:amenity=bank
     amenity=bar: Ca:Tag:amenity=bar
     amenity=bicycle_parking: Ca:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: Ca:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: Ca:Tag:amenity=bicycle repair station
     amenity=biergarten: Ca:Tag:amenity=biergarten
+    amenity=bureau_de_change: Ca:Tag:amenity=bureau de change
+    amenity=bus_station: Ca:Tag:amenity=bus station
     amenity=cafe: Ca:Tag:amenity=cafe
+    amenity=car_rental: Ca:Tag:amenity=car rental
+    amenity=car_wash: Ca:Tag:amenity=car wash
+    amenity=clinic: Ca:Tag:amenity=clinic
     amenity=college: Ca:Tag:amenity=college
+    amenity=dentist: Ca:Tag:amenity=dentist
+    amenity=doctors: Ca:Tag:amenity=doctors
     amenity=driving_school: Ca:Tag:amenity=driving school
     amenity=exhibition_centre: Ca:Tag:amenity=exhibition centre
     amenity=fast_food: Ca:Tag:amenity=fast food
+    amenity=ferry_terminal: Ca:Tag:amenity=ferry terminal
     amenity=food_court: Ca:Tag:amenity=food court
+    amenity=fuel: Ca:Tag:amenity=fuel
+    amenity=grit_bin: Ca:Tag:amenity=grit bin
     amenity=ice_cream: Ca:Tag:amenity=ice cream
     amenity=kindergarten: Ca:Tag:amenity=kindergarten
     amenity=language_school: Ca:Tag:amenity=language school
     amenity=library: Ca:Tag:amenity=library
+    amenity=motorcycle_parking: Ca:Tag:amenity=motorcycle parking
     amenity=music_school: Ca:Tag:amenity=music school
     amenity=nightclub: Ca:Tag:amenity=nightclub
+    amenity=nursing_home: Ca:Tag:amenity=nursing home
     amenity=outfitter: Ca:Tag:amenity=outfitter
+    amenity=parcel_locker: Ca:Tag:amenity=parcel locker
+    amenity=parking: Ca:Tag:amenity=parking
+    amenity=parking_entrance: Ca:Tag:amenity=parking entrance
+    amenity=parking_space: Ca:Tag:amenity=parking space
+    amenity=pharmacy: Ca:Tag:amenity=pharmacy
     amenity=post_box: Ca:Tag:amenity=post box
     amenity=pub: Ca:Tag:amenity=pub
     amenity=restaurant: Ca:Tag:amenity=restaurant
+    amenity=school: Ca:Tag:amenity=school
+    amenity=taxi: Ca:Tag:amenity=taxi
     amenity=toy_library: Ca:Tag:amenity=toy library
     amenity=university: Ca:Tag:amenity=university
+    amenity=vehicle_inspection: Ca:Tag:amenity=vehicle inspection
     barrier=cable_barrier: Ca:Tag:barrier=cable barrier
     barrier=kerb: Ca:Tag:barrier=kerb
     building=boathouse: Ca:Tag:building=boathouse
@@ -111,12 +143,16 @@ ca:
     leisure=swimming_pool: Ca:Tag:leisure=swimming pool
     leisure=tanning_salon: Ca:Tag:leisure=tanning salon
     man_made=gantry: Ca:Tag:man made=gantry
+    man_made=wastewater_plant: Ca:Tag:man made=wastewater plant
     name=Herfy: Ca:Tag:name=Herfy
     natural=cliff: Ca:Tag:natural=cliff
     network=VE:T:PO: Ca:Tag:network=VE:T:PO
     office=notary: Ca:Tag:office=notary
+    parking=surface: Ca:Tag:parking=surface
     place=isolated_dwelling: Ca:Tag:place=isolated dwelling
     power=line: Ca:Tag:power=line
+    service=aircraft_control: Ca:Tag:service=aircraft control
+    shop=alcohol: Ca:Tag:shop=alcohol
     shop=frozen_food: Ca:Tag:shop=frozen food
     tactile_paving=no: Ca:Tag:tactile paving=no
     vending=books: Ca:Tag:vending=books
@@ -438,7 +474,6 @@ cs:
     historic:period: Cs:Key:historic:period
     horse: Cs:Key:horse
     hour_off: Cs:Key:hour off
-    hour_on: Cs:Key:hour on
     hov: Cs:Key:hov
     iata: Cs:Key:iata
     icao: Cs:Key:icao
@@ -646,7 +681,6 @@ cs:
     post_box:type: Cs:Key:post box:type
     postal_code: Cs:Key:postal code
     power: Cs:Key:power
-    power_source: Cs:Key:power source
     power_supply: Cs:Key:power supply
     power_supply:schedule: Cs:Key:power supply:schedule
     preschool: Cs:Key:preschool
@@ -1202,6 +1236,7 @@ cs:
     building=transportation: Cs:Tag:building=transportation
     building=university: Cs:Tag:building=university
     building=warehouse: Cs:Tag:building=warehouse
+    building=wayside_shrine: Cs:Tag:building=wayside shrine
     building=yes: Cs:Tag:building=yes
     bunker_type=hardened_aircraft_shelter: Cs:Tag:bunker type=hardened aircraft shelter
     bunker_type=munitions: Cs:Tag:bunker type=munitions
@@ -1873,6 +1908,7 @@ cs:
     railway=traverser: Cs:Tag:railway=traverser
     railway=turntable: Cs:Tag:railway=turntable
     railway=wash: Cs:Tag:railway=wash
+    railway=water_crane: Cs:Tag:railway=water crane
     recycling_type=container: Cs:Tag:recycling type=container
     religion=buddhist: Cs:Tag:religion=buddhist
     religion=christian: Cs:Tag:religion=christian
@@ -2330,13 +2366,13 @@ de:
     Animal: DE:Key:Animal
     Annotations: DE:Key:Annotations
     FIXME: DE:Key:FIXME
-    Key:restaurant: DE:Key:Key:restaurant
     TODO: DE:Key:TODO
     VRS:ref: DE:Key:VRS:ref
     WDPA_ID:ref: DE:Key:WDPA ID:ref
     'abandoned:': 'DE:Key:abandoned:'
     abandoned:*: DE:Key:abandoned:*
     abandoned:amenity: DE:Key:abandoned:amenity
+    abandoned:highway: DE:Key:abandoned:highway
     abandoned:place: DE:Key:abandoned:place
     abandoned:railway: DE:Key:abandoned:railway
     abutters: DE:Key:abutters
@@ -2360,10 +2396,12 @@ de:
     aeroway: DE:Key:aeroway
     after_school: DE:Key:after school
     agricultural: DE:Key:agricultural
+    air_conditioning: DE:Key:air conditioning
     alt_name: DE:Key:alt name
     amenity: DE:Key:amenity
     architect: DE:Key:architect
     area: DE:Key:area
+    area:highway: DE:Key:area:highway
     artist_name: DE:Key:artist name
     artwork_type: DE:Key:artwork type
     asb: DE:Key:asb
@@ -2372,6 +2410,7 @@ de:
     atv:repair: DE:Key:atv:repair
     authentication: DE:Key:authentication
     automated: DE:Key:automated
+    automatic_door: DE:Key:automatic door
     backcountry: DE:Key:backcountry
     backrest: DE:Key:backrest
     backward: DE:Key:backward
@@ -2400,17 +2439,20 @@ de:
     books: DE:Key:books
     both: DE:Key:both
     boundary: DE:Key:boundary
+    branch: DE:Key:branch
     brand: DE:Key:brand
     breakfast: DE:Key:breakfast
     brewery: DE:Key:brewery
     bridge: DE:Key:bridge
     bridge:movable: DE:Key:bridge:movable
+    bridge:name: DE:Key:bridge:name
     bridge:structure: DE:Key:bridge:structure
     bridge:support: DE:Key:bridge:support
     buiding: DE:Key:buiding
     building: DE:Key:building
     building:architecture: DE:Key:building:architecture
     building:condition: DE:Key:building:condition
+    building:flats: DE:Key:building:flats
     building:levels: DE:Key:building:levels
     building:levels:underground: DE:Key:building:levels:underground
     building:material: DE:Key:building:material
@@ -2423,6 +2465,7 @@ de:
     busway: DE:Key:busway
     button_operated: DE:Key:button operated
     cables: DE:Key:cables
+    camera:type: DE:Key:camera:type
     canoe: DE:Key:canoe
     capacity: DE:Key:capacity
     capacity:charging: DE:Key:capacity:charging
@@ -2492,19 +2535,27 @@ de:
     currency:USD: DE:Key:currency:USD
     currency:others: DE:Key:currency:others
     cutting: DE:Key:cutting
+    cycle_barrier: DE:Key:cycle barrier
+    cycle_barrier:installation: DE:Key:cycle barrier:installation
+    cycle_highway: DE:Key:cycle highway
     cycleway: DE:Key:cycleway
     cycleway:left: DE:Key:cycleway:left
+    cycleway:left:oneway: DE:Key:cycleway:left:oneway
     cycleway:right: DE:Key:cycleway:right
     cycleway:right:oneway: DE:Key:cycleway:right:oneway
     cycleway:surface: DE:Key:cycleway:surface
+    'damage:': 'DE:Key:damage:'
     dance:style: DE:Key:dance:style
     dance:teaching: DE:Key:dance:teaching
     date: DE:Key:date
     de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: DE:Key:de:regionalschluessel
     de:strassenschluessel: DE:Key:de:strassenschluessel
+    defensive_works: DE:Key:defensive works
     delivery: DE:Key:delivery
+    delivery:partner: DE:Key:delivery:partner
     'demolished:': 'DE:Key:demolished:'
+    demolished:building: DE:Key:demolished:building
     denomination: DE:Key:denomination
     denotation: DE:Key:denotation
     departures_board: DE:Key:departures board
@@ -2522,7 +2573,6 @@ de:
     destroyed: DE:Key:destroyed
     'destroyed:': 'DE:Key:destroyed:'
     diameter: DE:Key:diameter
-    diaper: DE:Key:diaper
     diet: DE:Key:diet
     diet:*: DE:Key:diet:*
     diet:vegan: DE:Key:diet:vegan
@@ -2540,8 +2590,10 @@ de:
     dog: DE:Key:dog
     door: DE:Key:door
     draft: DE:Key:draft
+    drain: DE:Key:drain
     drink: DE:Key:drink
     drinking_water: DE:Key:drinking water
+    drinking_water:refill: DE:Key:drinking water:refill
     drive_in: DE:Key:drive in
     drive_through: DE:Key:drive through
     duration: DE:Key:duration
@@ -2549,12 +2601,15 @@ de:
     electrified: DE:Key:electrified
     embankment: DE:Key:embankment
     emergency: DE:Key:emergency
+    emergency:phone: DE:Key:emergency:phone
     end_date: DE:Key:end date
     engineer: DE:Key:engineer
     entrance: DE:Key:entrance
+    exit: DE:Key:exit
     facebook: DE:Key:facebook
     fair_trade: DE:Key:fair trade
     farmyard: DE:Key:farmyard
+    fax: DE:Key:fax
     fee: DE:Key:fee
     fence_type: DE:Key:fence type
     ferry:cable: DE:Key:ferry:cable
@@ -2562,6 +2617,7 @@ de:
     fire_boundary: DE:Key:fire boundary
     fire_hydrant: DE:Key:fire hydrant
     fireplace: DE:Key:fireplace
+    fix_guidepost: DE:Key:fix guidepost
     fixme: DE:Key:fixme
     flag:type: DE:Key:flag:type
     floating: DE:Key:floating
@@ -2589,6 +2645,7 @@ de:
     generator:output:hot_water: DE:Key:generator:output:hot water
     generator:output:steam: DE:Key:generator:output:steam
     generator:place: DE:Key:generator:place
+    generator:plant: DE:Key:generator:plant
     generator:source: DE:Key:generator:source
     generator:type: DE:Key:generator:type
     genus: DE:Key:genus
@@ -2654,6 +2711,7 @@ de:
     lamp_type: DE:Key:lamp type
     landfill:waste: DE:Key:landfill:waste
     landuse: DE:Key:landuse
+    lane_markings: DE:Key:lane markings
     lanes: DE:Key:lanes
     lanes:backward: DE:Key:lanes:backward
     lanes:both_ways: DE:Key:lanes:both ways
@@ -2674,6 +2732,8 @@ de:
     length: DE:Key:length
     level: DE:Key:level
     line: DE:Key:line
+    line_attachment: DE:Key:line attachment
+    line_management: DE:Key:line management
     lit: DE:Key:lit
     living_street: DE:Key:living street
     loc_name: DE:Key:loc name
@@ -2707,6 +2767,8 @@ de:
     maxspeed:variable: DE:Key:maxspeed:variable
     maxstay: DE:Key:maxstay
     maxweight: DE:Key:maxweight
+    maxweightrating: DE:Key:maxweightrating
+    maxweightrating:hgv: DE:Key:maxweightrating:hgv
     maxwidth: DE:Key:maxwidth
     maxwidth:physical: DE:Key:maxwidth:physical
     meadow: DE:Key:meadow
@@ -2768,6 +2830,7 @@ de:
     noref: DE:Key:noref
     note: DE:Key:note
     nudism: DE:Key:nudism
+    number_of_apartments: DE:Key:number of apartments
     nursery: DE:Key:nursery
     object: DE:Key:object
     observatory:type: DE:Key:observatory:type
@@ -2782,6 +2845,7 @@ de:
     oneway:moped: DE:Key:oneway:moped
     onkz: DE:Key:onkz
     openfire: DE:Key:openfire
+    opening: DE:Key:opening
     opening_date: DE:Key:opening date
     opening_hours: DE:Key:opening hours
     opening_hours:covid19: DE:Key:opening hours:covid19
@@ -2795,13 +2859,18 @@ de:
     osmc:status: DE:Key:osmc:status
     osmc:symbol: DE:Key:osmc:symbol
     outdoor_seating: DE:Key:outdoor seating
+    overlap: DE:Key:overlap
     overtaking: DE:Key:overtaking
     par: DE:Key:par
+    parcel_mail_in: DE:Key:parcel mail in
+    parcel_pickup: DE:Key:parcel pickup
     park_ride: DE:Key:park ride
     parking: DE:Key:parking
     parking:condition: DE:Key:parking:condition
     parking:lane: DE:Key:parking:lane
     parking:lane:hgv: DE:Key:parking:lane:hgv
+    parking:orientation: DE:Key:parking:orientation
+    parking_space: DE:Key:parking space
     passenger_information_display: DE:Key:passenger information display
     passing_places: DE:Key:passing places
     payment: DE:Key:payment
@@ -2826,7 +2895,6 @@ de:
     post_office: DE:Key:post office
     postal_code: DE:Key:postal code
     power: DE:Key:power
-    power_rating: DE:Key:power rating
     preschool: DE:Key:preschool
     priority: DE:Key:priority
     priority_road: DE:Key:priority road
@@ -2847,9 +2915,11 @@ de:
     railway:lzb: DE:Key:railway:lzb
     railway:position: DE:Key:railway:position
     railway:preserved: DE:Key:railway:preserved
+    railway:ref: DE:Key:railway:ref
     railway:signal:distant: DE:Key:railway:signal:distant
     railway:signal:speed_limit: DE:Key:railway:signal:speed limit
     railway:signal:speed_limit_distant: DE:Key:railway:signal:speed limit distant
+    railway:tilting: DE:Key:railway:tilting
     railway:track_ref: DE:Key:railway:track ref
     ramp: DE:Key:ramp
     'razed:': 'DE:Key:razed:'
@@ -2859,20 +2929,26 @@ de:
     ref: DE:Key:ref
     ref:IFOPT: DE:Key:ref:IFOPT
     ref:bufa: DE:Key:ref:bufa
+    ref:fgkz: DE:Key:ref:fgkz
     ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
+    ref:sprockhoff: DE:Key:ref:sprockhoff
     ref_name: DE:Key:ref name
     reg_name: DE:Key:reg name
     religion: DE:Key:religion
     'removed:': 'DE:Key:removed:'
     reservation: DE:Key:reservation
     reservoir_type: DE:Key:reservoir type
+    residential: DE:Key:residential
     resource: DE:Key:resource
     restaurant: DE:Key:restaurant
     reusable_packaging: DE:Key:reusable packaging
     reusable_packaging:accept: DE:Key:reusable packaging:accept
     reusable_packaging:offer: DE:Key:reusable packaging:offer
     right: DE:Key:right
+    roof:height: DE:Key:roof:height
     roof:material: DE:Key:roof:material
+    roof:orientation: DE:Key:roof:orientation
+    roof:shape: DE:Key:roof:shape
     room: DE:Key:room
     rooms: DE:Key:rooms
     rotor:diameter: DE:Key:rotor:diameter
@@ -2901,6 +2977,7 @@ de:
     shooting: DE:Key:shooting
     shop: DE:Key:shop
     short_protection_title: DE:Key:short protection title
+    shoulder: DE:Key:shoulder
     shower: DE:Key:shower
     sidewalk: DE:Key:sidewalk
     sidewalk:both:bicycle: DE:Key:sidewalk:both:bicycle
@@ -2926,6 +3003,7 @@ de:
     step_count: DE:Key:step count
     stone_type: DE:Key:stone type
     stroller: DE:Key:stroller
+    subject: DE:Key:subject
     substance: DE:Key:substance
     substation: DE:Key:substation
     summit:register: DE:Key:summit:register
@@ -2933,6 +3011,7 @@ de:
     support: DE:Key:support
     surface: DE:Key:surface
     surveillance: DE:Key:surveillance
+    surveillance:type: DE:Key:surveillance:type
     surveillance:zone: DE:Key:surveillance:zone
     survey:date: DE:Key:survey:date
     swimming: DE:Key:swimming
@@ -2997,14 +3076,17 @@ de:
     voltage: DE:Key:voltage
     voltage:primary: DE:Key:voltage:primary
     voltage:secondary: DE:Key:voltage:secondary
+    wall: DE:Key:wall
     waste: DE:Key:waste
     water: DE:Key:water
     water_characteristic: DE:Key:water characteristic
     water_well: DE:Key:water well
     waterway: DE:Key:waterway
     website: DE:Key:website
+    website:menu: DE:Key:website:menu
     wetland: DE:Key:wetland
     wheelchair: DE:Key:wheelchair
+    wheelchair:description: DE:Key:wheelchair:description
     wholesale: DE:Key:wholesale
     width: DE:Key:width
     wiki:symbol: DE:Key:wiki:symbol
@@ -3033,7 +3115,10 @@ de:
     access=destination: DE:Tag:access=destination
     access=forestry: DE:Tag:access=forestry
     access=no: DE:Tag:access=no
+    access=permissive: DE:Tag:access=permissive
+    access=permit: DE:Tag:access=permit
     access=private: DE:Tag:access=private
+    access=unknown: DE:Tag:access=unknown
     admin_level=2: DE:Tag:admin level=2
     advertising=column: DE:Tag:advertising=column
     advertising=flag: DE:Tag:advertising=flag
@@ -3125,11 +3210,14 @@ de:
     amenity=customs: DE:Tag:amenity=customs
     amenity=dancing_school: DE:Tag:amenity=dancing school
     amenity=dentist: DE:Tag:amenity=dentist
+    amenity=device_charging_station: DE:Tag:amenity=device charging station
     amenity=dive_centre: DE:Tag:amenity=dive centre
     amenity=doctors: DE:Tag:amenity=doctors
+    amenity=dog_parking: DE:Tag:amenity=dog parking
     amenity=dog_toilet: DE:Tag:amenity=dog toilet
     amenity=dressing_room: DE:Tag:amenity=dressing room
     amenity=drinking_water: DE:Tag:amenity=drinking water
+    amenity=driver_training: DE:Tag:amenity=driver training
     amenity=driving_school: DE:Tag:amenity=driving school
     amenity=embassy: DE:Tag:amenity=embassy
     amenity=emergency_phone: DE:Tag:amenity=emergency phone
@@ -3141,6 +3229,7 @@ de:
     amenity=fire_hydrant: DE:Tag:amenity=fire hydrant
     amenity=fire_station: DE:Tag:amenity=fire station
     amenity=fish_spa: DE:Tag:amenity=fish spa
+    amenity=food_court: DE:Tag:amenity=food court
     amenity=fountain: DE:Tag:amenity=fountain
     amenity=fridge: DE:Tag:amenity=fridge
     amenity=fuel: DE:Tag:amenity=fuel
@@ -3163,9 +3252,12 @@ de:
     amenity=lavoir: DE:Tag:amenity=lavoir
     amenity=letter_box: DE:Tag:amenity=letter box
     amenity=library: DE:Tag:amenity=library
+    amenity=loading_dock: DE:Tag:amenity=loading dock
+    amenity=lost_property_office: DE:Tag:amenity=lost property office
     amenity=lounger: DE:Tag:amenity=lounger
     amenity=marketplace: DE:Tag:amenity=marketplace
     amenity=medical_supply: DE:Tag:amenity=medical supply
+    amenity=mobile_library: DE:Tag:amenity=mobile library
     amenity=monastery: DE:Tag:amenity=monastery
     amenity=money_transfer: DE:Tag:amenity=money transfer
     amenity=mortuary: DE:Tag:amenity=mortuary
@@ -3174,6 +3266,7 @@ de:
     amenity=music_venue: DE:Tag:amenity=music venue
     amenity=nightclub: DE:Tag:amenity=nightclub
     amenity=nursing_home: DE:Tag:amenity=nursing home
+    amenity=parcel_locker: DE:Tag:amenity=parcel locker
     amenity=parking: DE:Tag:amenity=parking
     amenity=parking_entrance: DE:Tag:amenity=parking entrance
     amenity=parking_space: DE:Tag:amenity=parking space
@@ -3205,6 +3298,7 @@ de:
     amenity=shower: DE:Tag:amenity=shower
     amenity=ski_school: DE:Tag:amenity=ski school
     amenity=smoking_area: DE:Tag:amenity=smoking area
+    amenity=snow_removal_station: DE:Tag:amenity=snow removal station
     amenity=social_facility: DE:Tag:amenity=social facility
     amenity=stables: DE:Tag:amenity=stables
     amenity=studio: DE:Tag:amenity=studio
@@ -3214,6 +3308,7 @@ de:
     amenity=ticket_validator: DE:Tag:amenity=ticket validator
     amenity=toilets: DE:Tag:amenity=toilets
     amenity=townhall: DE:Tag:amenity=townhall
+    amenity=traffic_park: DE:Tag:amenity=traffic park
     amenity=trolley_bay: DE:Tag:amenity=trolley bay
     amenity=university: DE:Tag:amenity=university
     amenity=vehicle_inspection: DE:Tag:amenity=vehicle inspection
@@ -3238,8 +3333,12 @@ de:
     attraction=summer_toboggan: DE:Tag:attraction=summer toboggan
     attraction=train: DE:Tag:attraction=train
     attraction=water_slide: DE:Tag:attraction=water slide
+    barrier=barrier_board: DE:Tag:barrier=barrier board
+    barrier=berm: DE:Tag:barrier=berm
     barrier=block: DE:Tag:barrier=block
     barrier=bollard: DE:Tag:barrier=bollard
+    barrier=border_control: DE:Tag:barrier=border control
+    barrier=bump_gate: DE:Tag:barrier=bump gate
     barrier=bus_trap: DE:Tag:barrier=bus trap
     barrier=cable_barrier: DE:Tag:barrier=cable barrier
     barrier=cattle_grid: DE:Tag:barrier=cattle grid
@@ -3269,6 +3368,7 @@ de:
     barrier=sally_port: DE:Tag:barrier=sally port
     barrier=sliding_gate: DE:Tag:barrier=sliding gate
     barrier=spikes: DE:Tag:barrier=spikes
+    barrier=step: DE:Tag:barrier=step
     barrier=stile: DE:Tag:barrier=stile
     barrier=swing_gate: DE:Tag:barrier=swing gate
     barrier=tank_trap: DE:Tag:barrier=tank trap
@@ -3284,8 +3384,10 @@ de:
     bay=fjord: DE:Tag:bay=fjord
     bicycle=designated: DE:Tag:bicycle=designated
     bicycle=dismount: DE:Tag:bicycle=dismount
+    bicycle=optional_sidepath: DE:Tag:bicycle=optional sidepath
     bicycle=use_sidepath: DE:Tag:bicycle=use sidepath
     biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
+    boundary=administrative: DE:Tag:boundary=administrative
     boundary=marker: DE:Tag:boundary=marker
     boundary=national_park: DE:Tag:boundary=national park
     boundary=postal_code: DE:Tag:boundary=postal code
@@ -3317,13 +3419,16 @@ de:
     building=bakehouse: DE:Tag:building=bakehouse
     building=barn: DE:Tag:building=barn
     building=boathouse: DE:Tag:building=boathouse
+    building=bridge: DE:Tag:building=bridge
     building=bungalow: DE:Tag:building=bungalow
     building=bunker: DE:Tag:building=bunker
     building=cabin: DE:Tag:building=cabin
+    building=carport: DE:Tag:building=carport
     building=cathedral: DE:Tag:building=cathedral
     building=chapel: DE:Tag:building=chapel
     building=church: DE:Tag:building=church
     building=civic: DE:Tag:building=civic
+    building=college: DE:Tag:building=college
     building=commercial: DE:Tag:building=commercial
     building=construction: DE:Tag:building=construction
     building=container: DE:Tag:building=container
@@ -3338,6 +3443,7 @@ de:
     building=garage: DE:Tag:building=garage
     building=garages: DE:Tag:building=garages
     building=gatehouse: DE:Tag:building=gatehouse
+    building=ger: DE:Tag:building=ger
     building=grandstand: DE:Tag:building=grandstand
     building=greenhouse: DE:Tag:building=greenhouse
     building=hangar: DE:Tag:building=hangar
@@ -3352,6 +3458,7 @@ de:
     building=marquee: DE:Tag:building=marquee
     building=mosque: DE:Tag:building=mosque
     building=office: DE:Tag:building=office
+    building=outbuilding: DE:Tag:building=outbuilding
     building=parking: DE:Tag:building=parking
     building=pavilion: DE:Tag:building=pavilion
     building=presbytery: DE:Tag:building=presbytery
@@ -3371,6 +3478,7 @@ de:
     building=stable: DE:Tag:building=stable
     building=stadium: DE:Tag:building=stadium
     building=static_caravan: DE:Tag:building=static caravan
+    building=stilt_house: DE:Tag:building=stilt house
     building=sty: DE:Tag:building=sty
     building=supermarket: DE:Tag:building=supermarket
     building=synagogue: DE:Tag:building=synagogue
@@ -3379,6 +3487,8 @@ de:
     building=terrace: DE:Tag:building=terrace
     building=toilets: DE:Tag:building=toilets
     building=train_station: DE:Tag:building=train station
+    building=transformer_tower: DE:Tag:building=transformer tower
+    building=tree_house: DE:Tag:building=tree house
     building=university: DE:Tag:building=university
     building=warehouse: DE:Tag:building=warehouse
     building=water_tower: DE:Tag:building=water tower
@@ -3387,6 +3497,7 @@ de:
     bunker_type=pillbox: DE:Tag:bunker type=pillbox
     by_night=only: DE:Tag:by night=only
     canoe=portage: DE:Tag:canoe=portage
+    cargo=container: DE:Tag:cargo=container
     castle_type=castrum: DE:Tag:castle type=castrum
     castle_type=defensive: DE:Tag:castle type=defensive
     castle_type=fortress: DE:Tag:castle type=fortress
@@ -3394,6 +3505,7 @@ de:
     castle_type=palace: DE:Tag:castle type=palace
     castle_type=stately: DE:Tag:castle type=stately
     cemetery=grave: DE:Tag:cemetery=grave
+    cemetery=sector: DE:Tag:cemetery=sector
     cemetery=war_cemetery: DE:Tag:cemetery=war cemetery
     club=automobile: DE:Tag:club=automobile
     club=fan: DE:Tag:club=fan
@@ -3402,6 +3514,7 @@ de:
     communication=line: DE:Tag:communication=line
     company=logistics: DE:Tag:company=logistics
     construction=yes: DE:Tag:construction=yes
+    consulate=consulate_general: DE:Tag:consulate=consulate general
     content=hot_water: DE:Tag:content=hot water
     craft=agricultural_engines: DE:Tag:craft=agricultural engines
     craft=atelier: DE:Tag:craft=atelier
@@ -3426,6 +3539,7 @@ de:
     craft=cooper: DE:Tag:craft=cooper
     craft=dental_technician: DE:Tag:craft=dental technician
     craft=distillery: DE:Tag:craft=distillery
+    craft=door_construction: DE:Tag:craft=door construction
     craft=dressmaker: DE:Tag:craft=dressmaker
     craft=electrican: DE:Tag:craft=electrican
     craft=electrician: DE:Tag:craft=electrician
@@ -3442,9 +3556,12 @@ de:
     craft=information_electronics: DE:Tag:craft=information electronics
     craft=insulation: DE:Tag:craft=insulation
     craft=interior_work: DE:Tag:craft=interior work
+    craft=jeweller: DE:Tag:craft=jeweller
     craft=joiner: DE:Tag:craft=joiner
     craft=key_cutter: DE:Tag:craft=key cutter
+    craft=locksmith: DE:Tag:craft=locksmith
     craft=metal_construction: DE:Tag:craft=metal construction
+    craft=mint: DE:Tag:craft=mint
     craft=musical_instrument: DE:Tag:craft=musical instrument
     craft=oil_mill: DE:Tag:craft=oil mill
     craft=optician: DE:Tag:craft=optician
@@ -3460,6 +3577,7 @@ de:
     craft=pottery: DE:Tag:craft=pottery
     craft=roofer: DE:Tag:craft=roofer
     craft=saddler: DE:Tag:craft=saddler
+    craft=sailmaker: DE:Tag:craft=sailmaker
     craft=sawmill: DE:Tag:craft=sawmill
     craft=scaffolder: DE:Tag:craft=scaffolder
     craft=sculptor: DE:Tag:craft=sculptor
@@ -3467,6 +3585,7 @@ de:
     craft=signmaker: DE:Tag:craft=signmaker
     craft=stand_builder: DE:Tag:craft=stand builder
     craft=stonemason: DE:Tag:craft=stonemason
+    craft=stove_fitter: DE:Tag:craft=stove fitter
     craft=sun_protection: DE:Tag:craft=sun protection
     craft=tailor: DE:Tag:craft=tailor
     craft=tiler: DE:Tag:craft=tiler
@@ -3484,13 +3603,27 @@ de:
     crane:type=portal_crane: DE:Tag:crane:type=portal crane
     crane:type=travel_lift: DE:Tag:crane:type=travel lift
     crossing=marked: DE:Tag:crossing=marked
+    crossing=no: DE:Tag:crossing=no
     crossing=traffic_signals: DE:Tag:crossing=traffic signals
     crossing=uncontrolled: DE:Tag:crossing=uncontrolled
     crossing=unmarked: DE:Tag:crossing=unmarked
     crossing=zebra: DE:Tag:crossing=zebra
+    cuisine=asian: DE:Tag:cuisine=asian
     cuisine=brazilian: DE:Tag:cuisine=brazilian
+    cuisine=chinese: DE:Tag:cuisine=chinese
     cuisine=coffee_shop: DE:Tag:cuisine=coffee shop
     cuisine=dessert: DE:Tag:cuisine=dessert
+    cuisine=greek: DE:Tag:cuisine=greek
+    cuisine=indian: DE:Tag:cuisine=indian
+    cuisine=italian: DE:Tag:cuisine=italian
+    cuisine=japanese: DE:Tag:cuisine=japanese
+    cuisine=korean: DE:Tag:cuisine=korean
+    cuisine=pizza: DE:Tag:cuisine=pizza
+    cuisine=regional: DE:Tag:cuisine=regional
+    cuisine=seafood: DE:Tag:cuisine=seafood
+    cuisine=sushi: DE:Tag:cuisine=sushi
+    cuisine=thai: DE:Tag:cuisine=thai
+    cuisine=vietnamese: DE:Tag:cuisine=vietnamese
     cycleway:left=lane: DE:Tag:cycleway:left=lane
     cycleway:right=lane: DE:Tag:cycleway:right=lane
     cycleway:right=share_busway: DE:Tag:cycleway:right=share busway
@@ -3502,10 +3635,13 @@ de:
     cycleway=opposite_track: DE:Tag:cycleway=opposite track
     cycleway=separate: DE:Tag:cycleway=separate
     cycleway=share_busway: DE:Tag:cycleway=share busway
+    cycleway=shared_lane: DE:Tag:cycleway=shared lane
     cycleway=track: DE:Tag:cycleway=track
     defensive=bergfried: DE:Tag:defensive=bergfried
     defensive=donjon: DE:Tag:defensive=donjon
     defensive=keep: DE:Tag:defensive=keep
+    defensive_works=bastion: DE:Tag:defensive works=bastion
+    defensive_works=battery: DE:Tag:defensive works=battery
     diplomatic=ambassadors_residence: DE:Tag:diplomatic=ambassadors residence
     diplomatic=consulate: DE:Tag:diplomatic=consulate
     diplomatic=consulate_general: DE:Tag:diplomatic=consulate general
@@ -3525,6 +3661,7 @@ de:
     emergency=assembly_point: DE:Tag:emergency=assembly point
     emergency=defibrillator: DE:Tag:emergency=defibrillator
     emergency=designated: DE:Tag:emergency=designated
+    emergency=disaster_help_point: DE:Tag:emergency=disaster help point
     emergency=drinking_water: DE:Tag:emergency=drinking water
     emergency=dry_riser_inlet: DE:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: DE:Tag:emergency=emergency ward entrance
@@ -3546,16 +3683,19 @@ de:
     emergency=lifeguard_tower: DE:Tag:emergency=lifeguard tower
     emergency=mountain_rescue: DE:Tag:emergency=mountain rescue
     emergency=phone: DE:Tag:emergency=phone
+    emergency=rescue_box: DE:Tag:emergency=rescue box
     emergency=siren: DE:Tag:emergency=siren
     emergency=suction_point: DE:Tag:emergency=suction point
     emergency=water_rescue_station: DE:Tag:emergency=water rescue station
     emergency=water_tank: DE:Tag:emergency=water tank
+    emergency=yes: DE:Tag:emergency=yes
     emergency_service=technical: DE:Tag:emergency service=technical
     entrance=main: DE:Tag:entrance=main
     entrance=staircase: DE:Tag:entrance=staircase
     entrance=yes: DE:Tag:entrance=yes
     fast_food=cafeteria: DE:Tag:fast food=cafeteria
     foot=designated: DE:Tag:foot=designated
+    foot=yes: DE:Tag:foot=yes
     footway=crossing: DE:Tag:footway=crossing
     footway=sidewalk: DE:Tag:footway=sidewalk
     ford=stepping_stones: DE:Tag:ford=stepping stones
@@ -3645,20 +3785,29 @@ de:
     government=youth_welfare_department: DE:Tag:government=youth welfare department
     hazard=animal_crossing: DE:Tag:hazard=animal crossing
     hazard=children: DE:Tag:hazard=children
+    hazard=curve: DE:Tag:hazard=curve
     hazard=cyclists: DE:Tag:hazard=cyclists
     hazard=dangerous_junction: DE:Tag:hazard=dangerous junction
     hazard=falling_rocks: DE:Tag:hazard=falling rocks
+    hazard=horse_riders: DE:Tag:hazard=horse riders
     hazard=minefield: DE:Tag:hazard=minefield
     hazard=queues_likely: DE:Tag:hazard=queues likely
     hazard=school_zone: DE:Tag:hazard=school zone
     hazard=side_winds: DE:Tag:hazard=side winds
     hazard=slippery: DE:Tag:hazard=slippery
     hazmat:water=permissive: DE:Tag:hazmat:water=permissive
+    healthcare:speciality=allergology: DE:Tag:healthcare:speciality=allergology
+    healthcare:speciality=general: DE:Tag:healthcare:speciality=general
     healthcare:speciality=orthodontics: DE:Tag:healthcare:speciality=orthodontics
     healthcare:speciality=otolaryngology: DE:Tag:healthcare:speciality=otolaryngology
+    healthcare:speciality=paediatric_surgery: DE:Tag:healthcare:speciality=paediatric
+      surgery
+    healthcare:speciality=paediatrics: DE:Tag:healthcare:speciality=paediatrics
+    healthcare:speciality=vaccination: DE:Tag:healthcare:speciality=vaccination
     healthcare=alternative: DE:Tag:healthcare=alternative
     healthcare=audiologist: DE:Tag:healthcare=audiologist
     healthcare=birthing_center: DE:Tag:healthcare=birthing center
+    healthcare=birthing_centre: DE:Tag:healthcare=birthing centre
     healthcare=blood_bank: DE:Tag:healthcare=blood bank
     healthcare=blood_donation: DE:Tag:healthcare=blood donation
     healthcare=clinic: DE:Tag:healthcare=clinic
@@ -3672,14 +3821,15 @@ de:
     healthcare=midwife: DE:Tag:healthcare=midwife
     healthcare=occupational_therapist: DE:Tag:healthcare=occupational therapist
     healthcare=physiotherapist: DE:Tag:healthcare=physiotherapist
+    healthcare=sample_collection: DE:Tag:healthcare=sample collection
     healthcare=speech_therapist: DE:Tag:healthcare=speech therapist
+    hedge=hedge_bank: DE:Tag:hedge=hedge bank
     highway=abandoned: DE:Tag:highway=abandoned
     highway=access: DE:Tag:highway=access
     highway=bridleway: DE:Tag:highway=bridleway
     highway=bus_guideway: DE:Tag:highway=bus guideway
     highway=bus_stop: DE:Tag:highway=bus stop
     highway=busway: DE:Tag:highway=busway
-    highway=byway: DE:Tag:highway=byway
     highway=construction: DE:Tag:highway=construction
     highway=corridor: DE:Tag:highway=corridor
     highway=crossing: DE:Tag:highway=crossing
@@ -3719,6 +3869,7 @@ de:
     highway=service: DE:Tag:highway=service
     highway=services: DE:Tag:highway=services
     highway=speed_camera: DE:Tag:highway=speed camera
+    highway=speed_display: DE:Tag:highway=speed display
     highway=steps: DE:Tag:highway=steps
     highway=stop: DE:Tag:highway=stop
     highway=street_lamp: DE:Tag:highway=street lamp
@@ -3737,6 +3888,7 @@ de:
     highway=unknown: DE:Tag:highway=unknown
     highway=yes: DE:Tag:highway=yes
     historic=aircraft: DE:Tag:historic=aircraft
+    historic=aqueduct: DE:Tag:historic=aqueduct
     historic=archaeological_site: DE:Tag:historic=archaeological site
     historic=battlefield: DE:Tag:historic=battlefield
     historic=bomb_crater: DE:Tag:historic=bomb crater
@@ -3773,6 +3925,7 @@ de:
     horse=dismount: DE:Tag:horse=dismount
     industrial=bakery: DE:Tag:industrial=bakery
     industrial=communication: DE:Tag:industrial=communication
+    industrial=port: DE:Tag:industrial=port
     industrial=scrap_yard: DE:Tag:industrial=scrap yard
     industrial=slaughterhouse: DE:Tag:industrial=slaughterhouse
     information=audioguide: DE:Tag:information=audioguide
@@ -3788,6 +3941,7 @@ de:
     junction=circular: DE:Tag:junction=circular
     junction=roundabout: DE:Tag:junction=roundabout
     landuse=allotments: DE:Tag:landuse=allotments
+    landuse=animal_keeping: DE:Tag:landuse=animal keeping
     landuse=aquaculture: DE:Tag:landuse=aquaculture
     landuse=basin: DE:Tag:landuse=basin
     landuse=brownfield: DE:Tag:landuse=brownfield
@@ -3804,6 +3958,7 @@ de:
     landuse=forest: DE:Tag:landuse=forest
     landuse=garages: DE:Tag:landuse=garages
     landuse=grass: DE:Tag:landuse=grass
+    landuse=greenery: DE:Tag:landuse=greenery
     landuse=greenfield: DE:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: DE:Tag:landuse=greenhouse horticulture
     landuse=industrial: DE:Tag:landuse=industrial
@@ -3870,6 +4025,7 @@ de:
     leisure=sauna: DE:Tag:leisure=sauna
     leisure=schoolyard: DE:Tag:leisure=schoolyard
     leisure=slipway: DE:Tag:leisure=slipway
+    leisure=soccer_golf: DE:Tag:leisure=soccer golf
     leisure=sports_centre: DE:Tag:leisure=sports centre
     leisure=sports_hall: DE:Tag:leisure=sports hall
     leisure=stadium: DE:Tag:leisure=stadium
@@ -3900,17 +4056,23 @@ de:
     man_made=breakwater: DE:Tag:man made=breakwater
     man_made=bridge: DE:Tag:man made=bridge
     man_made=bunker_silo: DE:Tag:man made=bunker silo
+    man_made=cairn: DE:Tag:man made=cairn
     man_made=carpet_hanger: DE:Tag:man made=carpet hanger
+    man_made=cellar_entrance: DE:Tag:man made=cellar entrance
     man_made=chimney: DE:Tag:man made=chimney
+    man_made=clearcut: DE:Tag:man made=clearcut
+    man_made=column: DE:Tag:man made=column
     man_made=communications_tower: DE:Tag:man made=communications tower
     man_made=cooling_tower: DE:Tag:man made=cooling tower
     man_made=crane: DE:Tag:man made=crane
     man_made=cross: DE:Tag:man made=cross
     man_made=cutline: DE:Tag:man made=cutline
+    man_made=dolphin: DE:Tag:man made=dolphin
     man_made=dovecote: DE:Tag:man made=dovecote
     man_made=dyke: DE:Tag:man made=dyke
     man_made=embankment: DE:Tag:man made=embankment
     man_made=flagpole: DE:Tag:man made=flagpole
+    man_made=gantry: DE:Tag:man made=gantry
     man_made=gasometer: DE:Tag:man made=gasometer
     man_made=goods_conveyor: DE:Tag:man made=goods conveyor
     man_made=graduation_tower: DE:Tag:man made=graduation tower
@@ -3921,6 +4083,7 @@ de:
     man_made=insect_hotel: DE:Tag:man made=insect hotel
     man_made=kiln: DE:Tag:man made=kiln
     man_made=lighthouse: DE:Tag:man made=lighthouse
+    man_made=manhole: DE:Tag:man made=manhole
     man_made=mast: DE:Tag:man made=mast
     man_made=maypole: DE:Tag:man made=maypole
     man_made=mineshaft: DE:Tag:man made=mineshaft
@@ -3964,6 +4127,7 @@ de:
     manhole=drain: DE:Tag:manhole=drain
     marker=aerial: DE:Tag:marker=aerial
     marker=post: DE:Tag:marker=post
+    maxheight=default: DE:Tag:maxheight=default
     megalith_type=alignment: DE:Tag:megalith type=alignment
     megalith_type=chamber: DE:Tag:megalith type=chamber
     megalith_type=cist: DE:Tag:megalith type=cist
@@ -3987,15 +4151,20 @@ de:
     microbrewery=yes: DE:Tag:microbrewery=yes
     military=airfield: DE:Tag:military=airfield
     military=barracks: DE:Tag:military=barracks
+    military=base: DE:Tag:military=base
     military=bunker: DE:Tag:military=bunker
+    military=checkpoint: DE:Tag:military=checkpoint
     military=danger_area: DE:Tag:military=danger area
     military=naval_base: DE:Tag:military=naval base
     military=nuclear_explosion_site: DE:Tag:military=nuclear explosion site
+    military=obstacle_course: DE:Tag:military=obstacle course
     military=range: DE:Tag:military=range
     military=training_area: DE:Tag:military=training area
+    military=trench: DE:Tag:military=trench
     mooring=cruise: DE:Tag:mooring=cruise
     mooring=guest: DE:Tag:mooring=guest
     motorcycle:type=scooter: DE:Tag:motorcycle:type=scooter
+    mountain_pass=yes: DE:Tag:mountain pass=yes
     museum=archaeological: DE:Tag:museum=archaeological
     museum=children: DE:Tag:museum=children
     museum=history: DE:Tag:museum=history
@@ -4046,6 +4215,7 @@ de:
     natural=tree: DE:Tag:natural=tree
     natural=tree_group: DE:Tag:natural=tree group
     natural=tree_row: DE:Tag:natural=tree row
+    natural=tree_stump: DE:Tag:natural=tree stump
     natural=valley: DE:Tag:natural=valley
     natural=volcano: DE:Tag:natural=volcano
     natural=water: DE:Tag:natural=water
@@ -4079,6 +4249,7 @@ de:
     office=chamber: DE:Tag:office=chamber
     office=charity: DE:Tag:office=charity
     office=company: DE:Tag:office=company
+    office=consulting: DE:Tag:office=consulting
     office=diplomatic: DE:Tag:office=diplomatic
     office=educational_institution: DE:Tag:office=educational institution
     office=employment_agency: DE:Tag:office=employment agency
@@ -4099,6 +4270,7 @@ de:
     office=newspaper: DE:Tag:office=newspaper
     office=ngo: DE:Tag:office=ngo
     office=parish: DE:Tag:office=parish
+    office=physician: DE:Tag:office=physician
     office=political_party: DE:Tag:office=political party
     office=property_management: DE:Tag:office=property management
     office=religion: DE:Tag:office=religion
@@ -4110,6 +4282,7 @@ de:
     office=therapist: DE:Tag:office=therapist
     office=travel_agent: DE:Tag:office=travel agent
     office=union: DE:Tag:office=union
+    office=visa: DE:Tag:office=visa
     office=water_utility: DE:Tag:office=water utility
     oneway=-1: DE:Tag:oneway=-1
     oneway=alternating: DE:Tag:oneway=alternating
@@ -4167,6 +4340,7 @@ de:
     plant:source=wind: DE:Tag:plant:source=wind
     plant:type=combined_cycle: DE:Tag:plant:type=combined cycle
     plant:type=steam_turbine: DE:Tag:plant:type=steam turbine
+    playground=hopscotch: DE:Tag:playground=hopscotch
     playground=structure: DE:Tag:playground=structure
     police=academy: DE:Tag:police=academy
     police=barracks: DE:Tag:police=barracks
@@ -4179,9 +4353,10 @@ de:
     police=storage: DE:Tag:police=storage
     police=training_area: DE:Tag:police=training area
     police=yes: DE:Tag:police=yes
-    post_office=post_partner: DE:Tag:post office=post partner
+    port=fishing: DE:Tag:port=fishing
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
+    power=catenary_mast: DE:Tag:power=catenary mast
     power=compensator: DE:Tag:power=compensator
     power=converter: DE:Tag:power=converter
     power=generator: DE:Tag:power=generator
@@ -4209,6 +4384,7 @@ de:
     railway=abandoned: DE:Tag:railway=abandoned
     railway=buffer_stop: DE:Tag:railway=buffer stop
     railway=crossing: DE:Tag:railway=crossing
+    railway=crossing_box: DE:Tag:railway=crossing box
     railway=derail: DE:Tag:railway=derail
     railway=disused: DE:Tag:railway=disused
     railway=funicular: DE:Tag:railway=funicular
@@ -4220,6 +4396,7 @@ de:
     railway=miniature: DE:Tag:railway=miniature
     railway=monorail: DE:Tag:railway=monorail
     railway=narrow_gauge: DE:Tag:railway=narrow gauge
+    railway=owner_change: DE:Tag:railway=owner change
     railway=platform: DE:Tag:railway=platform
     railway=platform_edge: DE:Tag:railway=platform edge
     railway=preserved: DE:Tag:railway=preserved
@@ -4227,6 +4404,7 @@ de:
     railway=rail_brake: DE:Tag:railway=rail brake
     railway=railway_crossing: DE:Tag:railway=railway crossing
     railway=roundhouse: DE:Tag:railway=roundhouse
+    railway=service_station: DE:Tag:railway=service station
     railway=signal: DE:Tag:railway=signal
     railway=signal_box: DE:Tag:railway=signal box
     railway=station: DE:Tag:railway=station
@@ -4234,6 +4412,7 @@ de:
     railway=subway: DE:Tag:railway=subway
     railway=subway_entrance: DE:Tag:railway=subway entrance
     railway=switch: DE:Tag:railway=switch
+    railway=train_station_entrance: DE:Tag:railway=train station entrance
     railway=tram: DE:Tag:railway=tram
     railway=tram_crossing: DE:Tag:railway=tram crossing
     railway=tram_level_crossing: DE:Tag:railway=tram level crossing
@@ -4245,6 +4424,7 @@ de:
     railway=yard: DE:Tag:railway=yard
     recycling_type=centre: DE:Tag:recycling type=centre
     recycling_type=container: DE:Tag:recycling type=container
+    refrigerated=yes: DE:Tag:refrigerated=yes
     religion=buddhist: DE:Tag:religion=buddhist
     religion=christian: DE:Tag:religion=christian
     religion=hindu: DE:Tag:religion=hindu
@@ -4254,9 +4434,16 @@ de:
     rental=ski: DE:Tag:rental=ski
     rental=strandkorb: DE:Tag:rental=strandkorb
     repair=assisted_self_service: DE:Tag:repair=assisted self service
+    request_stop=yes: DE:Tag:request stop=yes
+    residential=rural: DE:Tag:residential=rural
     residential=urban: DE:Tag:residential=urban
     resource=aggregate: DE:Tag:resource=aggregate
+    road_marking=solid_stop_line: DE:Tag:road marking=solid stop line
     roller_coaster=track: DE:Tag:roller coaster=track
+    roof:shape=flat: DE:Tag:roof:shape=flat
+    roof:shape=gabled: DE:Tag:roof:shape=gabled
+    roof:shape=many: DE:Tag:roof:shape=many
+    roof:shape=skillion: DE:Tag:roof:shape=skillion
     route=bicycle: DE:Tag:route=bicycle
     route=bus: DE:Tag:route=bus
     route=detour: DE:Tag:route=detour
@@ -4264,6 +4451,7 @@ de:
     route=fitness_trail: DE:Tag:route=fitness trail
     route=foot: DE:Tag:route=foot
     route=hiking: DE:Tag:route=hiking
+    route=historic: DE:Tag:route=historic
     route=horse: DE:Tag:route=horse
     route=inline_skates: DE:Tag:route=inline skates
     route=light_rail: DE:Tag:route=light rail
@@ -4282,6 +4470,7 @@ de:
     route=train: DE:Tag:route=train
     route=tram: DE:Tag:route=tram
     route=trolleybus: DE:Tag:route=trolleybus
+    seamark:type=fairway: DE:Tag:seamark:type=fairway
     seamark:type=mooring: DE:Tag:seamark:type=mooring
     seamark:type=rock: DE:Tag:seamark:type=rock
     segregated=no: DE:Tag:segregated=no
@@ -4320,6 +4509,7 @@ de:
     shop=bookmaker: DE:Tag:shop=bookmaker
     shop=books: DE:Tag:shop=books
     shop=boutique: DE:Tag:shop=boutique
+    shop=brewing_supplies: DE:Tag:shop=brewing supplies
     shop=butcher: DE:Tag:shop=butcher
     shop=camera: DE:Tag:shop=camera
     shop=candles: DE:Tag:shop=candles
@@ -4348,6 +4538,7 @@ de:
     shop=doityourself: DE:Tag:shop=doityourself
     shop=doors: DE:Tag:shop=doors
     shop=dry_cleaning: DE:Tag:shop=dry cleaning
+    shop=electrical: DE:Tag:shop=electrical
     shop=electronics: DE:Tag:shop=electronics
     shop=equestrian: DE:Tag:shop=equestrian
     shop=erotic: DE:Tag:shop=erotic
@@ -4367,6 +4558,7 @@ de:
     shop=gas: DE:Tag:shop=gas
     shop=general: DE:Tag:shop=general
     shop=gift: DE:Tag:shop=gift
+    shop=glaziery: DE:Tag:shop=glaziery
     shop=golf: DE:Tag:shop=golf
     shop=greengrocer: DE:Tag:shop=greengrocer
     shop=grocery: DE:Tag:shop=grocery
@@ -4409,15 +4601,18 @@ de:
     shop=outpost: DE:Tag:shop=outpost
     shop=paint: DE:Tag:shop=paint
     shop=party: DE:Tag:shop=party
+    shop=pasta: DE:Tag:shop=pasta
     shop=pastry: DE:Tag:shop=pastry
     shop=pawnbroker: DE:Tag:shop=pawnbroker
     shop=perfumery: DE:Tag:shop=perfumery
     shop=pet: DE:Tag:shop=pet
     shop=pet_grooming: DE:Tag:shop=pet grooming
     shop=photo: DE:Tag:shop=photo
+    shop=plant_hire: DE:Tag:shop=plant hire
     shop=pottery: DE:Tag:shop=pottery
     shop=radiotechnics: DE:Tag:shop=radiotechnics
     shop=religion: DE:Tag:shop=religion
+    shop=repair: DE:Tag:shop=repair
     shop=robot: DE:Tag:shop=robot
     shop=scuba_diving: DE:Tag:shop=scuba diving
     shop=seafood: DE:Tag:shop=seafood
@@ -4468,11 +4663,13 @@ de:
     site_type=tumulus: DE:Tag:site type=tumulus
     social_facility=ambulatory_care: DE:Tag:social facility=ambulatory care
     social_facility=assisted_living: DE:Tag:social facility=assisted living
+    social_facility=clothing_bank: DE:Tag:social facility=clothing bank
     social_facility=day_care: DE:Tag:social facility=day care
     social_facility=food_bank: DE:Tag:social facility=food bank
     social_facility=group_home: DE:Tag:social facility=group home
     social_facility=hospice: DE:Tag:social facility=hospice
     social_facility=nursing_home: DE:Tag:social facility=nursing home
+    social_facility=outreach: DE:Tag:social facility=outreach
     social_facility=shelter: DE:Tag:social facility=shelter
     social_facility=soup_kitchen: DE:Tag:social facility=soup kitchen
     social_facility=workshop: DE:Tag:social facility=workshop
@@ -4528,6 +4725,7 @@ de:
     sport=sailing: DE:Tag:sport=sailing
     sport=scuba_diving: DE:Tag:sport=scuba diving
     sport=shooting: DE:Tag:sport=shooting
+    sport=shot-put: DE:Tag:sport=shot-put
     sport=skateboard: DE:Tag:sport=skateboard
     sport=soccer: DE:Tag:sport=soccer
     sport=swimming: DE:Tag:sport=swimming
@@ -4537,6 +4735,8 @@ de:
     sport=toboggan: DE:Tag:sport=toboggan
     sport=trampoline: DE:Tag:sport=trampoline
     sport=volleyball: DE:Tag:sport=volleyball
+    sport=water_ski: DE:Tag:sport=water ski
+    sport=yoga: DE:Tag:sport=yoga
     station=light_rail: DE:Tag:station=light rail
     station=subway: DE:Tag:station=subway
     studio=audio: DE:Tag:studio=audio
@@ -4551,6 +4751,7 @@ de:
     summit:cross=yes: DE:Tag:summit:cross=yes
     surface=artificial_turf: DE:Tag:surface=artificial turf
     surface=asphalt: DE:Tag:surface=asphalt
+    surface=chipseal: DE:Tag:surface=chipseal
     surface=clay: DE:Tag:surface=clay
     surface=cobblestone: DE:Tag:surface=cobblestone
     surface=compacted: DE:Tag:surface=compacted
@@ -4566,6 +4767,7 @@ de:
     surface=tartan: DE:Tag:surface=tartan
     surface=unhewn_cobblestone: DE:Tag:surface=unhewn cobblestone
     surface=unpaved: DE:Tag:surface=unpaved
+    swimming_pool=yes: DE:Tag:swimming pool=yes
     switch=circuit_breaker: DE:Tag:switch=circuit breaker
     switch=disconnector: DE:Tag:switch=disconnector
     switch=mechanical: DE:Tag:switch=mechanical
@@ -4630,11 +4832,22 @@ de:
     tower:type=radar: DE:Tag:tower:type=radar
     tower:type=siren: DE:Tag:tower:type=siren
     tower:type=watchtower: DE:Tag:tower:type=watchtower
+    traffic_calming=bump: DE:Tag:traffic calming=bump
+    traffic_calming=chicane: DE:Tag:traffic calming=chicane
+    traffic_calming=choker: DE:Tag:traffic calming=choker
+    traffic_calming=cushion: DE:Tag:traffic calming=cushion
+    traffic_calming=dip: DE:Tag:traffic calming=dip
+    traffic_calming=double_dip: DE:Tag:traffic calming=double dip
     traffic_calming=dynamic_bump: DE:Tag:traffic calming=dynamic bump
+    traffic_calming=hump: DE:Tag:traffic calming=hump
     traffic_calming=island: DE:Tag:traffic calming=island
+    traffic_calming=mini_bumps: DE:Tag:traffic calming=mini bumps
+    traffic_calming=rumble_strip: DE:Tag:traffic calming=rumble strip
     traffic_calming=table: DE:Tag:traffic calming=table
     'traffic_sign=DE:': 'DE:Tag:traffic sign=DE:'
     traffic_sign=DE:1022-10: DE:Tag:traffic sign=DE:1022-10
+    traffic_sign=DE:103-10: DE:Tag:traffic sign=DE:103-10
+    traffic_sign=DE:103-20: DE:Tag:traffic sign=DE:103-20
     traffic_sign=DE:124: DE:Tag:traffic sign=DE:124
     traffic_sign=DE:133-10: DE:Tag:traffic sign=DE:133-10
     traffic_sign=DE:136-10: DE:Tag:traffic sign=DE:136-10
@@ -4683,6 +4896,8 @@ de:
     traffic_sign=DE:274.1-20: DE:Tag:traffic sign=DE:274.1-20
     traffic_sign=DE:274.2: DE:Tag:traffic sign=DE:274.2
     traffic_sign=DE:274.2-20: DE:Tag:traffic sign=DE:274.2-20
+    traffic_sign=DE:276: DE:Tag:traffic sign=DE:276
+    traffic_sign=DE:277: DE:Tag:traffic sign=DE:277
     traffic_sign=DE:282: DE:Tag:traffic sign=DE:282
     traffic_sign=DE:306: DE:Tag:traffic sign=DE:306
     traffic_sign=DE:310: DE:Tag:traffic sign=DE:310
@@ -4700,6 +4915,8 @@ de:
     traffic_sign=DE:354: DE:Tag:traffic sign=DE:354
     traffic_sign=DE:357: DE:Tag:traffic sign=DE:357
     traffic_sign=DE:385: DE:Tag:traffic sign=DE:385
+    traffic_sign=DE:386: DE:Tag:traffic sign=DE:386
+    traffic_sign=DE:386.1: DE:Tag:traffic sign=DE:386.1
     traffic_sign=DE:386.3: DE:Tag:traffic sign=DE:386.3
     traffic_sign=DE:394-50: DE:Tag:traffic sign=DE:394-50
     traffic_sign=DE:437: DE:Tag:traffic sign=DE:437
@@ -4708,10 +4925,16 @@ de:
     traffic_sign=DE:448: DE:Tag:traffic sign=DE:448
     traffic_sign=DE:449: DE:Tag:traffic sign=DE:449
     traffic_sign=DE:453: DE:Tag:traffic sign=DE:453
+    traffic_sign=DE:600-30: DE:Tag:traffic sign=DE:600-30
+    traffic_sign=DE:600-31: DE:Tag:traffic sign=DE:600-31
+    traffic_sign=DE:600-32: DE:Tag:traffic sign=DE:600-32
+    traffic_sign=DE:600-33: DE:Tag:traffic sign=DE:600-33
+    traffic_sign=DE:600-34: DE:Tag:traffic sign=DE:600-34
     traffic_sign=city_limit: DE:Tag:traffic sign=city limit
     transformer=distribution: DE:Tag:transformer=distribution
     tunnel=building_passage: DE:Tag:tunnel=building passage
     tunnel=culvert: DE:Tag:tunnel=culvert
+    type=enforcement: DE:Tag:type=enforcement
     type=waterway: DE:Tag:type=waterway
     usage=headrace: DE:Tag:usage=headrace
     usage=industrial: DE:Tag:usage=industrial
@@ -4719,6 +4942,7 @@ de:
     usage=penstock: DE:Tag:usage=penstock
     usage=tailrace: DE:Tag:usage=tailrace
     usage=transmission: DE:Tag:usage=transmission
+    vehicle=no: DE:Tag:vehicle=no
     vending: DE:Tag:vending
     vending=animal_feed: DE:Tag:vending=animal feed
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
@@ -4727,10 +4951,13 @@ de:
     vending=candles: DE:Tag:vending=candles
     vending=chewing_gums: DE:Tag:vending=chewing gums
     vending=coffee: DE:Tag:vending=coffee
+    vending=coin_change_machine: DE:Tag:vending=coin change machine
     vending=elongated_coin: DE:Tag:vending=elongated coin
     vending=excrement_bags: DE:Tag:vending=excrement bags
+    vending=flower_seeds: DE:Tag:vending=flower seeds
     vending=flowers: DE:Tag:vending=flowers
     vending=food: DE:Tag:vending=food
+    vending=fuel: DE:Tag:vending=fuel
     vending=ice_cream: DE:Tag:vending=ice cream
     vending=milk: DE:Tag:vending=milk
     vending=newspapers: DE:Tag:vending=newspapers
@@ -4743,6 +4970,7 @@ de:
     vending=sex_toys: DE:Tag:vending=sex toys
     vending=stamps: DE:Tag:vending=stamps
     vending=sweets: DE:Tag:vending=sweets
+    vending=syringes: DE:Tag:vending=syringes
     vending=toys: DE:Tag:vending=toys
     vending=water: DE:Tag:vending=water
     vending_machine=fuel: DE:Tag:vending machine=fuel
@@ -4750,12 +4978,23 @@ de:
     wall=dry_stone: DE:Tag:wall=dry stone
     wall=no: DE:Tag:wall=no
     wall=noise_barrier: DE:Tag:wall=noise barrier
+    wall=stone: DE:Tag:wall=stone
+    wall=stone_wall: DE:Tag:wall=stone wall
+    waste=cigarettes: DE:Tag:waste=cigarettes
     waste=dog_excrement: DE:Tag:waste=dog excrement
+    waste=drugs: DE:Tag:waste=drugs
+    waste=oil: DE:Tag:waste=oil
+    waste=organic: DE:Tag:waste=organic
+    waste=pizza_box: DE:Tag:waste=pizza box
+    waste=rubble: DE:Tag:waste=rubble
+    waste=trash: DE:Tag:waste=trash
     water=basin: DE:Tag:water=basin
     water=canal: DE:Tag:water=canal
+    water=harbour: DE:Tag:water=harbour
     water=lagoon: DE:Tag:water=lagoon
     water=lake: DE:Tag:water=lake
     water=lock: DE:Tag:water=lock
+    water=moat: DE:Tag:water=moat
     water=oxbow: DE:Tag:water=oxbow
     water=pond: DE:Tag:water=pond
     water=reservoir: DE:Tag:water=reservoir
@@ -4779,6 +5018,7 @@ de:
     waterway=rapids: DE:Tag:waterway=rapids
     waterway=river: DE:Tag:waterway=river
     waterway=riverbank: DE:Tag:waterway=riverbank
+    waterway=security_lock: DE:Tag:waterway=security lock
     waterway=stream: DE:Tag:waterway=stream
     waterway=tidal_channel: DE:Tag:waterway=tidal channel
     waterway=waterfall: DE:Tag:waterway=waterfall
@@ -4843,8 +5083,14 @@ el:
     highway=track: El:Tag:highway=track
 en:
   key:
+    '*:backward': Key:*:backward
     '*:conditional': Key:*:conditional
+    '*:en': Key:*:en
+    '*:forward': Key:*:forward
     '*:lanes': Key:*:lanes
+    '*:left': Key:*:left
+    '*:right': Key:*:right
+    '*:wikidata': Key:*:wikidata
     3dmr: Key:3dmr
     3dr:type: Key:3dr:type
     4wd_only: Key:4wd only
@@ -4854,6 +5100,7 @@ en:
     AlpinRes_ID: Key:AlpinRes ID
     CEMT: Key:CEMT
     CLC:code: Key:CLC:code
+    Community: Key:Community
     DGPS_correction: Key:DGPS correction
     EHAK:code: Key:EHAK:code
     EH_ref: Key:EH ref
@@ -4864,6 +5111,7 @@ en:
     GNS:dsg_code: Key:GNS:dsg code
     GNS:id: Key:GNS:id
     HE_ref: Key:HE ref
+    HFCS: Key:HFCS
     HU:ed_direction: Key:HU:ed direction
     HU:hu-go:length: Key:HU:hu-go:length
     HU:hu-go:milestone: Key:HU:hu-go:milestone
@@ -4879,20 +5127,25 @@ en:
     LINZ2OSM:dataset: Key:LINZ2OSM:dataset
     LINZ2OSM:layer: Key:LINZ2OSM:layer
     LINZ2OSM:source_version: Key:LINZ2OSM:source version
+    LINZ:dataset: Key:LINZ:dataset
     LINZ:layer: Key:LINZ:layer
     LINZ:source_version: Key:LINZ:source version
     Lock_ref: Key:Lock ref
     Mapper: Key:Mapper
+    NHD:FCode: Key:NHD:FCode
     NHD:ReachCode: Key:NHD:ReachCode
     NHS: Key:NHS
     NSIW: Key:NSIW
+    Oslostandarden: Key:Oslostandarden
     PMSA_ref: Key:PMSA ref
+    Place:CN: Key:Place:CN
     Power_supply:schedule: Key:Power supply:schedule
     RLIS:bicycle: Key:RLIS:bicycle
     RLIS:reviewed: Key:RLIS:reviewed
     Schalansky_ref: Key:Schalansky ref
     Shop: Key:Shop
     Source: Key:Source
+    TARC: Key:TARC
     TMC: Key:TMC
     TMC:Direction: Key:TMC:Direction
     TMC:LocationCode: Key:TMC:LocationCode
@@ -4912,96 +5165,80 @@ en:
     abandoned:railway: Key:abandoned:railway
     abutters: Key:abutters
     access: Key:access
-    access:bdouble: Key:access:bdouble
     access:conditional: Key:access:conditional
+    access:covid19: Key:access:covid19
     access:lanes: Key:access:lanes
-    access:lhv: Key:access:lhv
-    access:roadtrain: Key:access:roadtrain
     access:roadtrain:trailers: Key:access:roadtrain:trailers
+    accuracy:meters: Key:accuracy:meters
     active_traffic_management: Key:active traffic management
     actuator: Key:actuator
-    addr: Key:addr
-    addr:alternatenumber: Key:addr:alternatenumber
-    addr:block: Key:addr:block
-    addr:block:ar: Key:addr:block:ar
-    addr:block:en: Key:addr:block:en
+    addr:TW:dataset: Key:addr:TW:dataset
+    addr:block_number: Key:addr:block number
     addr:borough: Key:addr:borough
     addr:city: Key:addr:city
-    addr:city:ar: Key:addr:city:ar
-    addr:city:de: Key:addr:city:de
-    addr:city:en: Key:addr:city:en
-    addr:city:it: Key:addr:city:it
+    addr:city:scl: Key:addr:city:scl
     addr:city:simc: Key:addr:city:simc
+    addr:city:ur: Key:addr:city:ur
     addr:conscriptionnumber: Key:addr:conscriptionnumber
     addr:country: Key:addr:country
-    addr:description: Key:addr:description
-    addr:description:ar: Key:addr:description:ar
+    addr:county: Key:addr:county
     addr:district: Key:addr:district
     addr:district:ar: Key:addr:district:ar
     addr:district:en: Key:addr:district:en
-    addr:door: Key:addr:door
+    addr:district:ur: Key:addr:district:ur
     addr:flats: Key:addr:flats
     addr:floor: Key:addr:floor
-    addr:full: Key:addr:full
     addr:hamlet: Key:addr:hamlet
-    addr:hamlet:de: Key:addr:hamlet:de
-    addr:hamlet:it: Key:addr:hamlet:it
     addr:housename: Key:addr:housename
-    addr:housename:ar: Key:addr:housename:ar
     addr:housenumber: Key:addr:housenumber
-    addr:housenumber:ar: Key:addr:housenumber:ar
-    addr:inclusion: Key:addr:inclusion
-    addr:interpolation: Key:addr:interpolation
-    addr:neighbourhood: Key:addr:neighbourhood
+    addr:milestone: Key:addr:milestone
     addr:place: Key:addr:place
     addr:place:ar: Key:addr:place:ar
-    addr:place:de: Key:addr:place:de
     addr:place:en: Key:addr:place:en
-    addr:place:it: Key:addr:place:it
+    addr:plot: Key:addr:plot
     addr:postcode: Key:addr:postcode
+    addr:postcode:source: Key:addr:postcode:source
     addr:province: Key:addr:province
-    addr:province:ar: Key:addr:province:ar
-    addr:province:en: Key:addr:province:en
+    addr:province:ur: Key:addr:province:ur
     addr:provisionalnumber: Key:addr:provisionalnumber
-    addr:region: Key:addr:region
+    addr:sector: Key:addr:sector
+    addr:source: Key:addr:source
     addr:staircase: Key:addr:staircase
     addr:state: Key:addr:state
     addr:street: Key:addr:street
-    addr:street:ar: Key:addr:street:ar
-    addr:street:de: Key:addr:street:de
-    addr:street:en: Key:addr:street:en
-    addr:street:it: Key:addr:street:it
-    addr:street:name: Key:addr:street:name
-    addr:street:prefix: Key:addr:street:prefix
     addr:street:sym_ul: Key:addr:street:sym ul
-    addr:street:type: Key:addr:street:type
+    addr:street:ur: Key:addr:street:ur
     addr:streetnumber: Key:addr:streetnumber
     addr:subdistrict: Key:addr:subdistrict
-    addr:subdistrict:ar: Key:addr:subdistrict:ar
-    addr:subdistrict:en: Key:addr:subdistrict:en
     addr:suburb: Key:addr:suburb
+    addr:town: Key:addr:town
     addr:type: Key:addr:type
     addr:unit: Key:addr:unit
     admin_level: Key:admin level
+    admin_title: Key:admin title
     adr_les: Key:adr les
     advertising: Key:advertising
     aerialway: Key:aerialway
     aerialway:drag_lift: Key:aerialway:drag lift
     aerialway:duration: Key:aerialway:duration
+    aerialway:occupancy: Key:aerialway:occupancy
+    aerialway:station: Key:aerialway:station
     aerodrome:type: Key:aerodrome:type
     aeroway: Key:aeroway
     after_school: Key:after school
+    age: Key:age
     agrarian: Key:agrarian
     agricultural: Key:agricultural
     air_conditioning: Key:air conditioning
-    airconditioned: Key:airconditioned
     alt_name: Key:alt name
     alt_name:ar: Key:alt name:ar
     alt_name:arc: Key:alt name:arc
     alt_name:azb: Key:alt name:azb
     alt_name:be: Key:alt name:be
     alt_name:ckb: Key:alt name:ckb
+    alt_name:de: Key:alt name:de
     alt_name:en: Key:alt name:en
+    alt_name:es: Key:alt name:es
     alt_name:fa: Key:alt name:fa
     alt_name:fr: Key:alt name:fr
     alt_name:glk: Key:alt name:glk
@@ -5023,6 +5260,7 @@ en:
     alt_name:th: Key:alt name:th
     alt_name:ug: Key:alt name:ug
     alt_name:ur: Key:alt name:ur
+    alt_name:zh: Key:alt name:zh
     alt_name_1: Key:alt name 1
     amenity: Key:amenity
     amenity:eftpos: Key:amenity:eftpos
@@ -5036,8 +5274,12 @@ en:
     area: Key:area
     area:aeroway: Key:area:aeroway
     area:highway: Key:area:highway
+    artist:note: Key:artist:note
     artist:wikidata: Key:artist:wikidata
+    artist:wikipedia: Key:artist:wikipedia
     artist_name: Key:artist name
+    artwork:subject:wikidata: Key:artwork:subject:wikidata
+    artwork:subject:wikipedia: Key:artwork:subject:wikipedia
     artwork_subject: Key:artwork subject
     artwork_type: Key:artwork type
     asb: Key:asb
@@ -5065,10 +5307,15 @@ en:
     authentication:none: Key:authentication:none
     authentication:phone_call: Key:authentication:phone call
     authentication:short_message: Key:authentication:short message
+    auto_rickshaw: Key:auto rickshaw
     autoaws: Key:autoaws
     automated: Key:automated
     automatic_door: Key:automatic door
     autonomy: Key:autonomy
+    avalanche_protection: Key:avalanche protection
+    avalanche_transceiver: Key:avalanche transceiver
+    avz: Key:avz
+    baby: Key:baby
     baby_feeding: Key:baby feeding
     backcountry: Key:backcountry
     backrest: Key:backrest
@@ -5093,13 +5340,17 @@ en:
     bench:type: Key:bench:type
     bicycle: Key:bicycle
     bicycle:backward: Key:bicycle:backward
+    bicycle:both: Key:bicycle:both
     bicycle:class:mtb: Key:bicycle:class:mtb
     bicycle:class:mtb:technical: Key:bicycle:class:mtb:technical
     bicycle:conditional: Key:bicycle:conditional
     bicycle:designated:type: Key:bicycle:designated:type
     bicycle:forward: Key:bicycle:forward
+    bicycle:left: Key:bicycle:left
     bicycle:oneway: Key:bicycle:oneway
+    bicycle:right: Key:bicycle:right
     bicycle:type: Key:bicycle:type
+    bicycle_bypass: Key:bicycle bypass
     bicycle_parking: Key:bicycle parking
     bicycle_road: Key:bicycle road
     bike_ride: Key:bike ride
@@ -5124,12 +5375,19 @@ en:
     boundary: Key:boundary
     boundary_type: Key:boundary type
     branch: Key:branch
-    branch:type: Key:branch:type
     brand: Key:brand
     brand:ar: Key:brand:ar
+    brand:de: Key:brand:de
+    brand:en: Key:brand:en
+    brand:es: Key:brand:es
+    brand:main: Key:brand:main
+    brand:remarketed: Key:brand:remarketed
+    brand:website: Key:brand:website
     brand:wikidata: Key:brand:wikidata
     brand:wikipedia: Key:brand:wikipedia
     brand:wikipedia:ar: Key:brand:wikipedia:ar
+    brand:wikipedia:de: Key:brand:wikipedia:de
+    brand:wikipedia:es: Key:brand:wikipedia:es
     breakfast: Key:breakfast
     brewery: Key:brewery
     bridge: Key:bridge
@@ -5144,17 +5402,21 @@ en:
     bridge:short_name: Key:bridge:short name
     bridge:structure: Key:bridge:structure
     bridge:support: Key:bridge:support
+    bubbleid: Key:bubbleid
+    buffer_stop: Key:buffer stop
     building: Key:building
     building:age: Key:building:age
     building:architecture: Key:building:architecture
     building:cladding: Key:building:cladding
+    building:color: Key:building:color
     building:colour: Key:building:colour
     building:condition: Key:building:condition
     building:cullis:height: Key:building:cullis:height
+    building:design: Key:building:design
     building:facade:colour: Key:building:facade:colour
     building:fireproof: Key:building:fireproof
     building:flats: Key:building:flats
-    building:height: Key:building:height
+    building:foundation_height: Key:building:foundation height
     building:level: Key:building:level
     building:level:1,2,3...: Key:building:level:1,2,3...
     building:levels: Key:building:levels
@@ -5165,7 +5427,6 @@ en:
     building:part: Key:building:part
     building:place: Key:building:place
     building:prefabricated: Key:building:prefabricated
-    building:roof: Key:building:roof
     building:roof:colour: Key:building:roof:colour
     building:ruian:type: Key:building:ruian:type
     building:soft_storey: Key:building:soft storey
@@ -5184,6 +5445,7 @@ en:
     bus:lanes:backward: Key:bus:lanes:backward
     bus:lanes:forward: Key:bus:lanes:forward
     bus_bay: Key:bus bay
+    bus_class:length: Key:bus class:length
     busbar: Key:busbar
     busway: Key:busway
     busway:left: Key:busway:left
@@ -5196,8 +5458,11 @@ en:
     cables: Key:cables
     cadc:2019: Key:cadc:2019
     cadc:2020: Key:cadc:2020
+    cadet: Key:cadet
     cafe: Key:cafe
     callsign: Key:callsign
+    camera:direction: Key:camera:direction
+    camera:type: Key:camera:type
     camp_site: Key:camp site
     camp_type: Key:camp type
     campers: Key:campers
@@ -5223,6 +5488,8 @@ en:
     carpool: Key:carpool
     carriage: Key:carriage
     carriageway_ref: Key:carriageway ref
+    carriageway_ref:left: Key:carriageway ref:left
+    carriageway_ref:right: Key:carriageway ref:right
     casemate: Key:casemate
     cash_withdrawal: Key:cash withdrawal
     cash_withdrawal:currency: Key:cash withdrawal:currency
@@ -5243,6 +5510,7 @@ en:
     census:population: Key:census:population
     centralkey: Key:centralkey
     change: Key:change
+    change:lanes: Key:change:lanes
     changesets_count: Key:changesets count
     changing_table: Key:changing table
     changing_table:count: Key:changing table:count
@@ -5252,6 +5520,10 @@ en:
     charity: Key:charity
     chchsid: Key:chchsid
     check_date: Key:check date
+    check_date:crossing: Key:check date:crossing
+    check_date:opening_hours: Key:check date:opening hours
+    check_date:shelter: Key:check date:shelter
+    check_date:surface: Key:check date:surface
     checkpoint: Key:checkpoint
     china_class: Key:china class
     china_population: Key:china population
@@ -5260,6 +5532,7 @@ en:
     circumference: Key:circumference
     city_limit: Key:city limit
     clacks_overhead: Key:clacks overhead
+    claimed_by: Key:claimed by
     class: Key:class
     class:bicycle: Key:class:bicycle
     class:bicycle:commute: Key:class:bicycle:commute
@@ -5277,7 +5550,6 @@ en:
     clothes: Key:clothes
     clothes:for: Key:clothes:for
     club: Key:club
-    club-mate: Key:club-mate
     coach: Key:coach
     coastline:survey_quality: Key:coastline:survey quality
     cocktails: Key:cocktails
@@ -5296,6 +5568,7 @@ en:
     communication:amateur_radio:repeater:frequency_out: Key:communication:amateur
       radio:repeater:frequency out
     communication:amateur_radio:repeater:modulation: Key:communication:amateur radio:repeater:modulation
+    communication:amateur_radio:repeater:power: Key:communication:amateur radio:repeater:power
     communication:amateur_radio:repeater:shift: Key:communication:amateur radio:repeater:shift
     communication:amateur_radio:repeater:toneburst: Key:communication:amateur radio:repeater:toneburst
     communication:bos: Key:communication:bos
@@ -5308,55 +5581,42 @@ en:
     community_centre: Key:community centre
     community_centre:for: Key:community centre:for
     company: Key:company
+    compensator: Key:compensator
     compressed_air: Key:compressed air
     condition: Key:condition
     conditional: Key:conditional
     condo: Key:condo
+    confession_times: Key:confession times
     connection_point: Key:connection point
+    consecrated: Key:consecrated
     construction: Key:construction
     construction:website: Key:construction:website
     construction_end_expected: Key:construction end expected
     construction_start_expected: Key:construction start expected
     consulate: Key:consulate
     consulting: Key:consulting
-    contact: Key:contact
-    contact:city: Key:contact:city
-    contact:diaspora: Key:contact:diaspora
     contact:email: Key:contact:email
     contact:facebook: Key:contact:facebook
-    contact:fax: Key:contact:fax
-    contact:flickr: Key:contact:flickr
-    contact:foursquare: Key:contact:foursquare
-    contact:gnusocial: Key:contact:gnusocial
     contact:google_plus: Key:contact:google plus
-    contact:housenumber: Key:contact:housenumber
-    contact:instagram: Key:contact:instagram
     contact:linkedin: Key:contact:linkedin
-    contact:mastodon: Key:contact:mastodon
-    contact:mobile: Key:contact:mobile
     contact:ok: Key:contact:ok
-    contact:phone: Key:contact:phone
-    contact:pinterest: Key:contact:pinterest
-    contact:postcode: Key:contact:postcode
-    contact:skype: Key:contact:skype
-    contact:street: Key:contact:street
-    contact:telegram: Key:contact:telegram
+    contact:sip: Key:contact:sip
     contact:twitter: Key:contact:twitter
-    contact:vhf: Key:contact:vhf
-    contact:viber: Key:contact:viber
     contact:vk: Key:contact:vk
-    contact:webcam: Key:contact:webcam
-    contact:website: Key:contact:website
-    contact:whatsapp: Key:contact:whatsapp
     contact:xing: Key:contact:xing
     contact:xmpp: Key:contact:xmpp
-    contact:youtube: Key:contact:youtube
+    contamination: Key:contamination
     content: Key:content
     converted_by: Key:converted by
     conveying: Key:conveying
     cooker: Key:cooker
     cooling:method: Key:cooling:method
+    corners: Key:corners
+    cosmha: Key:cosmha
+    counselling: Key:counselling
+    counselling_type:*: Key:counselling type:*
     country: Key:country
+    couplings: Key:couplings
     courts: Key:courts
     covered: Key:covered
     craft: Key:craft
@@ -5367,11 +5627,17 @@ en:
     crossing:activation: Key:crossing:activation
     crossing:barrier: Key:crossing:barrier
     crossing:bell: Key:crossing:bell
+    crossing:chicane: Key:crossing:chicane
     crossing:island: Key:crossing:island
     crossing:light: Key:crossing:light
+    crossing:marking: Key:crossing:marking
     crossing:on_demand: Key:crossing:on demand
     crossing:saltire: Key:crossing:saltire
+    crossing:signals: Key:crossing:signals
     crossing_ref: Key:crossing ref
+    cruising: Key:cruising
+    cs_dir:backward: Key:cs dir:backward
+    cs_dir:forward: Key:cs dir:forward
     cuisine: Key:cuisine
     cultivation_method: Key:cultivation method
     currency: Key:currency
@@ -5382,20 +5648,28 @@ en:
     currency:PLN: Key:currency:PLN
     currency:RUB: Key:currency:RUB
     currency:USD: Key:currency:USD
+    currency:XBT: Key:currency:XBT
     currency:XXX: Key:currency:XXX
     currency:others: Key:currency:others
     curve: Key:curve
+    curve:name: Key:curve:name
+    curve:ref: Key:curve:ref
     curves: Key:curves
     cutting: Key:cutting
     cyclability: Key:cyclability
     cycle: Key:cycle
+    cycle_barrier: Key:cycle barrier
+    cycle_barrier:installation: Key:cycle barrier:installation
     cycle_highway: Key:cycle highway
     cycle_network: Key:cycle network
+    cycle_rickshaw: Key:cycle rickshaw
     cyclestreet: Key:cyclestreet
     cyclestreets_id: Key:cyclestreets id
     cycleway: Key:cycleway
     cycleway:both: Key:cycleway:both
+    cycleway:both:lane: Key:cycleway:both:lane
     cycleway:buffer: Key:cycleway:buffer
+    cycleway:foot: Key:cycleway:foot
     cycleway:lane: Key:cycleway:lane
     cycleway:left: Key:cycleway:left
     cycleway:left:lane: Key:cycleway:left:lane
@@ -5406,24 +5680,28 @@ en:
     cycleway:right:oneway: Key:cycleway:right:oneway
     cycleway:right:surface: Key:cycleway:right:surface
     cycleway:right=forward: Key:cycleway:right=forward
+    cycleway:segregated: Key:cycleway:segregated
     cycleway:surface: Key:cycleway:surface
     cycleway:width: Key:cycleway:width
     cycling_width: Key:cycling width
+    damage: Key:damage
+    'damage:': 'Key:damage:'
+    damage:date: Key:damage:date
+    damage:event: Key:damage:event
+    damage:type: Key:damage:type
     dance:style: Key:dance:style
     dance:teaching: Key:dance:teaching
     date: Key:date
-    date_off: Key:date off
-    date_on: Key:date on
-    day_off: Key:day off
-    day_on: Key:day on
     de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: Key:de:regionalschluessel
     de:strassenschluessel: Key:de:strassenschluessel
     deanery: Key:deanery
     default_language: Key:default language
-    defensive_structure: Key:defensive structure
+    defensive_works: Key:defensive works
+    deflection: Key:deflection
     dehoga: Key:dehoga
     delivery: Key:delivery
+    delivery:partner: Key:delivery:partner
     delivery_point: Key:delivery point
     delivery_point:access: Key:delivery point:access
     delivery_point:type: Key:delivery point:type
@@ -5474,6 +5752,7 @@ en:
     destination:street:lang:ar:forward: Key:destination:street:lang:ar:forward
     destination:symbol: Key:destination:symbol
     destination:to:lang:ar: Key:destination:to:lang:ar
+    destination:wikidata: Key:destination:wikidata
     destroyed: Key:destroyed
     'destroyed:': 'Key:destroyed:'
     detour: Key:detour
@@ -5482,7 +5761,6 @@ en:
     dewnr:uid: Key:dewnr:uid
     dhm_id: Key:dhm id
     diameter: Key:diameter
-    diaper: Key:diaper
     dibavod:id: Key:dibavod:id
     diet: Key:diet
     'diet:': 'Key:diet:'
@@ -5517,9 +5795,11 @@ en:
     disabled: Key:disabled
     disabled_spaces: Key:disabled spaces
     disc_golf: Key:disc golf
+    disease:*: Key:disease:*
     dishwasher: Key:dishwasher
     dispensing: Key:dispensing
     display: Key:display
+    disputed_by: Key:disputed by
     distance: Key:distance
     distillery: Key:distillery
     'disused:': 'Key:disused:'
@@ -5541,15 +5821,11 @@ en:
     double_tracked_motor_vehicle: Key:double tracked motor vehicle
     draft: Key:draft
     draisine: Key:draisine
-    drink: Key:drink
-    drink:afri-cola: Key:drink:afri-cola
     drink:beer: Key:drink:beer
     drink:club-mate: Key:drink:club-mate
     drink:coffee: Key:drink:coffee
     drink:espresso: Key:drink:espresso
-    drink:kräusen: Key:drink:kräusen
     drink:milk: Key:drink:milk
-    drink:milk-raw: Key:drink:milk-raw
     drink:raw_milk: Key:drink:raw milk
     drink:tea: Key:drink:tea
     drink:wine: Key:drink:wine
@@ -5579,14 +5855,20 @@ en:
     ele: Key:ele
     ele:NHN: Key:ele:NHN
     ele:local: Key:ele:local
+    ele:max: Key:ele:max
+    ele:min: Key:ele:min
+    ele:natural: Key:ele:natural
     ele:wgs84: Key:ele:wgs84
     electric_bicycle: Key:electric bicycle
+    electric_scooter: Key:electric scooter
     electricity: Key:electricity
     electrified: Key:electrified
     elevator: Key:elevator
     email: Key:email
     embankment: Key:embankment
+    embankment:side: Key:embankment:side
     embassy: Key:embassy
+    embedded: Key:embedded
     embedded_rails: Key:embedded rails
     embedded_rails:lanes: Key:embedded rails:lanes
     emergency: Key:emergency
@@ -5598,12 +5880,18 @@ en:
     enforcement: Key:enforcement
     engineer: Key:engineer
     entrance: Key:entrance
+    ephemeral: Key:ephemeral
+    escooter: Key:escooter
+    esr:user: Key:esr:user
     est_height: Key:est height
     est_length: Key:est length
     est_width: Key:est width
+    estuary: Key:estuary
     etymology: Key:etymology
+    euro_const: Key:euro const
     european_cultural_path: Key:european cultural path
     evacuation_route: Key:evacuation route
+    events_venue: Key:events venue
     excavation: Key:excavation
     exhibit: Key:exhibit
     exit: Key:exit
@@ -5612,6 +5900,7 @@ en:
     expressway: Key:expressway
     facebook: Key:facebook
     faces: Key:faces
+    factory: Key:factory
     fair_trade: Key:fair trade
     fallow: Key:fallow
     farming_system: Key:farming system
@@ -5621,6 +5910,7 @@ en:
     fax: Key:fax
     fcc:registration_number: Key:fcc:registration number
     fcc:unique_system_identifier: Key:fcc:unique system identifier
+    fdep:landuse_code: Key:fdep:landuse code
     fee: Key:fee
     fee:conditional: Key:fee:conditional
     fee:disabled: Key:fee:disabled
@@ -5636,12 +5926,15 @@ en:
     fhrs:authority: Key:fhrs:authority
     fhrs:id: Key:fhrs:id
     fhrs:local_authority_id: Key:fhrs:local authority id
+    fid: Key:fid
     field: Key:field
     finance_agent: Key:finance agent
     fine: Key:fine
     fire: Key:fire
     fire_boundary: Key:fire boundary
     fire_hydrant: Key:fire hydrant
+    fire_hydrant:diameter: Key:fire hydrant:diameter
+    fire_hydrant:diameter:signed: Key:fire hydrant:diameter:signed
     fire_object:type: Key:fire object:type
     fire_operator: Key:fire operator
     fire_path: Key:fire path
@@ -5653,14 +5946,17 @@ en:
     fitness_station: Key:fitness station
     fix_guidepost: Key:fix guidepost
     fixme: Key:fixme
+    fixme:osmchina: Key:fixme:osmchina
     flag: Key:flag
     flag:name: Key:flag:name
     flag:type: Key:flag:type
     flag:wikidata: Key:flag:wikidata
     flashing_lights: Key:flashing lights
     flat_steps: Key:flat steps
+    flats: Key:flats
     flickr: Key:flickr
     floating: Key:floating
+    flood_date: Key:flood date
     flood_mark: Key:flood mark
     flood_prone: Key:flood prone
     floor:material: Key:floor:material
@@ -5671,8 +5967,10 @@ en:
     foot:forward: Key:foot:forward
     footway: Key:footway
     footway:surface: Key:footway:surface
+    foraging: Key:foraging
     ford: Key:ford
     forestry: Key:forestry
+    forklift: Key:forklift
     format: Key:format
     format:top: Key:format:top
     fortification_type: Key:fortification type
@@ -5750,6 +6048,7 @@ en:
     genus:it: Key:genus:it
     genus:ru: Key:genus:ru
     genus:wikidata: Key:genus:wikidata
+    geobase:acquisitionTechnique: Key:geobase:acquisitionTechnique
     geocodigo: Key:geocodigo
     geological: Key:geological
     geothermal: Key:geothermal
@@ -5761,6 +6060,7 @@ en:
     gnis:feature_id: Key:gnis:feature id
     gnis:ftype: Key:gnis:ftype
     gnis:id: Key:gnis:id
+    gnis:import_uuid: Key:gnis:import uuid
     golf: Key:golf
     golf:course: Key:golf:course
     golf_cart: Key:golf cart
@@ -5781,6 +6081,7 @@ en:
     gtfs:trip_id:sample: Key:gtfs:trip id:sample
     guest_house: Key:guest house
     guide: Key:guide
+    guide_type: Key:guide type
     guidepost: Key:guidepost
     guidepost:hiking: Key:guidepost:hiking
     gun_emplacement_type: Key:gun emplacement type
@@ -5806,9 +6107,15 @@ en:
     hazard_return_period: Key:hazard return period
     hazard_type: Key:hazard type
     hazmat: Key:hazmat
+    hazmat:explosive: Key:hazmat:explosive
     hazmat:water: Key:hazmat:water
     headframe: Key:headframe
+    headlight: Key:headlight
+    health_amenity:*: Key:health amenity:*
+    health_amenity:type: Key:health amenity:type
     health_facility:type: Key:health facility:type
+    health_service:*: Key:health service:*
+    health_service:counselling: Key:health service:counselling
     healthcare: Key:healthcare
     healthcare:counselling: Key:healthcare:counselling
     healthcare:speciality: Key:healthcare:speciality
@@ -5829,22 +6136,26 @@ en:
     highway:category: Key:highway:category
     highway:category:pl: Key:highway:category:pl
     highway:class:pl: Key:highway:class:pl
+    highway_authority_ref: Key:highway authority ref
     hiking: Key:hiking
     historic: Key:historic
     historic:civilization: Key:historic:civilization
     historic:era: Key:historic:era
     historic:period: Key:historic:period
     history: Key:history
+    hiv: Key:hiv
+    hiv:test: Key:hiv:test
     hoops: Key:hoops
     horse: Key:horse
     horse-drawn_carriage: Key:horse-drawn carriage
     horse_scale: Key:horse scale
+    hospital:level:CN: Key:hospital:level:CN
+    host: Key:host
     hot_water: Key:hot water
-    hour_off: Key:hour off
-    hour_on: Key:hour on
     house: Key:house
     hov: Key:hov
     hov:lanes: Key:hov:lanes
+    hov:minimum: Key:hov:minimum
     hunting: Key:hunting
     hunting_stand: Key:hunting stand
     iata: Key:iata
@@ -5872,18 +6183,31 @@ en:
     industrial: Key:industrial
     industry:isic_code: Key:industry:isic code
     infant_bed: Key:infant bed
+    infection:hiv: Key:infection:hiv
     informal: Key:informal
     information: Key:information
+    inlet: Key:inlet
     inline_skates: Key:inline skates
     inscription: Key:inscription
     inscription:ar: Key:inscription:ar
     inscription:url: Key:inscription:url
     int_name: Key:int name
     int_name:ar: Key:int name:ar
+    int_name:arc: Key:int name:arc
+    int_name:de: Key:int name:de
+    int_name:es: Key:int name:es
+    int_name:gr: Key:int name:gr
+    int_name:grc: Key:int name:grc
+    int_name:syc: Key:int name:syc
     int_ref: Key:int ref
     int_ref:ar: Key:int ref:ar
+    int_ref:arc: Key:int ref:arc
+    int_ref:de: Key:int ref:de
+    int_ref:es: Key:int ref:es
+    int_ref:gr: Key:int ref:gr
+    int_ref:grc: Key:int ref:grc
+    int_ref:syc: Key:int ref:syc
     intermittent: Key:intermittent
-    internet: Key:internet
     internet_access: Key:internet access
     internet_access:fee: Key:internet access:fee
     internet_access:operator: Key:internet access:operator
@@ -5944,7 +6268,7 @@ en:
     kms:zip_name: Key:kms:zip name
     kms:zip_no: Key:kms:zip no
     kneipp_water_cure: Key:kneipp water cure
-    kp: Key:kp
+    kons:inscription_date: Key:kons:inscription date
     kudish: Key:kudish
     kurb: Key:kurb
     lacounty:ain: Key:lacounty:ain
@@ -5974,6 +6298,7 @@ en:
     language:ckb: Key:language:ckb
     language:de: Key:language:de
     language:el: Key:language:el
+    language:es: Key:language:es
     language:fa: Key:language:fa
     language:glk: Key:language:glk
     language:gr: Key:language:gr
@@ -6014,10 +6339,13 @@ en:
     listed_status: Key:listed status
     lit: Key:lit
     lit:perceived: Key:lit:perceived
+    lit_by_led: Key:lit by led
     living_street: Key:living street
     loading_gauge: Key:loading gauge
     loc_name: Key:loc name
     loc_name:ar: Key:loc name:ar
+    loc_name:de: Key:loc name:de
+    loc_name:es: Key:loc name:es
     loc_name:fa: Key:loc name:fa
     loc_name:gr: Key:loc name:gr
     loc_name:grc: Key:loc name:grc
@@ -6036,9 +6364,15 @@ en:
     locked:conditional: Key:locked:conditional
     long_name: Key:long name
     long_name:ar: Key:long name:ar
+    long_name:arc: Key:long name:arc
     long_name:azb: Key:long name:azb
+    long_name:de: Key:long name:de
+    long_name:es: Key:long name:es
     long_name:fa: Key:long name:fa
+    long_name:gr: Key:long name:gr
+    long_name:grc: Key:long name:grc
     long_name:pnb: Key:long name:pnb
+    long_name:syc: Key:long name:syc
     long_name:ur: Key:long name:ur
     lottery: Key:lottery
     love_locks: Key:love locks
@@ -6061,6 +6395,7 @@ en:
     mapper: Key:mapper
     maritime: Key:maritime
     marker: Key:marker
+    mass_times: Key:mass times
     massage: Key:massage
     massgis:ARTICLE97: Key:massgis:ARTICLE97
     massgis:SITE_NAME: Key:massgis:SITE NAME
@@ -6070,11 +6405,13 @@ en:
     maxage: Key:maxage
     maxaxleload: Key:maxaxleload
     maxbogieweight: Key:maxbogieweight
+    maxcharge: Key:maxcharge
     maxdraft: Key:maxdraft
     maxdraught: Key:maxdraught
     maxheight: Key:maxheight
     maxheight:legal: Key:maxheight:legal
     maxheight:physical: Key:maxheight:physical
+    maxheight:signed: Key:maxheight:signed
     maxlength: Key:maxlength
     maxspeed: Key:maxspeed
     maxspeed:advisory: Key:maxspeed:advisory
@@ -6088,6 +6425,7 @@ en:
     maxspeed:hgv:forward: Key:maxspeed:hgv:forward
     maxspeed:lanes: Key:maxspeed:lanes
     maxspeed:practical: Key:maxspeed:practical
+    maxspeed:psv:conditional: Key:maxspeed:psv:conditional
     maxspeed:seasonal:winter: Key:maxspeed:seasonal:winter
     maxspeed:source: Key:maxspeed:source
     maxspeed:trailer: Key:maxspeed:trailer
@@ -6097,6 +6435,7 @@ en:
     maxstay:conditional: Key:maxstay:conditional
     maxtents: Key:maxtents
     maxweight: Key:maxweight
+    maxweight:conditional: Key:maxweight:conditional
     maxweight:signed: Key:maxweight:signed
     maxweightrating: Key:maxweightrating
     maxweightrating:bus: Key:maxweightrating:bus
@@ -6113,16 +6452,21 @@ en:
     megalith_type: Key:megalith type
     membership: Key:membership
     memorial: Key:memorial
+    memorial:conflict: Key:memorial:conflict
     memorial:subject: Key:memorial:subject
+    memorial:subject:wikidata: Key:memorial:subject:wikidata
+    memorial:subject:wikipedia: Key:memorial:subject:wikipedia
     memorial:type: Key:memorial:type
     message: Key:message
     mhs:inscription_date: Key:mhs:inscription date
     microbrewery: Key:microbrewery
+    microwave: Key:microwave
     milestone_type: Key:milestone type
     military: Key:military
     military_service: Key:military service
     mimics: Key:mimics
     min_age: Key:min age
+    min_distance: Key:min distance
     min_height: Key:min height
     minage: Key:minage
     mindistance: Key:mindistance
@@ -6144,6 +6488,7 @@ en:
     monitoring:groundwater: Key:monitoring:groundwater
     monitoring:meteoric_activity: Key:monitoring:meteoric activity
     monitoring:noise: Key:monitoring:noise
+    monitoring:pedestrian: Key:monitoring:pedestrian
     monitoring:radiation: Key:monitoring:radiation
     monitoring:river_level: Key:monitoring:river level
     monitoring:river_levels: Key:monitoring:river levels
@@ -6191,24 +6536,31 @@ en:
     mtb:scale:uphill: Key:mtb:scale:uphill
     mtb_scale: Key:mtb scale
     museum: Key:museum
+    museum:subject:wikidata: Key:museum:subject:wikidata
     museum_type: Key:museum type
     musical_instrument: Key:musical instrument
     musical_instrument:repair: Key:musical instrument:repair
+    naics: Key:naics
     name: Key:name
+    name:af: Key:name:af
     name:ar: Key:name:ar
     name:ar1: Key:name:ar1
     name:arc: Key:name:arc
     name:ast: Key:name:ast
+    name:aus: Key:name:aus
+    name:az: Key:name:az
     name:az-Arab: Key:name:az-Arab
     name:azb: Key:name:azb
     name:be: Key:name:be
     name:be-tarask: Key:name:be-tarask
     name:ber: Key:name:ber
+    name:bg: Key:name:bg
     name:bn: Key:name:bn
     name:bn-Arab: Key:name:bn-Arab
-    name:botanical: Key:name:botanical
     name:br: Key:name:br
     name:ca: Key:name:ca
+    name:carnaval: Key:name:carnaval
+    name:cdo: Key:name:cdo
     name:ckb: Key:name:ckb
     name:cs: Key:name:cs
     name:cy: Key:name:cy
@@ -6240,6 +6592,7 @@ en:
     name:gsw: Key:name:gsw
     name:he: Key:name:he
     name:hi: Key:name:hi
+    name:hop: Key:name:hop
     name:hr: Key:name:hr
     name:hsb: Key:name:hsb
     name:hu: Key:name:hu
@@ -6252,6 +6605,7 @@ en:
     name:ja_rm: Key:name:ja rm
     name:jbo: Key:name:jbo
     name:ka: Key:name:ka
+    name:ka-Latn: Key:name:ka-Latn
     name:kab: Key:name:kab
     name:kab-Arab: Key:name:kab-Arab
     name:kk: Key:name:kk
@@ -6266,30 +6620,48 @@ en:
     name:ku: Key:name:ku
     name:ku-Arab: Key:name:ku-Arab
     name:ky-Arab: Key:name:ky-Arab
+    name:lah: Key:name:lah
     name:language: Key:name:language
     name:left: Key:name:left
     name:left:ar: Key:name:left:ar
+    name:left:arc: Key:name:left:arc
+    name:left:de: Key:name:left:de
+    name:left:es: Key:name:left:es
     name:left:fr: Key:name:left:fr
+    name:left:gr: Key:name:left:gr
+    name:left:grc: Key:name:left:grc
+    name:left:syc: Key:name:left:syc
     name:lg: Key:name:lg
+    name:li: Key:name:li
     name:lrc: Key:name:lrc
     name:lt: Key:name:lt
     name:lv: Key:name:lv
     name:mg: Key:name:mg
+    name:mi: Key:name:mi
     name:mk: Key:name:mk
     name:ml: Key:name:ml
     name:mr: Key:name:mr
+    name:ms: Key:name:ms
     name:ms-Arab: Key:name:ms-Arab
     name:my: Key:name:my
     name:mzn: Key:name:mzn
     name:nds: Key:name:nds
     name:nds-nl: Key:name:nds-nl
+    name:ne: Key:name:ne
     name:nl: Key:name:nl
     name:nn: Key:name:nn
     name:no: Key:name:no
     name:nov: Key:name:nov
     name:oc: Key:name:oc
     name:ota: Key:name:ota
+    name:pa: Key:name:pa
     name:pa-Arab: Key:name:pa-Arab
+    name:pa-Aran: Key:name:pa-Aran
+    name:pa-Guru: Key:name:pa-Guru
+    name:pa-IN: Key:name:pa-IN
+    name:pa-PK: Key:name:pa-PK
+    name:pa-Shah: Key:name:pa-Shah
+    name:pjt: Key:name:pjt
     name:pl: Key:name:pl
     name:pnb: Key:name:pnb
     name:prefix: Key:name:prefix
@@ -6299,15 +6671,23 @@ en:
     name:pt: Key:name:pt
     name:right: Key:name:right
     name:right:ar: Key:name:right:ar
+    name:right:arc: Key:name:right:arc
+    name:right:de: Key:name:right:de
+    name:right:es: Key:name:right:es
+    name:right:gr: Key:name:right:gr
+    name:right:grc: Key:name:right:grc
+    name:right:syc: Key:name:right:syc
     name:ro: Key:name:ro
     name:ru: Key:name:ru
     name:ru:word_stress: Key:name:ru:word stress
     name:sc: Key:name:sc
     name:sd: Key:name:sd
+    name:se: Key:name:se
     name:sh: Key:name:sh
     name:signed: Key:name:signed
     name:sk: Key:name:sk
     name:sl: Key:name:sl
+    name:sq: Key:name:sq
     name:sr: Key:name:sr
     name:sr-Latn: Key:name:sr-Latn
     name:suffix: Key:name:suffix
@@ -6326,11 +6706,15 @@ en:
     name:ur: Key:name:ur
     name:vi: Key:name:vi
     name:vi-Hani: Key:name:vi-Hani
+    name:vls: Key:name:vls
     name:vo: Key:name:vo
+    name:wa: Key:name:wa
     name:wikipedia: Key:name:wikipedia
     name:xx: Key:name:xx
     name:yue: Key:name:yue
     name:zh: Key:name:zh
+    name:zh-Hans: Key:name:zh-Hans
+    name:zh-Hant: Key:name:zh-Hant
     name:zh-sg: Key:name:zh-sg
     name_1: Key:name 1
     name_2: Key:name 2
@@ -6386,6 +6770,8 @@ en:
     network:guid: Key:network:guid
     network:type: Key:network:type
     network:wikidata: Key:network:wikidata
+    network:wikipedia: Key:network:wikipedia
+    nev: Key:nev
     next_check_date: Key:next check date
     nhd:com_id: Key:nhd:com id
     nhd:fcode: Key:nhd:fcode
@@ -6411,7 +6797,9 @@ en:
     note:depth: Key:note:depth
     note:en: Key:note:en
     note:ja: Key:note:ja
+    note:name: Key:note:name
     note:pilotage: Key:note:pilotage
+    note:project_page: Key:note:project page
     notes: Key:notes
     nuclear_explosion:country: Key:nuclear explosion:country
     nudism: Key:nudism
@@ -6438,7 +6826,9 @@ en:
     official_name:azb: Key:official name:azb
     official_name:be: Key:official name:be
     official_name:ckb: Key:official name:ckb
+    official_name:de: Key:official name:de
     official_name:en: Key:official name:en
+    official_name:es: Key:official name:es
     official_name:fa: Key:official name:fa
     official_name:fr: Key:official name:fr
     official_name:glk: Key:official name:glk
@@ -6459,6 +6849,7 @@ en:
     official_name:ur: Key:official name:ur
     official_ref: Key:official ref
     offshore: Key:offshore
+    ohm:name: Key:ohm:name
     ohv: Key:ohv
     ois:fixme: Key:ois:fixme
     old_addr:housenumber: Key:old addr:housenumber
@@ -6470,10 +6861,12 @@ en:
     old_name:ckb: Key:old name:ckb
     old_name:de: Key:old name:de
     old_name:en: Key:old name:en
+    old_name:es: Key:old name:es
     old_name:etymology:wikidata: Key:old name:etymology:wikidata
     old_name:fa: Key:old name:fa
     old_name:gr: Key:old name:gr
     old_name:grc: Key:old name:grc
+    old_name:ko: Key:old name:ko
     old_name:ks: Key:old name:ks
     old_name:ku-Arab: Key:old name:ku-Arab
     old_name:lrc: Key:old name:lrc
@@ -6504,6 +6897,7 @@ en:
     open_air: Key:open air
     openbenches:id: Key:openbenches:id
     openfire: Key:openfire
+    opening: Key:opening
     opening_date: Key:opening date
     opening_hours: Key:opening hours
     opening_hours/Tutorial: Key:opening hours/Tutorial
@@ -6511,9 +6905,12 @@ en:
     opening_hours:covid19: Key:opening hours:covid19
     opening_hours:drive_through: Key:opening hours:drive through
     opening_hours:kitchen: Key:opening hours:kitchen
+    opening_hours:lifeguard: Key:opening hours:lifeguard
     opening_hours:office: Key:opening hours:office
+    opening_hours:pharmacy: Key:opening hours:pharmacy
     opening_hours:reception: Key:opening hours:reception
     opening_hours:signed: Key:opening hours:signed
+    opening_hours:store: Key:opening hours:store
     opening_hours:url: Key:opening hours:url
     opening_hours:workshop: Key:opening hours:workshop
     openplaques:id: Key:openplaques:id
@@ -6521,15 +6918,25 @@ en:
     operational_status: Key:operational status
     operator: Key:operator
     operator:MNC: Key:operator:MNC
+    operator:abbr: Key:operator:abbr
+    operator:addr: Key:operator:addr
     operator:ar: Key:operator:ar
     operator:be: Key:operator:be
+    operator:de: Key:operator:de
     operator:en: Key:operator:en
+    operator:es: Key:operator:es
     operator:guid: Key:operator:guid
+    operator:phone: Key:operator:phone
     operator:ru: Key:operator:ru
+    operator:short: Key:operator:short
     operator:type: Key:operator:type
+    operator:ur: Key:operator:ur
+    operator:website: Key:operator:website
     operator:wikidata: Key:operator:wikidata
     operator:wikipedia: Key:operator:wikipedia
     operator:wikipedia:ar: Key:operator:wikipedia:ar
+    operator:wikipedia:de: Key:operator:wikipedia:de
+    operator:wikipedia:es: Key:operator:wikipedia:es
     orchard: Key:orchard
     organ: Key:organ
     organic: Key:organic
@@ -6556,22 +6963,31 @@ en:
     outdoor: Key:outdoor
     outdoor_seating: Key:outdoor seating
     outdoor_seating:comfort: Key:outdoor seating:comfort
+    outlet: Key:outlet
     oven: Key:oven
+    overlap: Key:overlap
     overtaking: Key:overtaking
     overtaking:hgv: Key:overtaking:hgv
     owner: Key:owner
+    owner:wikidata: Key:owner:wikidata
     ownership: Key:ownership
     par: Key:par
+    parcel_mail_in: Key:parcel mail in
+    parcel_pickup: Key:parcel pickup
     parish: Key:parish
     park:type: Key:park:type
     park_ride: Key:park ride
     parking: Key:parking
     parking:condition: Key:parking:condition
     parking:condition:both: Key:parking:condition:both
+    parking:condition:both:maxstay: Key:parking:condition:both:maxstay
     parking:condition:left: Key:parking:condition:left
+    parking:condition:left:maxstay: Key:parking:condition:left:maxstay
     parking:condition:right: Key:parking:condition:right
+    parking:condition:right:maxstay: Key:parking:condition:right:maxstay
     parking:condition:right:time_interval: Key:parking:condition:right:time interval
     parking:condition:side: Key:parking:condition:side
+    parking:fee: Key:parking:fee
     parking:lane: Key:parking:lane
     parking:lane:both: Key:parking:lane:both
     parking:lane:hgv: Key:parking:lane:hgv
@@ -6663,9 +7079,10 @@ en:
     payment:wechat: Key:payment:wechat
     payment:wire_transfer: Key:payment:wire transfer
     permanent_camping: Key:permanent camping
+    pets: Key:pets
     phoenixbikeguide: Key:phoenixbikeguide
     phone: Key:phone
-    photo: Key:photo
+    phone:mnemonic: Key:phone:mnemonic
     photograph: Key:photograph
     photography: Key:photography
     picnic_table: Key:picnic table
@@ -6678,14 +7095,17 @@ en:
     piste:grooming: Key:piste:grooming
     piste:ref: Key:piste:ref
     piste:type: Key:piste:type
-    pk: Key:pk
+    pitch:net: Key:pitch:net
     place: Key:place
+    place:CN: Key:place:CN
     place:PH: Key:place:PH
+    place:cn: Key:place:cn
     place:fr: Key:place:fr
     place:ph: Key:place:ph
     place_name: Key:place name
     placement: Key:placement
     placement:end: Key:placement:end
+    placement:forward: Key:placement:forward
     placement:start: Key:placement:start
     planned: Key:planned
     plant: Key:plant
@@ -6706,6 +7126,7 @@ en:
     plant:type: Key:plant:type
     plant_community: Key:plant community
     platforms: Key:platforms
+    playability: Key:playability
     playground: Key:playground
     'playground:': 'Key:playground:'
     playground:theme: Key:playground:theme
@@ -6714,22 +7135,23 @@ en:
     pole: Key:pole
     pole:type: Key:pole:type
     police: Key:police
+    political_division: Key:political division
     polling_station: Key:polling station
     population: Key:population
     population:date: Key:population:date
     population_rank: Key:population rank
+    port: Key:port
     position: Key:position
     post_box:design: Key:post box:design
     post_box:type: Key:post box:type
     post_office: Key:post office
+    post_office:brand: Key:post office:brand
     post_office:parcel_pickup: Key:post office:parcel pickup
     postal_code: Key:postal code
-    postcode: Key:postcode
+    postal_code:source: Key:postal code:source
     potholes: Key:potholes
     power: Key:power
     power_output: Key:power output
-    power_rating: Key:power rating
-    power_source: Key:power source
     power_supply: Key:power supply
     power_supply:schedule: Key:power supply:schedule
     practicability: Key:practicability
@@ -6738,6 +7160,7 @@ en:
     previous: Key:previous
     previous:access: Key:previous:access
     previous:vehicle: Key:previous:vehicle
+    previously: Key:previously
     priority: Key:priority
     priority_road: Key:priority road
     produce: Key:produce
@@ -6747,9 +7170,10 @@ en:
     proposed:highway: Key:proposed:highway
     proposed:name: Key:proposed:name
     protect_class: Key:protect class
-    protect_id: Key:protect id
     protected: Key:protected
     protection_title: Key:protection title
+    provided_for: Key:provided for
+    provided_for:*: Key:provided for:*
     prow_ref: Key:prow ref
     pruning: Key:pruning
     psv: Key:psv
@@ -6781,11 +7205,13 @@ en:
     railway:lzb: Key:railway:lzb
     railway:position: Key:railway:position
     railway:preserved: Key:railway:preserved
+    railway:ref: Key:railway:ref
     railway:signal:combined: Key:railway:signal:combined
     railway:signal:distant: Key:railway:signal:distant
     railway:signal:main: Key:railway:signal:main
     railway:signal:speed_limit: Key:railway:signal:speed limit
     railway:signal:speed_limit_distant: Key:railway:signal:speed limit distant
+    railway:tilting: Key:railway:tilting
     railway:track_ref: Key:railway:track ref
     railway:traffic_mode: Key:railway:traffic mode
     railway:zbs: Key:railway:zbs
@@ -6808,7 +7234,9 @@ en:
     recycling:PET: Key:recycling:PET
     recycling:fire_extinguishers: Key:recycling:fire extinguishers
     recycling:pet_drink_bottles: Key:recycling:pet drink bottles
+    recycling:plastic_bottle_caps: Key:recycling:plastic bottle caps
     recycling:plastic_bottle_tops: Key:recycling:plastic bottle tops
+    recycling:pmd: Key:recycling:pmd
     recycling_type: Key:recycling type
     red_turn:left: Key:red turn:left
     red_turn:right: Key:red turn:right
@@ -6822,11 +7250,13 @@ en:
     ref: Key:ref
     ref:AGESIC: Key:ref:AGESIC
     ref:CEF: Key:ref:CEF
+    ref:CNES: Key:ref:CNES
     ref:DK:cvr: Key:ref:DK:cvr
     ref:De_Lijn: Key:ref:De Lijn
     ref:ERDF:gdo: Key:ref:ERDF:gdo
     ref:EU:ENTSOE_EIC: Key:ref:EU:ENTSOE EIC
     ref:EU:EVSE: Key:ref:EU:EVSE
+    ref:EU:bwid: Key:ref:EU:bwid
     ref:FR:42C: Key:ref:FR:42C
     ref:FR:ANFR: Key:ref:FR:ANFR
     ref:FR:ARCEP: Key:ref:FR:ARCEP
@@ -6839,6 +7269,7 @@ en:
     ref:FR:FINESS: Key:ref:FR:FINESS
     ref:FR:INSEE: Key:ref:FR:INSEE
     ref:FR:IRVE: Key:ref:FR:IRVE
+    ref:FR:Joconde: Key:ref:FR:Joconde
     ref:FR:LaPoste: Key:ref:FR:LaPoste
     ref:FR:MemorialGenWeb: Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: Key:ref:FR:NAF
@@ -6860,18 +7291,31 @@ en:
     ref:GB:mpan: Key:ref:GB:mpan
     ref:GB:nhs_ods: Key:ref:GB:nhs ods
     ref:GB:uprn: Key:ref:GB:uprn
+    ref:GB:wpd_site: Key:ref:GB:wpd site
+    ref:HMDB: Key:ref:HMDB
     ref:HU:edid: Key:ref:HU:edid
+    ref:IE:lenehan: Key:ref:IE:lenehan
+    ref:IE:niah: Key:ref:IE:niah
+    ref:IE:smr: Key:ref:IE:smr
     ref:IFOPT: Key:ref:IFOPT
     ref:INEP: Key:ref:INEP
     ref:INSEE: Key:ref:INSEE
     ref:ISTAT: Key:ref:ISTAT
     ref:LILA: Key:ref:LILA
     ref:LOCODE: Key:ref:LOCODE
+    ref:LV:addr: Key:ref:LV:addr
     ref:NAG:UPRN:1: Key:ref:NAG:UPRN:1
     ref:NBd: Key:ref:NBd
     ref:NLPG:UPRN:1: Key:ref:NLPG:UPRN:1
     ref:NPLG:UPRN:1: Key:ref:NPLG:UPRN:1
+    ref:ProRail: Key:ref:ProRail
     ref:REI: Key:ref:REI
+    ref:RS:grad: Key:ref:RS:grad
+    ref:RS:naselje: Key:ref:RS:naselje
+    ref:RS:okrug: Key:ref:RS:okrug
+    ref:RS:opstina: Key:ref:RS:opstina
+    ref:RS:pokrajina: Key:ref:RS:pokrajina
+    ref:STIB_MIVB: Key:ref:STIB MIVB
     ref:TECB: Key:ref:TECB
     ref:TECC: Key:ref:TECC
     ref:TECH: Key:ref:TECH
@@ -6879,10 +7323,15 @@ en:
     ref:TECN: Key:ref:TECN
     ref:TECX: Key:ref:TECX
     ref:UAI: Key:ref:UAI
+    'ref:US-TX:': 'Key:ref:US-TX:'
+    ref:US-TX:thc: Key:ref:US-TX:thc
+    ref:US:EIA: Key:ref:US:EIA
     ref:US:EPA: Key:ref:US:EPA
+    ref:US:MA:SARIS: Key:ref:US:MA:SARIS
     ref:UrbIS: Key:ref:UrbIS
     ref:WDPA: Key:ref:WDPA
     ref:ar: Key:ref:ar
+    ref:arc: Key:ref:arc
     ref:at:bda: Key:ref:at:bda
     ref:at:gkz: Key:ref:at:gkz
     ref:at:okz: Key:ref:at:okz
@@ -6902,25 +7351,41 @@ en:
     ref:colour: Key:ref:colour
     ref:coop: Key:ref:coop
     ref:crs: Key:ref:crs
+    ref:csioz: Key:ref:csioz
     ref:ctb: Key:ref:ctb
+    ref:de: Key:ref:de
     ref:deniirn: Key:ref:deniirn
     ref:dew:park_id: Key:ref:dew:park id
     ref:dhis2: Key:ref:dhis2
     ref:doc: Key:ref:doc
     ref:edubase: Key:ref:edubase
+    ref:edubase:group: Key:ref:edubase:group
     ref:ef: Key:ref:ef
+    ref:es: Key:ref:es
+    ref:fgkz: Key:ref:fgkz
+    ref:gbfs: Key:ref:gbfs
     ref:gnis: Key:ref:gnis
+    ref:gr: Key:ref:gr
+    ref:grc: Key:ref:grc
     ref:gsi: Key:ref:gsi
     ref:gss: Key:ref:gss
     ref:gurs:hs_mid: Key:ref:gurs:hs mid
+    ref:gurs:sta_sid: Key:ref:gurs:sta sid
+    ref:gwlnr: Key:ref:gwlnr
     ref:harbour: Key:ref:harbour
     ref:herbarium: Key:ref:herbarium
+    ref:hmdb: Key:ref:hmdb
     ref:hsmaq: Key:ref:hsmaq
     ref:industrial: Key:ref:industrial
+    ref:ine: Key:ref:ine
     ref:isil: Key:ref:isil
     ref:kmb: Key:ref:kmb
+    ref:kons: Key:ref:kons
     ref:linz:address_id: Key:ref:linz:address id
     ref:linz:building_id: Key:ref:linz:building id
+    ref:linz:hydrographic_id: Key:ref:linz:hydrographic id
+    ref:linz:pastoral_lease_id: Key:ref:linz:pastoral lease id
+    ref:linz:topo50_id: Key:ref:linz:topo50 id
     ref:lor: Key:ref:lor
     ref:mcrb: Key:ref:mcrb
     ref:mhs: Key:ref:mhs
@@ -6929,6 +7394,7 @@ en:
     ref:minvskaddress: Key:ref:minvskaddress
     ref:mise: Key:ref:mise
     ref:mobil-parken.de: Key:ref:mobil-parken.de
+    ref:msal: Key:ref:msal
     ref:nid: Key:ref:nid
     ref:nrhp: Key:ref:nrhp
     ref:ortsnetz: Key:ref:ortsnetz
@@ -6947,12 +7413,18 @@ en:
     ref:se:scb: Key:ref:se:scb
     ref:seedcode: Key:ref:seedcode
     ref:shop:num: Key:ref:shop:num
+    ref:signed: Key:ref:signed
     ref:sitp: Key:ref:sitp
+    ref:sprockhoff: Key:ref:sprockhoff
     ref:sr:maticni_broj: Key:ref:sr:maticni broj
     ref:ssb_tettsted: Key:ref:ssb tettsted
     ref:statistical: Key:ref:statistical
+    ref:syc: Key:ref:syc
     ref:taskey: Key:ref:taskey
+    ref:temples.ru: Key:ref:temples.ru
+    ref:thc: Key:ref:thc
     ref:udir_nsr: Key:ref:udir nsr
+    ref:us:ny:swis: Key:ref:us:ny:swis
     ref:vatin: Key:ref:vatin
     ref:vatin:hu: Key:ref:vatin:hu
     ref:vorwahl: Key:ref:vorwahl
@@ -6967,6 +7439,8 @@ en:
     reference_point: Key:reference point
     reg_name: Key:reg name
     reg_name:ar: Key:reg name:ar
+    reg_name:de: Key:reg name:de
+    reg_name:es: Key:reg name:es
     reg_name:gr: Key:reg name:gr
     reg_name:grc: Key:reg name:grc
     reg_ref: Key:reg ref
@@ -7011,7 +7485,10 @@ en:
     roller_coaster: Key:roller coaster
     roof:colour: Key:roof:colour
     roof:direction: Key:roof:direction
+    roof:height: Key:roof:height
+    roof:levels: Key:roof:levels
     roof:material: Key:roof:material
+    roof:orientation: Key:roof:orientation
     roof:ridge: Key:roof:ridge
     roof:shape: Key:roof:shape
     room: Key:room
@@ -7049,7 +7526,9 @@ en:
     safety_rope: Key:safety rope
     safety_rope_side: Key:safety rope side
     sagns_id: Key:sagns id
+    sailboat: Key:sailboat
     salt: Key:salt
+    sample_collection: Key:sample collection
     sanitary_dump_station: Key:sanitary dump station
     sauna: Key:sauna
     sauna:fuel: Key:sauna:fuel
@@ -7058,30 +7537,81 @@ en:
     sauna:water:description: Key:sauna:water:description
     scenic: Key:scenic
     school: Key:school
+    'school:': 'Key:school:'
+    school:boarding: Key:school:boarding
+    school:federation:name: Key:school:federation:name
     school:gender: Key:school:gender
+    school:language: Key:school:language
+    school:selective: Key:school:selective
+    school:trust: Key:school:trust
+    school:trust:name: Key:school:trust:name
+    school:trust:type: Key:school:trust:type
+    school:type: Key:school:type
+    screen: Key:screen
     scuba_diving:courses: Key:scuba diving:courses
     scuba_diving:rental: Key:scuba diving:rental
     sculpture_type: Key:sculpture type
     seamark: Key:seamark
+    seamark:beacon_cardinal:category: Key:seamark:beacon cardinal:category
+    seamark:beacon_cardinal:colour: Key:seamark:beacon cardinal:colour
+    seamark:beacon_cardinal:colour_pattern: Key:seamark:beacon cardinal:colour pattern
+    seamark:beacon_cardinal:shape: Key:seamark:beacon cardinal:shape
+    seamark:beacon_isolated_danger:colour: Key:seamark:beacon isolated danger:colour
+    seamark:beacon_isolated_danger:colour_pattern: Key:seamark:beacon isolated danger:colour
+      pattern
     seamark:beacon_isolated_danger:shape: Key:seamark:beacon isolated danger:shape
+    seamark:beacon_lateral:category: Key:seamark:beacon lateral:category
+    seamark:beacon_lateral:colour: Key:seamark:beacon lateral:colour
+    seamark:beacon_lateral:colour_pattern: Key:seamark:beacon lateral:colour pattern
+    seamark:beacon_lateral:reflectivity: Key:seamark:beacon lateral:reflectivity
+    seamark:beacon_lateral:shape: Key:seamark:beacon lateral:shape
+    seamark:beacon_lateral:system: Key:seamark:beacon lateral:system
     seamark:beacon_safe_water:colour: Key:seamark:beacon safe water:colour
     seamark:beacon_safe_water:colour_pattern: Key:seamark:beacon safe water:colour
       pattern
     seamark:beacon_safe_water:shape: Key:seamark:beacon safe water:shape
+    seamark:beacon_special_purpose:category: Key:seamark:beacon special purpose:category
+    seamark:beacon_special_purpose:colour_pattern: Key:seamark:beacon special purpose:colour
+      pattern
+    seamark:beacon_special_purpose:height: Key:seamark:beacon special purpose:height
+    seamark:beacon_special_purpose:shape: Key:seamark:beacon special purpose:shape
+    seamark:berth:category: Key:seamark:berth:category
+    seamark:berth:class: Key:seamark:berth:class
     seamark:bridge:category: Key:seamark:bridge:category
     seamark:bridge:clearance_height: Key:seamark:bridge:clearance height
     seamark:bridge:clearance_height_closed: Key:seamark:bridge:clearance height closed
     seamark:bridge:clearance_height_open: Key:seamark:bridge:clearance height open
     seamark:bridge:clearance_width: Key:seamark:bridge:clearance width
+    seamark:buoy_cardinal:category: Key:seamark:buoy cardinal:category
+    seamark:buoy_cardinal:colour: Key:seamark:buoy cardinal:colour
+    seamark:buoy_cardinal:colour_pattern: Key:seamark:buoy cardinal:colour pattern
+    seamark:buoy_cardinal:shape: Key:seamark:buoy cardinal:shape
+    seamark:buoy_installation:category: Key:seamark:buoy installation:category
+    seamark:buoy_isolated_danger:colour: Key:seamark:buoy isolated danger:colour
+    seamark:buoy_isolated_danger:colour_pattern: Key:seamark:buoy isolated danger:colour
+      pattern
+    seamark:buoy_isolated_danger:shape: Key:seamark:buoy isolated danger:shape
+    seamark:buoy_lateral:category: Key:seamark:buoy lateral:category
+    seamark:buoy_lateral:colour: Key:seamark:buoy lateral:colour
     seamark:buoy_lateral:reflectivity: Key:seamark:buoy lateral:reflectivity
+    seamark:buoy_lateral:shape: Key:seamark:buoy lateral:shape
+    seamark:buoy_lateral:system: Key:seamark:buoy lateral:system
+    seamark:buoy_safe_water:colour: Key:seamark:buoy safe water:colour
+    seamark:buoy_safe_water:colour_pattern: Key:seamark:buoy safe water:colour pattern
+    seamark:buoy_safe_water:shape: Key:seamark:buoy safe water:shape
+    seamark:buoy_special_purpose:category: Key:seamark:buoy special purpose:category
+    seamark:buoy_special_purpose:colour: Key:seamark:buoy special purpose:colour
     seamark:buoy_special_purpose:reflectivity: Key:seamark:buoy special purpose:reflectivity
+    seamark:buoy_special_purpose:shape: Key:seamark:buoy special purpose:shape
     seamark:cable_overhead:category: Key:seamark:cable overhead:category
+    seamark:cable_overhead:clearance_height_safe: Key:seamark:cable overhead:clearance
+      height safe
     seamark:cable_overhead:vertical_clearance_safe: Key:seamark:cable overhead:vertical
       clearance safe
     seamark:cable_submarine:category: Key:seamark:cable submarine:category
     seamark:conspicuity: Key:seamark:conspicuity
+    seamark:crane:category: Key:seamark:crane:category
     seamark:distance_mark:category: Key:seamark:distance mark:category
-    seamark:distance_mark:distance: Key:seamark:distance mark:distance
     seamark:distance_mark:height_units: Key:seamark:distance mark:height units
     seamark:distance_mark:units: Key:seamark:distance mark:units
     seamark:fixme: Key:seamark:fixme
@@ -7095,23 +7625,88 @@ en:
     seamark:gate:category: Key:seamark:gate:category
     seamark:gate:clearance_height: Key:seamark:gate:clearance height
     seamark:gate:clearance_width: Key:seamark:gate:clearance width
+    seamark:harbour:category: Key:seamark:harbour:category
+    seamark:hulk:category: Key:seamark:hulk:category
     seamark:landmark:category: Key:seamark:landmark:category
     seamark:landmark:conspicuity: Key:seamark:landmark:conspicuity
     seamark:landmark:function: Key:seamark:landmark:function
+    seamark:light:1:category: Key:seamark:light:1:category
+    seamark:light:1:character: Key:seamark:light:1:character
+    seamark:light:1:colour: Key:seamark:light:1:colour
+    seamark:light:1:exhibition: Key:seamark:light:1:exhibition
+    seamark:light:1:group: Key:seamark:light:1:group
+    seamark:light:1:height: Key:seamark:light:1:height
+    seamark:light:1:orientation: Key:seamark:light:1:orientation
+    seamark:light:1:period: Key:seamark:light:1:period
+    seamark:light:1:range: Key:seamark:light:1:range
+    seamark:light:1:sector_end: Key:seamark:light:1:sector end
+    seamark:light:1:sector_start: Key:seamark:light:1:sector start
+    seamark:light:1:sequence: Key:seamark:light:1:sequence
+    seamark:light:1:visibility: Key:seamark:light:1:visibility
+    seamark:light:2:character: Key:seamark:light:2:character
+    seamark:light:2:colour: Key:seamark:light:2:colour
+    seamark:light:2:exhibition: Key:seamark:light:2:exhibition
+    seamark:light:2:group: Key:seamark:light:2:group
+    seamark:light:2:height: Key:seamark:light:2:height
+    seamark:light:2:orientation: Key:seamark:light:2:orientation
+    seamark:light:2:period: Key:seamark:light:2:period
+    seamark:light:2:range: Key:seamark:light:2:range
+    seamark:light:2:sector_end: Key:seamark:light:2:sector end
+    seamark:light:2:sector_start: Key:seamark:light:2:sector start
+    seamark:light:2:sequence: Key:seamark:light:2:sequence
+    seamark:light:2:visibility: Key:seamark:light:2:visibility
+    seamark:light:3:character: Key:seamark:light:3:character
+    seamark:light:3:colour: Key:seamark:light:3:colour
+    seamark:light:3:exhibition: Key:seamark:light:3:exhibition
+    seamark:light:3:group: Key:seamark:light:3:group
+    seamark:light:3:height: Key:seamark:light:3:height
+    seamark:light:3:orientation: Key:seamark:light:3:orientation
+    seamark:light:3:period: Key:seamark:light:3:period
+    seamark:light:3:range: Key:seamark:light:3:range
+    seamark:light:3:sector_end: Key:seamark:light:3:sector end
+    seamark:light:3:sector_start: Key:seamark:light:3:sector start
+    seamark:light:3:sequence: Key:seamark:light:3:sequence
+    seamark:light:3:visibility: Key:seamark:light:3:visibility
+    seamark:light:category: Key:seamark:light:category
+    seamark:light:character: Key:seamark:light:character
+    seamark:light:colour: Key:seamark:light:colour
     seamark:light:exhibition: Key:seamark:light:exhibition
     seamark:light:range: Key:seamark:light:range
+    seamark:light:sector_end: Key:seamark:light:sector end
+    seamark:light:sector_start: Key:seamark:light:sector start
     seamark:light:status: Key:seamark:light:status
     seamark:light:visibility: Key:seamark:light:visibility
+    seamark:light_float:colour: Key:seamark:light float:colour
+    seamark:light_float:colour_pattern: Key:seamark:light float:colour pattern
     seamark:light_vessel:colour: Key:seamark:light vessel:colour
+    seamark:marine_farm:category: Key:seamark:marine farm:category
+    seamark:mooring:shape: Key:seamark:mooring:shape
     seamark:name: Key:seamark:name
+    seamark:notice:1:category: Key:seamark:notice:1:category
+    seamark:notice:1:function: Key:seamark:notice:1:function
+    seamark:notice:2:category: Key:seamark:notice:2:category
+    seamark:notice:2:function: Key:seamark:notice:2:function
+    seamark:notice:3:category: Key:seamark:notice:3:category
+    seamark:notice:addition: Key:seamark:notice:addition
+    seamark:notice:category: Key:seamark:notice:category
+    seamark:notice:direction: Key:seamark:notice:direction
+    seamark:notice:function: Key:seamark:notice:function
+    seamark:notice:impact: Key:seamark:notice:impact
+    seamark:notice:orientation: Key:seamark:notice:orientation
+    seamark:notice:system: Key:seamark:notice:system
     seamark:obstruction:category: Key:seamark:obstruction:category
+    seamark:obstruction:depth: Key:seamark:obstruction:depth
+    seamark:obstruction:water_level: Key:seamark:obstruction:water level
+    seamark:pile:category: Key:seamark:pile:category
     seamark:pilot_boarding:category: Key:seamark:pilot boarding:category
+    seamark:pilot_boarding:channel: Key:seamark:pilot boarding:channel
     seamark:pipeline_submarine:category: Key:seamark:pipeline submarine:category
     seamark:pipeline_submarine:name: Key:seamark:pipeline submarine:name
     seamark:pipeline_submarine:product: Key:seamark:pipeline submarine:product
     seamark:platform:category: Key:seamark:platform:category
+    seamark:platform:construction: Key:seamark:platform:construction
+    seamark:production_area:category: Key:seamark:production area:category
     seamark:radar_reflector: Key:seamark:radar reflector
-    seamark:radar_station:category: Key:seamark:radar station:category
     seamark:radar_station:channel: Key:seamark:radar station:channel
     seamark:radar_transponder:category: Key:seamark:radar transponder:category
     seamark:radar_transponder:group: Key:seamark:radar transponder:group
@@ -7121,6 +7716,7 @@ en:
     seamark:radar_transponder:sector_start: Key:seamark:radar transponder:sector start
     seamark:radar_transponder:sequence: Key:seamark:radar transponder:sequence
     seamark:radar_transponder:wavelength: Key:seamark:radar transponder:wavelength
+    seamark:radio_station:category: Key:seamark:radio station:category
     seamark:radio_station:group: Key:seamark:radio station:group
     seamark:reflectivity: Key:seamark:reflectivity
     seamark:restricted_area:category: Key:seamark:restricted area:category
@@ -7130,8 +7726,15 @@ en:
     seamark:sea_area:category: Key:seamark:sea area:category
     seamark:seabed_area:surface: Key:seamark:seabed area:surface
     seamark:shoreline_construction:category: Key:seamark:shoreline construction:category
+    seamark:shoreline_construction:construction: Key:seamark:shoreline construction:construction
+    seamark:signal_station_traffic:category: Key:seamark:signal station traffic:category
     seamark:small_craft_facility:category: Key:seamark:small craft facility:category
+    seamark:topmark:colour: Key:seamark:topmark:colour
+    seamark:topmark:colour_pattern: Key:seamark:topmark:colour pattern
+    seamark:topmark:shape: Key:seamark:topmark:shape
     seamark:type: Key:seamark:type
+    seamark:waterway_gauge:category: Key:seamark:waterway gauge:category
+    seamark:wreck:category: Key:seamark:wreck:category
     seasonal: Key:seasonal
     seasonal:snowfall:regaintime: Key:seasonal:snowfall:regaintime
     seats: Key:seats
@@ -7141,6 +7744,7 @@ en:
     self_service: Key:self service
     sells:tobacco: Key:sells:tobacco
     service: Key:service
+    service:bicycle: Key:service:bicycle
     service:bicycle:cleaning: Key:service:bicycle:cleaning
     service:bicycle:diy: Key:service:bicycle:diy
     service:bicycle:ebike: Key:service:bicycle:ebike
@@ -7152,6 +7756,7 @@ en:
     service:vehicle: Key:service:vehicle
     service:vehicle:lpg: Key:service:vehicle:lpg
     service_times: Key:service times
+    seveso: Key:seveso
     shade: Key:shade
     share_taxi: Key:share taxi
     shelter: Key:shelter
@@ -7162,14 +7767,22 @@ en:
     shop: Key:shop
     short_name: Key:short name
     short_name:ar: Key:short name:ar
+    short_name:arc: Key:short name:arc
     short_name:azb: Key:short name:azb
     short_name:ckb: Key:short name:ckb
+    short_name:de: Key:short name:de
+    short_name:es: Key:short name:es
     short_name:fa: Key:short name:fa
+    short_name:gr: Key:short name:gr
+    short_name:grc: Key:short name:grc
+    short_name:pl: Key:short name:pl
+    short_name:syc: Key:short name:syc
     short_name:ug: Key:short name:ug
     short_name:ur: Key:short name:ur
     shoulder: Key:shoulder
     shower: Key:shower
     shrine: Key:shrine
+    shrubbery:density: Key:shrubbery:density
     side_road: Key:side road
     sides: Key:sides
     sidewalk: Key:sidewalk
@@ -7192,7 +7805,6 @@ en:
     site_type: Key:site type
     size: Key:size
     ski: Key:ski
-    ski_tour_difficulty: Key:ski tour difficulty
     sl_realtime: Key:sl realtime
     sl_stop_id: Key:sl stop id
     sloped_curb: Key:sloped curb
@@ -7206,6 +7818,7 @@ en:
     snowplowing: Key:snowplowing
     snowplowing:category: Key:snowplowing:category
     snowplowing:operator: Key:snowplowing:operator
+    snowshoe: Key:snowshoe
     social_facility: Key:social facility
     social_facility:for: Key:social facility:for
     socket: Key:socket
@@ -7213,6 +7826,7 @@ en:
     socket:schuko: Key:socket:schuko
     socket:type1: Key:socket:type1
     socket:type2: Key:socket:type2
+    socket:type2:output: Key:socket:type2:output
     socket:type3: Key:socket:type3
     socket:type3c: Key:socket:type3c
     socket:typee: Key:socket:typee
@@ -7222,6 +7836,8 @@ en:
     sorting_name:arc: Key:sorting name:arc
     sorting_name:azb: Key:sorting name:azb
     sorting_name:be: Key:sorting name:be
+    sorting_name:de: Key:sorting name:de
+    sorting_name:es: Key:sorting name:es
     sorting_name:fa: Key:sorting name:fa
     sorting_name:gr: Key:sorting name:gr
     sorting_name:grc: Key:sorting name:grc
@@ -7233,22 +7849,52 @@ en:
     source: Key:source
     source:ProRail: Key:source:ProRail
     source:addr: Key:source:addr
+    source:addr:date: Key:source:addr:date
+    source:addr:housenumber: Key:source:addr:housenumber
+    source:addr:housenumber:ref: Key:source:addr:housenumber:ref
     source:addr:postcode: Key:source:addr:postcode
+    source:addr:version: Key:source:addr:version
+    source:address: Key:source:address
+    source:alt_name: Key:source:alt name
     source:ar: Key:source:ar
     source:area: Key:source:area
+    source:bicycle: Key:source:bicycle
+    source:bridge: Key:source:bridge
     source:building: Key:source:building
     source:conscriptionnumber: Key:source:conscriptionnumber
+    source:damage: Key:source:damage
+    source:data: Key:source:data
     source:date: Key:source:date
+    source:description: Key:source:description
+    source:designation: Key:source:designation
     source:destination: Key:source:destination
+    source:ele: Key:source:ele
     source:en: Key:source:en
+    source:file: Key:source:file
     source:footprint: Key:source:footprint
     source:geometry: Key:source:geometry
     source:geometry:date: Key:source:geometry:date
+    source:geometry:oidn: Key:source:geometry:oidn
     source:geometry:ref: Key:source:geometry:ref
+    source:geometry:version: Key:source:geometry:version
+    source:height: Key:source:height
+    source:heritage: Key:source:heritage
+    source:hgv: Key:source:hgv
+    source:hgv:national_network: Key:source:hgv:national network
+    source:hgv:state_network: Key:source:hgv:state network
+    source:highway: Key:source:highway
+    source:highway_authority_ref: Key:source:highway authority ref
+    source:highway_classification: Key:source:highway classification
+    source:housenumber: Key:source:housenumber
+    source:id: Key:source:id
     source:imagery: Key:source:imagery
     source:ja: Key:source:ja
+    source:lake: Key:source:lake
     source:lanes: Key:source:lanes
+    source:lit: Key:source:lit
     source:loc: Key:source:loc
+    source:location: Key:source:location
+    source:maxaxleload: Key:source:maxaxleload
     source:maxspeed: Key:source:maxspeed
     source:maxspeed:backward: Key:source:maxspeed:backward
     source:maxspeed:forward: Key:source:maxspeed:forward
@@ -7256,17 +7902,39 @@ en:
     source:name:ar: Key:source:name:ar
     source:name:br: Key:source:name:br
     source:name:date: Key:source:name:date
+    source:name:oc: Key:source:name:oc
+    source:old_name: Key:source:old name
+    source:old_ref:fap: Key:source:old ref:fap
     source:oneway: Key:source:oneway
     source:outline: Key:source:outline
+    source:pkey: Key:source:pkey
     source:population: Key:source:population
     source:position: Key:source:position
+    source:postal_code: Key:source:postal code
     source:postcode: Key:source:postcode
+    source:power: Key:source:power
+    source:prow_ref: Key:source:prow ref
     source:ref: Key:source:ref
+    source:ro: Key:source:ro
     source:shape: Key:source:shape
+    source:street: Key:source:street
+    source:streetnumber: Key:source:streetnumber
+    source:surface: Key:source:surface
     source:taxon: Key:source:taxon
     source:tracer: Key:source:tracer
+    source:url: Key:source:url
+    source:user: Key:source:user
+    source:version: Key:source:version
+    source:wfs: Key:source:wfs
+    source:wheelchair: Key:source:wheelchair
+    source:width: Key:source:width
     source:zoomlevel: Key:source:zoomlevel
+    source_date: Key:source date
     source_ref: Key:source ref
+    source_ref:name: Key:source ref:name
+    source_ref:url: Key:source ref:url
+    source_type_imagery: Key:source type imagery
+    spacing: Key:spacing
     species: Key:species
     species:FR: Key:species:FR
     species:ar: Key:species:ar
@@ -7288,19 +7956,25 @@ en:
     speisebezirk: Key:speisebezirk
     sport: Key:sport
     sqkm: Key:sqkm
+    ssvz: Key:ssvz
+    stage_door: Key:stage door
     stairs: Key:stairs
     stamps: Key:stamps
+    standing: Key:standing
     stars: Key:stars
     start_date: Key:start date
     state: Key:state
     station: Key:station
+    statue: Key:statue
     status: Key:status
     step:contrast: Key:step:contrast
     step_count: Key:step count
     steps: Key:steps
     stile: Key:stile
+    stilts: Key:stilts
     stone_type: Key:stone type
     stop: Key:stop
+    stop:direction: Key:stop:direction
     stop_id: Key:stop id
     storage_area: Key:storage area
     stove: Key:stove
@@ -7324,6 +7998,7 @@ en:
     support:notinsel: Key:support:notinsel
     surface: Key:surface
     surface:grade: Key:surface:grade
+    surface:note: Key:surface:note
     surveillance: Key:surveillance
     surveillance:type: Key:surveillance:type
     surveillance:zone: Key:surveillance:zone
@@ -7333,6 +8008,7 @@ en:
     survey_point:structure: Key:survey point:structure
     sustrans_ref: Key:sustrans ref
     swimming: Key:swimming
+    swimming_lanes: Key:swimming lanes
     swimming_pool: Key:swimming pool
     switch: Key:switch
     symbol: Key:symbol
@@ -7353,10 +8029,12 @@ en:
     tailor:bespoke_tailoring: Key:tailor:bespoke tailoring
     takeaway: Key:takeaway
     tank: Key:tank
+    tank_cleaning_truck: Key:tank cleaning truck
     tank_trap: Key:tank trap
     target: Key:target
     taxi: Key:taxi
     taxon: Key:taxon
+    taxon:wikidata: Key:taxon:wikidata
     technical_type: Key:technical type
     technology: Key:technology
     telecom: Key:telecom
@@ -7373,6 +8051,7 @@ en:
     teryt:simc: Key:teryt:simc
     teryt:stan_na: Key:teryt:stan na
     teryt:terc: Key:teryt:terc
+    thatcher_name: Key:thatcher name
     theatre:genre: Key:theatre:genre
     theatre:type: Key:theatre:type
     theme: Key:theme
@@ -7387,6 +8066,7 @@ en:
     tiger:FUNCSTAT: Key:tiger:FUNCSTAT
     tiger:LSAD: Key:tiger:LSAD
     tiger:MTFCC: Key:tiger:MTFCC
+    tiger:NAME: Key:tiger:NAME
     tiger:PLACENS: Key:tiger:PLACENS
     tiger:cfcc: Key:tiger:cfcc
     tiger:county: Key:tiger:county
@@ -7406,6 +8086,7 @@ en:
     toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
     toll:hgv: Key:toll:hgv
+    toll:hov: Key:toll:hov
     toll:motorcycle: Key:toll:motorcycle
     tomb: Key:tomb
     topless: Key:topless
@@ -7423,11 +8104,15 @@ en:
     traffic:hourly: Key:traffic:hourly
     traffic_calming: Key:traffic calming
     traffic_sign: Key:traffic sign
+    traffic_sign:2: Key:traffic sign:2
+    traffic_sign:3: Key:traffic sign:3
+    traffic_sign:4: Key:traffic sign:4
     traffic_sign:backward: Key:traffic sign:backward
     traffic_sign:direction: Key:traffic sign:direction
     traffic_sign:forward: Key:traffic sign:forward
     traffic_signals: Key:traffic signals
     traffic_signals:arrow: Key:traffic signals:arrow
+    traffic_signals:bicycle_early_release: Key:traffic signals:bicycle early release
     traffic_signals:countdown: Key:traffic signals:countdown
     traffic_signals:direction: Key:traffic signals:direction
     traffic_signals:floor_vibration: Key:traffic signals:floor vibration
@@ -7444,9 +8129,11 @@ en:
     trailer: Key:trailer
     trailer:rental: Key:trailer:rental
     train: Key:train
+    training: Key:training
     tram: Key:tram
     transformer: Key:transformer
     transformer:devices: Key:transformer:devices
+    tree:ref: Key:tree:ref
     tree_lined: Key:tree lined
     trees: Key:trees
     trench: Key:trench
@@ -7485,11 +8172,11 @@ en:
     uir_adr:ADRESA_KOD: Key:uir adr:ADRESA KOD
     unisex: Key:unisex
     unit: Key:unit
-    unnamed: Key:unnamed
     unsigned: Key:unsigned
     unsigned_ref: Key:unsigned ref
     url: Key:url
     url:restrictions: Key:url:restrictions
+    us:ny:swis: Key:us:ny:swis
     usage: Key:usage
     user_defined_other: Key:user defined other
     utahagrc:parcelid: Key:utahagrc:parcelid
@@ -7498,12 +8185,13 @@ en:
     vacuum_cleaner: Key:vacuum cleaner
     validate:ants:yellow: Key:validate:ants:yellow
     validate:no_name: Key:validate:no name
-    validate:no_ref: Key:validate:no ref
     valve: Key:valve
     vegan: Key:vegan
     vegetarian: Key:vegetarian
     vehicle: Key:vehicle
     vehicle:conditional: Key:vehicle:conditional
+    vehicle:wikidata: Key:vehicle:wikidata
+    vehicle:wikipedia: Key:vehicle:wikipedia
     vending: Key:vending
     verge: Key:verge
     vhf: Key:vhf
@@ -7517,6 +8205,7 @@ en:
     voltage: Key:voltage
     voltage:primary: Key:voltage:primary
     voltage:secondary: Key:voltage:secondary
+    voltage:tertiary: Key:voltage:tertiary
     walk-in: Key:walk-in
     wall: Key:wall
     wall:material: Key:wall:material
@@ -7530,6 +8219,7 @@ en:
     water_system: Key:water system
     water_well: Key:water well
     waterway: Key:waterway
+    waterway:type: Key:waterway:type
     weather_protection: Key:weather protection
     website: Key:website
     website:booking: Key:website:booking
@@ -7550,14 +8240,17 @@ en:
     wikimedia_commons: Key:wikimedia commons
     wikipedia: Key:wikipedia
     wikipedia:ar: Key:wikipedia:ar
+    wikipedia:arc: Key:wikipedia:arc
     wikipedia:azb: Key:wikipedia:azb
     wikipedia:be: Key:wikipedia:be
     wikipedia:ckb: Key:wikipedia:ckb
     wikipedia:de: Key:wikipedia:de
     wikipedia:en: Key:wikipedia:en
+    wikipedia:es: Key:wikipedia:es
     wikipedia:fa: Key:wikipedia:fa
     wikipedia:fr: Key:wikipedia:fr
     wikipedia:glk: Key:wikipedia:glk
+    wikipedia:grc: Key:wikipedia:grc
     wikipedia:ks: Key:wikipedia:ks
     wikipedia:lrc: Key:wikipedia:lrc
     wikipedia:mzn: Key:wikipedia:mzn
@@ -7568,12 +8261,14 @@ en:
     wikipedia:ug: Key:wikipedia:ug
     wikipedia:ur: Key:wikipedia:ur
     windings: Key:windings
+    windings:auto: Key:windings:auto
     windings:configuration: Key:windings:configuration
     windings:primary: Key:windings:primary
     windings:secondary: Key:windings:secondary
     windings:tertiary: Key:windings:tertiary
     windmill:type: Key:windmill:type
     windmill:vanes: Key:windmill:vanes
+    window: Key:window
     wine:grape: Key:wine:grape
     wine:region: Key:wine:region
     wine:type: Key:wine:type
@@ -7583,6 +8278,7 @@ en:
     winter_room: Key:winter room
     winter_service: Key:winter service
     winter_service:gritting: Key:winter service:gritting
+    winter_service:heating: Key:winter service:heating
     winter_service:priority: Key:winter service:priority
     winter_service:salting: Key:winter service:salting
     wires: Key:wires
@@ -7591,6 +8287,7 @@ en:
     wood_available: Key:wood available
     wood_provided: Key:wood provided
     woody_species_100m: Key:woody species 100m
+    working: Key:working
     workrules: Key:workrules
     works: Key:works
     workshop: Key:workshop
@@ -7619,7 +8316,9 @@ en:
     abandoned:amenity=prison: Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: Tag:abandoned:amenity=prison camp
     abandoned=yes: Tag:abandoned=yes
+    abutters=retail: Tag:abutters=retail
     access=agricultural: Tag:access=agricultural
+    access=bdouble: Tag:access=bdouble
     access=customers: Tag:access=customers
     access=delivery: Tag:access=delivery
     access=designated: Tag:access=designated
@@ -7641,6 +8340,7 @@ en:
     actuator=hydraulic_cylinder: Tag:actuator=hydraulic cylinder
     actuator=manual: Tag:actuator=manual
     actuator=pneumatic_cylinder: Tag:actuator=pneumatic cylinder
+    addr:TW:dataset=137998: Tag:addr:TW:dataset=137998
     addr:type=water: Tag:addr:type=water
     admin_level=1: Tag:admin level=1
     admin_level=10: Tag:admin level=10
@@ -7679,6 +8379,7 @@ en:
     aerialway=platter: Tag:aerialway=platter
     aerialway=pylon: Tag:aerialway=pylon
     aerialway=rope_tow: Tag:aerialway=rope tow
+    aerialway=ropetow: Tag:aerialway=ropetow
     aerialway=station: Tag:aerialway=station
     aerialway=t-bar: Tag:aerialway=t-bar
     aerialway=zip_line: Tag:aerialway=zip line
@@ -7689,6 +8390,7 @@ en:
     aerodrome:type=private: Tag:aerodrome:type=private
     aerodrome:type=regional: Tag:aerodrome:type=regional
     aeroway=aerodrome: Tag:aeroway=aerodrome
+    aeroway=aircraft_crossing: Tag:aeroway=aircraft crossing
     aeroway=airport: Tag:aeroway=airport
     aeroway=airstrip: Tag:aeroway=airstrip
     aeroway=airtanker_base: Tag:aeroway=airtanker base
@@ -7708,14 +8410,15 @@ en:
     aeroway=parking_position: Tag:aeroway=parking position
     aeroway=runway: Tag:aeroway=runway
     aeroway=spaceport: Tag:aeroway=spaceport
+    aeroway=stopway: Tag:aeroway=stopway
     aeroway=taxilane: Tag:aeroway=taxilane
     aeroway=taxiway: Tag:aeroway=taxiway
     aeroway=terminal: Tag:aeroway=terminal
+    aeroway=tower: Tag:aeroway=tower
     aeroway=windsock: Tag:aeroway=windsock
     airmark=beacon: Tag:airmark=beacon
     ale_supply=limited: Tag:ale supply=limited
     allotments=plot: Tag:allotments=plot
-    amenity=High_school: Tag:amenity=High school
     amenity=Kneippbecken: Tag:amenity=Kneippbecken
     amenity=administration: Tag:amenity=administration
     amenity=advertising: Tag:amenity=advertising
@@ -7723,9 +8426,9 @@ en:
     amenity=ambulance_station: Tag:amenity=ambulance station
     amenity=animal_boarding: Tag:amenity=animal boarding
     amenity=animal_breeding: Tag:amenity=animal breeding
+    amenity=animal_effluent_disposal: Tag:amenity=animal effluent disposal
     amenity=animal_shelter: Tag:amenity=animal shelter
     amenity=animal_training: Tag:amenity=animal training
-    amenity=architect_office: Tag:amenity=architect office
     amenity=archive: Tag:amenity=archive
     amenity=arts_centre: Tag:amenity=arts centre
     amenity=artwork: Tag:amenity=artwork
@@ -7745,7 +8448,6 @@ en:
     amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
     amenity=biergarten: Tag:amenity=biergarten
     amenity=bike_parking: Tag:amenity=bike parking
-    amenity=bikeshed: Tag:amenity=bikeshed
     amenity=binoculars: Tag:amenity=binoculars
     amenity=bird_bath: Tag:amenity=bird bath
     amenity=blood_bank: Tag:amenity=blood bank
@@ -7782,7 +8484,6 @@ en:
     amenity=coast_guard: Tag:amenity=coast guard
     amenity=coast_radar_station: Tag:amenity=coast radar station
     amenity=college: Tag:amenity=college
-    amenity=community_center: Tag:amenity=community center
     amenity=community_centre: Tag:amenity=community centre
     amenity=compressed_air: Tag:amenity=compressed air
     amenity=concert_hall: Tag:amenity=concert hall
@@ -7810,6 +8511,7 @@ en:
     amenity=dog_toilet: Tag:amenity=dog toilet
     amenity=dog_waste_bin: Tag:amenity=dog waste bin
     amenity=dojo: Tag:amenity=dojo
+    amenity=dormitory: Tag:amenity=dormitory
     amenity=dressing_room: Tag:amenity=dressing room
     amenity=drinking_water: Tag:amenity=drinking water
     amenity=driver_training: Tag:amenity=driver training
@@ -7836,6 +8538,7 @@ en:
     amenity=food_court: Tag:amenity=food court
     amenity=food_sharing: Tag:amenity=food sharing
     amenity=fountain: Tag:amenity=fountain
+    amenity=freeshop: Tag:amenity=freeshop
     amenity=fridge: Tag:amenity=fridge
     amenity=fuel: Tag:amenity=fuel
     amenity=funeral_hall: Tag:amenity=funeral hall
@@ -7897,6 +8600,7 @@ en:
     amenity=office: Tag:amenity=office
     amenity=osmica: Tag:amenity=osmica
     amenity=outfitter: Tag:amenity=outfitter
+    amenity=parcel_locker: Tag:amenity=parcel locker
     amenity=park: Tag:amenity=park
     amenity=parking: Tag:amenity=parking
     amenity=parking_entrance: Tag:amenity=parking entrance
@@ -7931,6 +8635,7 @@ en:
     amenity=refugee_housing: Tag:amenity=refugee housing
     amenity=refugee_site: Tag:amenity=refugee site
     amenity=register_office: Tag:amenity=register office
+    amenity=relay_box: Tag:amenity=relay box
     amenity=rescue_box: Tag:amenity=rescue box
     amenity=rescue_station: Tag:amenity=rescue station
     amenity=research_institute: Tag:amenity=research institute
@@ -7942,6 +8647,7 @@ en:
     amenity=sanitary_dump_station: Tag:amenity=sanitary dump station
     amenity=sauna: Tag:amenity=sauna
     amenity=school: Tag:amenity=school
+    amenity=scooter_rental: Tag:amenity=scooter rental
     amenity=seat: Tag:amenity=seat
     amenity=shelter: Tag:amenity=shelter
     amenity=shop: Tag:amenity=shop
@@ -8020,6 +8726,7 @@ en:
     area:highway=trunk: Tag:area:highway=trunk
     area:highway=trunk_link: Tag:area:highway=trunk link
     area:highway=turning_circle: Tag:area:highway=turning circle
+    artwork_subject=sheela-na-gig: Tag:artwork subject=sheela-na-gig
     artwork_type=architecture: Tag:artwork type=architecture
     artwork_type=bust: Tag:artwork type=bust
     artwork_type=mural: Tag:artwork type=mural
@@ -8034,6 +8741,17 @@ en:
     assembly_point:tornado=yes: Tag:assembly point:tornado=yes
     assembly_point:tsunami=yes: Tag:assembly point:tsunami=yes
     athletics=cross_country: Tag:athletics=cross country
+    athletics=discus_throw: Tag:athletics=discus throw
+    athletics=hammer_throw: Tag:athletics=hammer throw
+    athletics=high_jump: Tag:athletics=high jump
+    athletics=javelin_throw: Tag:athletics=javelin throw
+    athletics=long_jump: Tag:athletics=long jump
+    athletics=pole_vault: Tag:athletics=pole vault
+    athletics=running: Tag:athletics=running
+    athletics=shot_put: Tag:athletics=shot put
+    athletics=sprint: Tag:athletics=sprint
+    athletics=steeplechase: Tag:athletics=steeplechase
+    athletics=triple_jump: Tag:athletics=triple jump
     atm=no: Tag:atm=no
     atm=yes: Tag:atm=yes
     attraction=alpine_coaster: Tag:attraction=alpine coaster
@@ -8044,11 +8762,14 @@ en:
     attraction=summer_toboggan: Tag:attraction=summer toboggan
     attraction=train: Tag:attraction=train
     attraction=water_slide: Tag:attraction=water slide
+    avalanche_protection=snow_bridge: Tag:avalanche protection=snow bridge
     baby_hatch=yes: Tag:baby hatch=yes
     bakehouse: Tag:bakehouse
     baking_oven: Tag:baking oven
     barrier=avalanche_protection: Tag:barrier=avalanche protection
     barrier=bar: Tag:barrier=bar
+    barrier=barricade: Tag:barrier=barricade
+    barrier=barrier_board: Tag:barrier=barrier board
     barrier=berm: Tag:barrier=berm
     barrier=block: Tag:barrier=block
     barrier=bollard: Tag:barrier=bollard
@@ -8062,6 +8783,7 @@ en:
     barrier=chech_hedgehog: Tag:barrier=chech hedgehog
     barrier=chicane: Tag:barrier=chicane
     barrier=city_wall: Tag:barrier=city wall
+    barrier=coupure: Tag:barrier=coupure
     barrier=cycle_barrier: Tag:barrier=cycle barrier
     barrier=czech_hedgehog: Tag:barrier=czech hedgehog
     barrier=debris: Tag:barrier=debris
@@ -8069,6 +8791,7 @@ en:
     barrier=embankment: Tag:barrier=embankment
     barrier=entrance: Tag:barrier=entrance
     barrier=fence: Tag:barrier=fence
+    barrier=foldable_pie_slice: Tag:barrier=foldable pie slice
     barrier=full-height_turnstile: Tag:barrier=full-height turnstile
     barrier=gate: Tag:barrier=gate
     barrier=guard_rail: Tag:barrier=guard rail
@@ -8094,8 +8817,10 @@ en:
     barrier=rope: Tag:barrier=rope
     barrier=sally_port: Tag:barrier=sally port
     barrier=select_acces: Tag:barrier=select acces
+    barrier=sliding_beam: Tag:barrier=sliding beam
     barrier=sliding_gate: Tag:barrier=sliding gate
     barrier=spikes: Tag:barrier=spikes
+    barrier=steeplechase_jump: Tag:barrier=steeplechase jump
     barrier=step: Tag:barrier=step
     barrier=stile: Tag:barrier=stile
     barrier=sump_buster: Tag:barrier=sump buster
@@ -8132,6 +8857,8 @@ en:
     bicycle=dismount: Tag:bicycle=dismount
     bicycle=no: Tag:bicycle=no
     bicycle=official: Tag:bicycle=official
+    bicycle=optional_sidepath: Tag:bicycle=optional sidepath
+    bicycle=permissive: Tag:bicycle=permissive
     bicycle=private: Tag:bicycle=private
     bicycle=use_sidepath: Tag:bicycle=use sidepath
     bicycle=yes: Tag:bicycle=yes
@@ -8146,7 +8873,11 @@ en:
     boat:type=pedalo: Tag:boat:type=pedalo
     boat:type=rowing: Tag:boat:type=rowing
     boat:type=sailing: Tag:boat:type=sailing
+    books=comic: Tag:books=comic
+    books=textbook: Tag:books=textbook
     border_type=harbour_limits: Tag:border type=harbour limits
+    border_type=nation: Tag:border type=nation
+    border_zone=5km_zone: Tag:border zone=5km zone
     boules=bocce: Tag:boules=bocce
     boules=boule_de_fort: Tag:boules=boule de fort
     boules=breton: Tag:boules=breton
@@ -8154,9 +8885,15 @@ en:
     boules=petanque: Tag:boules=petanque
     boundary=aboriginal_lands: Tag:boundary=aboriginal lands
     boundary=administrative: Tag:boundary=administrative
+    boundary=administrative_cooperation: Tag:boundary=administrative cooperation
+    boundary=border_zone: Tag:boundary=border zone
     boundary=census: Tag:boundary=census
     boundary=civil: Tag:boundary=civil
+    boundary=disputed: Tag:boundary=disputed
     boundary=economic: Tag:boundary=economic
+    boundary=enclave: Tag:boundary=enclave
+    boundary=exclave: Tag:boundary=exclave
+    boundary=forest: Tag:boundary=forest
     boundary=forest_compartment: Tag:boundary=forest compartment
     boundary=forestry_compartment: Tag:boundary=forestry compartment
     boundary=hazard: Tag:boundary=hazard
@@ -8180,11 +8917,14 @@ en:
     boundary=vice_county: Tag:boundary=vice county
     boundary=waste_collection: Tag:boundary=waste collection
     boundary=water_protection_area: Tag:boundary=water protection area
+    brand=Deutsche_Post: Tag:brand=Deutsche Post
+    brand=Eroski: Tag:brand=Eroski
     brand=Harley-Davidson: Tag:brand=Harley-Davidson
     brand=KTM: Tag:brand=KTM
     brand=Louis_Motorrad: Tag:brand=Louis Motorrad
     brand=Moto_Guzzi: Tag:brand=Moto Guzzi
     brand=Polo_Motorrad: Tag:brand=Polo Motorrad
+    brand=Spar: Tag:brand=Spar
     brand=Triumph: Tag:brand=Triumph
     brand=Zero: Tag:brand=Zero
     bridge:movable=bascule: Tag:bridge:movable=bascule
@@ -8217,6 +8957,7 @@ en:
     bridge=simple_brunnel: Tag:bridge=simple brunnel
     bridge=trestle: Tag:bridge=trestle
     bridge=viaduct: Tag:bridge=viaduct
+    building:part=porch: Tag:building:part=porch
     building:use=stable: Tag:building:use=stable
     building=*: Tag:building=*
     building=Y: Tag:building=Y
@@ -8226,6 +8967,7 @@ en:
     building=bakehouse: Tag:building=bakehouse
     building=barn: Tag:building=barn
     building=barracks: Tag:building=barracks
+    building=beach_hut: Tag:building=beach hut
     building=boathouse: Tag:building=boathouse
     building=brewery: Tag:building=brewery
     building=bridge: Tag:building=bridge
@@ -8249,6 +8991,7 @@ en:
     building=container: Tag:building=container
     building=convent: Tag:building=convent
     building=cowshed: Tag:building=cowshed
+    building=data_center: Tag:building=data center
     building=demountable: Tag:building=demountable
     building=detached: Tag:building=detached
     building=digester: Tag:building=digester
@@ -8273,6 +9016,8 @@ en:
     building=grandstand: Tag:building=grandstand
     building=greenhouse: Tag:building=greenhouse
     building=ground_station: Tag:building=ground station
+    building=guard_post: Tag:building=guard post
+    building=gurdwara: Tag:building=gurdwara
     building=hangar: Tag:building=hangar
     building=hospital: Tag:building=hospital
     building=hotel: Tag:building=hotel
@@ -8281,7 +9026,9 @@ en:
     building=hut: Tag:building=hut
     building=industrial: Tag:building=industrial
     building=kindergarten: Tag:building=kindergarten
+    building=kingdom_hall: Tag:building=kingdom hall
     building=kiosk: Tag:building=kiosk
+    building=lighthouse: Tag:building=lighthouse
     building=manufacture: Tag:building=manufacture
     building=marquee: Tag:building=marquee
     building=military: Tag:building=military
@@ -8289,14 +9036,18 @@ en:
     building=mosque: Tag:building=mosque
     building=museum: Tag:building=museum
     building=office: Tag:building=office
+    building=outbuilding: Tag:building=outbuilding
+    building=pagoda: Tag:building=pagoda
     building=palace: Tag:building=palace
     building=parking: Tag:building=parking
     building=pavilion: Tag:building=pavilion
     building=planned: Tag:building=planned
+    building=porch: Tag:building=porch
     building=presbytery: Tag:building=presbytery
     building=proposed: Tag:building=proposed
     building=public: Tag:building=public
     building=quonset_hut: Tag:building=quonset hut
+    building=railway: Tag:building=railway
     building=religious: Tag:building=religious
     building=remote_digital_terminal: Tag:building=remote digital terminal
     building=residential: Tag:building=residential
@@ -8304,6 +9055,7 @@ en:
     building=riding_hall: Tag:building=riding hall
     building=roof: Tag:building=roof
     building=roundhouse: Tag:building=roundhouse
+    building=row_houses: Tag:building=row houses
     building=ruins: Tag:building=ruins
     building=school: Tag:building=school
     building=semi: Tag:building=semi
@@ -8344,6 +9096,7 @@ en:
     building=warehouse: Tag:building=warehouse
     building=water_tower: Tag:building=water tower
     building=wayside_shrine: Tag:building=wayside shrine
+    building=windmill: Tag:building=windmill
     building=yes: Tag:building=yes
     bunker_type=gun_emplacement: Tag:bunker type=gun emplacement
     bunker_type=hardened_aircraft_shelter: Tag:bunker type=hardened aircraft shelter
@@ -8363,6 +9116,12 @@ en:
     busway=opposite_lane: Tag:busway=opposite lane
     by_night=only: Tag:by night=only
     cabin:rental=yes: Tag:cabin:rental=yes
+    cadet=ambulance: Tag:cadet=ambulance
+    cadet=emergency_services: Tag:cadet=emergency services
+    cadet=fire: Tag:cadet=fire
+    cadet=lifeguard: Tag:cadet=lifeguard
+    cadet=military: Tag:cadet=military
+    cadet=police: Tag:cadet=police
     cafe=time-cafe: Tag:cafe=time-cafe
     cafe=time_cafe: Tag:cafe=time cafe
     camp_site=basic: Tag:camp site=basic
@@ -8380,6 +9139,8 @@ en:
     car:type=hgv: Tag:car:type=hgv
     car=no: Tag:car=no
     car=yes: Tag:car=yes
+    cargo=container: Tag:cargo=container
+    cargo=liquid_bulk: Tag:cargo=liquid bulk
     carpenter=joiner: Tag:carpenter=joiner
     castle_type=castrum: Tag:castle type=castrum
     castle_type=defensive: Tag:castle type=defensive
@@ -8389,6 +9150,7 @@ en:
     castle_type=palace: Tag:castle type=palace
     castle_type=shiro: Tag:castle type=shiro
     castle_type=stately: Tag:castle type=stately
+    cemetery=cillín: Tag:cemetery=cillín
     cemetery=grave: Tag:cemetery=grave
     cemetery=sector: Tag:cemetery=sector
     cemetery=war_cemetery: Tag:cemetery=war cemetery
@@ -8407,6 +9169,7 @@ en:
     club=amateur_radio: Tag:club=amateur radio
     club=automobile: Tag:club=automobile
     club=bicycle: Tag:club=bicycle
+    club=cadet: Tag:club=cadet
     club=card_games: Tag:club=card games
     club=chess: Tag:club=chess
     club=fan: Tag:club=fan
@@ -8414,6 +9177,7 @@ en:
     club=freemasonry: Tag:club=freemasonry
     club=golf: Tag:club=golf
     club=linux: Tag:club=linux
+    club=military_cadets: Tag:club=military cadets
     club=motorcycle: Tag:club=motorcycle
     club=music: Tag:club=music
     club=nudism: Tag:club=nudism
@@ -8427,14 +9191,26 @@ en:
     coastline:survey_quality=complete: Tag:coastline:survey quality=complete
     coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
     collection_times:signed=no: Tag:collection times:signed=no
+    communication:television=dvb-t: Tag:communication:television=dvb-t
+    communication:television=dvb-t2: Tag:communication:television=dvb-t2
     communication=line: Tag:communication=line
     communication=mobile_phone: Tag:communication=mobile phone
     community_centre=club_home: Tag:community centre=club home
     community_centre=youth_centre: Tag:community centre=youth centre
     company=aerospace: Tag:company=aerospace
+    company=internet_shop: Tag:company=internet shop
     company=it: Tag:company=it
     company=logistics: Tag:company=logistics
     company=software_development: Tag:company=software development
+    compensator=filter: Tag:compensator=filter
+    compensator=series_capacitor: Tag:compensator=series capacitor
+    compensator=series_reactor: Tag:compensator=series reactor
+    compensator=shunt_capacitor: Tag:compensator=shunt capacitor
+    compensator=shunt_reactor: Tag:compensator=shunt reactor
+    compensator=statcom: Tag:compensator=statcom
+    compensator=static_var: Tag:compensator=static var
+    compensator=synchronous_condenser: Tag:compensator=synchronous condenser
+    compensator=voltage_regulator: Tag:compensator=voltage regulator
     construction:power=plant: Tag:construction:power=plant
     construction=shed: Tag:construction=shed
     construction=yes: Tag:construction=yes
@@ -8442,10 +9218,15 @@ en:
     consulate=consular_office: Tag:consulate=consular office
     consulate=consulate_general: Tag:consulate=consulate general
     consulate=honorary_consul: Tag:consulate=honorary consul
+    consulate=residence: Tag:consulate=residence
     consulate=yes: Tag:consulate=yes
     content=hot_water: Tag:content=hot water
+    content=slurry: Tag:content=slurry
+    cooling:method=air_cooling: Tag:cooling:method=air cooling
     cooling:method=dry_cooling: Tag:cooling:method=dry cooling
     cooling:method=mechanical_draft: Tag:cooling:method=mechanical draft
+    covered=no: Tag:covered=no
+    covered=yes: Tag:covered=yes
     craft=agricultural_engines: Tag:craft=agricultural engines
     craft=atelier: Tag:craft=atelier
     craft=bag_repair: Tag:craft=bag repair
@@ -8540,6 +9321,7 @@ en:
     craft=upholsterer: Tag:craft=upholsterer
     craft=watchmaker: Tag:craft=watchmaker
     craft=water_well_drilling: Tag:craft=water well drilling
+    craft=weaver: Tag:craft=weaver
     craft=welder: Tag:craft=welder
     craft=window_construction: Tag:craft=window construction
     craft=winery: Tag:craft=winery
@@ -8582,40 +9364,70 @@ en:
     crossing=unknown: Tag:crossing=unknown
     crossing=unmarked: Tag:crossing=unmarked
     crossing=zebra: Tag:crossing=zebra
+    crossing_ref=delineated: Tag:crossing ref=delineated
     crossing_ref=zebra: Tag:crossing ref=zebra
+    cuisine=american: Tag:cuisine=american
+    cuisine=asian: Tag:cuisine=asian
     cuisine=barbecue: Tag:cuisine=barbecue
     cuisine=brazilian: Tag:cuisine=brazilian
     cuisine=brunch: Tag:cuisine=brunch
     cuisine=bubble_tea: Tag:cuisine=bubble tea
     cuisine=burger: Tag:cuisine=burger
+    cuisine=catalan: Tag:cuisine=catalan
     cuisine=chicken: Tag:cuisine=chicken
+    cuisine=chinese: Tag:cuisine=chinese
     cuisine=coffee_shop: Tag:cuisine=coffee shop
+    cuisine=couscous: Tag:cuisine=couscous
+    cuisine=crepe: Tag:cuisine=crepe
+    cuisine=curry: Tag:cuisine=curry
     cuisine=dessert: Tag:cuisine=dessert
     cuisine=donut: Tag:cuisine=donut
     cuisine=dumplings: Tag:cuisine=dumplings
     cuisine=empanada: Tag:cuisine=empanada
+    cuisine=fish: Tag:cuisine=fish
     cuisine=fish_and_chips: Tag:cuisine=fish and chips
+    cuisine=french: Tag:cuisine=french
     cuisine=friture: Tag:cuisine=friture
+    cuisine=german: Tag:cuisine=german
+    cuisine=greek: Tag:cuisine=greek
     cuisine=hot_dog: Tag:cuisine=hot dog
+    cuisine=hot_pot: Tag:cuisine=hot pot
     cuisine=ice_cream: Tag:cuisine=ice cream
+    cuisine=indian: Tag:cuisine=indian
+    cuisine=italian: Tag:cuisine=italian
+    cuisine=japanese: Tag:cuisine=japanese
     cuisine=kebab: Tag:cuisine=kebab
+    cuisine=korean: Tag:cuisine=korean
+    cuisine=mediterranean: Tag:cuisine=mediterranean
+    cuisine=mexican: Tag:cuisine=mexican
+    cuisine=noodle: Tag:cuisine=noodle
+    cuisine=pakistani: Tag:cuisine=pakistani
+    cuisine=pancake: Tag:cuisine=pancake
     cuisine=pasta: Tag:cuisine=pasta
     cuisine=pizza: Tag:cuisine=pizza
+    cuisine=regional: Tag:cuisine=regional
     cuisine=sandwich: Tag:cuisine=sandwich
     cuisine=seafood: Tag:cuisine=seafood
     cuisine=soup: Tag:cuisine=soup
+    cuisine=spanish: Tag:cuisine=spanish
     cuisine=steak_house: Tag:cuisine=steak house
     cuisine=strudel: Tag:cuisine=strudel
     cuisine=sushi: Tag:cuisine=sushi
+    cuisine=tapas: Tag:cuisine=tapas
     cuisine=tea_house: Tag:cuisine=tea house
     cuisine=tea_shop: Tag:cuisine=tea shop
     cuisine=teahouse: Tag:cuisine=teahouse
+    cuisine=thai: Tag:cuisine=thai
+    cuisine=turkish: Tag:cuisine=turkish
+    cuisine=vietnamese: Tag:cuisine=vietnamese
     cuisine=waffle: Tag:cuisine=waffle
     cuisine=wings: Tag:cuisine=wings
+    culvert=inverted_siphon: Tag:culvert=inverted siphon
     curve=hairpin: Tag:curve=hairpin
     curve=loop: Tag:curve=loop
     curves=extended: Tag:curves=extended
     curves=serpentine: Tag:curves=serpentine
+    cycle_network=BE-VLG:cycle_highway: Tag:cycle network=BE-VLG:cycle highway
     cycle_network=EuroVelo: Tag:cycle network=EuroVelo
     cycle_network=US:CA:SF: Tag:cycle network=US:CA:SF
     cycle_network=US:GA: Tag:cycle network=US:GA
@@ -8630,6 +9442,8 @@ en:
     cycleway:both=lane: Tag:cycleway:both=lane
     cycleway:both=no: Tag:cycleway:both=no
     cycleway:both=shared_lane: Tag:cycleway:both=shared lane
+    cycleway:foot=designated: Tag:cycleway:foot=designated
+    cycleway:foot=no: Tag:cycleway:foot=no
     cycleway:left=lane: Tag:cycleway:left=lane
     cycleway:left=no: Tag:cycleway:left=no
     cycleway:left=opposite_lane: Tag:cycleway:left=opposite lane
@@ -8660,24 +9474,38 @@ en:
     cycleway=share_busway: Tag:cycleway=share busway
     cycleway=shared_busway: Tag:cycleway=shared busway
     cycleway=shared_lane: Tag:cycleway=shared lane
+    cycleway=shared_line: Tag:cycleway=shared line
     cycleway=sidepath: Tag:cycleway=sidepath
     cycleway=track: Tag:cycleway=track
     dataset=buildings: Tag:dataset=buildings
     defensive=bergfried: Tag:defensive=bergfried
     defensive=donjon: Tag:defensive=donjon
     defensive=keep: Tag:defensive=keep
+    defensive_works=bastion: Tag:defensive works=bastion
+    defensive_works=battery: Tag:defensive works=battery
     delivery=shipment: Tag:delivery=shipment
     demolished=yes: Tag:demolished=yes
     dennert_fir_tree=yes: Tag:dennert fir tree=yes
     denomination=la_luz_del_mundo: Tag:denomination=la luz del mundo
     denomination=mormon: Tag:denomination=mormon
     denomination=reformed: Tag:denomination=reformed
+    denotation=agricultural: Tag:denotation=agricultural
+    denotation=avenue: Tag:denotation=avenue
     denotation=cluster: Tag:denotation=cluster
+    denotation=landmark: Tag:denotation=landmark
+    denotation=natural_monument: Tag:denotation=natural monument
+    denotation=urban: Tag:denotation=urban
     designation=byway_open_to_all_traffic: Tag:designation=byway open to all traffic
+    designation=civil_parish: Tag:designation=civil parish
     designation=common: Tag:designation=common
+    designation=core_path: Tag:designation=core path
+    designation=public_bridleway: Tag:designation=public bridleway
+    designation=public_footpath: Tag:designation=public footpath
+    designation=restricted_byway: Tag:designation=restricted byway
     destroyed=yes: Tag:destroyed=yes
     diet:kosher=only: Tag:diet:kosher=only
     diet:kosher=yes: Tag:diet:kosher=yes
+    diet:meat=yes: Tag:diet:meat=yes
     diplomatic=ambassadors_residence: Tag:diplomatic=ambassadors residence
     diplomatic=consulate: Tag:diplomatic=consulate
     diplomatic=consulate_general: Tag:diplomatic=consulate general
@@ -8694,6 +9522,7 @@ en:
     dock=drydock: Tag:dock=drydock
     dock=floating: Tag:dock=floating
     dock=tidal: Tag:dock=tidal
+    dog=designated: Tag:dog=designated
     dog=leashed: Tag:dog=leashed
     dog=no: Tag:dog=no
     dog=unleashed: Tag:dog=unleashed
@@ -8707,6 +9536,8 @@ en:
     electrified=4th_rail: Tag:electrified=4th rail
     electrified=contact_line: Tag:electrified=contact line
     electrified=rail: Tag:electrified=rail
+    electronics_repair=phone: Tag:electronics repair=phone
+    embankment=dyke: Tag:embankment=dyke
     embassy=branch_embassy: Tag:embassy=branch embassy
     embassy=delegation: Tag:embassy=delegation
     embassy=high_commission: Tag:embassy=high commission
@@ -8771,21 +9602,28 @@ en:
     emergency=wet_riser: Tag:emergency=wet riser
     emergency=yes: Tag:emergency=yes
     emergency_service=technical: Tag:emergency service=technical
+    entrance=exit: Tag:entrance=exit
+    entrance=fire_exit: Tag:entrance=fire exit
     entrance=garage: Tag:entrance=garage
     entrance=gate: Tag:entrance=gate
     entrance=main: Tag:entrance=main
     entrance=main_entrance: Tag:entrance=main entrance
     entrance=secondary: Tag:entrance=secondary
+    entrance=shop: Tag:entrance=shop
     entrance=staircase: Tag:entrance=staircase
     entrance=yes: Tag:entrance=yes
     esperanto=esperanto: Tag:esperanto=esperanto
     esperanto=yes: Tag:esperanto=yes
-    estuary=yes: Tag:estuary=yes
     faculty=aerospace: Tag:faculty=aerospace
+    faculty=engineering: Tag:faculty=engineering
     farmland=arable: Tag:farmland=arable
     farmland=pasture: Tag:farmland=pasture
     farmyard=stockyard: Tag:farmyard=stockyard
     fast_food=cafeteria: Tag:fast food=cafeteria
+    fire_hydrant:position=green: Tag:fire hydrant:position=green
+    fire_hydrant:position=lane: Tag:fire hydrant:position=lane
+    fire_hydrant:position=parking_lot: Tag:fire hydrant:position=parking lot
+    fire_hydrant:position=sidewalk: Tag:fire hydrant:position=sidewalk
     fire_hydrant:type=pillar: Tag:fire hydrant:type=pillar
     fire_hydrant:type=pipe: Tag:fire hydrant:type=pipe
     fire_hydrant:type=underground: Tag:fire hydrant:type=underground
@@ -8806,9 +9644,12 @@ en:
     flood_mark=plaque: Tag:flood mark=plaque
     floor:material=wood: Tag:floor:material=wood
     flow_direction=both: Tag:flow direction=both
+    foldable_pie_slice: Tag:foldable pie slice
     foot=designated: Tag:foot=designated
+    foot=destination: Tag:foot=destination
     foot=no: Tag:foot=no
     foot=official: Tag:foot=official
+    foot=permissive: Tag:foot=permissive
     foot=private: Tag:foot=private
     foot=use_sidepath: Tag:foot=use sidepath
     foot=yes: Tag:foot=yes
@@ -8818,6 +9659,7 @@ en:
     footway=crossing: Tag:footway=crossing
     footway=left: Tag:footway=left
     footway=none: Tag:footway=none
+    footway=path: Tag:footway=path
     footway=right: Tag:footway=right
     footway=sidewalk: Tag:footway=sidewalk
     footway=traffic_island: Tag:footway=traffic island
@@ -8836,7 +9678,9 @@ en:
     fountain=roman_wolf: Tag:fountain=roman wolf
     fountain=stone_block: Tag:fountain=stone block
     fountain=toret: Tag:fountain=toret
+    fountain=wallace: Tag:fountain=wallace
     garden:type=botanical: Tag:garden:type=botanical
+    garden:type=monastery: Tag:garden:type=monastery
     generator:method=anaerobic_digestion: Tag:generator:method=anaerobic digestion
     generator:method=barrage: Tag:generator:method=barrage
     generator:method=combustion: Tag:generator:method=combustion
@@ -8963,7 +9807,11 @@ en:
     hazard=dangerous_junction: Tag:hazard=dangerous junction
     hazard=dip: Tag:hazard=dip
     hazard=falling_rocks: Tag:hazard=falling rocks
+    hazard=fog: Tag:hazard=fog
+    hazard=frail_pedestrians: Tag:hazard=frail pedestrians
     hazard=frost_heave: Tag:hazard=frost heave
+    hazard=ground_clearance: Tag:hazard=ground clearance
+    hazard=hole: Tag:hazard=hole
     hazard=horse_riders: Tag:hazard=horse riders
     hazard=ice: Tag:hazard=ice
     hazard=landslide: Tag:hazard=landslide
@@ -8975,6 +9823,8 @@ en:
     hazard=pedestrians: Tag:hazard=pedestrians
     hazard=queues_likely: Tag:hazard=queues likely
     hazard=quicksand: Tag:hazard=quicksand
+    hazard=road_narrows: Tag:hazard=road narrows
+    hazard=roadworks: Tag:hazard=roadworks
     hazard=school_zone: Tag:hazard=school zone
     hazard=shooting_range: Tag:hazard=shooting range
     hazard=side_winds: Tag:hazard=side winds
@@ -8982,21 +9832,102 @@ en:
     hazard=turn: Tag:hazard=turn
     hazard=turns: Tag:hazard=turns
     hazard=unexploded_ordnance: Tag:hazard=unexploded ordnance
+    hazard=washout: Tag:hazard=washout
     hazard_prone=yes: Tag:hazard prone=yes
     hazard_type=avalanche: Tag:hazard type=avalanche
     hazard_type=flood: Tag:hazard type=flood
     hazard_type=landslide: Tag:hazard type=landslide
     hazmat:water=permissive: Tag:hazmat:water=permissive
+    headlight=required: Tag:headlight=required
+    health_facility:type=office: Tag:health facility:type=office
     healthcare:speciality=abortion: Tag:healthcare:speciality=abortion
+    healthcare:speciality=allergology: Tag:healthcare:speciality=allergology
+    healthcare:speciality=anaesthetics: Tag:healthcare:speciality=anaesthetics
+    healthcare:speciality=behavior: Tag:healthcare:speciality=behavior
+    healthcare:speciality=biochemistry: Tag:healthcare:speciality=biochemistry
+    healthcare:speciality=biological_haematology: Tag:healthcare:speciality=biological
+      haematology
+    healthcare:speciality=biology: Tag:healthcare:speciality=biology
+    healthcare:speciality=blood_check: Tag:healthcare:speciality=blood check
+    healthcare:speciality=body: Tag:healthcare:speciality=body
+    healthcare:speciality=cardiac_surgery: Tag:healthcare:speciality=cardiac surgery
+    healthcare:speciality=cardiology: Tag:healthcare:speciality=cardiology
+    healthcare:speciality=cardiothoracic_surgery: Tag:healthcare:speciality=cardiothoracic
+      surgery
+    healthcare:speciality=child_psychiatry: Tag:healthcare:speciality=child psychiatry
+    healthcare:speciality=clinical_pathology: Tag:healthcare:speciality=clinical pathology
+    healthcare:speciality=community: Tag:healthcare:speciality=community
+    healthcare:speciality=dental_oral_maxillo_facial_surgery: Tag:healthcare:speciality=dental
+      oral maxillo facial surgery
+    healthcare:speciality=depth: Tag:healthcare:speciality=depth
+    healthcare:speciality=dermatology: Tag:healthcare:speciality=dermatology
+    healthcare:speciality=dermatovenereology: Tag:healthcare:speciality=dermatovenereology
+    healthcare:speciality=diagnostic_radiology: Tag:healthcare:speciality=diagnostic
+      radiology
+    healthcare:speciality=emergency: Tag:healthcare:speciality=emergency
+    healthcare:speciality=endocrinology: Tag:healthcare:speciality=endocrinology
+    healthcare:speciality=fertility: Tag:healthcare:speciality=fertility
+    healthcare:speciality=gastroenterological_surgery: Tag:healthcare:speciality=gastroenterological
+      surgery
+    healthcare:speciality=gastroenterology: Tag:healthcare:speciality=gastroenterology
+    healthcare:speciality=general: Tag:healthcare:speciality=general
+    healthcare:speciality=geriatrics: Tag:healthcare:speciality=geriatrics
+    healthcare:speciality=gynaecology: Tag:healthcare:speciality=gynaecology
+    healthcare:speciality=haematology: Tag:healthcare:speciality=haematology
+    healthcare:speciality=hepatology: Tag:healthcare:speciality=hepatology
+    healthcare:speciality=humanistic: Tag:healthcare:speciality=humanistic
+    healthcare:speciality=immunology: Tag:healthcare:speciality=immunology
+    healthcare:speciality=infectious_diseases: Tag:healthcare:speciality=infectious
+      diseases
+    healthcare:speciality=intensive: Tag:healthcare:speciality=intensive
+    healthcare:speciality=internal: Tag:healthcare:speciality=internal
     healthcare:speciality=maxillofacial_surgery: Tag:healthcare:speciality=maxillofacial
       surgery
+    healthcare:speciality=microbiology: Tag:healthcare:speciality=microbiology
+    healthcare:speciality=neonatology: Tag:healthcare:speciality=neonatology
+    healthcare:speciality=nephrology: Tag:healthcare:speciality=nephrology
+    healthcare:speciality=neurology: Tag:healthcare:speciality=neurology
+    healthcare:speciality=neurophysiology: Tag:healthcare:speciality=neurophysiology
+    healthcare:speciality=neuropsychiatry: Tag:healthcare:speciality=neuropsychiatry
+    healthcare:speciality=neurosurgery: Tag:healthcare:speciality=neurosurgery
+    healthcare:speciality=nuclear: Tag:healthcare:speciality=nuclear
+    healthcare:speciality=occupational: Tag:healthcare:speciality=occupational
+    healthcare:speciality=oncology: Tag:healthcare:speciality=oncology
+    healthcare:speciality=ophthalmology: Tag:healthcare:speciality=ophthalmology
     healthcare:speciality=orthodontics: Tag:healthcare:speciality=orthodontics
+    healthcare:speciality=orthopaedics: Tag:healthcare:speciality=orthopaedics
     healthcare:speciality=otolaryngology: Tag:healthcare:speciality=otolaryngology
+    healthcare:speciality=paediatric_surgery: Tag:healthcare:speciality=paediatric
+      surgery
+    healthcare:speciality=paediatrics: Tag:healthcare:speciality=paediatrics
+    healthcare:speciality=palliative: Tag:healthcare:speciality=palliative
+    healthcare:speciality=pathology: Tag:healthcare:speciality=pathology
+    healthcare:speciality=pharmacology: Tag:healthcare:speciality=pharmacology
+    healthcare:speciality=physiatry: Tag:healthcare:speciality=physiatry
+    healthcare:speciality=plastic_surgery: Tag:healthcare:speciality=plastic surgery
+    healthcare:speciality=podiatry: Tag:healthcare:speciality=podiatry
+    healthcare:speciality=proctology: Tag:healthcare:speciality=proctology
     healthcare:speciality=psychiatry: Tag:healthcare:speciality=psychiatry
+    healthcare:speciality=pulmonology: Tag:healthcare:speciality=pulmonology
+    healthcare:speciality=radiology: Tag:healthcare:speciality=radiology
+    healthcare:speciality=radiotherapy: Tag:healthcare:speciality=radiotherapy
+    healthcare:speciality=rheumatology: Tag:healthcare:speciality=rheumatology
+    healthcare:speciality=stomatology: Tag:healthcare:speciality=stomatology
+    healthcare:speciality=surgery: Tag:healthcare:speciality=surgery
+    healthcare:speciality=surgical_oncology: Tag:healthcare:speciality=surgical oncology
+    healthcare:speciality=systemic: Tag:healthcare:speciality=systemic
+    healthcare:speciality=thoracic_surgery: Tag:healthcare:speciality=thoracic surgery
+    healthcare:speciality=transplant: Tag:healthcare:speciality=transplant
+    healthcare:speciality=trauma: Tag:healthcare:speciality=trauma
+    healthcare:speciality=tropical: Tag:healthcare:speciality=tropical
+    healthcare:speciality=urology: Tag:healthcare:speciality=urology
     healthcare:speciality=vaccination: Tag:healthcare:speciality=vaccination
+    healthcare:speciality=vascular_surgery: Tag:healthcare:speciality=vascular surgery
+    healthcare:speciality=venereology: Tag:healthcare:speciality=venereology
     healthcare=alternative: Tag:healthcare=alternative
     healthcare=audiologist: Tag:healthcare=audiologist
     healthcare=birthing_center: Tag:healthcare=birthing center
+    healthcare=birthing_centre: Tag:healthcare=birthing centre
     healthcare=blood_bank: Tag:healthcare=blood bank
     healthcare=blood_donation: Tag:healthcare=blood donation
     healthcare=centre: Tag:healthcare=centre
@@ -9024,6 +9955,7 @@ en:
     healthcare=speech_therapist: Tag:healthcare=speech therapist
     healthcare=vaccination_centre: Tag:healthcare=vaccination centre
     healthcare=yes: Tag:healthcare=yes
+    hedge=hedge_bank: Tag:hedge=hedge bank
     hgv=discouraged: Tag:hgv=discouraged
     hgv=yes: Tag:hgv=yes
     highway=Bus_guideway: Tag:highway=Bus guideway
@@ -9034,7 +9966,6 @@ en:
     highway=bus_guideway: Tag:highway=bus guideway
     highway=bus_stop: Tag:highway=bus stop
     highway=busway: Tag:highway=busway
-    highway=byway: Tag:highway=byway
     highway=cattle_grid: Tag:highway=cattle grid
     highway=construction: Tag:highway=construction
     highway=corridor: Tag:highway=corridor
@@ -9051,8 +9982,6 @@ en:
     highway=gate: Tag:highway=gate
     highway=give_way: Tag:highway=give way
     highway=green_lane: Tag:highway=green lane
-    highway=incline: Tag:highway=incline
-    highway=incline_steep: Tag:highway=incline steep
     highway=living_street: Tag:highway=living street
     highway=milestone: Tag:highway=milestone
     highway=mini_roundabout: Tag:highway=mini roundabout
@@ -9083,7 +10012,6 @@ en:
     highway=speed_camera: Tag:highway=speed camera
     highway=speed_display: Tag:highway=speed display
     highway=steps: Tag:highway=steps
-    highway=stile: Tag:highway=stile
     highway=stop: Tag:highway=stop
     highway=street: Tag:highway=street
     highway=street_lamp: Tag:highway=street lamp
@@ -9123,6 +10051,7 @@ en:
     historic=city_gate: Tag:historic=city gate
     historic=city_wall: Tag:historic=city wall
     historic=citywalls: Tag:historic=citywalls
+    historic=creamery: Tag:historic=creamery
     historic=district: Tag:historic=district
     historic=event: Tag:historic=event
     historic=farm: Tag:historic=farm
@@ -9161,6 +10090,7 @@ en:
     historic=wayside_cross: Tag:historic=wayside cross
     historic=wayside_shrine: Tag:historic=wayside shrine
     historic=wreck: Tag:historic=wreck
+    historic=yes: Tag:historic=yes
     holding_position:type=ILS: Tag:holding position:type=ILS
     holding_position:type=intermediate: Tag:holding position:type=intermediate
     holding_position:type=runway: Tag:holding position:type=runway
@@ -9171,11 +10101,14 @@ en:
     horse=dismount: Tag:horse=dismount
     house=bungalow: Tag:house=bungalow
     house=detached: Tag:house=detached
+    house=link-detached: Tag:house=link-detached
+    house=maisonette: Tag:house=maisonette
     house=semi-detached: Tag:house=semi-detached
     house=terrace: Tag:house=terrace
     house=terraced: Tag:house=terraced
     hov=yes: Tag:hov=yes
     hunting=raised_hide: Tag:hunting=raised hide
+    ice_skates=kluning: Tag:ice skates=kluning
     indoor=area: Tag:indoor=area
     indoor=corridor: Tag:indoor=corridor
     indoor=door: Tag:indoor=door
@@ -9216,6 +10149,7 @@ en:
     industrial=warehouse: Tag:industrial=warehouse
     industrial=well_cluster: Tag:industrial=well cluster
     industrial=wellsite: Tag:industrial=wellsite
+    industrial=winery: Tag:industrial=winery
     information=audioguide: Tag:information=audioguide
     information=board: Tag:information=board
     information=finger-post: Tag:information=finger-post
@@ -9224,10 +10158,19 @@ en:
     information=guidepost: Tag:information=guidepost
     information=map: Tag:information=map
     information=office: Tag:information=office
+    information=route_marker: Tag:information=route marker
+    information=sign: Tag:information=sign
+    information=stele: Tag:information=stele
     information=tactile_map: Tag:information=tactile map
     information=tactile_model: Tag:information=tactile model
     information=terminal: Tag:information=terminal
     information=visitor_centre: Tag:information=visitor centre
+    inlet=bell_mouth: Tag:inlet=bell mouth
+    inlet=direct: Tag:inlet=direct
+    inlet=grate: Tag:inlet=grate
+    inlet=kerb_opening: Tag:inlet=kerb opening
+    inlet=screen: Tag:inlet=screen
+    inlet=valve: Tag:inlet=valve
     insurance=health: Tag:insurance=health
     internet_access=no: Tag:internet access=no
     internet_access=terminal: Tag:internet access=terminal
@@ -9279,6 +10222,7 @@ en:
     landmark=windmill: Tag:landmark=windmill
     landmark=windmotor: Tag:landmark=windmotor
     landmark=windsock: Tag:landmark=windsock
+    landuse:secondary: Tag:landuse:secondary
     landuse=agriculture: Tag:landuse=agriculture
     landuse=allotments: Tag:landuse=allotments
     landuse=animal_keeping: Tag:landuse=animal keeping
@@ -9300,6 +10244,7 @@ en:
     landuse=farmland: Tag:landuse=farmland
     landuse=farmyard: Tag:landuse=farmyard
     landuse=field: Tag:landuse=field
+    landuse=fish_pond: Tag:landuse=fish pond
     landuse=fishfarm: Tag:landuse=fishfarm
     landuse=flowerbed: Tag:landuse=flowerbed
     landuse=forest: Tag:landuse=forest
@@ -9329,7 +10274,9 @@ en:
     landuse=pond: Tag:landuse=pond
     landuse=port: Tag:landuse=port
     landuse=prison: Tag:landuse=prison
+    landuse=public_works: Tag:landuse=public works
     landuse=quarry: Tag:landuse=quarry
+    landuse=radio: Tag:landuse=radio
     landuse=railway: Tag:landuse=railway
     landuse=recreation_ground: Tag:landuse=recreation ground
     landuse=religious: Tag:landuse=religious
@@ -9370,6 +10317,7 @@ en:
     leisure=adult_gaming_centre: Tag:leisure=adult gaming centre
     leisure=amusement_arcade: Tag:leisure=amusement arcade
     leisure=arena: Tag:leisure=arena
+    leisure=axe_throwing: Tag:leisure=axe throwing
     leisure=bandstand: Tag:leisure=bandstand
     leisure=barefoot: Tag:leisure=barefoot
     leisure=bathing_place: Tag:leisure=bathing place
@@ -9409,6 +10357,7 @@ en:
     leisure=outdoor_seating: Tag:leisure=outdoor seating
     leisure=paddling_pool: Tag:leisure=paddling pool
     leisure=park: Tag:leisure=park
+    leisure=parklet: Tag:leisure=parklet
     leisure=picnic: Tag:leisure=picnic
     leisure=picnic_site: Tag:leisure=picnic site
     leisure=picnic_table: Tag:leisure=picnic table
@@ -9487,6 +10436,7 @@ en:
     man_made=beacon: Tag:man made=beacon
     man_made=beehive: Tag:man made=beehive
     man_made=bioreactor: Tag:man made=bioreactor
+    man_made=bird_feeder: Tag:man made=bird feeder
     man_made=breakwater: Tag:man made=breakwater
     man_made=bridge: Tag:man made=bridge
     man_made=bunker_silo: Tag:man made=bunker silo
@@ -9497,6 +10447,7 @@ en:
     man_made=chiller: Tag:man made=chiller
     man_made=chimney: Tag:man made=chimney
     man_made=clearcut: Tag:man made=clearcut
+    man_made=column: Tag:man made=column
     man_made=communications_tower: Tag:man made=communications tower
     man_made=compass_rose: Tag:man made=compass rose
     man_made=cooling: Tag:man made=cooling
@@ -9514,11 +10465,13 @@ en:
     man_made=drinking_fountain: Tag:man made=drinking fountain
     man_made=dyke: Tag:man made=dyke
     man_made=embankment: Tag:man made=embankment
+    man_made=ferry_cable: Tag:man made=ferry cable
     man_made=flagpole: Tag:man made=flagpole
     man_made=flare: Tag:man made=flare
     man_made=floating_storage: Tag:man made=floating storage
     man_made=footwear_decontamination: Tag:man made=footwear decontamination
     man_made=frost_fan: Tag:man made=frost fan
+    man_made=fuel_column: Tag:man made=fuel column
     man_made=gantry: Tag:man made=gantry
     man_made=gas_well: Tag:man made=gas well
     man_made=gasometer: Tag:man made=gasometer
@@ -9530,6 +10483,7 @@ en:
     man_made=guy: Tag:man made=guy
     man_made=guy_wire: Tag:man made=guy wire
     man_made=heap: Tag:man made=heap
+    man_made=hongsalmun: Tag:man made=hongsalmun
     man_made=hot_water_tank: Tag:man made=hot water tank
     man_made=hunting_stand: Tag:man made=hunting stand
     man_made=ice_house: Tag:man made=ice house
@@ -9543,6 +10497,7 @@ en:
     man_made=mast: Tag:man made=mast
     man_made=maypole: Tag:man made=maypole
     man_made=measurement_station: Tag:man made=measurement station
+    man_made=meridian_marker: Tag:man made=meridian marker
     man_made=mineshaft: Tag:man made=mineshaft
     man_made=monitoring_station: Tag:man made=monitoring station
     man_made=mounting_block: Tag:man made=mounting block
@@ -9552,6 +10507,7 @@ en:
     man_made=offshore_platform: Tag:man made=offshore platform
     man_made=oil_well: Tag:man made=oil well
     man_made=outfall: Tag:man made=outfall
+    man_made=paifang: Tag:man made=paifang
     man_made=petroleum_well: Tag:man made=petroleum well
     man_made=pier: Tag:man made=pier
     man_made=pillar: Tag:man made=pillar
@@ -9585,13 +10541,17 @@ en:
     man_made=surveillance: Tag:man made=surveillance
     man_made=survey_point: Tag:man made=survey point
     man_made=tailings_pond: Tag:man made=tailings pond
+    man_made=telephone_box: Tag:man made=telephone box
+    man_made=telephone_exchange: Tag:man made=telephone exchange
     man_made=telescope: Tag:man made=telescope
     man_made=tell: Tag:man made=tell
     man_made=threshing_floor: Tag:man made=threshing floor
     man_made=tomb: Tag:man made=tomb
+    man_made=torii: Tag:man made=torii
     man_made=tower: Tag:man made=tower
     man_made=tunnel: Tag:man made=tunnel
     man_made=utility_pole: Tag:man made=utility pole
+    man_made=video_wall: Tag:man made=video wall
     man_made=wastewater_basin: Tag:man made=wastewater basin
     man_made=wastewater_plant: Tag:man made=wastewater plant
     man_made=water_tank: Tag:man made=water tank
@@ -9612,19 +10572,26 @@ en:
     maritime=yes: Tag:maritime=yes
     marker=aerial: Tag:marker=aerial
     marker=ground: Tag:marker=ground
+    marker=paddle: Tag:marker=paddle
     marker=pedestal: Tag:marker=pedestal
     marker=plate: Tag:marker=plate
     marker=post: Tag:marker=post
     marker=stone: Tag:marker=stone
     material=concrete: Tag:material=concrete
+    material=epoxy: Tag:material=epoxy
     maxheight=default: Tag:maxheight=default
+    maxspeed:type=GB:nsl_restricted: Tag:maxspeed:type=GB:nsl restricted
+    maxspeed:type=PL:rural: Tag:maxspeed:type=PL:rural
+    maxspeed:type=PL:urban: Tag:maxspeed:type=PL:urban
     maxweight:signed=no: Tag:maxweight:signed=no
+    mechanical_coupling=nodding_donkey: Tag:mechanical coupling=nodding donkey
     mechanical_driver=combustion_engine: Tag:mechanical driver=combustion engine
     mechanical_driver=electric_motor: Tag:mechanical driver=electric motor
     mechanical_driver=manual: Tag:mechanical driver=manual
     mechanical_driver=reciprocating_solenoid: Tag:mechanical driver=reciprocating
       solenoid
     medical=aed: Tag:medical=aed
+    medical_system:western=yes: Tag:medical system:western=yes
     megalith_type=alignment: Tag:megalith type=alignment
     megalith_type=chamber: Tag:megalith type=chamber
     megalith_type=cist: Tag:megalith type=cist
@@ -9643,11 +10610,14 @@ en:
     memorial:type=statue: Tag:memorial:type=statue
     memorial:type=stele: Tag:memorial:type=stele
     memorial:type=stolperstein: Tag:memorial:type=stolperstein
+    memorial=bench: Tag:memorial=bench
     memorial=blue_plaque: Tag:memorial=blue plaque
     memorial=bust: Tag:memorial=bust
     memorial=cenotaph: Tag:memorial=cenotaph
     memorial=cross: Tag:memorial=cross
+    memorial=flood_mark: Tag:memorial=flood mark
     memorial=ghost_bike: Tag:memorial=ghost bike
+    memorial=khachkar: Tag:memorial=khachkar
     memorial=obelisk: Tag:memorial=obelisk
     memorial=plaque: Tag:memorial=plaque
     memorial=sculpture: Tag:memorial=sculpture
@@ -9659,6 +10629,7 @@ en:
     memorial=vehicle: Tag:memorial=vehicle
     memorial=war_memorial: Tag:memorial=war memorial
     microbrewery=yes: Tag:microbrewery=yes
+    military=academy: Tag:military=academy
     military=airfield: Tag:military=airfield
     military=ammunition: Tag:military=ammunition
     military=barracks: Tag:military=barracks
@@ -9666,6 +10637,7 @@ en:
     military=bunker: Tag:military=bunker
     military=checkpoint: Tag:military=checkpoint
     military=danger_area: Tag:military=danger area
+    military=depot: Tag:military=depot
     military=exclusion_zone: Tag:military=exclusion zone
     military=launchpad: Tag:military=launchpad
     military=naval_base: Tag:military=naval base
@@ -9673,10 +10645,12 @@ en:
     military=obstacle_course: Tag:military=obstacle course
     military=office: Tag:military=office
     military=range: Tag:military=range
+    military=school: Tag:military=school
     military=training_area: Tag:military=training area
     military=trench: Tag:military=trench
     military_service=air_force: Tag:military service=air force
     military_service=army: Tag:military service=army
+    military_service=coast_guard: Tag:military service=coast guard
     military_service=marines: Tag:military service=marines
     military_service=navy: Tag:military service=navy
     mofa=use_sidepath: Tag:mofa=use sidepath
@@ -9691,6 +10665,8 @@ en:
     mooring=spm: Tag:mooring=spm
     mooring=visitor: Tag:mooring=visitor
     moped=use_sidepath: Tag:moped=use sidepath
+    motor_vehicle=destination: Tag:motor vehicle=destination
+    motor_vehicle=yes: Tag:motor vehicle=yes
     motorcycle:type=electric: Tag:motorcycle:type=electric
     motorcycle:type=sportbike: Tag:motorcycle:type=sportbike
     motorcycle=no: Tag:motorcycle=no
@@ -9698,8 +10674,10 @@ en:
     motorroad=no: Tag:motorroad=no
     mountain_pass=yes: Tag:mountain pass=yes
     museum=aerospace: Tag:museum=aerospace
+    museum=agriculture: Tag:museum=agriculture
     museum=archaeological: Tag:museum=archaeological
     museum=art: Tag:museum=art
+    museum=aviation: Tag:museum=aviation
     museum=children: Tag:museum=children
     museum=history: Tag:museum=history
     museum=living_history: Tag:museum=living history
@@ -9720,11 +10698,13 @@ en:
     name=Costco: Tag:name=Costco
     name=Dollarama: Tag:name=Dollarama
     name=Domino's_Pizza: Tag:name=Domino's Pizza
+    name=Fossil: Tag:name=Fossil
     name=Herfy: Tag:name=Herfy
     name=Jollibee: Tag:name=Jollibee
     name=KFC: Tag:name=KFC
     name=McDonald's: Tag:name=McDonald's
     name=NHS: Tag:name=NHS
+    name=Starbucks: Tag:name=Starbucks
     name=Subway: Tag:name=Subway
     name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: Tag:name=The Church of Jesus
       Christ of Latter-day Saints
@@ -9759,6 +10739,7 @@ en:
     natural=esker: Tag:natural=esker
     natural=fell: Tag:natural=fell
     natural=fjord: Tag:natural=fjord
+    natural=fumarole: Tag:natural=fumarole
     natural=geothermal: Tag:natural=geothermal
     natural=geothermal_area: Tag:natural=geothermal area
     natural=geothermal_field: Tag:natural=geothermal field
@@ -9829,6 +10810,11 @@ en:
     network=BR:PB: Tag:network=BR:PB
     network=Barrie_Transit: Tag:network=Barrie Transit
     network=CA:ON:York: Tag:network=CA:ON:York
+    network=CA:ON:primary: Tag:network=CA:ON:primary
+    network=CA:ON:secondary: Tag:network=CA:ON:secondary
+    network=CA:ON:tertiary: Tag:network=CA:ON:tertiary
+    network=CA:transcanada: Tag:network=CA:transcanada
+    network=CA:transcanada:namedRoute: Tag:network=CA:transcanada:namedRoute
     network=CN:AH: Tag:network=CN:AH
     network=CN:JS: Tag:network=CN:JS
     network=CN:expressway: Tag:network=CN:expressway
@@ -9837,12 +10823,35 @@ en:
     network=Flinkster: Tag:network=Flinkster
     network=JP:national: Tag:network=JP:national
     network=JP:prefectural:nagano: Tag:network=JP:prefectural:nagano
+    network=NL:A: Tag:network=NL:A
+    network=NL:N: Tag:network=NL:N
+    network=NL:R:IJmuiden: Tag:network=NL:R:IJmuiden
+    network=NL:R:Ommen: Tag:network=NL:R:Ommen
+    network=NL:R:Schouwen: Tag:network=NL:R:Schouwen
+    network=NL:R:Sluis: Tag:network=NL:R:Sluis
+    network=NL:R:Spaarnwoude: Tag:network=NL:R:Spaarnwoude
+    network=NL:R:Voorthuizen: Tag:network=NL:R:Voorthuizen
+    network=NL:S:Amsterdam: Tag:network=NL:S:Amsterdam
+    network=NL:S:Den_Haag: Tag:network=NL:S:Den Haag
+    network=NL:S:Heerlen: Tag:network=NL:S:Heerlen
+    network=NL:S:Nijmegen: Tag:network=NL:S:Nijmegen
+    network=NL:S:Parkstad: Tag:network=NL:S:Parkstad
+    network=NL:S:Rotterdam: Tag:network=NL:S:Rotterdam
+    network=NL:S:Zaanstad: Tag:network=NL:S:Zaanstad
+    network=NL:binnenstedelijke_ring: Tag:network=NL:binnenstedelijke ring
+    network=NL:ring: Tag:network=NL:ring
+    network=SE:LS: Tag:network=SE:LS
+    network=SE:LV: Tag:network=SE:LV
+    network=SE:RV: Tag:network=SE:RV
     network=US:ADHS: Tag:network=US:ADHS
     network=US:AK: Tag:network=US:AK
     network=US:AL: Tag:network=US:AL
     network=US:AR: Tag:network=US:AR
+    network=US:AS: Tag:network=US:AS
     network=US:AZ: Tag:network=US:AZ
+    network=US:BIA: Tag:network=US:BIA
     network=US:CA: Tag:network=US:CA
+    network=US:CA:CR: Tag:network=US:CA:CR
     network=US:CO: Tag:network=US:CO
     network=US:CT: Tag:network=US:CT
     network=US:DC: Tag:network=US:DC
@@ -9850,14 +10859,20 @@ en:
     network=US:FL: Tag:network=US:FL
     network=US:FL:Toll: Tag:network=US:FL:Toll
     network=US:GA: Tag:network=US:GA
+    network=US:GU: Tag:network=US:GU
     network=US:HI: Tag:network=US:HI
     network=US:I: Tag:network=US:I
+    network=US:I:Alternate: Tag:network=US:I:Alternate
+    network=US:I:Business:Loop: Tag:network=US:I:Business:Loop
+    network=US:I:Business:Spur: Tag:network=US:I:Business:Spur
+    network=US:I:Future: Tag:network=US:I:Future
     network=US:IA: Tag:network=US:IA
     network=US:ID: Tag:network=US:ID
     network=US:IL: Tag:network=US:IL
     network=US:IN: Tag:network=US:IN
     network=US:KS: Tag:network=US:KS
     network=US:KY: Tag:network=US:KY
+    network=US:KY:Parkway: Tag:network=US:KY:Parkway
     network=US:LA: Tag:network=US:LA
     network=US:MA: Tag:network=US:MA
     network=US:MD: Tag:network=US:MD
@@ -9866,6 +10881,7 @@ en:
     network=US:MN: Tag:network=US:MN
     network=US:MO: Tag:network=US:MO
     network=US:MO:Supplemental: Tag:network=US:MO:Supplemental
+    network=US:MP: Tag:network=US:MP
     network=US:MS: Tag:network=US:MS
     network=US:MT: Tag:network=US:MT
     network=US:MT:secondary: Tag:network=US:MT:secondary
@@ -9948,6 +10964,7 @@ en:
     network=US:OH:HOL: Tag:network=US:OH:HOL
     network=US:OH:JEF: Tag:network=US:OH:JEF
     network=US:OH:KNO: Tag:network=US:OH:KNO
+    network=US:OH:LAK: Tag:network=US:OH:LAK
     network=US:OH:LAW: Tag:network=US:OH:LAW
     network=US:OH:LIC: Tag:network=US:OH:LIC
     network=US:OH:LOG: Tag:network=US:OH:LOG
@@ -9994,6 +11011,8 @@ en:
     network=US:SC: Tag:network=US:SC
     network=US:SD: Tag:network=US:SD
     network=US:TN: Tag:network=US:TN
+    network=US:TN:primary: Tag:network=US:TN:primary
+    network=US:TN:secondary: Tag:network=US:TN:secondary
     network=US:TX: Tag:network=US:TX
     network=US:TX:Beltway: Tag:network=US:TX:Beltway
     network=US:TX:FM: Tag:network=US:TX:FM
@@ -10007,17 +11026,26 @@ en:
     network=US:TX:Van_Zandt: Tag:network=US:TX:Van Zandt
     network=US:TX:Wood: Tag:network=US:TX:Wood
     network=US:US: Tag:network=US:US
+    network=US:US:Alternate: Tag:network=US:US:Alternate
+    network=US:US:Business: Tag:network=US:US:Business
+    network=US:US:Bypass: Tag:network=US:US:Bypass
+    network=US:US:Historic: Tag:network=US:US:Historic
+    network=US:US:Spur: Tag:network=US:US:Spur
+    network=US:US:Truck: Tag:network=US:US:Truck
     network=US:UT: Tag:network=US:UT
     network=US:VA: Tag:network=US:VA
     network=US:VA:Secondary: Tag:network=US:VA:Secondary
     network=US:VA:secondary: Tag:network=US:VA:secondary
+    network=US:VI: Tag:network=US:VI
     network=US:VT: Tag:network=US:VT
     network=US:WA: Tag:network=US:WA
     network=US:WI: Tag:network=US:WI
     network=US:WV: Tag:network=US:WV
     network=US:WV:Berkeley: Tag:network=US:WV:Berkeley
+    network=US:WV:County: Tag:network=US:WV:County
     network=US:WV:Gilmer: Tag:network=US:WV:Gilmer
     network=US:WV:HARP: Tag:network=US:WV:HARP
+    network=US:WV:Mason: Tag:network=US:WV:Mason
     network=US:WV:McDowell: Tag:network=US:WV:McDowell
     network=US:WV:Mercer: Tag:network=US:WV:Mercer
     network=US:WY: Tag:network=US:WY
@@ -10030,6 +11058,7 @@ en:
     network=call-a-bike: Tag:network=call-a-bike
     network=cambio/stadtmobil: Tag:network=cambio/stadtmobil
     network=cambio_stadtmobil: Tag:network=cambio stadtmobil
+    network=e-road: Tag:network=e-road
     network=e-waterway: Tag:network=e-waterway
     network=icn: Tag:network=icn
     network=iwn: Tag:network=iwn
@@ -10048,6 +11077,7 @@ en:
     network=rmn: Tag:network=rmn
     network=rpn: Tag:network=rpn
     network=rwn: Tag:network=rwn
+    network=sk:national: Tag:network=sk:national
     nhd:fcode=46003: Tag:nhd:fcode=46003
     nhd:ftype=StreamRiver: Tag:nhd:ftype=StreamRiver
     noexit=no: Tag:noexit=no
@@ -10066,6 +11096,7 @@ en:
     office=archive: Tag:office=archive
     office=association: Tag:office=association
     office=bail_bond_agent: Tag:office=bail bond agent
+    office=chamber: Tag:office=chamber
     office=charity: Tag:office=charity
     office=company: Tag:office=company
     office=consulting: Tag:office=consulting
@@ -10100,7 +11131,9 @@ en:
     office=notary: Tag:office=notary
     office=occupational_safety: Tag:office=occupational safety
     office=parish: Tag:office=parish
+    office=physician: Tag:office=physician
     office=political_party: Tag:office=political party
+    office=politician: Tag:office=politician
     office=private_investigator: Tag:office=private investigator
     office=property_management: Tag:office=property management
     office=publisher: Tag:office=publisher
@@ -10124,6 +11157,7 @@ en:
     office=university: Tag:office=university
     office=visa: Tag:office=visa
     office=water_utility: Tag:office=water utility
+    office=wedding_planner: Tag:office=wedding planner
     office=yes: Tag:office=yes
     on_demand=yes: Tag:on demand=yes
     oneway:bicycle=yes: Tag:oneway:bicycle=yes
@@ -10143,7 +11177,9 @@ en:
     operator=Enedis: Tag:operator=Enedis
     operator=Flinkster: Tag:operator=Flinkster
     operator=GRDF: Tag:operator=GRDF
+    operator=GRTgaz: Tag:operator=GRTgaz
     operator=Orange: Tag:operator=Orange
+    operator=ProRail: Tag:operator=ProRail
     operator=RTE: Tag:operator=RTE
     operator=Stadtmobil: Tag:operator=Stadtmobil
     operator=book-n-drive: Tag:operator=book-n-drive
@@ -10152,6 +11188,13 @@ en:
     operator=stadtmobil: Tag:operator=stadtmobil
     operator=teilAuto: Tag:operator=teilAuto
     orchard=meadow_orchard: Tag:orchard=meadow orchard
+    outdoor_seating=terrace: Tag:outdoor seating=terrace
+    outlet=bell_mouth: Tag:outlet=bell mouth
+    outlet=direct: Tag:outlet=direct
+    outlet=noise_barrier: Tag:outlet=noise barrier
+    outlet=screen: Tag:outlet=screen
+    outlet=sock: Tag:outlet=sock
+    outlet=valve: Tag:outlet=valve
     ownership=private: Tag:ownership=private
     parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
     parking:orientation=perpendicular: Tag:parking:orientation=perpendicular
@@ -10171,6 +11214,7 @@ en:
     passenger=yes: Tag:passenger=yes
     path=crossing: Tag:path=crossing
     path=desire: Tag:path=desire
+    path=sidewalk: Tag:path=sidewalk
     physically_present=no: Tag:physically present=no
     pilotage=boarding_point: Tag:pilotage=boarding point
     pilotage=office: Tag:pilotage=office
@@ -10180,6 +11224,7 @@ en:
     pipeline=valve: Tag:pipeline=valve
     piste:type=connection: Tag:piste:type=connection
     piste:type=downhill: Tag:piste:type=downhill
+    piste:type=hike: Tag:piste:type=hike
     piste:type=nordic: Tag:piste:type=nordic
     piste:type=ski_jump: Tag:piste:type=ski jump
     piste:type=ski_jump_landing: Tag:piste:type=ski jump landing
@@ -10209,6 +11254,7 @@ en:
     place=shieling: Tag:place=shieling
     place=square: Tag:place=square
     place=state: Tag:place=state
+    place=subcounty: Tag:place=subcounty
     place=suburb: Tag:place=suburb
     place=town: Tag:place=town
     place=village: Tag:place=village
@@ -10239,9 +11285,22 @@ en:
     plant:type=gas_turbine: Tag:plant:type=gas turbine
     plant:type=solar_photovoltaic_panel: Tag:plant:type=solar photovoltaic panel
     plant:type=steam_turbine: Tag:plant:type=steam turbine
+    playground=balancebeam: Tag:playground=balancebeam
+    playground=bridge: Tag:playground=bridge
+    playground=climbingframe: Tag:playground=climbingframe
+    playground=climbingwall: Tag:playground=climbingwall
+    playground=funnel_ball: Tag:playground=funnel ball
+    playground=hopscotch: Tag:playground=hopscotch
+    playground=horizontal_bar: Tag:playground=horizontal bar
     playground=map: Tag:playground=map
+    playground=playhouse: Tag:playground=playhouse
+    playground=sandpit: Tag:playground=sandpit
+    playground=sledding: Tag:playground=sledding
     playground=slide: Tag:playground=slide
     playground=structure: Tag:playground=structure
+    playground=teenshelter: Tag:playground=teenshelter
+    playground=tetherball: Tag:playground=tetherball
+    playground=youth_bench: Tag:playground=youth bench
     pole=transition: Tag:pole=transition
     police=academy: Tag:police=academy
     police=barracks: Tag:police=barracks
@@ -10255,7 +11314,15 @@ en:
     police=storage: Tag:police=storage
     police=training_area: Tag:police=training area
     police=yes: Tag:police=yes
-    post_office=post_partner: Tag:post office=post partner
+    political_division=NL:kamerkieskring: Tag:political division=NL:kamerkieskring
+    political_division=NL:statenkieskring: Tag:political division=NL:statenkieskring
+    political_division=congressional_district: Tag:political division=congressional
+      district
+    political_division=euro_const: Tag:political division=euro const
+    political_division=linguistic_community: Tag:political division=linguistic community
+    port=cargo: Tag:port=cargo
+    port=fishing: Tag:port=fishing
+    port=roro: Tag:port=roro
     power=antenna_line: Tag:power=antenna line
     power=busbar: Tag:power=busbar
     power=cable: Tag:power=cable
@@ -10304,6 +11371,7 @@ en:
     product=steel: Tag:product=steel
     product=sugar: Tag:product=sugar
     protect_class=11: Tag:protect class=11
+    protect_class=13: Tag:protect class=13
     protect_class=19: Tag:protect class=19
     protect_class=1a: Tag:protect class=1a
     protect_class=1b: Tag:protect class=1b
@@ -10314,6 +11382,7 @@ en:
     protect_class=5: Tag:protect class=5
     protect_class=6: Tag:protect class=6
     protected_area=nature_reserve: Tag:protected area=nature reserve
+    protected_area=recreation: Tag:protected area=recreation
     pseudo=yes: Tag:pseudo=yes
     psv=designated: Tag:psv=designated
     psv=no: Tag:psv=no
@@ -10363,8 +11432,10 @@ en:
     railway=PRT: Tag:railway=PRT
     railway=Subway: Tag:railway=Subway
     railway=abandoned: Tag:railway=abandoned
+    railway=border: Tag:railway=border
     railway=buffer_stop: Tag:railway=buffer stop
     railway=crossing: Tag:railway=crossing
+    railway=crossing_box: Tag:railway=crossing box
     railway=crossing_controller: Tag:railway=crossing controller
     railway=derail: Tag:railway=derail
     railway=diamond: Tag:railway=diamond
@@ -10378,6 +11449,7 @@ en:
     railway=miniature: Tag:railway=miniature
     railway=monorail: Tag:railway=monorail
     railway=narrow_gauge: Tag:railway=narrow gauge
+    railway=owner_change: Tag:railway=owner change
     railway=platform: Tag:railway=platform
     railway=platform_edge: Tag:railway=platform edge
     railway=preserved: Tag:railway=preserved
@@ -10385,6 +11457,7 @@ en:
     railway=rail_brake: Tag:railway=rail brake
     railway=railway_crossing: Tag:railway=railway crossing
     railway=roundhouse: Tag:railway=roundhouse
+    railway=service_station: Tag:railway=service station
     railway=signal: Tag:railway=signal
     railway=signal_box: Tag:railway=signal box
     railway=spur_junction: Tag:railway=spur junction
@@ -10409,6 +11482,7 @@ en:
     recreation_ground=showground: Tag:recreation ground=showground
     recycling_type=centre: Tag:recycling type=centre
     refitted=yes: Tag:refitted=yes
+    refrigerated=yes: Tag:refrigerated=yes
     refugee=yes: Tag:refugee=yes
     religion=buddhist: Tag:religion=buddhist
     religion=christian: Tag:religion=christian
@@ -10417,6 +11491,7 @@ en:
     religion=jewish: Tag:religion=jewish
     religion=multifaith: Tag:religion=multifaith
     religion=muslim: Tag:religion=muslim
+    religion=none: Tag:religion=none
     religion=pagan: Tag:religion=pagan
     religion=self-realization_fellowship: Tag:religion=self-realization fellowship
     religion=shinto: Tag:religion=shinto
@@ -10424,6 +11499,7 @@ en:
     religion=taoist: Tag:religion=taoist
     religion=zoroastrian: Tag:religion=zoroastrian
     rental=appliance: Tag:rental=appliance
+    rental=event: Tag:rental=event
     rental=quadracycle: Tag:rental=quadracycle
     rental=ski: Tag:rental=ski
     rental=strandkorb: Tag:rental=strandkorb
@@ -10432,6 +11508,7 @@ en:
     request_stop=yes: Tag:request stop=yes
     research=aerospace: Tag:research=aerospace
     residential=apartments: Tag:residential=apartments
+    residential=condominium: Tag:residential=condominium
     residential=halting_site: Tag:residential=halting site
     residential=rural: Tag:residential=rural
     residential=trailer_park: Tag:residential=trailer park
@@ -10440,9 +11517,20 @@ en:
     resource=aggregate: Tag:resource=aggregate
     resource=gravel: Tag:resource=gravel
     resource=sand: Tag:resource=sand
+    restriction=no_right_turn_on_red: Tag:restriction=no right turn on red
+    retaining_wall=flood_wall: Tag:retaining wall=flood wall
     road_marking=solid_stop_line: Tag:road marking=solid stop line
     roller_coaster=track: Tag:roller coaster=track
+    roof:shape=flat: Tag:roof:shape=flat
+    roof:shape=gabled: Tag:roof:shape=gabled
+    roof:shape=half-hipped: Tag:roof:shape=half-hipped
+    roof:shape=half_hipped: Tag:roof:shape=half hipped
+    roof:shape=hipped: Tag:roof:shape=hipped
+    roof:shape=many: Tag:roof:shape=many
+    roof:shape=pyramidal: Tag:roof:shape=pyramidal
+    roof:shape=skillion: Tag:roof:shape=skillion
     route=aqueduct: Tag:route=aqueduct
+    route=atv: Tag:route=atv
     route=bicycle: Tag:route=bicycle
     route=boat: Tag:route=boat
     route=bus: Tag:route=bus
@@ -10455,7 +11543,9 @@ en:
     route=ferry: Tag:route=ferry
     route=fitness_trail: Tag:route=fitness trail
     route=foot: Tag:route=foot
+    route=funicular: Tag:route=funicular
     route=hiking: Tag:route=hiking
+    route=historic: Tag:route=historic
     route=horse: Tag:route=horse
     route=inline_skates: Tag:route=inline skates
     route=light_rail: Tag:route=light rail
@@ -10485,14 +11575,44 @@ en:
     school:gender=female: Tag:school:gender=female
     school:gender=male: Tag:school:gender=male
     school:gender=mixed: Tag:school:gender=mixed
+    school=entrance: Tag:school=entrance
     seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour
       pattern=horizontal
-    seamark:beacon_cardinal:shape=tower: Tag:seamark:beacon cardinal:shape=tower
     seamark:beacon_isolated_danger:colour=black;red;black: Tag:seamark:beacon isolated
       danger:colour=black;red;black
     seamark:beacon_isolated_danger:colour_pattern=horizontal: Tag:seamark:beacon isolated
       danger:colour pattern=horizontal
     seamark:beacon_isolated_danger:shape=tower: Tag:seamark:beacon isolated danger:shape=tower
+    seamark:beacon_lateral:category=channel_left: Tag:seamark:beacon lateral:category=channel
+      left
+    seamark:beacon_lateral:category=channel_left_bank: Tag:seamark:beacon lateral:category=channel
+      left bank
+    seamark:beacon_lateral:category=channel_right: Tag:seamark:beacon lateral:category=channel
+      right
+    seamark:beacon_lateral:category=channel_right_bank: Tag:seamark:beacon lateral:category=channel
+      right bank
+    seamark:beacon_lateral:category=crossover_left: Tag:seamark:beacon lateral:category=crossover
+      left
+    seamark:beacon_lateral:category=crossover_right: Tag:seamark:beacon lateral:category=crossover
+      right
+    seamark:beacon_lateral:category=danger_left: Tag:seamark:beacon lateral:category=danger
+      left
+    seamark:beacon_lateral:category=danger_right: Tag:seamark:beacon lateral:category=danger
+      right
+    seamark:beacon_lateral:category=harbour_left: Tag:seamark:beacon lateral:category=harbour
+      left
+    seamark:beacon_lateral:category=harbour_right: Tag:seamark:beacon lateral:category=harbour
+      right
+    seamark:beacon_lateral:category=port: Tag:seamark:beacon lateral:category=port
+    seamark:beacon_lateral:category=preferred_channel_port: Tag:seamark:beacon lateral:category=preferred
+      channel port
+    seamark:beacon_lateral:category=preferred_channel_starboard: Tag:seamark:beacon
+      lateral:category=preferred channel starboard
+    seamark:beacon_lateral:category=starboard: Tag:seamark:beacon lateral:category=starboard
+    seamark:beacon_lateral:category=waterway_left: Tag:seamark:beacon lateral:category=waterway
+      left
+    seamark:beacon_lateral:category=waterway_right: Tag:seamark:beacon lateral:category=waterway
+      right
     seamark:beacon_lateral:colour=green: Tag:seamark:beacon lateral:colour=green
     seamark:beacon_lateral:colour=green;red;green: Tag:seamark:beacon lateral:colour=green;red;green
     seamark:beacon_lateral:colour=green;white;green;white: Tag:seamark:beacon lateral:colour=green;white;green;white
@@ -10507,10 +11627,9 @@ en:
     seamark:beacon_lateral:shape=tower: Tag:seamark:beacon lateral:shape=tower
     seamark:beacon_lateral:shape=withy: Tag:seamark:beacon lateral:shape=withy
     seamark:beacon_safe_water:colour=red;white: Tag:seamark:beacon safe water:colour=red;white
-    seamark:beacon_safe_water:colour_pattern=vertical: Tag:seamark:beacon safe water:colour
-      pattern=vertical
     seamark:beacon_safe_water:shape=tower: Tag:seamark:beacon safe water:shape=tower
     seamark:beacon_special_purpose:category=cable: Tag:seamark:beacon special purpose:category=cable
+    seamark:beacon_special_purpose:category=leading: Tag:seamark:beacon special purpose:category=leading
     seamark:beacon_special_purpose:category=notice: Tag:seamark:beacon special purpose:category=notice
     seamark:beacon_special_purpose:category=racing: Tag:seamark:beacon special purpose:category=racing
     seamark:beacon_special_purpose:category=warning: Tag:seamark:beacon special purpose:category=warning
@@ -10523,24 +11642,52 @@ en:
     seamark:beacon_special_purpose:colour=white: Tag:seamark:beacon special purpose:colour=white
     seamark:beacon_special_purpose:colour=yellow: Tag:seamark:beacon special purpose:colour=yellow
     seamark:beacon_special_purpose:shape=cairn: Tag:seamark:beacon special purpose:shape=cairn
+    seamark:beacon_special_purpose:shape=lattice: Tag:seamark:beacon special purpose:shape=lattice
+    seamark:beacon_special_purpose:shape=pile: Tag:seamark:beacon special purpose:shape=pile
     seamark:beacon_special_purpose:shape=pole: Tag:seamark:beacon special purpose:shape=pole
     seamark:beacon_special_purpose:shape=tower: Tag:seamark:beacon special purpose:shape=tower
-    seamark:buoy_cardinal:colour_pattern=horizontal: Tag:seamark:buoy cardinal:colour
-      pattern=horizontal
+    seamark:buoy_cardinal:category=east: Tag:seamark:buoy cardinal:category=east
+    seamark:buoy_cardinal:category=north: Tag:seamark:buoy cardinal:category=north
+    seamark:buoy_cardinal:category=south: Tag:seamark:buoy cardinal:category=south
+    seamark:buoy_cardinal:category=west: Tag:seamark:buoy cardinal:category=west
     seamark:buoy_cardinal:shape=can: Tag:seamark:buoy cardinal:shape=can
     seamark:buoy_cardinal:shape=conical: Tag:seamark:buoy cardinal:shape=conical
     seamark:buoy_cardinal:shape=pillar: Tag:seamark:buoy cardinal:shape=pillar
     seamark:buoy_cardinal:shape=spar: Tag:seamark:buoy cardinal:shape=spar
     seamark:buoy_cardinal:shape=spherical: Tag:seamark:buoy cardinal:shape=spherical
-    seamark:buoy_isolated_danger:colour=black;red;black: Tag:seamark:buoy isolated
-      danger:colour=black;red;black
-    seamark:buoy_isolated_danger:colour_pattern=horizontal: Tag:seamark:buoy isolated
-      danger:colour pattern=horizontal
     seamark:buoy_isolated_danger:shape=can: Tag:seamark:buoy isolated danger:shape=can
     seamark:buoy_isolated_danger:shape=conical: Tag:seamark:buoy isolated danger:shape=conical
     seamark:buoy_isolated_danger:shape=pillar: Tag:seamark:buoy isolated danger:shape=pillar
     seamark:buoy_isolated_danger:shape=spar: Tag:seamark:buoy isolated danger:shape=spar
     seamark:buoy_isolated_danger:shape=spherical: Tag:seamark:buoy isolated danger:shape=spherical
+    seamark:buoy_lateral:category=bridge_pier: Tag:seamark:buoy lateral:category=bridge
+      pier
+    seamark:buoy_lateral:category=channel_left: Tag:seamark:buoy lateral:category=channel
+      left
+    seamark:buoy_lateral:category=channel_right: Tag:seamark:buoy lateral:category=channel
+      right
+    seamark:buoy_lateral:category=channel_separation: Tag:seamark:buoy lateral:category=channel
+      separation
+    seamark:buoy_lateral:category=danger_left: Tag:seamark:buoy lateral:category=danger
+      left
+    seamark:buoy_lateral:category=danger_right: Tag:seamark:buoy lateral:category=danger
+      right
+    seamark:buoy_lateral:category=port: Tag:seamark:buoy lateral:category=port
+    seamark:buoy_lateral:category=preferred_channel_port: Tag:seamark:buoy lateral:category=preferred
+      channel port
+    seamark:buoy_lateral:category=preferred_channel_starboard: Tag:seamark:buoy lateral:category=preferred
+      channel starboard
+    seamark:buoy_lateral:category=starboard: Tag:seamark:buoy lateral:category=starboard
+    seamark:buoy_lateral:category=turnoff_left: Tag:seamark:buoy lateral:category=turnoff
+      left
+    seamark:buoy_lateral:category=turnoff_right: Tag:seamark:buoy lateral:category=turnoff
+      right
+    seamark:buoy_lateral:category=waterway_left: Tag:seamark:buoy lateral:category=waterway
+      left
+    seamark:buoy_lateral:category=waterway_right: Tag:seamark:buoy lateral:category=waterway
+      right
+    seamark:buoy_lateral:category=waterway_separation: Tag:seamark:buoy lateral:category=waterway
+      separation
     seamark:buoy_lateral:colour=green: Tag:seamark:buoy lateral:colour=green
     seamark:buoy_lateral:colour=green;red;green: Tag:seamark:buoy lateral:colour=green;red;green
     seamark:buoy_lateral:colour=green;white;green;white: Tag:seamark:buoy lateral:colour=green;white;green;white
@@ -10553,8 +11700,6 @@ en:
     seamark:buoy_lateral:shape=can: Tag:seamark:buoy lateral:shape=can
     seamark:buoy_lateral:shape=conical: Tag:seamark:buoy lateral:shape=conical
     seamark:buoy_lateral:shape=pillar: Tag:seamark:buoy lateral:shape=pillar
-    seamark:buoy_lateral:shape=spar: Tag:seamark:buoy lateral:shape=spar
-    seamark:buoy_lateral:shape=spherical: Tag:seamark:buoy lateral:shape=spherical
     seamark:buoy_safe_water:colour=red;white: Tag:seamark:buoy safe water:colour=red;white
     seamark:buoy_safe_water:colour_pattern=vertical: Tag:seamark:buoy safe water:colour
       pattern=vertical
@@ -10563,8 +11708,14 @@ en:
     seamark:buoy_safe_water:shape=pillar: Tag:seamark:buoy safe water:shape=pillar
     seamark:buoy_safe_water:shape=spar: Tag:seamark:buoy safe water:shape=spar
     seamark:buoy_safe_water:shape=spherical: Tag:seamark:buoy safe water:shape=spherical
+    seamark:buoy_special_purpose:category=mooring: Tag:seamark:buoy special purpose:category=mooring
+    seamark:buoy_special_purpose:category=no_entry: Tag:seamark:buoy special purpose:category=no
+      entry
     seamark:buoy_special_purpose:category=odas: Tag:seamark:buoy special purpose:category=odas
     seamark:buoy_special_purpose:category=racing: Tag:seamark:buoy special purpose:category=racing
+    seamark:buoy_special_purpose:category=recreation_zone: Tag:seamark:buoy special
+      purpose:category=recreation zone
+    seamark:buoy_special_purpose:category=warning: Tag:seamark:buoy special purpose:category=warning
     seamark:buoy_special_purpose:colour=black: Tag:seamark:buoy special purpose:colour=black
     seamark:buoy_special_purpose:colour=blue: Tag:seamark:buoy special purpose:colour=blue
     seamark:buoy_special_purpose:colour=green: Tag:seamark:buoy special purpose:colour=green
@@ -10587,6 +11738,8 @@ en:
     seamark:buoy_special_purpose:shape=super-buoy: Tag:seamark:buoy special purpose:shape=super-buoy
     seamark:cable_overhead:category=power: Tag:seamark:cable overhead:category=power
     seamark:cable_overhead:category=telephone: Tag:seamark:cable overhead:category=telephone
+    seamark:cable_overhead:category=transmission: Tag:seamark:cable overhead:category=transmission
+    seamark:cable_submarine:category=power: Tag:seamark:cable submarine:category=power
     seamark:conspicuity=conspicious: Tag:seamark:conspicuity=conspicious
     seamark:conspicuity=conspicuous: Tag:seamark:conspicuity=conspicuous
     seamark:distance_mark:category=board: Tag:seamark:distance mark:category=board
@@ -10603,6 +11756,7 @@ en:
     seamark:fog_signal:category=siren: Tag:seamark:fog signal:category=siren
     seamark:fog_signal:category=whistle: Tag:seamark:fog signal:category=whistle
     seamark:fog_signal=yes: Tag:seamark:fog signal=yes
+    seamark:harbour:category=fishing: Tag:seamark:harbour:category=fishing
     seamark:harbour:category=marina: Tag:seamark:harbour:category=marina
     seamark:landmark:category=cairn: Tag:seamark:landmark:category=cairn
     seamark:landmark:category=cemetery: Tag:seamark:landmark:category=cemetery
@@ -10637,6 +11791,9 @@ en:
       shrine
     seamark:landmark:function=tempel: Tag:seamark:landmark:function=tempel
     seamark:landmark:function=temple: Tag:seamark:landmark:function=temple
+    seamark:light:1:category=directional: Tag:seamark:light:1:category=directional
+    seamark:light:1:category=lower: Tag:seamark:light:1:category=lower
+    seamark:light:1:category=upper: Tag:seamark:light:1:category=upper
     seamark:light:category=aero: Tag:seamark:light:category=aero
     seamark:light:category=air_obstruction: Tag:seamark:light:category=air obstruction
     seamark:light:category=directional: Tag:seamark:light:category=directional
@@ -10660,10 +11817,27 @@ en:
     seamark:light:visibility=intensified: Tag:seamark:light:visibility=intensified
     seamark:light:visibility=part_obscured: Tag:seamark:light:visibility=part obscured
     seamark:light:visibility=unintensified: Tag:seamark:light:visibility=unintensified
+    seamark:mooring:category=dolphin: Tag:seamark:mooring:category=dolphin
+    seamark:mooring:category=pile: Tag:seamark:mooring:category=pile
     seamark:mooring:category=wall: Tag:seamark:mooring:category=wall
+    seamark:notice:category=ferry_independent: Tag:seamark:notice:category=ferry independent
+    seamark:notice:category=ferry_non_independent: Tag:seamark:notice:category=ferry
+      non independent
+    seamark:notice:category=limited_headroom: Tag:seamark:notice:category=limited
+      headroom
+    seamark:notice:category=no_anchoring: Tag:seamark:notice:category=no anchoring
+    seamark:notice:category=no_berthing: Tag:seamark:notice:category=no berthing
+    seamark:notice:category=no_entry: Tag:seamark:notice:category=no entry
+    seamark:notice:category=speed_limit: Tag:seamark:notice:category=speed limit
+    seamark:notice:function=information: Tag:seamark:notice:function=information
+    seamark:notice:function=prohibition: Tag:seamark:notice:function=prohibition
+    seamark:notice:function=recommendation: Tag:seamark:notice:function=recommendation
+    seamark:notice:function=regulation: Tag:seamark:notice:function=regulation
+    seamark:notice:function=restriction: Tag:seamark:notice:function=restriction
     seamark:obstruction:category=boom: Tag:seamark:obstruction:category=boom
     seamark:radar_transponder:category=racon: Tag:seamark:radar transponder:category=racon
     seamark:radar_transponder:category=ramark: Tag:seamark:radar transponder:category=ramark
+    seamark:radio_station:category=ais: Tag:seamark:radio station:category=ais
     seamark:radio_station:category=chiaka: Tag:seamark:radio station:category=chiaka
     seamark:radio_station:category=commercial_broadcast: Tag:seamark:radio station:category=commercial
       broadcast
@@ -10671,6 +11845,9 @@ en:
       communication
     seamark:radio_station:category=time_signal: Tag:seamark:radio station:category=time
       signal
+    seamark:rescue_station:category=lifeboat: Tag:seamark:rescue station:category=lifeboat
+    seamark:rescue_station:category=lifeboat_on_mooring: Tag:seamark:rescue station:category=lifeboat
+      on mooring
     seamark:restricted_area:category=ecological_reserve: Tag:seamark:restricted area:category=ecological
       reserve
     seamark:restricted_area:category=foul_ground: Tag:seamark:restricted area:category=foul
@@ -10712,6 +11889,14 @@ en:
       speed
     seamark:restricted_area:restriction=turning_prohibited: Tag:seamark:restricted
       area:restriction=turning prohibited
+    seamark:sea_area:category=narrows: Tag:seamark:sea area:category=narrows
+    seamark:sea_area:category=shoal: Tag:seamark:sea area:category=shoal
+    seamark:shoreline_construction:category=breakwater: Tag:seamark:shoreline construction:category=breakwater
+    seamark:shoreline_construction:category=fender: Tag:seamark:shoreline construction:category=fender
+    seamark:shoreline_construction:category=groyne: Tag:seamark:shoreline construction:category=groyne
+    seamark:shoreline_construction:category=training_wall: Tag:seamark:shoreline construction:category=training
+      wall
+    seamark:signal_station_traffic:category=lock: Tag:seamark:signal station traffic:category=lock
     seamark:small_craft_facility:category=boat_hoist: Tag:seamark:small craft facility:category=boat
       hoist
     seamark:small_craft_facility:category=boatyard: Tag:seamark:small craft facility:category=boatyard
@@ -10719,7 +11904,10 @@ en:
     seamark:small_craft_facility:category=electricity: Tag:seamark:small craft facility:category=electricity
     seamark:small_craft_facility:category=fuel_station: Tag:seamark:small craft facility:category=fuel
       station
+    seamark:small_craft_facility:category=launderette: Tag:seamark:small craft facility:category=launderette
     seamark:small_craft_facility:category=laundrette: Tag:seamark:small craft facility:category=laundrette
+    seamark:small_craft_facility:category=nautical_club: Tag:seamark:small craft facility:category=nautical
+      club
     seamark:small_craft_facility:category=pump-out: Tag:seamark:small craft facility:category=pump-out
     seamark:small_craft_facility:category=showers: Tag:seamark:small craft facility:category=showers
     seamark:small_craft_facility:category=slipway: Tag:seamark:small craft facility:category=slipway
@@ -10730,17 +11918,12 @@ en:
     seamark:small_craft_facility:category=water_tap: Tag:seamark:small craft facility:category=water
       tap
     seamark:topmark:colour=black: Tag:seamark:topmark:colour=black
-    seamark:topmark:colour=green: Tag:seamark:topmark:colour=green
     seamark:topmark:colour=grey: Tag:seamark:topmark:colour=grey
     seamark:topmark:colour=orange: Tag:seamark:topmark:colour=orange
-    seamark:topmark:colour=red: Tag:seamark:topmark:colour=red
     seamark:topmark:colour=white: Tag:seamark:topmark:colour=white
-    seamark:topmark:colour=yellow: Tag:seamark:topmark:colour=yellow
     seamark:topmark:shape=2_cones_base_together: Tag:seamark:topmark:shape=2 cones
       base together
     seamark:topmark:shape=2_cones_down: Tag:seamark:topmark:shape=2 cones down
-    seamark:topmark:shape=2_cones_point_together: Tag:seamark:topmark:shape=2 cones
-      point together
     seamark:topmark:shape=2_cones_up: Tag:seamark:topmark:shape=2 cones up
     seamark:topmark:shape=2_spheres: Tag:seamark:topmark:shape=2 spheres
     seamark:topmark:shape=board: Tag:seamark:topmark:shape=board
@@ -10752,58 +11935,88 @@ en:
     seamark:topmark:shape=diamond: Tag:seamark:topmark:shape=diamond
     seamark:topmark:shape=flag: Tag:seamark:topmark:shape=flag
     seamark:topmark:shape=rectangle: Tag:seamark:topmark:shape=rectangle
-    seamark:topmark:shape=rhombus: Tag:seamark:topmark:shape=rhombus
     seamark:topmark:shape=sphere: Tag:seamark:topmark:shape=sphere
     seamark:topmark:shape=square: Tag:seamark:topmark:shape=square
     seamark:topmark:shape=upright-cross: Tag:seamark:topmark:shape=upright-cross
     seamark:topmark:shape=upright_cross: Tag:seamark:topmark:shape=upright cross
-    seamark:topmark:shape=x-shape: Tag:seamark:topmark:shape=x-shape
     seamark:type=anchorage: Tag:seamark:type=anchorage
     seamark:type=beacon_cardinal: Tag:seamark:type=beacon cardinal
     seamark:type=beacon_isolated_danger: Tag:seamark:type=beacon isolated danger
     seamark:type=beacon_lateral: Tag:seamark:type=beacon lateral
+    seamark:type=beacon_safe_water: Tag:seamark:type=beacon safe water
     seamark:type=beacon_special_purpose: Tag:seamark:type=beacon special purpose
     seamark:type=berth: Tag:seamark:type=berth
     seamark:type=bridge: Tag:seamark:type=bridge
+    seamark:type=bunker_station: Tag:seamark:type=bunker station
     seamark:type=buoy_cardinal: Tag:seamark:type=buoy cardinal
+    seamark:type=buoy_installation: Tag:seamark:type=buoy installation
+    seamark:type=buoy_isolated_danger: Tag:seamark:type=buoy isolated danger
     seamark:type=buoy_lateral: Tag:seamark:type=buoy lateral
     seamark:type=buoy_safe_water: Tag:seamark:type=buoy safe water
     seamark:type=buoy_special_purpose: Tag:seamark:type=buoy special purpose
+    seamark:type=cable_area: Tag:seamark:type=cable area
     seamark:type=cable_overhead: Tag:seamark:type=cable overhead
     seamark:type=cable_submarine: Tag:seamark:type=cable submarine
+    seamark:type=calling-in_point: Tag:seamark:type=calling-in point
     seamark:type=causeway: Tag:seamark:type=causeway
     seamark:type=checkpoint: Tag:seamark:type=checkpoint
+    seamark:type=coastguard_station: Tag:seamark:type=coastguard station
     seamark:type=communication_area: Tag:seamark:type=communication area
+    seamark:type=crane: Tag:seamark:type=crane
     seamark:type=distance_mark: Tag:seamark:type=distance mark
+    seamark:type=dredged_area: Tag:seamark:type=dredged area
     seamark:type=dry_dock: Tag:seamark:type=dry dock
+    seamark:type=dumping_ground: Tag:seamark:type=dumping ground
     seamark:type=exceptional_structure: Tag:seamark:type=exceptional structure
+    seamark:type=fairway: Tag:seamark:type=fairway
     seamark:type=gate: Tag:seamark:type=gate
     seamark:type=harbour: Tag:seamark:type=harbour
+    seamark:type=hulk: Tag:seamark:type=hulk
     seamark:type=landmark: Tag:seamark:type=landmark
     seamark:type=light: Tag:seamark:type=light
+    seamark:type=light_float: Tag:seamark:type=light float
     seamark:type=light_major: Tag:seamark:type=light major
     seamark:type=light_minor: Tag:seamark:type=light minor
+    seamark:type=light_vessel: Tag:seamark:type=light vessel
     seamark:type=lock_basin: Tag:seamark:type=lock basin
+    seamark:type=marine_farm: Tag:seamark:type=marine farm
     seamark:type=mooring: Tag:seamark:type=mooring
     seamark:type=navigation_line: Tag:seamark:type=navigation line
     seamark:type=notice: Tag:seamark:type=notice
+    seamark:type=obstruction: Tag:seamark:type=obstruction
     seamark:type=pile: Tag:seamark:type=pile
+    seamark:type=pilot_boarding: Tag:seamark:type=pilot boarding
     seamark:type=pipeline_submarine: Tag:seamark:type=pipeline submarine
     seamark:type=platform: Tag:seamark:type=platform
-    seamark:type=radar_transponder: Tag:seamark:type=radar transponder
+    seamark:type=production_area: Tag:seamark:type=production area
+    seamark:type=radar_station: Tag:seamark:type=radar station
+    seamark:type=radio_station: Tag:seamark:type=radio station
     seamark:type=recommended_track: Tag:seamark:type=recommended track
+    seamark:type=rescue_station: Tag:seamark:type=rescue station
     seamark:type=restricted_area: Tag:seamark:type=restricted area
     seamark:type=rock: Tag:seamark:type=rock
+    seamark:type=sea_area: Tag:seamark:type=sea area
+    seamark:type=seaplane_landing_area: Tag:seamark:type=seaplane landing area
+    seamark:type=separation_boundary: Tag:seamark:type=separation boundary
+    seamark:type=separation_lane: Tag:seamark:type=separation lane
+    seamark:type=separation_line: Tag:seamark:type=separation line
+    seamark:type=separation_zone: Tag:seamark:type=separation zone
+    seamark:type=shoreline_construction: Tag:seamark:type=shoreline construction
     seamark:type=signal_station_traffic: Tag:seamark:type=signal station traffic
     seamark:type=signal_station_warning: Tag:seamark:type=signal station warning
     seamark:type=small_craft_facility: Tag:seamark:type=small craft facility
     seamark:type=virtual_aton: Tag:seamark:type=virtual aton
+    seamark:type=waterway_gauge: Tag:seamark:type=waterway gauge
     seamark:type=wreck: Tag:seamark:type=wreck
+    seamark:wreck:category=dangerous: Tag:seamark:wreck:category=dangerous
+    seamark:wreck:category=hull_showing: Tag:seamark:wreck:category=hull showing
+    seamark:wreck:category=non-dangerous: Tag:seamark:wreck:category=non-dangerous
     seamark=landmark: Tag:seamark=landmark
     second_hand=only: Tag:second hand=only
     second_hand=yes: Tag:second hand=yes
     segregated=no: Tag:segregated=no
     segregated=yes: Tag:segregated=yes
+    service:vehicle:tyres=yes: Tag:service:vehicle:tyres=yes
     service=aircraft_control: Tag:service=aircraft control
     service=alley: Tag:service=alley
     service=bus: Tag:service=bus
@@ -10818,6 +12031,7 @@ en:
     service=irrigation: Tag:service=irrigation
     service=parking_aisle: Tag:service=parking aisle
     service=parts: Tag:service=parts
+    service=pipestem: Tag:service=pipestem
     service=repair: Tag:service=repair
     service=siding: Tag:service=siding
     service=slipway: Tag:service=slipway
@@ -10825,12 +12039,15 @@ en:
     service=tyres: Tag:service=tyres
     service=yard: Tag:service=yard
     sett:style=portuguese: Tag:sett:style=portuguese
+    seveso=seuil_bas: Tag:seveso=seuil bas
+    seveso=seuil_haut: Tag:seveso=seuil haut
     shelter_type=Wetterpilz: Tag:shelter type=Wetterpilz
     shelter_type=basic_hut: Tag:shelter type=basic hut
     shelter_type=changing_rooms: Tag:shelter type=changing rooms
     shelter_type=field_shelter: Tag:shelter type=field shelter
     shelter_type=gazebo: Tag:shelter type=gazebo
     shelter_type=lean_to: Tag:shelter type=lean to
+    shelter_type=nuclear: Tag:shelter type=nuclear
     shelter_type=pavilion: Tag:shelter type=pavilion
     shelter_type=picnic_shelter: Tag:shelter type=picnic shelter
     shelter_type=public_transport: Tag:shelter type=public transport
@@ -10919,11 +12136,13 @@ en:
     shop=energy: Tag:shop=energy
     shop=equestrian: Tag:shop=equestrian
     shop=erotic: Tag:shop=erotic
+    shop=esoteric: Tag:shop=esoteric
     shop=estate_agent: Tag:shop=estate agent
     shop=fabric: Tag:shop=fabric
     shop=fabrics: Tag:shop=fabrics
     shop=farm: Tag:shop=farm
     shop=fashion: Tag:shop=fashion
+    shop=fashion_accesories: Tag:shop=fashion accesories
     shop=fashion_accessories: Tag:shop=fashion accessories
     shop=fast_food: Tag:shop=fast food
     shop=firearms: Tag:shop=firearms
@@ -10990,6 +12209,7 @@ en:
     shop=junk_yard: Tag:shop=junk yard
     shop=kiosk: Tag:shop=kiosk
     shop=kitchen: Tag:shop=kitchen
+    shop=kitchenware: Tag:shop=kitchenware
     shop=lamps: Tag:shop=lamps
     shop=laundromat: Tag:shop=laundromat
     shop=laundry: Tag:shop=laundry
@@ -11019,6 +12239,7 @@ en:
     shop=music: Tag:shop=music
     shop=musical_instrument: Tag:shop=musical instrument
     shop=musical_instruments: Tag:shop=musical instruments
+    shop=new_age: Tag:shop=new age
     shop=newsagent: Tag:shop=newsagent
     shop=no: Tag:shop=no
     shop=nutrition_supplements: Tag:shop=nutrition supplements
@@ -11027,6 +12248,7 @@ en:
     shop=optician: Tag:shop=optician
     shop=organic: Tag:shop=organic
     shop=outdoor: Tag:shop=outdoor
+    shop=outdoor_power_equipment: Tag:shop=outdoor power equipment
     shop=outpost: Tag:shop=outpost
     shop=paint: Tag:shop=paint
     shop=party: Tag:shop=party
@@ -11042,6 +12264,7 @@ en:
     shop=photo: Tag:shop=photo
     shop=photo_studio: Tag:shop=photo studio
     shop=photography: Tag:shop=photography
+    shop=plant_hire: Tag:shop=plant hire
     shop=pottery: Tag:shop=pottery
     shop=printer_ink: Tag:shop=printer ink
     shop=printing: Tag:shop=printing
@@ -11074,6 +12297,7 @@ en:
     shop=spare_parts: Tag:shop=spare parts
     shop=spices: Tag:shop=spices
     shop=sports: Tag:shop=sports
+    shop=stairs: Tag:shop=stairs
     shop=stationery: Tag:shop=stationery
     shop=storage_rental: Tag:shop=storage rental
     shop=street_vendor: Tag:shop=street vendor
@@ -11084,6 +12308,7 @@ en:
     shop=tailor: Tag:shop=tailor
     shop=tattoo: Tag:shop=tattoo
     shop=tea: Tag:shop=tea
+    shop=telecommunication: Tag:shop=telecommunication
     shop=ticket: Tag:shop=ticket
     shop=tickets: Tag:shop=tickets
     shop=tiles: Tag:shop=tiles
@@ -11137,6 +12362,7 @@ en:
     sinkhole=ponor: Tag:sinkhole=ponor
     site=parking: Tag:site=parking
     site=piste: Tag:site=piste
+    site=venue: Tag:site=venue
     site_type=bigstone: Tag:site type=bigstone
     site_type=city: Tag:site type=city
     site_type=fortification: Tag:site type=fortification
@@ -11168,11 +12394,17 @@ en:
     source:geometry=ACTMapiRoads: Tag:source:geometry=ACTMapiRoads
     source:geometry=ACTMapiTP: Tag:source:geometry=ACTMapiTP
     source:geometry=Bing: Tag:source:geometry=Bing
+    source:geometry=GURS: Tag:source:geometry=GURS
     source:geometry=LPI_NSW_Imagery: Tag:source:geometry=LPI NSW Imagery
     source:geometry=NPWS_Estate: Tag:source:geometry=NPWS Estate
     source:geometry=NSW_LPI_Base_Map: Tag:source:geometry=NSW LPI Base Map
     source:geometry=NSW_LPI_Imagery: Tag:source:geometry=NSW LPI Imagery
     source:geometry=PSMA_Admin_Boundaries: Tag:source:geometry=PSMA Admin Boundaries
+    source:maxspeed=BE-BRU:urban: Tag:source:maxspeed=BE-BRU:urban
+    source:maxspeed=BE-VLG:rural: Tag:source:maxspeed=BE-VLG:rural
+    source:maxspeed=BE-VLG:urban: Tag:source:maxspeed=BE-VLG:urban
+    source:maxspeed=BE-WAL:rural: Tag:source:maxspeed=BE-WAL:rural
+    source:maxspeed=BE-WAL:urban: Tag:source:maxspeed=BE-WAL:urban
     source:maxspeed=implicit: Tag:source:maxspeed=implicit
     source:name=LPI_NSW_Base_Map: Tag:source:name=LPI NSW Base Map
     source:name=NPWS_Estate: Tag:source:name=NPWS Estate
@@ -11213,6 +12445,7 @@ en:
     source=VicMap_ParkRes: Tag:source=VicMap ParkRes
     source=YahooJapan/ALPSMAP: Tag:source=YahooJapan/ALPSMAP
     source=gurs: Tag:source=gurs
+    source=www.geoportal.gov.pl: Tag:source=www.geoportal.gov.pl
     sport=10pin: Tag:sport=10pin
     sport=8pin: Tag:sport=8pin
     sport=9pin: Tag:sport=9pin
@@ -11275,9 +12508,11 @@ en:
     sport=footballgolf: Tag:sport=footballgolf
     sport=four_square: Tag:sport=four square
     sport=free_flying: Tag:sport=free flying
+    sport=funnel_ball: Tag:sport=funnel ball
     sport=futsal: Tag:sport=futsal
     sport=gaelic_football: Tag:sport=gaelic football
     sport=gaelic_games: Tag:sport=gaelic games
+    sport=gaga: Tag:sport=gaga
     sport=golf: Tag:sport=golf
     sport=gymnastics: Tag:sport=gymnastics
     sport=handball: Tag:sport=handball
@@ -11356,8 +12591,10 @@ en:
     sport=taekwondo: Tag:sport=taekwondo
     sport=team_handball: Tag:sport=team handball
     sport=tennis: Tag:sport=tennis
+    sport=tetherball: Tag:sport=tetherball
     sport=toboggan: Tag:sport=toboggan
     sport=trampoline: Tag:sport=trampoline
+    sport=trugo: Tag:sport=trugo
     sport=ultimate: Tag:sport=ultimate
     sport=volleyball: Tag:sport=volleyball
     sport=wakeboarding: Tag:sport=wakeboarding
@@ -11373,7 +12610,13 @@ en:
     spring:type=hot: Tag:spring:type=hot
     station=funicular: Tag:station=funicular
     station=light_rail: Tag:station=light rail
+    station=monorail: Tag:station=monorail
     station=subway: Tag:station=subway
+    statue=animal: Tag:statue=animal
+    statue=equestrian: Tag:statue=equestrian
+    statue=virgin: Tag:statue=virgin
+    stile=stepover: Tag:stile=stepover
+    stone_type=khachkar: Tag:stone type=khachkar
     stream=intermittent: Tag:stream=intermittent
     street_vendor=yes: Tag:street vendor=yes
     studio=audio: Tag:studio=audio
@@ -11381,6 +12624,7 @@ en:
     studio=television: Tag:studio=television
     studio=video: Tag:studio=video
     submarine=yes: Tag:submarine=yes
+    substance=water: Tag:substance=water
     substation=compensation: Tag:substation=compensation
     substation=converter: Tag:substation=converter
     substation=distribution: Tag:substation=distribution
@@ -11395,6 +12639,9 @@ en:
     surface=acrylic: Tag:surface=acrylic
     surface=artificial_turf: Tag:surface=artificial turf
     surface=asphalt: Tag:surface=asphalt
+    surface=brick: Tag:surface=brick
+    surface=bricks: Tag:surface=bricks
+    surface=carpet: Tag:surface=carpet
     surface=chipseal: Tag:surface=chipseal
     surface=clay: Tag:surface=clay
     surface=cobblestone: Tag:surface=cobblestone
@@ -11410,6 +12657,7 @@ en:
     surface=gravel: Tag:surface=gravel
     surface=ground: Tag:surface=ground
     surface=metal: Tag:surface=metal
+    surface=metal_grid: Tag:surface=metal grid
     surface=mud: Tag:surface=mud
     surface=paved: Tag:surface=paved
     surface=paving_stones: Tag:surface=paving stones
@@ -11418,6 +12666,8 @@ en:
     surface=rocks: Tag:surface=rocks
     surface=sand: Tag:surface=sand
     surface=sett: Tag:surface=sett
+    surface=snow: Tag:surface=snow
+    surface=stepping_stones: Tag:surface=stepping stones
     surface=tartan: Tag:surface=tartan
     surface=unhewn_cobblestone: Tag:surface=unhewn cobblestone
     surface=unpaved: Tag:surface=unpaved
@@ -11453,6 +12703,7 @@ en:
     telecom:medium=copper: Tag:telecom:medium=copper
     telecom:medium=fibre: Tag:telecom:medium=fibre
     telecom=antenna: Tag:telecom=antenna
+    telecom=central_office: Tag:telecom=central office
     telecom=connection_point: Tag:telecom=connection point
     telecom=cross-connect: Tag:telecom=cross-connect
     telecom=data_center: Tag:telecom=data center
@@ -11460,9 +12711,11 @@ en:
     telecom=datacenter: Tag:telecom=datacenter
     telecom=distribution_point: Tag:telecom=distribution point
     telecom=exchange: Tag:telecom=exchange
+    telecom=outdoor_dslam: Tag:telecom=outdoor dslam
     telecom=remote_digital_terminal: Tag:telecom=remote digital terminal
     telecom=remote_terminal: Tag:telecom=remote terminal
     telecom=service_device: Tag:telecom=service device
+    telecom=street_cabinet: Tag:telecom=street cabinet
     telescope:type=optical: Tag:telescope:type=optical
     telescope:type=radio: Tag:telescope:type=radio
     theatre:type=amphi: Tag:theatre:type=amphi
@@ -11471,6 +12724,7 @@ en:
     theatre:type=opera_house: Tag:theatre:type=opera house
     tickets:public_transport_subscription=yes: Tag:tickets:public transport subscription=yes
     toilets:access=customers: Tag:toilets:access=customers
+    toll:designated=yes: Tag:toll:designated=yes
     toll=yes: Tag:toll=yes
     tomb=cenotaph: Tag:tomb=cenotaph
     tomb=columbarium: Tag:tomb=columbarium
@@ -11523,6 +12777,7 @@ en:
     tower:construction=guyed_tube: Tag:tower:construction=guyed tube
     tower:construction=lattice: Tag:tower:construction=lattice
     tower:type: Tag:tower:type
+    tower:type=anchor: Tag:tower:type=anchor
     tower:type=bell_tower: Tag:tower:type=bell tower
     tower:type=bridge: Tag:tower:type=bridge
     tower:type=communication: Tag:tower:type=communication
@@ -11542,6 +12797,7 @@ en:
     tower:type=radar: Tag:tower:type=radar
     tower:type=siren: Tag:tower:type=siren
     tower:type=suspension: Tag:tower:type=suspension
+    tower:type=transposing: Tag:tower:type=transposing
     tower:type=watchtower: Tag:tower:type=watchtower
     trade=wood: Tag:trade=wood
     traffic=local: Tag:traffic=local
@@ -11562,15 +12818,20 @@ en:
     traffic_calming=island: Tag:traffic calming=island
     traffic_calming=mini_bumps: Tag:traffic calming=mini bumps
     traffic_calming=painted_island: Tag:traffic calming=painted island
+    traffic_calming=painted_table: Tag:traffic calming=painted table
     traffic_calming=rumble_strip: Tag:traffic calming=rumble strip
     traffic_calming=table: Tag:traffic calming=table
     traffic_sign:backward=DE:325.1: Tag:traffic sign:backward=DE:325.1
     traffic_sign:backward=DE:325.2: Tag:traffic sign:backward=DE:325.2
     traffic_sign:forward=DE:325.1: Tag:traffic sign:forward=DE:325.1
     traffic_sign:forward=DE:325.2: Tag:traffic sign:forward=DE:325.2
+    traffic_sign=AT:52.1: Tag:traffic sign=AT:52.1
+    traffic_sign=AT:52.17a-a: Tag:traffic sign=AT:52.17a-a
     traffic_sign=CH:2.59.3: Tag:traffic sign=CH:2.59.3
     traffic_sign=CH:2.59.5: Tag:traffic sign=CH:2.59.5
     traffic_sign=DE:1022-10: Tag:traffic sign=DE:1022-10
+    traffic_sign=DE:103-10: Tag:traffic sign=DE:103-10
+    traffic_sign=DE:103-20: Tag:traffic sign=DE:103-20
     traffic_sign=DE:124: Tag:traffic sign=DE:124
     traffic_sign=DE:133-10: Tag:traffic sign=DE:133-10
     traffic_sign=DE:136-10: Tag:traffic sign=DE:136-10
@@ -11618,6 +12879,8 @@ en:
     traffic_sign=DE:274.1-20: Tag:traffic sign=DE:274.1-20
     traffic_sign=DE:274.2: Tag:traffic sign=DE:274.2
     traffic_sign=DE:274.2-20: Tag:traffic sign=DE:274.2-20
+    traffic_sign=DE:276: Tag:traffic sign=DE:276
+    traffic_sign=DE:277: Tag:traffic sign=DE:277
     traffic_sign=DE:282: Tag:traffic sign=DE:282
     traffic_sign=DE:306: Tag:traffic sign=DE:306
     traffic_sign=DE:310: Tag:traffic sign=DE:310
@@ -11635,6 +12898,7 @@ en:
     traffic_sign=DE:354: Tag:traffic sign=DE:354
     traffic_sign=DE:357: Tag:traffic sign=DE:357
     traffic_sign=DE:385: Tag:traffic sign=DE:385
+    traffic_sign=DE:386.1: Tag:traffic sign=DE:386.1
     traffic_sign=DE:386.3: Tag:traffic sign=DE:386.3
     traffic_sign=DE:394-50: Tag:traffic sign=DE:394-50
     traffic_sign=DE:437: Tag:traffic sign=DE:437
@@ -11643,15 +12907,27 @@ en:
     traffic_sign=DE:448: Tag:traffic sign=DE:448
     traffic_sign=DE:449: Tag:traffic sign=DE:449
     traffic_sign=DE:453: Tag:traffic sign=DE:453
+    traffic_sign=DE:600-35: Tag:traffic sign=DE:600-35
+    traffic_sign=DE:600-36: Tag:traffic sign=DE:600-36
+    traffic_sign=DE:600-37: Tag:traffic sign=DE:600-37
+    traffic_sign=DE:600-38: Tag:traffic sign=DE:600-38
+    traffic_sign=DE:600-39: Tag:traffic sign=DE:600-39
     traffic_sign=NL:A01-30-ZB: Tag:traffic sign=NL:A01-30-ZB
     traffic_sign=NL:C15: Tag:traffic sign=NL:C15
     traffic_sign=NL:G07: Tag:traffic sign=NL:G07
     traffic_sign=NL:G11: Tag:traffic sign=NL:G11
     traffic_sign=NL:G12a: Tag:traffic sign=NL:G12a
     traffic_sign=NL:G13: Tag:traffic sign=NL:G13
+    traffic_sign=NL:L51: Tag:traffic sign=NL:L51
+    traffic_sign=PL:A-1: Tag:traffic sign=PL:A-1
+    traffic_sign=PL:A-2: Tag:traffic sign=PL:A-2
+    traffic_sign=PL:D-42: Tag:traffic sign=PL:D-42
+    traffic_sign=PL:D-43: Tag:traffic sign=PL:D-43
+    traffic_sign=US:MD:M1-5: Tag:traffic sign=US:MD:M1-5
     traffic_sign=city_limit: Tag:traffic sign=city limit
     traffic_sign=give_way: Tag:traffic sign=give way
     traffic_sign=stop: Tag:traffic sign=stop
+    traffic_signals=continuous_green: Tag:traffic signals=continuous green
     traffic_signals=tram_priority: Tag:traffic signals=tram priority
     trailer:type=motorcycle: Tag:trailer:type=motorcycle
     trailhead: Tag:trailhead
@@ -11663,6 +12939,7 @@ en:
     transformer=converter: Tag:transformer=converter
     transformer=distribution: Tag:transformer=distribution
     transformer=generator: Tag:transformer=generator
+    transformer=main: Tag:transformer=main
     transformer=phase_angle_regulator: Tag:transformer=phase angle regulator
     transformer=traction: Tag:transformer=traction
     transformer=yes: Tag:transformer=yes
@@ -11694,6 +12971,7 @@ en:
     type=destination_sign: Tag:type=destination sign
     type=enforcement: Tag:type=enforcement
     type=fixed_point: Tag:type=fixed point
+    type=health: Tag:type=health
     type=multipolygon: Tag:type=multipolygon
     type=observation_spot: Tag:type=observation spot
     type=public_transport: Tag:type=public transport
@@ -11702,6 +12980,7 @@ en:
     type=site: Tag:type=site
     type=superroute: Tag:type=superroute
     type=triangulation: Tag:type=triangulation
+    type=turnlanes:turns: Tag:type=turnlanes:turns
     type=waterway: Tag:type=waterway
     usage=branch: Tag:usage=branch
     usage=distribution: Tag:usage=distribution
@@ -11738,12 +13017,17 @@ en:
     valley=balka: Tag:valley=balka
     valve=ball: Tag:valve=ball
     valve=butterfly: Tag:valve=butterfly
+    valve=check: Tag:valve=check
     valve=gate: Tag:valve=gate
     valve=globe: Tag:valve=globe
+    valve=hollow_jet: Tag:valve=hollow jet
     valve=needle: Tag:valve=needle
     valve=plug: Tag:valve=plug
     valve=spool: Tag:valve=spool
     vehicle=customers: Tag:vehicle=customers
+    vehicle=destination: Tag:vehicle=destination
+    vehicle=no: Tag:vehicle=no
+    vehicle=yes: Tag:vehicle=yes
     vending: Tag:vending
     vending=SIM-cards: Tag:vending=SIM-cards
     vending=SIM_cards: Tag:vending=SIM cards
@@ -11760,6 +13044,8 @@ en:
     vending=chewing_gums: Tag:vending=chewing gums
     vending=cigarettes: Tag:vending=cigarettes
     vending=coffee: Tag:vending=coffee
+    vending=coin_change_machine: Tag:vending=coin change machine
+    vending=coin_rolls: Tag:vending=coin rolls
     vending=condoms: Tag:vending=condoms
     vending=contact_lenses: Tag:vending=contact lenses
     vending=drinks: Tag:vending=drinks
@@ -11771,6 +13057,7 @@ en:
     vending=first_aid: Tag:vending=first aid
     vending=fishing_bait: Tag:vending=fishing bait
     vending=fishing_tackle: Tag:vending=fishing tackle
+    vending=flower_seeds: Tag:vending=flower seeds
     vending=flowers: Tag:vending=flowers
     vending=food: Tag:vending=food
     vending=fuel: Tag:vending=fuel
@@ -11804,9 +13091,15 @@ en:
     vending_machine=fuel: Tag:vending machine=fuel
     wall=brick: Tag:wall=brick
     wall=castle_wall: Tag:wall=castle wall
+    wall=concrete: Tag:wall=concrete
+    wall=concrete_block: Tag:wall=concrete block
     wall=dry_stone: Tag:wall=dry stone
+    wall=flint: Tag:wall=flint
+    wall=flood_wall: Tag:wall=flood wall
+    wall=gabion:value: Tag:wall=gabion:value
     wall=no: Tag:wall=no
     wall=noise_barrier: Tag:wall=noise barrier
+    wall=pise:value: Tag:wall=pise:value
     wall=seawall: Tag:wall=seawall
     wall=stone: Tag:wall=stone
     wall=stone_wall: Tag:wall=stone wall
@@ -11817,14 +13110,17 @@ en:
     waste=drugs: Tag:waste=drugs
     waste=oil: Tag:waste=oil
     waste=organic: Tag:waste=organic
+    waste=pizza_box: Tag:waste=pizza box
     waste=rubble: Tag:waste=rubble
     waste=sharps: Tag:waste=sharps
     waste=trash: Tag:waste=trash
     water=basin: Tag:water=basin
     water=canal: Tag:water=canal
     water=ditch: Tag:water=ditch
+    water=dock: Tag:water=dock
     water=drain: Tag:water=drain
     water=fish_pass: Tag:water=fish pass
+    water=harbour: Tag:water=harbour
     water=intermittent: Tag:water=intermittent
     water=lagoon: Tag:water=lagoon
     water=lake: Tag:water=lake
@@ -11856,7 +13152,6 @@ en:
     waterway=drain: Tag:waterway=drain
     waterway=dredged_area: Tag:waterway=dredged area
     waterway=drystream: Tag:waterway=drystream
-    waterway=estuary: Tag:waterway=estuary
     waterway=fairway: Tag:waterway=fairway
     waterway=fish_pass: Tag:waterway=fish pass
     waterway=floating_barrier: Tag:waterway=floating barrier
@@ -11873,6 +13168,7 @@ en:
     waterway=riverbed: Tag:waterway=riverbed
     waterway=sanitary_dump_station: Tag:waterway=sanitary dump station
     waterway=seaway: Tag:waterway=seaway
+    waterway=security_lock: Tag:waterway=security lock
     waterway=sluice_gate: Tag:waterway=sluice gate
     waterway=soakhole: Tag:waterway=soakhole
     waterway=spillway: Tag:waterway=spillway
@@ -11910,6 +13206,8 @@ en:
     zone:traffic=DE:motorway: Tag:zone:traffic=DE:motorway
     zone:traffic=DE:rural: Tag:zone:traffic=DE:rural
     zone:traffic=DE:urban: Tag:zone:traffic=DE:urban
+    zone:traffic=NL:rural: Tag:zone:traffic=NL:rural
+    zone:traffic=NL:urban: Tag:zone:traffic=NL:urban
     zoo=aviary: Tag:zoo=aviary
     zoo=birds: Tag:zoo=birds
     zoo=butterfly: Tag:zoo=butterfly
@@ -11920,13 +13218,33 @@ en:
     zoo=safari_park: Tag:zoo=safari park
     zoo=wildlife_park: Tag:zoo=wildlife park
 eo:
+  key:
+    bench: Eo:Key:bench
+    diet: Eo:Key:diet
+    diet:vegan: Eo:Key:diet:vegan
+    diet:vegetarian: Eo:Key:diet:vegetarian
+    website:menu: Eo:Key:website:menu
   tag:
+    aeroway=windsock: Eo:Tag:aeroway=windsock
+    amenity=bench: Eo:Tag:amenity=bench
+    amenity=cafe: Eo:Tag:amenity=cafe
+    amenity=fast_food: Eo:Tag:amenity=fast food
+    amenity=restaurant: Eo:Tag:amenity=restaurant
     craft=tinsmith: Eo:Tag:craft=tinsmith
     esperanto=esperanto: Eo:Tag:esperanto=esperanto
     esperanto=yes: Eo:Tag:esperanto=yes
+    generator:source=solar: Eo:Tag:generator:source=solar
+    highway=cycleway: Eo:Tag:highway=cycleway
+    highway=street_lamp: Eo:Tag:highway=street lamp
+    leisure=picnic_table: Eo:Tag:leisure=picnic table
+    place=country: Eo:Tag:place=country
+    place=hamlet: Eo:Tag:place=hamlet
+    place=village: Eo:Tag:place=village
     shop=bakery: Eo:Tag:shop=bakery
+    waterway=river: Eo:Tag:waterway=river
 es:
   key:
+    4wd_only: ES:Key:4wd only
     AlpinRes_ID: ES:Key:AlpinRes ID
     abandoned: ES:Key:abandoned
     'abandoned:': 'ES:Key:abandoned:'
@@ -11940,7 +13258,9 @@ es:
     access:roadtrain:trailers: ES:Key:access:roadtrain:trailers
     addr: ES:Key:addr
     addr:city: ES:Key:addr:city
+    addr:conscriptionnumber: ES:Key:addr:conscriptionnumber
     addr:country: ES:Key:addr:country
+    addr:county: ES:Key:addr:county
     addr:district: ES:Key:addr:district
     addr:flats: ES:Key:addr:flats
     addr:floor: ES:Key:addr:floor
@@ -11951,6 +13271,7 @@ es:
     addr:inclusion: ES:Key:addr:inclusion
     addr:interpolation: ES:Key:addr:interpolation
     addr:place: ES:Key:addr:place
+    addr:postbox: ES:Key:addr:postbox
     addr:postcode: ES:Key:addr:postcode
     addr:province: ES:Key:addr:province
     addr:state: ES:Key:addr:state
@@ -11958,6 +13279,7 @@ es:
     addr:subdistrict: ES:Key:addr:subdistrict
     addr:suburb: ES:Key:addr:suburb
     admin_level: ES:Key:admin level
+    advertising: ES:Key:advertising
     aerialway: ES:Key:aerialway
     aeroway: ES:Key:aeroway
     after_school: ES:Key:after school
@@ -11970,27 +13292,38 @@ es:
     artist_name: ES:Key:artist name
     artwork_subject: ES:Key:artwork subject
     artwork_type: ES:Key:artwork type
+    attribution: ES:Key:attribution
+    atv: ES:Key:atv
+    avalanche_protection: ES:Key:avalanche protection
     backrest: ES:Key:backrest
     barrier: ES:Key:barrier
+    basin: ES:Key:basin
     bdouble: ES:Key:bdouble
     beauty: ES:Key:beauty
     beds: ES:Key:beds
+    bench: ES:Key:bench
+    bicycle: ES:Key:bicycle
     bicycle_parking: ES:Key:bicycle parking
     bicycle_road: ES:Key:bicycle road
     board:title: ES:Key:board:title
+    boat: ES:Key:boat
+    bollard: ES:Key:bollard
     books: ES:Key:books
     border_type: ES:Key:border type
+    boundary: ES:Key:boundary
     branch: ES:Key:branch
     brand: ES:Key:brand
     brewery: ES:Key:brewery
     bridge: ES:Key:bridge
     bridge:structure: ES:Key:bridge:structure
     building: ES:Key:building
+    building:colour: ES:Key:building:colour
     building:fireproof: ES:Key:building:fireproof
     building:flats: ES:Key:building:flats
     building:levels: ES:Key:building:levels
     building:levels:underground: ES:Key:building:levels:underground
     building:material: ES:Key:building:material
+    building:max_level: ES:Key:building:max level
     building:min_level: ES:Key:building:min level
     building:part: ES:Key:building:part
     building:soft_storey: ES:Key:building:soft storey
@@ -11999,10 +13332,16 @@ es:
     bus_bay: ES:Key:bus bay
     busway: ES:Key:busway
     capital: ES:Key:capital
+    car_wash: ES:Key:car wash
+    cash_withdrawal: ES:Key:cash withdrawal
+    castle_type: ES:Key:castle type
     cemetery: ES:Key:cemetery
+    change: ES:Key:change
     changesets_count: ES:Key:changesets count
+    charge: ES:Key:charge
     check_date: ES:Key:check date
     circumference: ES:Key:circumference
+    closed:note: ES:Key:closed:note
     clothes: ES:Key:clothes
     club: ES:Key:club
     collection_times: ES:Key:collection times
@@ -12016,8 +13355,37 @@ es:
     construction: ES:Key:construction
     consulting: ES:Key:consulting
     contact: ES:Key:contact
+    contact:city: ES:Key:contact:city
+    contact:diaspora: ES:Key:contact:diaspora
+    contact:email: ES:Key:contact:email
     contact:facebook: ES:Key:contact:facebook
+    contact:fax: ES:Key:contact:fax
+    contact:flickr: ES:Key:contact:flickr
+    contact:foursquare: ES:Key:contact:foursquare
+    contact:gnusocial: ES:Key:contact:gnusocial
+    contact:housenumber: ES:Key:contact:housenumber
+    contact:instagram: ES:Key:contact:instagram
+    contact:linkedin: ES:Key:contact:linkedin
+    contact:mastodon: ES:Key:contact:mastodon
+    contact:mobile: ES:Key:contact:mobile
+    contact:ok: ES:Key:contact:ok
+    contact:phone: ES:Key:contact:phone
+    contact:pinterest: ES:Key:contact:pinterest
+    contact:pobox: ES:Key:contact:pobox
+    contact:postcode: ES:Key:contact:postcode
+    contact:sip: ES:Key:contact:sip
+    contact:skype: ES:Key:contact:skype
+    contact:street: ES:Key:contact:street
+    contact:telegram: ES:Key:contact:telegram
     contact:twitter: ES:Key:contact:twitter
+    contact:vhf: ES:Key:contact:vhf
+    contact:viber: ES:Key:contact:viber
+    contact:vk: ES:Key:contact:vk
+    contact:webcam: ES:Key:contact:webcam
+    contact:website: ES:Key:contact:website
+    contact:whatsapp: ES:Key:contact:whatsapp
+    contact:xing: ES:Key:contact:xing
+    contact:youtube: ES:Key:contact:youtube
     content: ES:Key:content
     conveying: ES:Key:conveying
     country: ES:Key:country
@@ -12042,8 +13410,8 @@ es:
     'demolished:': 'ES:Key:demolished:'
     denotation: ES:Key:denotation
     description: ES:Key:description
+    designation: ES:Key:designation
     destination: ES:Key:destination
-    diaper: ES:Key:diaper
     diet: ES:Key:diet
     diet:*: ES:Key:diet:*
     diet:kosher: ES:Key:diet:kosher
@@ -12055,31 +13423,45 @@ es:
     disused: ES:Key:disused
     'disused:': 'ES:Key:disused:'
     disused:railway: ES:Key:disused:railway
+    drain: ES:Key:drain
+    drinking_water: ES:Key:drinking water
     drive_in: ES:Key:drive in
     drive_through: ES:Key:drive through
     ele: ES:Key:ele
+    electric_bicycle: ES:Key:electric bicycle
+    electrified: ES:Key:electrified
     email: ES:Key:email
     embankment: ES:Key:embankment
+    embedded_rails: ES:Key:embedded rails
     emergency: ES:Key:emergency
     emergency:phone: ES:Key:emergency:phone
     end_date: ES:Key:end date
     enforcement: ES:Key:enforcement
     engineer: ES:Key:engineer
     entrance: ES:Key:entrance
+    est_width: ES:Key:est width
     evacuation_route: ES:Key:evacuation route
     facebook: ES:Key:facebook
     fair_trade: ES:Key:fair trade
     fax: ES:Key:fax
     fee: ES:Key:fee
     fence_type: ES:Key:fence type
+    fire_boundary: ES:Key:fire boundary
+    fire_object:type: ES:Key:fire object:type
+    fire_operator: ES:Key:fire operator
+    fire_rank: ES:Key:fire rank
     fishing: ES:Key:fishing
     fixme: ES:Key:fixme
     flag:type: ES:Key:flag:type
+    flood_date: ES:Key:flood date
+    flood_mark: ES:Key:flood mark
     flood_prone: ES:Key:flood prone
     foot: ES:Key:foot
     foot:backward: ES:Key:foot:backward
     footway: ES:Key:footway
     ford: ES:Key:ford
+    forestry: ES:Key:forestry
+    frequency: ES:Key:frequency
     from: ES:Key:from
     fuel:diesel_G2: ES:Key:fuel:diesel G2
     garden:style: ES:Key:garden:style
@@ -12091,19 +13473,28 @@ es:
     generator:type: ES:Key:generator:type
     genus: ES:Key:genus
     geological: ES:Key:geological
+    golf_cart: ES:Key:golf cart
     goods: ES:Key:goods
     government: ES:Key:government
     grassland: ES:Key:grassland
     handrail: ES:Key:handrail
+    hazard: ES:Key:hazard
     hazard_prone: ES:Key:hazard prone
+    hazmat: ES:Key:hazmat
     healthcare: ES:Key:healthcare
     healthcare:counselling: ES:Key:healthcare:counselling
+    healthcare:speciality: ES:Key:healthcare:speciality
     height: ES:Key:height
     heritage: ES:Key:heritage
+    hgv: ES:Key:hgv
     highway: ES:Key:highway
     historic: ES:Key:historic
     historic:civilization: ES:Key:historic:civilization
+    horse: ES:Key:horse
     house: ES:Key:house
+    iata: ES:Key:iata
+    icao: ES:Key:icao
+    ice_road: ES:Key:ice road
     image: ES:Key:image
     imagery_used: ES:Key:imagery used
     incline: ES:Key:incline
@@ -12111,7 +13502,10 @@ es:
     industrial: ES:Key:industrial
     informal: ES:Key:informal
     information: ES:Key:information
+    inline_skates: ES:Key:inline skates
     inscription: ES:Key:inscription
+    int_name: ES:Key:int name
+    int_ref: ES:Key:int ref
     intermittent: ES:Key:intermittent
     internet_access: ES:Key:internet access
     internet_access:fee: ES:Key:internet access:fee
@@ -12121,7 +13515,9 @@ es:
     is_in:continent: ES:Key:is in:continent
     is_in:country: ES:Key:is in:country
     isced:level: ES:Key:isced:level
+    junction: ES:Key:junction
     kerb: ES:Key:kerb
+    kitchen: ES:Key:kitchen
     ladder: ES:Key:ladder
     landuse: ES:Key:landuse
     lane_markings: ES:Key:lane markings
@@ -12129,6 +13525,7 @@ es:
     lanes:psv: ES:Key:lanes:psv
     lawyer: ES:Key:lawyer
     layer: ES:Key:layer
+    lcn_ref: ES:Key:lcn ref
     leaf_cycle: ES:Key:leaf cycle
     leaf_type: ES:Key:leaf type
     leisure: ES:Key:leisure
@@ -12136,10 +13533,16 @@ es:
     level: ES:Key:level
     lgbtq: ES:Key:lgbtq
     lhv: ES:Key:lhv
+    lifeguard: ES:Key:lifeguard
+    line: ES:Key:line
+    lit: ES:Key:lit
     lit:perceived: ES:Key:lit:perceived
+    loc_name: ES:Key:loc name
+    loc_ref: ES:Key:loc ref
     local_ref: ES:Key:local ref
     locale: ES:Key:locale
     location: ES:Key:location
+    lock: ES:Key:lock
     man_made: ES:Key:man made
     manhole: ES:Key:manhole
     manufacturer: ES:Key:manufacturer
@@ -12149,6 +13552,7 @@ es:
     maxaxleload: ES:Key:maxaxleload
     maxbogieweight: ES:Key:maxbogieweight
     maxheight: ES:Key:maxheight
+    maxlength: ES:Key:maxlength
     maxspeed: ES:Key:maxspeed
     maxspeed:advisory: ES:Key:maxspeed:advisory
     maxspeed:practical: ES:Key:maxspeed:practical
@@ -12156,13 +13560,18 @@ es:
     maxweight: ES:Key:maxweight
     maxwidth: ES:Key:maxwidth
     memorial: ES:Key:memorial
+    military: ES:Key:military
     min_age: ES:Key:min age
     min_height: ES:Key:min height
+    minspeed: ES:Key:minspeed
+    mofa: ES:Key:mofa
     monitoring:galileo: ES:Key:monitoring:galileo
     monitoring:glonass: ES:Key:monitoring:glonass
     monitoring:gps: ES:Key:monitoring:gps
+    mooring: ES:Key:mooring
     moped: ES:Key:moped
     motor_vehicle: ES:Key:motor vehicle
+    motorboat: ES:Key:motorboat
     motorcar: ES:Key:motorcar
     motorcycle: ES:Key:motorcycle
     motorcycle:clothes: ES:Key:motorcycle:clothes
@@ -12175,12 +13584,24 @@ es:
     motorhome: ES:Key:motorhome
     motorroad: ES:Key:motorroad
     mountain_pass: ES:Key:mountain pass
+    mtb:description: ES:Key:mtb:description
+    mtb:scale: ES:Key:mtb:scale
+    mtb:scale:imba: ES:Key:mtb:scale:imba
+    mtb:scale:uphill: ES:Key:mtb:scale:uphill
     museum: ES:Key:museum
     museum_type: ES:Key:museum type
     musical_instrument: ES:Key:musical instrument
     name: ES:Key:name
+    name:es: ES:Key:name:es
+    name:etymology: ES:Key:name:etymology
+    name:etymology:wikidata: ES:Key:name:etymology:wikidata
+    name:left: ES:Key:name:left
+    name:right: ES:Key:name:right
     narrow: ES:Key:narrow
+    nat_name: ES:Key:nat name
+    nat_ref: ES:Key:nat ref
     natural: ES:Key:natural
+    ncn_ref: ES:Key:ncn ref
     network:type: ES:Key:network:type
     noaddress: ES:Key:noaddress
     noexit: ES:Key:noexit
@@ -12191,7 +13612,9 @@ es:
     nudism: ES:Key:nudism
     object: ES:Key:object
     office: ES:Key:office
+    official_name: ES:Key:official name
     old_name: ES:Key:old name
+    old_ref: ES:Key:old ref
     oneway: ES:Key:oneway
     oneway:bicycle: ES:Key:oneway:bicycle
     oneway:psv: ES:Key:oneway:psv
@@ -12205,6 +13628,7 @@ es:
     orienteering: ES:Key:orienteering
     origin: ES:Key:origin
     osmc:symbol: ES:Key:osmc:symbol
+    oven: ES:Key:oven
     overtaking: ES:Key:overtaking
     owner: ES:Key:owner
     ownership: ES:Key:ownership
@@ -12213,11 +13637,13 @@ es:
     parking:lane: ES:Key:parking:lane
     parking:orientation: ES:Key:parking:orientation
     passenger: ES:Key:passenger
+    passing_places: ES:Key:passing places
     payment: ES:Key:payment
     phone: ES:Key:phone
     place: ES:Key:place
     placement: ES:Key:placement
     police: ES:Key:police
+    political_division: ES:Key:political division
     population: ES:Key:population
     power: ES:Key:power
     prepayment: ES:Key:prepayment
@@ -12236,20 +13662,28 @@ es:
     pump: ES:Key:pump
     railway: ES:Key:railway
     railway:preserved: ES:Key:railway:preserved
+    railway:track_ref: ES:Key:railway:track ref
     ramp: ES:Key:ramp
+    rcn_ref: ES:Key:rcn ref
+    real_ale: ES:Key:real ale
     recycling_type: ES:Key:recycling type
     ref: ES:Key:ref
     ref:bic: ES:Key:ref:bic
     ref:color: ES:Key:ref:color
     ref:colour: ES:Key:ref:colour
     ref:isil: ES:Key:ref:isil
+    reg_name: ES:Key:reg name
+    reg_ref: ES:Key:reg ref
     related_law: ES:Key:related law
     religion: ES:Key:religion
     'removed:': 'ES:Key:removed:'
     reservation: ES:Key:reservation
     residential: ES:Key:residential
     resource: ES:Key:resource
+    restaurant: ES:Key:restaurant
+    restriction: ES:Key:restriction
     review_requested: ES:Key:review requested
+    roadtrain: ES:Key:roadtrain
     roller_coaster: ES:Key:roller coaster
     roof:colour: ES:Key:roof:colour
     roof:direction: ES:Key:roof:direction
@@ -12269,19 +13703,30 @@ es:
     second_hand: ES:Key:second hand
     segregated: ES:Key:segregated
     self_service: ES:Key:self service
+    service: ES:Key:service
     service:bicycle:diy: ES:Key:service:bicycle:diy
+    service_times: ES:Key:service times
     shelter: ES:Key:shelter
     shelter_type: ES:Key:shelter type
     shooting: ES:Key:shooting
     shop: ES:Key:shop
+    short_name: ES:Key:short name
     shoulder: ES:Key:shoulder
     sidewalk: ES:Key:sidewalk
     site_type: ES:Key:site type
+    ski: ES:Key:ski
+    smoothness: ES:Key:smoothness
     social_facility: ES:Key:social facility
     social_facility:for: ES:Key:social facility:for
+    sorting_name: ES:Key:sorting name
     source: ES:Key:source
+    source:geometry: ES:Key:source:geometry
+    source:name: ES:Key:source:name
+    source:ref: ES:Key:source:ref
+    source_ref: ES:Key:source ref
     species: ES:Key:species
     species:de: ES:Key:species:de
+    speed_pedelec: ES:Key:speed pedelec
     sport: ES:Key:sport
     stars: ES:Key:stars
     start_date: ES:Key:start date
@@ -12296,22 +13741,30 @@ es:
     symbol: ES:Key:symbol
     tactile_paving: ES:Key:tactile paving
     takeaway: ES:Key:takeaway
+    tank: ES:Key:tank
     taxi: ES:Key:taxi
+    telecom: ES:Key:telecom
     tents: ES:Key:tents
     theatre:type: ES:Key:theatre:type
+    tidal: ES:Key:tidal
     to: ES:Key:to
     todo: ES:Key:todo
     toilets: ES:Key:toilets
     toilets:wheelchair: ES:Key:toilets:wheelchair
+    toll: ES:Key:toll
     tourism: ES:Key:tourism
     tourist_bus: ES:Key:tourist bus
     tower:construction: ES:Key:tower:construction
+    tracks: ES:Key:tracks
     tracktype: ES:Key:tracktype
     traffic: ES:Key:traffic
     traffic_calming: ES:Key:traffic calming
     traffic_sign: ES:Key:traffic sign
     traffic_signals: ES:Key:traffic signals
     traffic_signals:direction: ES:Key:traffic signals:direction
+    trail_visibility: ES:Key:trail visibility
+    trailblazed: ES:Key:trailblazed
+    trailblazed:visibility: ES:Key:trailblazed:visibility
     train: ES:Key:train
     transformer: ES:Key:transformer
     tree_lined: ES:Key:tree lined
@@ -12321,12 +13774,17 @@ es:
     turn: ES:Key:turn
     twitter: ES:Key:twitter
     type: ES:Key:type
+    unisex: ES:Key:unisex
     unnamed: ES:Key:unnamed
     url: ES:Key:url
+    usage: ES:Key:usage
     vaccination: ES:Key:vaccination
     vehicle: ES:Key:vehicle
     vending: ES:Key:vending
     via: ES:Key:via
+    voltage: ES:Key:voltage
+    wall: ES:Key:wall
+    waste: ES:Key:waste
     water: ES:Key:water
     water_source: ES:Key:water source
     waterway: ES:Key:waterway
@@ -12339,18 +13797,41 @@ es:
     wikidata: ES:Key:wikidata
     wikimedia_commons: ES:Key:wikimedia commons
     wikipedia: ES:Key:wikipedia
+    winter_road: ES:Key:winter road
   tag:
     abandoned:amenity=prison: ES:Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: ES:Tag:abandoned:amenity=prison camp
+    abutters=commercial: ES:Tag:abutters=commercial
+    abutters=industrial: ES:Tag:abutters=industrial
+    abutters=mixed: ES:Tag:abutters=mixed
+    abutters=residential: ES:Tag:abutters=residential
+    abutters=retail: ES:Tag:abutters=retail
     access=agricultural: ES:Tag:access=agricultural
     access=customers: ES:Tag:access=customers
     access=delivery: ES:Tag:access=delivery
+    access=designated: ES:Tag:access=designated
     access=forestry: ES:Tag:access=forestry
+    access=no: ES:Tag:access=no
+    access=permit: ES:Tag:access=permit
     access=private: ES:Tag:access=private
+    admin_level=10: ES:Tag:admin level=10
+    admin_level=11: ES:Tag:admin level=11
     admin_level=2: ES:Tag:admin level=2
+    admin_level=3: ES:Tag:admin level=3
+    admin_level=4: ES:Tag:admin level=4
+    admin_level=5: ES:Tag:admin level=5
+    admin_level=6: ES:Tag:admin level=6
+    admin_level=7: ES:Tag:admin level=7
+    admin_level=8: ES:Tag:admin level=8
+    admin_level=9: ES:Tag:admin level=9
+    advertising=billboard: ES:Tag:advertising=billboard
     advertising=board: ES:Tag:advertising=board
     advertising=column: ES:Tag:advertising=column
+    advertising=flag: ES:Tag:advertising=flag
+    advertising=poster_box: ES:Tag:advertising=poster box
     advertising=screen: ES:Tag:advertising=screen
+    advertising=sculpture: ES:Tag:advertising=sculpture
+    advertising=sign: ES:Tag:advertising=sign
     advertising=tarp: ES:Tag:advertising=tarp
     advertising=totem: ES:Tag:advertising=totem
     advertising=wall_painting: ES:Tag:advertising=wall painting
@@ -12366,24 +13847,30 @@ es:
     aerialway=platter: ES:Tag:aerialway=platter
     aerialway=pylon: ES:Tag:aerialway=pylon
     aerialway=rope_tow: ES:Tag:aerialway=rope tow
+    aerialway=ropetow: ES:Tag:aerialway=ropetow
     aerialway=station: ES:Tag:aerialway=station
     aerialway=t-bar: ES:Tag:aerialway=t-bar
     aerialway=zip_line: ES:Tag:aerialway=zip line
     aerodrome:type=regional: ES:Tag:aerodrome:type=regional
     aeroway=aerodrome: ES:Tag:aeroway=aerodrome
+    aeroway=aircraft_crossing: ES:Tag:aeroway=aircraft crossing
     aeroway=apron: ES:Tag:aeroway=apron
+    aeroway=fuel: ES:Tag:aeroway=fuel
     aeroway=gate: ES:Tag:aeroway=gate
     aeroway=hangar: ES:Tag:aeroway=hangar
     aeroway=helipad: ES:Tag:aeroway=helipad
     aeroway=heliport: ES:Tag:aeroway=heliport
     aeroway=holding_position: ES:Tag:aeroway=holding position
     aeroway=navigationaid: ES:Tag:aeroway=navigationaid
+    aeroway=parking_position: ES:Tag:aeroway=parking position
     aeroway=runway: ES:Tag:aeroway=runway
+    aeroway=spaceport: ES:Tag:aeroway=spaceport
     aeroway=taxiway: ES:Tag:aeroway=taxiway
     aeroway=terminal: ES:Tag:aeroway=terminal
     aeroway=windsock: ES:Tag:aeroway=windsock
     airmark=beacon: ES:Tag:airmark=beacon
     allotments=plot: ES:Tag:allotments=plot
+    amenity=animal_boarding: ES:Tag:amenity=animal boarding
     amenity=animal_breeding: ES:Tag:amenity=animal breeding
     amenity=animal_shelter: ES:Tag:amenity=animal shelter
     amenity=archive: ES:Tag:amenity=archive
@@ -12395,27 +13882,38 @@ es:
     amenity=bank: ES:Tag:amenity=bank
     amenity=bar: ES:Tag:amenity=bar
     amenity=bbq: ES:Tag:amenity=bbq
+    amenity=bear_box: ES:Tag:amenity=bear box
     amenity=bench: ES:Tag:amenity=bench
     amenity=bicycle_library: ES:Tag:amenity=bicycle library
     amenity=bicycle_parking: ES:Tag:amenity=bicycle parking
     amenity=bicycle_rental: ES:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: ES:Tag:amenity=bicycle repair station
     amenity=biergarten: ES:Tag:amenity=biergarten
+    amenity=binoculars: ES:Tag:amenity=binoculars
+    amenity=blood_bank: ES:Tag:amenity=blood bank
+    amenity=boat_rental: ES:Tag:amenity=boat rental
+    amenity=boat_sharing: ES:Tag:amenity=boat sharing
     amenity=boat_storage: ES:Tag:amenity=boat storage
     amenity=brothel: ES:Tag:amenity=brothel
     amenity=bureau_de_change: ES:Tag:amenity=bureau de change
     amenity=bus_station: ES:Tag:amenity=bus station
     amenity=cafe: ES:Tag:amenity=cafe
+    amenity=canteen: ES:Tag:amenity=canteen
     amenity=car_rental: ES:Tag:amenity=car rental
+    amenity=car_sharing: ES:Tag:amenity=car sharing
     amenity=car_wash: ES:Tag:amenity=car wash
     amenity=casino: ES:Tag:amenity=casino
+    amenity=chair: ES:Tag:amenity=chair
+    amenity=charging_station: ES:Tag:amenity=charging station
     amenity=childcare: ES:Tag:amenity=childcare
     amenity=cinema: ES:Tag:amenity=cinema
     amenity=clinic: ES:Tag:amenity=clinic
     amenity=clock: ES:Tag:amenity=clock
+    amenity=clothes_dryer: ES:Tag:amenity=clothes dryer
     amenity=college: ES:Tag:amenity=college
     amenity=community_centre: ES:Tag:amenity=community centre
     amenity=compressed_air: ES:Tag:amenity=compressed air
+    amenity=concert_hall: ES:Tag:amenity=concert hall
     amenity=conference_centre: ES:Tag:amenity=conference centre
     amenity=courthouse: ES:Tag:amenity=courthouse
     amenity=coworking_space: ES:Tag:amenity=coworking space
@@ -12424,50 +13922,69 @@ es:
     amenity=dancing_school: ES:Tag:amenity=dancing school
     amenity=dentist: ES:Tag:amenity=dentist
     amenity=device_charging_station: ES:Tag:amenity=device charging station
+    amenity=dive_centre: ES:Tag:amenity=dive centre
     amenity=doctors: ES:Tag:amenity=doctors
+    amenity=dog_toilet: ES:Tag:amenity=dog toilet
+    amenity=dojo: ES:Tag:amenity=dojo
+    amenity=dressing_room: ES:Tag:amenity=dressing room
     amenity=drinking_water: ES:Tag:amenity=drinking water
+    amenity=driver_training: ES:Tag:amenity=driver training
     amenity=driving_school: ES:Tag:amenity=driving school
     amenity=dryer: ES:Tag:amenity=dryer
     amenity=embassy: ES:Tag:amenity=embassy
+    amenity=events_centre: ES:Tag:amenity=events centre
     amenity=events_venue: ES:Tag:amenity=events venue
     amenity=exhibition_centre: ES:Tag:amenity=exhibition centre
     amenity=fast_food: ES:Tag:amenity=fast food
+    amenity=feeding_place: ES:Tag:amenity=feeding place
     amenity=ferry_terminal: ES:Tag:amenity=ferry terminal
+    amenity=financial_advice: ES:Tag:amenity=financial advice
     amenity=fire_station: ES:Tag:amenity=fire station
     amenity=food_court: ES:Tag:amenity=food court
     amenity=fountain: ES:Tag:amenity=fountain
     amenity=fuel: ES:Tag:amenity=fuel
     amenity=funeral_hall: ES:Tag:amenity=funeral hall
     amenity=gambling: ES:Tag:amenity=gambling
+    amenity=game_feeding: ES:Tag:amenity=game feeding
     amenity=give_box: ES:Tag:amenity=give box
     amenity=grave_yard: ES:Tag:amenity=grave yard
     amenity=grit_bin: ES:Tag:amenity=grit bin
     amenity=harbourmaster: ES:Tag:amenity=harbourmaster
     amenity=hitching_post: ES:Tag:amenity=hitching post
+    amenity=hookah_lounge: ES:Tag:amenity=hookah lounge
     amenity=hospital: ES:Tag:amenity=hospital
+    amenity=hunting_stand: ES:Tag:amenity=hunting stand
     amenity=ice_cream: ES:Tag:amenity=ice cream
     amenity=internet_cafe: ES:Tag:amenity=internet cafe
     amenity=jobcentre: ES:Tag:amenity=jobcentre
     amenity=karaoke_box: ES:Tag:amenity=karaoke box
+    amenity=kick-scooter_rental: ES:Tag:amenity=kick-scooter rental
     amenity=kindergarten: ES:Tag:amenity=kindergarten
+    amenity=kitchen: ES:Tag:amenity=kitchen
+    amenity=kneipp_water_cure: ES:Tag:amenity=kneipp water cure
     amenity=language_school: ES:Tag:amenity=language school
     amenity=lavoir: ES:Tag:amenity=lavoir
     amenity=letter_box: ES:Tag:amenity=letter box
     amenity=library: ES:Tag:amenity=library
     amenity=life_ring: ES:Tag:amenity=life ring
+    amenity=loading_dock: ES:Tag:amenity=loading dock
     amenity=lost_property_office: ES:Tag:amenity=lost property office
     amenity=lounger: ES:Tag:amenity=lounger
     amenity=love_hotel: ES:Tag:amenity=love hotel
+    amenity=marae: ES:Tag:amenity=marae
     amenity=marketplace: ES:Tag:amenity=marketplace
     amenity=mobile_library: ES:Tag:amenity=mobile library
     amenity=mobile_money_agent: ES:Tag:amenity=mobile money agent
+    amenity=monastery: ES:Tag:amenity=monastery
     amenity=money_transfer: ES:Tag:amenity=money transfer
     amenity=mortuary: ES:Tag:amenity=mortuary
     amenity=motorcycle_parking: ES:Tag:amenity=motorcycle parking
+    amenity=motorcycle_rental: ES:Tag:amenity=motorcycle rental
     amenity=music_school: ES:Tag:amenity=music school
     amenity=nightclub: ES:Tag:amenity=nightclub
     amenity=nursing_home: ES:Tag:amenity=nursing home
     amenity=outfitter: ES:Tag:amenity=outfitter
+    amenity=parcel_locker: ES:Tag:amenity=parcel locker
     amenity=parking: ES:Tag:amenity=parking
     amenity=parking_entrance: ES:Tag:amenity=parking entrance
     amenity=parking_space: ES:Tag:amenity=parking space
@@ -12480,6 +13997,7 @@ es:
     amenity=place_of_worship: ES:Tag:amenity=place of worship
     amenity=planetarium: ES:Tag:amenity=planetarium
     amenity=police: ES:Tag:amenity=police
+    amenity=polling_station: ES:Tag:amenity=polling station
     amenity=post_box: ES:Tag:amenity=post box
     amenity=post_depot: ES:Tag:amenity=post depot
     amenity=post_office: ES:Tag:amenity=post office
@@ -12494,36 +14012,53 @@ es:
     amenity=ranger_station: ES:Tag:amenity=ranger station
     amenity=recycling: ES:Tag:amenity=recycling
     amenity=refugee_housing: ES:Tag:amenity=refugee housing
+    amenity=refugee_site: ES:Tag:amenity=refugee site
+    amenity=relay_box: ES:Tag:amenity=relay box
     amenity=research_institute: ES:Tag:amenity=research institute
     amenity=restaurant: ES:Tag:amenity=restaurant
     amenity=retirement_home: ES:Tag:amenity=retirement home
+    amenity=sanatorium: ES:Tag:amenity=sanatorium
+    amenity=sanitary_dump_station: ES:Tag:amenity=sanitary dump station
     amenity=school: ES:Tag:amenity=school
     amenity=seat: ES:Tag:amenity=seat
     amenity=shelter: ES:Tag:amenity=shelter
     amenity=shower: ES:Tag:amenity=shower
+    amenity=ski_rental: ES:Tag:amenity=ski rental
     amenity=ski_school: ES:Tag:amenity=ski school
+    amenity=smoking_area: ES:Tag:amenity=smoking area
     amenity=social_centre: ES:Tag:amenity=social centre
+    amenity=social_club: ES:Tag:amenity=social club
     amenity=social_facility: ES:Tag:amenity=social facility
     amenity=sport_school: ES:Tag:amenity=sport school
+    amenity=stage: ES:Tag:amenity=stage
     amenity=stool: ES:Tag:amenity=stool
     amenity=stripclub: ES:Tag:amenity=stripclub
     amenity=studio: ES:Tag:amenity=studio
+    amenity=swingerclub: ES:Tag:amenity=swingerclub
+    amenity=table: ES:Tag:amenity=table
     amenity=taxi: ES:Tag:amenity=taxi
     amenity=telephone: ES:Tag:amenity=telephone
     amenity=television: ES:Tag:amenity=television
     amenity=theatre: ES:Tag:amenity=theatre
+    amenity=ticket_validator: ES:Tag:amenity=ticket validator
     amenity=toilets: ES:Tag:amenity=toilets
     amenity=tourist_bus_parking: ES:Tag:amenity=tourist bus parking
     amenity=townhall: ES:Tag:amenity=townhall
     amenity=toy_library: ES:Tag:amenity=toy library
+    amenity=traffic_park: ES:Tag:amenity=traffic park
+    amenity=training: ES:Tag:amenity=training
     amenity=trolley_bay: ES:Tag:amenity=trolley bay
     amenity=university: ES:Tag:amenity=university
+    amenity=vacuum_cleaner: ES:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: ES:Tag:amenity=vehicle inspection
+    amenity=vehicle_ramp: ES:Tag:amenity=vehicle ramp
     amenity=vending_machine: ES:Tag:amenity=vending machine
     amenity=veterinary: ES:Tag:amenity=veterinary
     amenity=washing_machine: ES:Tag:amenity=washing machine
     amenity=waste_basket: ES:Tag:amenity=waste basket
     amenity=waste_disposal: ES:Tag:amenity=waste disposal
+    amenity=waste_dump_site: ES:Tag:amenity=waste dump site
+    amenity=waste_transfer_station: ES:Tag:amenity=waste transfer station
     amenity=water_point: ES:Tag:amenity=water point
     amenity=watering_place: ES:Tag:amenity=watering place
     amenity=weighbridge: ES:Tag:amenity=weighbridge
@@ -12534,50 +14069,112 @@ es:
     area:highway=footway: ES:Tag:area:highway=footway
     area:highway=path: ES:Tag:area:highway=path
     area:highway=pedestrian: ES:Tag:area:highway=pedestrian
+    area=yes: ES:Tag:area=yes
     artwork_type=sculpture: ES:Tag:artwork type=sculpture
+    atm=yes: ES:Tag:atm=yes
     attraction=roller_coaster: ES:Tag:attraction=roller coaster
     attraction=water_slide: ES:Tag:attraction=water slide
+    avalanche_protection=snow_bridge: ES:Tag:avalanche protection=snow bridge
     barrier=block: ES:Tag:barrier=block
     barrier=bollard: ES:Tag:barrier=bollard
     barrier=border_control: ES:Tag:barrier=border control
+    barrier=bump_gate: ES:Tag:barrier=bump gate
+    barrier=bus_trap: ES:Tag:barrier=bus trap
     barrier=cable_barrier: ES:Tag:barrier=cable barrier
     barrier=cattle_grid: ES:Tag:barrier=cattle grid
     barrier=chain: ES:Tag:barrier=chain
     barrier=city_wall: ES:Tag:barrier=city wall
+    barrier=coupure: ES:Tag:barrier=coupure
+    barrier=cycle_barrier: ES:Tag:barrier=cycle barrier
     barrier=debris: ES:Tag:barrier=debris
+    barrier=ditch: ES:Tag:barrier=ditch
     barrier=entrance: ES:Tag:barrier=entrance
     barrier=fence: ES:Tag:barrier=fence
+    barrier=full-height_turnstile: ES:Tag:barrier=full-height turnstile
     barrier=gate: ES:Tag:barrier=gate
     barrier=guard_rail: ES:Tag:barrier=guard rail
+    barrier=haha: ES:Tag:barrier=haha
+    barrier=hampshire_gate: ES:Tag:barrier=hampshire gate
     barrier=handrail: ES:Tag:barrier=handrail
     barrier=hedge: ES:Tag:barrier=hedge
     barrier=height_restrictor: ES:Tag:barrier=height restrictor
+    barrier=horse_jump: ES:Tag:barrier=horse jump
+    barrier=horse_stile: ES:Tag:barrier=horse stile
     barrier=jersey_barrier: ES:Tag:barrier=jersey barrier
+    barrier=kent_carriage_gap: ES:Tag:barrier=kent carriage gap
     barrier=kerb: ES:Tag:barrier=kerb
+    barrier=kissing_gate: ES:Tag:barrier=kissing gate
     barrier=lift_gate: ES:Tag:barrier=lift gate
+    barrier=log: ES:Tag:barrier=log
+    barrier=motorcycle_barrier: ES:Tag:barrier=motorcycle barrier
+    barrier=planter: ES:Tag:barrier=planter
     barrier=retaining_wall: ES:Tag:barrier=retaining wall
     barrier=rope: ES:Tag:barrier=rope
     barrier=sally_port: ES:Tag:barrier=sally port
+    barrier=sliding_gate: ES:Tag:barrier=sliding gate
     barrier=spikes: ES:Tag:barrier=spikes
+    barrier=step: ES:Tag:barrier=step
+    barrier=stile: ES:Tag:barrier=stile
+    barrier=sump_buster: ES:Tag:barrier=sump buster
     barrier=swing_gate: ES:Tag:barrier=swing gate
+    barrier=tank_trap: ES:Tag:barrier=tank trap
     barrier=toll_booth: ES:Tag:barrier=toll booth
+    barrier=turnstile: ES:Tag:barrier=turnstile
     barrier=tyres: ES:Tag:barrier=tyres
     barrier=wall: ES:Tag:barrier=wall
+    barrier=wicket_gate: ES:Tag:barrier=wicket gate
+    barrier=yes: ES:Tag:barrier=yes
+    basin=detention: ES:Tag:basin=detention
+    basin=evaporation: ES:Tag:basin=evaporation
+    basin=infiltration: ES:Tag:basin=infiltration
+    basin=retention: ES:Tag:basin=retention
     bicycle=no: ES:Tag:bicycle=no
     bicycle=use_sidepath: ES:Tag:bicycle=use sidepath
     bicycle=yes: ES:Tag:bicycle=yes
+    bicycle_road=yes: ES:Tag:bicycle road=yes
+    border_type=baseline: ES:Tag:border type=baseline
+    border_type=contiguous: ES:Tag:border type=contiguous
+    border_type=eez: ES:Tag:border type=eez
+    border_type=nation: ES:Tag:border type=nation
+    border_type=territorial: ES:Tag:border type=territorial
+    boundary=aboriginal_lands: ES:Tag:boundary=aboriginal lands
     boundary=administrative: ES:Tag:boundary=administrative
+    boundary=administrative_cooperation: ES:Tag:boundary=administrative cooperation
+    boundary=border_zone: ES:Tag:boundary=border zone
+    boundary=census: ES:Tag:boundary=census
+    boundary=civil: ES:Tag:boundary=civil
+    boundary=disputed: ES:Tag:boundary=disputed
+    boundary=exclave: ES:Tag:boundary=exclave
+    boundary=forest: ES:Tag:boundary=forest
+    boundary=forest_compartment: ES:Tag:boundary=forest compartment
+    boundary=hazard: ES:Tag:boundary=hazard
+    boundary=historic: ES:Tag:boundary=historic
+    boundary=local_authority: ES:Tag:boundary=local authority
+    boundary=low_emission_zone: ES:Tag:boundary=low emission zone
+    boundary=maritime: ES:Tag:boundary=maritime
+    boundary=marker: ES:Tag:boundary=marker
+    boundary=military_district: ES:Tag:boundary=military district
     boundary=national_park: ES:Tag:boundary=national park
+    boundary=place: ES:Tag:boundary=place
     boundary=political: ES:Tag:boundary=political
+    boundary=postal_code: ES:Tag:boundary=postal code
     boundary=protected_area: ES:Tag:boundary=protected area
     boundary=regional_park: ES:Tag:boundary=regional park
+    boundary=religious_administration: ES:Tag:boundary=religious administration
+    boundary=safety_region: ES:Tag:boundary=safety region
+    boundary=special_economic_zone: ES:Tag:boundary=special economic zone
+    boundary=urban: ES:Tag:boundary=urban
+    boundary=water_protection_area: ES:Tag:boundary=water protection area
     bridge:structure=beam: ES:Tag:bridge:structure=beam
     bridge=aqueduct: ES:Tag:bridge=aqueduct
     bridge=boardwalk: ES:Tag:bridge=boardwalk
     bridge=viaduct: ES:Tag:bridge=viaduct
+    bridge=yes: ES:Tag:bridge=yes
     building=apartments: ES:Tag:building=apartments
     building=bakehouse: ES:Tag:building=bakehouse
     building=barn: ES:Tag:building=barn
+    building=barracks: ES:Tag:building=barracks
+    building=beach_hut: ES:Tag:building=beach hut
     building=boathouse: ES:Tag:building=boathouse
     building=brewery: ES:Tag:building=brewery
     building=bridge: ES:Tag:building=bridge
@@ -12585,6 +14182,7 @@ es:
     building=bunker: ES:Tag:building=bunker
     building=cabin: ES:Tag:building=cabin
     building=carport: ES:Tag:building=carport
+    building=castle: ES:Tag:building=castle
     building=cathedral: ES:Tag:building=cathedral
     building=chapel: ES:Tag:building=chapel
     building=church: ES:Tag:building=church
@@ -12616,12 +14214,15 @@ es:
     building=hut: ES:Tag:building=hut
     building=industrial: ES:Tag:building=industrial
     building=kindergarten: ES:Tag:building=kindergarten
+    building=kingdom_hall: ES:Tag:building=kingdom hall
     building=kiosk: ES:Tag:building=kiosk
+    building=military: ES:Tag:building=military
     building=monastery: ES:Tag:building=monastery
     building=mosque: ES:Tag:building=mosque
     building=office: ES:Tag:building=office
     building=parking: ES:Tag:building=parking
     building=pavilion: ES:Tag:building=pavilion
+    building=presbytery: ES:Tag:building=presbytery
     building=public: ES:Tag:building=public
     building=religious: ES:Tag:building=religious
     building=residential: ES:Tag:building=residential
@@ -12636,10 +14237,12 @@ es:
     building=shed: ES:Tag:building=shed
     building=shrine: ES:Tag:building=shrine
     building=slurry_tank: ES:Tag:building=slurry tank
+    building=sports_centre: ES:Tag:building=sports centre
     building=sports_hall: ES:Tag:building=sports hall
     building=stable: ES:Tag:building=stable
     building=stadium: ES:Tag:building=stadium
     building=static_caravan: ES:Tag:building=static caravan
+    building=stilt_house: ES:Tag:building=stilt house
     building=storage_tank: ES:Tag:building=storage tank
     building=sty: ES:Tag:building=sty
     building=supermarket: ES:Tag:building=supermarket
@@ -12658,13 +14261,47 @@ es:
     building=yes: ES:Tag:building=yes
     busway=lane: ES:Tag:busway=lane
     castle_type=manor: ES:Tag:castle type=manor
+    cemetery=cillín: ES:Tag:cemetery=cillín
     cemetery=grave: ES:Tag:cemetery=grave
     cemetery=sector: ES:Tag:cemetery=sector
+    cemetery=war_cemetery: ES:Tag:cemetery=war cemetery
     clothes=fashion: ES:Tag:clothes=fashion
+    clothes=luxury: ES:Tag:clothes=luxury
+    clothes=motorcycle: ES:Tag:clothes=motorcycle
+    clothes=sports: ES:Tag:clothes=sports
+    clothes=swimwear: ES:Tag:clothes=swimwear
+    clothes=underwear: ES:Tag:clothes=underwear
+    clothes=unisex: ES:Tag:clothes=unisex
+    clothes=wedding: ES:Tag:clothes=wedding
+    clothes=women: ES:Tag:clothes=women
+    clothes=women;men: ES:Tag:clothes=women;men
+    clothes=women;men;children: ES:Tag:clothes=women;men;children
+    club=amateur_radio: ES:Tag:club=amateur radio
+    club=automobile: ES:Tag:club=automobile
+    club=bicycle: ES:Tag:club=bicycle
+    club=cadet: ES:Tag:club=cadet
+    club=card_games: ES:Tag:club=card games
+    club=chess: ES:Tag:club=chess
+    club=fan: ES:Tag:club=fan
+    club=fishing: ES:Tag:club=fishing
+    club=freemasonry: ES:Tag:club=freemasonry
+    club=golf: ES:Tag:club=golf
+    club=linux: ES:Tag:club=linux
+    club=motorcycle: ES:Tag:club=motorcycle
+    club=music: ES:Tag:club=music
+    club=nudism: ES:Tag:club=nudism
+    club=sailing: ES:Tag:club=sailing
     club=scout: ES:Tag:club=scout
+    club=scuba_diving: ES:Tag:club=scuba diving
+    club=social: ES:Tag:club=social
     club=sport: ES:Tag:club=sport
+    club=tourism: ES:Tag:club=tourism
+    club=youth_movement: ES:Tag:club=youth movement
     company=logistics: ES:Tag:company=logistics
+    covered=yes: ES:Tag:covered=yes
     craft=agricultural_engines: ES:Tag:craft=agricultural engines
+    craft=atelier: ES:Tag:craft=atelier
+    craft=bag_repair: ES:Tag:craft=bag repair
     craft=bakery: ES:Tag:craft=bakery
     craft=basket_maker: ES:Tag:craft=basket maker
     craft=beekeeper: ES:Tag:craft=beekeeper
@@ -12673,78 +14310,248 @@ es:
     craft=bookbinder: ES:Tag:craft=bookbinder
     craft=brewery: ES:Tag:craft=brewery
     craft=builder: ES:Tag:craft=builder
+    craft=cabinet_maker: ES:Tag:craft=cabinet maker
+    craft=car_painter: ES:Tag:craft=car painter
+    craft=carpenter: ES:Tag:craft=carpenter
+    craft=carpet_cleaner: ES:Tag:craft=carpet cleaner
     craft=carpet_layer: ES:Tag:craft=carpet layer
     craft=caterer: ES:Tag:craft=caterer
+    craft=cheese: ES:Tag:craft=cheese
     craft=chimney_sweeper: ES:Tag:craft=chimney sweeper
+    craft=cleaning: ES:Tag:craft=cleaning
     craft=clockmaker: ES:Tag:craft=clockmaker
     craft=confectionery: ES:Tag:craft=confectionery
+    craft=cooper: ES:Tag:craft=cooper
     craft=dental_technician: ES:Tag:craft=dental technician
     craft=distillery: ES:Tag:craft=distillery
+    craft=door_construction: ES:Tag:craft=door construction
     craft=dressmaker: ES:Tag:craft=dressmaker
     craft=electrician: ES:Tag:craft=electrician
     craft=electronics_repair: ES:Tag:craft=electronics repair
+    craft=embroiderer: ES:Tag:craft=embroiderer
     craft=engraver: ES:Tag:craft=engraver
+    craft=floorer: ES:Tag:craft=floorer
     craft=gardener: ES:Tag:craft=gardener
+    craft=glassblower: ES:Tag:craft=glassblower
     craft=glaziery: ES:Tag:craft=glaziery
+    craft=goldsmith: ES:Tag:craft=goldsmith
+    craft=grinding_mill: ES:Tag:craft=grinding mill
     craft=handicraft: ES:Tag:craft=handicraft
     craft=hvac: ES:Tag:craft=hvac
     craft=information_electronics: ES:Tag:craft=information electronics
+    craft=insulation: ES:Tag:craft=insulation
+    craft=interior_work: ES:Tag:craft=interior work
     craft=jeweller: ES:Tag:craft=jeweller
+    craft=joiner: ES:Tag:craft=joiner
+    craft=key_cutter: ES:Tag:craft=key cutter
+    craft=lapidary: ES:Tag:craft=lapidary
+    craft=leather: ES:Tag:craft=leather
+    craft=locksmith: ES:Tag:craft=locksmith
     craft=luthier: ES:Tag:craft=luthier
     craft=metal_construction: ES:Tag:craft=metal construction
+    craft=mint: ES:Tag:craft=mint
     craft=musical_instrument: ES:Tag:craft=musical instrument
     craft=oil_mill: ES:Tag:craft=oil mill
     craft=optician: ES:Tag:craft=optician
+    craft=organ_builder: ES:Tag:craft=organ builder
+    craft=painter: ES:Tag:craft=painter
+    craft=parquet_layer: ES:Tag:craft=parquet layer
+    craft=paver: ES:Tag:craft=paver
     craft=photographer: ES:Tag:craft=photographer
     craft=photographic_laboratory: ES:Tag:craft=photographic laboratory
+    craft=piano_tuner: ES:Tag:craft=piano tuner
+    craft=plasterer: ES:Tag:craft=plasterer
     craft=plumber: ES:Tag:craft=plumber
     craft=pottery: ES:Tag:craft=pottery
     craft=printer: ES:Tag:craft=printer
+    craft=printmaker: ES:Tag:craft=printmaker
     craft=restoration: ES:Tag:craft=restoration
+    craft=rigger: ES:Tag:craft=rigger
+    craft=roofer: ES:Tag:craft=roofer
+    craft=saddler: ES:Tag:craft=saddler
+    craft=sailmaker: ES:Tag:craft=sailmaker
+    craft=sawmill: ES:Tag:craft=sawmill
+    craft=scaffolder: ES:Tag:craft=scaffolder
+    craft=sculptor: ES:Tag:craft=sculptor
+    craft=sewing: ES:Tag:craft=sewing
     craft=shoemaker: ES:Tag:craft=shoemaker
+    craft=signmaker: ES:Tag:craft=signmaker
     craft=stand_builder: ES:Tag:craft=stand builder
+    craft=stonemason: ES:Tag:craft=stonemason
+    craft=stove_fitter: ES:Tag:craft=stove fitter
+    craft=sun_protection: ES:Tag:craft=sun protection
     craft=tailor: ES:Tag:craft=tailor
     craft=tiler: ES:Tag:craft=tiler
+    craft=tinsmith: ES:Tag:craft=tinsmith
+    craft=toolmaker: ES:Tag:craft=toolmaker
+    craft=turner: ES:Tag:craft=turner
     craft=upholsterer: ES:Tag:craft=upholsterer
     craft=watchmaker: ES:Tag:craft=watchmaker
+    craft=water_well_drilling: ES:Tag:craft=water well drilling
+    craft=weaver: ES:Tag:craft=weaver
     craft=welder: ES:Tag:craft=welder
+    craft=window_construction: ES:Tag:craft=window construction
     craft=winery: ES:Tag:craft=winery
+    crop=soy: ES:Tag:crop=soy
+    crop=sugarcane: ES:Tag:crop=sugarcane
     crossing=marked: ES:Tag:crossing=marked
+    crossing=no: ES:Tag:crossing=no
     crossing=traffic_signals: ES:Tag:crossing=traffic signals
     crossing=uncontrolled: ES:Tag:crossing=uncontrolled
+    crossing=unmarked: ES:Tag:crossing=unmarked
     crossing=zebra: ES:Tag:crossing=zebra
+    cuisine=american: ES:Tag:cuisine=american
+    cuisine=asian: ES:Tag:cuisine=asian
+    cuisine=bagel: ES:Tag:cuisine=bagel
+    cuisine=barbecue: ES:Tag:cuisine=barbecue
+    cuisine=brazilian: ES:Tag:cuisine=brazilian
+    cuisine=brunch: ES:Tag:cuisine=brunch
+    cuisine=bubble_tea: ES:Tag:cuisine=bubble tea
+    cuisine=burger: ES:Tag:cuisine=burger
+    cuisine=cake: ES:Tag:cuisine=cake
+    cuisine=catalan: ES:Tag:cuisine=catalan
+    cuisine=chicken: ES:Tag:cuisine=chicken
+    cuisine=chinese: ES:Tag:cuisine=chinese
+    cuisine=coffee_shop: ES:Tag:cuisine=coffee shop
+    cuisine=couscous: ES:Tag:cuisine=couscous
+    cuisine=crepe: ES:Tag:cuisine=crepe
+    cuisine=curry: ES:Tag:cuisine=curry
+    cuisine=dessert: ES:Tag:cuisine=dessert
+    cuisine=donut: ES:Tag:cuisine=donut
+    cuisine=doughnut: ES:Tag:cuisine=doughnut
+    cuisine=dumplings: ES:Tag:cuisine=dumplings
+    cuisine=empanada: ES:Tag:cuisine=empanada
+    cuisine=fish: ES:Tag:cuisine=fish
     cuisine=fish_and_chips: ES:Tag:cuisine=fish and chips
+    cuisine=french: ES:Tag:cuisine=french
+    cuisine=fried_food: ES:Tag:cuisine=fried food
+    cuisine=friture: ES:Tag:cuisine=friture
+    cuisine=german: ES:Tag:cuisine=german
+    cuisine=greek: ES:Tag:cuisine=greek
+    cuisine=grill: ES:Tag:cuisine=grill
+    cuisine=gyro: ES:Tag:cuisine=gyro
+    cuisine=hot_dog: ES:Tag:cuisine=hot dog
+    cuisine=hot_pot: ES:Tag:cuisine=hot pot
+    cuisine=ice_cream: ES:Tag:cuisine=ice cream
+    cuisine=indian: ES:Tag:cuisine=indian
+    cuisine=italian: ES:Tag:cuisine=italian
+    cuisine=japanese: ES:Tag:cuisine=japanese
+    cuisine=kebab: ES:Tag:cuisine=kebab
+    cuisine=korean: ES:Tag:cuisine=korean
+    cuisine=mediterranean: ES:Tag:cuisine=mediterranean
+    cuisine=mexican: ES:Tag:cuisine=mexican
+    cuisine=noodle: ES:Tag:cuisine=noodle
+    cuisine=pakistani: ES:Tag:cuisine=pakistani
+    cuisine=pancake: ES:Tag:cuisine=pancake
+    cuisine=pasta: ES:Tag:cuisine=pasta
+    cuisine=pie: ES:Tag:cuisine=pie
+    cuisine=pizza: ES:Tag:cuisine=pizza
+    cuisine=regional: ES:Tag:cuisine=regional
+    cuisine=sandwich: ES:Tag:cuisine=sandwich
+    cuisine=seafood: ES:Tag:cuisine=seafood
+    cuisine=soup: ES:Tag:cuisine=soup
+    cuisine=spanish: ES:Tag:cuisine=spanish
+    cuisine=steak_house: ES:Tag:cuisine=steak house
+    cuisine=strudel: ES:Tag:cuisine=strudel
+    cuisine=sushi: ES:Tag:cuisine=sushi
+    cuisine=tapas: ES:Tag:cuisine=tapas
+    cuisine=tea_shop: ES:Tag:cuisine=tea shop
+    cuisine=teahouse: ES:Tag:cuisine=teahouse
+    cuisine=thai: ES:Tag:cuisine=thai
+    cuisine=turkish: ES:Tag:cuisine=turkish
+    cuisine=vietnamese: ES:Tag:cuisine=vietnamese
+    cuisine=waffle: ES:Tag:cuisine=waffle
+    cuisine=wings: ES:Tag:cuisine=wings
+    cutting=yes: ES:Tag:cutting=yes
     cycleway:both=lane: ES:Tag:cycleway:both=lane
     cycleway:both=no: ES:Tag:cycleway:both=no
+    cycleway:left=lane: ES:Tag:cycleway:left=lane
+    cycleway:left=share_busway: ES:Tag:cycleway:left=share busway
+    cycleway:left=shared_busway: ES:Tag:cycleway:left=shared busway
+    cycleway:left=shared_lane: ES:Tag:cycleway:left=shared lane
     cycleway:left=track: ES:Tag:cycleway:left=track
     cycleway:right=lane: ES:Tag:cycleway:right=lane
+    cycleway:right=share_busway: ES:Tag:cycleway:right=share busway
+    cycleway:right=shared_lane: ES:Tag:cycleway:right=shared lane
     cycleway:right=track: ES:Tag:cycleway:right=track
+    cycleway=asl: ES:Tag:cycleway=asl
     cycleway=crossing: ES:Tag:cycleway=crossing
     cycleway=lane: ES:Tag:cycleway=lane
     cycleway=no: ES:Tag:cycleway=no
     cycleway=opposite: ES:Tag:cycleway=opposite
     cycleway=opposite_lane: ES:Tag:cycleway=opposite lane
+    cycleway=opposite_share_busway: ES:Tag:cycleway=opposite share busway
     cycleway=opposite_track: ES:Tag:cycleway=opposite track
     cycleway=separate: ES:Tag:cycleway=separate
     cycleway=share_busway: ES:Tag:cycleway=share busway
+    cycleway=shared: ES:Tag:cycleway=shared
+    cycleway=shared_lane: ES:Tag:cycleway=shared lane
+    cycleway=shared_line: ES:Tag:cycleway=shared line
     cycleway=track: ES:Tag:cycleway=track
     denomination=mormon: ES:Tag:denomination=mormon
+    designation=byway_open_to_all_traffic: ES:Tag:designation=byway open to all traffic
+    designation=civil_parish: ES:Tag:designation=civil parish
+    designation=common: ES:Tag:designation=common
+    designation=core_path: ES:Tag:designation=core path
+    designation=public_bridleway: ES:Tag:designation=public bridleway
+    designation=public_footpath: ES:Tag:designation=public footpath
+    designation=restricted_byway: ES:Tag:designation=restricted byway
     disused=yes: ES:Tag:disused=yes
+    embankment=yes: ES:Tag:embankment=yes
+    emergency=access_point: ES:Tag:emergency=access point
     emergency=ambulance_station: ES:Tag:emergency=ambulance station
+    emergency=assembly_point: ES:Tag:emergency=assembly point
     emergency=defibrillator: ES:Tag:emergency=defibrillator
+    emergency=drinking_water: ES:Tag:emergency=drinking water
     emergency=dry_riser: ES:Tag:emergency=dry riser
+    emergency=dry_riser_inlet: ES:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: ES:Tag:emergency=emergency ward entrance
+    emergency=fire_alarm_box: ES:Tag:emergency=fire alarm box
     emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
     emergency=fire_hose: ES:Tag:emergency=fire hose
     emergency=fire_hydrant: ES:Tag:emergency=fire hydrant
+    emergency=fire_lookout: ES:Tag:emergency=fire lookout
+    emergency=fire_water_pond: ES:Tag:emergency=fire water pond
+    emergency=first_aid: ES:Tag:emergency=first aid
+    emergency=first_aid_kit: ES:Tag:emergency=first aid kit
     emergency=landing_site: ES:Tag:emergency=landing site
+    emergency=life_ring: ES:Tag:emergency=life ring
+    emergency=lifeboat_station: ES:Tag:emergency=lifeboat station
     emergency=lifeguard: ES:Tag:emergency=lifeguard
+    emergency=lifeguard_place: ES:Tag:emergency=lifeguard place
     emergency=lifeguard_tower: ES:Tag:emergency=lifeguard tower
+    emergency=marine_refuge: ES:Tag:emergency=marine refuge
+    emergency=marine_rescue: ES:Tag:emergency=marine rescue
+    emergency=mountain_rescue: ES:Tag:emergency=mountain rescue
     emergency=phone: ES:Tag:emergency=phone
     emergency=ses_station: ES:Tag:emergency=ses station
+    emergency=shower: ES:Tag:emergency=shower
+    emergency=siamese: ES:Tag:emergency=siamese
+    emergency=siren: ES:Tag:emergency=siren
+    emergency=slipway: ES:Tag:emergency=slipway
+    emergency=sprinkler_connection: ES:Tag:emergency=sprinkler connection
+    emergency=standpipe: ES:Tag:emergency=standpipe
+    emergency=suction_point: ES:Tag:emergency=suction point
+    emergency=water_tank: ES:Tag:emergency=water tank
     emergency=yes: ES:Tag:emergency=yes
+    fence_type=barbed_wire: ES:Tag:fence type=barbed wire
+    fence_type=bars: ES:Tag:fence type=bars
+    fence_type=chain_link: ES:Tag:fence type=chain link
+    fence_type=concrete: ES:Tag:fence type=concrete
+    fence_type=corrugated_metal: ES:Tag:fence type=corrugated metal
+    fence_type=electric: ES:Tag:fence type=electric
+    fence_type=metal: ES:Tag:fence type=metal
+    fence_type=pole: ES:Tag:fence type=pole
+    fence_type=railing: ES:Tag:fence type=railing
+    fence_type=roundpole: ES:Tag:fence type=roundpole
+    fence_type=split_rail: ES:Tag:fence type=split rail
+    fence_type=wire: ES:Tag:fence type=wire
+    fence_type=wood: ES:Tag:fence type=wood
+    flood_mark=painting: ES:Tag:flood mark=painting
+    flood_mark=plaque: ES:Tag:flood mark=plaque
     flow_direction=both: ES:Tag:flow direction=both
     foot=use_sidepath: ES:Tag:foot=use sidepath
+    foot=yes: ES:Tag:foot=yes
     footway=access_aisle: ES:Tag:footway=access aisle
     footway=crossing: ES:Tag:footway=crossing
     footway=sidewalk: ES:Tag:footway=sidewalk
@@ -12763,9 +14570,14 @@ es:
       panel
     generator:type=solar_thermal_collector: ES:Tag:generator:type=solar thermal collector
     generator:type=vertical_axis: ES:Tag:generator:type=vertical axis
+    geological=columnar_jointing: ES:Tag:geological=columnar jointing
+    geological=fault: ES:Tag:geological=fault
     geological=moraine: ES:Tag:geological=moraine
     geological=outcrop: ES:Tag:geological=outcrop
     geological=palaeontological_site: ES:Tag:geological=palaeontological site
+    geological=volcanic_caldera_rim: ES:Tag:geological=volcanic caldera rim
+    geological=volcanic_lava_field: ES:Tag:geological=volcanic lava field
+    geological=volcanic_vent: ES:Tag:geological=volcanic vent
     golf=bunker: ES:Tag:golf=bunker
     golf=clubhouse: ES:Tag:golf=clubhouse
     golf=driving_range: ES:Tag:golf=driving range
@@ -12791,6 +14603,7 @@ es:
     government=tax: ES:Tag:government=tax
     government=youth_welfare_department: ES:Tag:government=youth welfare department
     hazard=animal_crossing: ES:Tag:hazard=animal crossing
+    hazard=bump: ES:Tag:hazard=bump
     hazard=contamination: ES:Tag:hazard=contamination
     hazard=cyclists: ES:Tag:hazard=cyclists
     hazard=dangerous_junction: ES:Tag:hazard=dangerous junction
@@ -12798,20 +14611,43 @@ es:
     hazard=queues_likely: ES:Tag:hazard=queues likely
     hazard=slippery: ES:Tag:hazard=slippery
     healthcare:speciality=vaccination: ES:Tag:healthcare:speciality=vaccination
+    healthcare=alternative: ES:Tag:healthcare=alternative
+    healthcare=audiologist: ES:Tag:healthcare=audiologist
     healthcare=birthing_center: ES:Tag:healthcare=birthing center
+    healthcare=birthing_centre: ES:Tag:healthcare=birthing centre
+    healthcare=blood_bank: ES:Tag:healthcare=blood bank
+    healthcare=blood_donation: ES:Tag:healthcare=blood donation
+    healthcare=centre: ES:Tag:healthcare=centre
     healthcare=clinic: ES:Tag:healthcare=clinic
+    healthcare=community_health_worker: ES:Tag:healthcare=community health worker
+    healthcare=counselling: ES:Tag:healthcare=counselling
     healthcare=dentist: ES:Tag:healthcare=dentist
+    healthcare=dialysis: ES:Tag:healthcare=dialysis
     healthcare=doctor: ES:Tag:healthcare=doctor
+    healthcare=hospice: ES:Tag:healthcare=hospice
     healthcare=hospital: ES:Tag:healthcare=hospital
     healthcare=laboratory: ES:Tag:healthcare=laboratory
     healthcare=midwife: ES:Tag:healthcare=midwife
+    healthcare=nurse: ES:Tag:healthcare=nurse
+    healthcare=nutrition_counselling: ES:Tag:healthcare=nutrition counselling
+    healthcare=occupational_therapist: ES:Tag:healthcare=occupational therapist
+    healthcare=optometrist: ES:Tag:healthcare=optometrist
+    healthcare=pharmacy: ES:Tag:healthcare=pharmacy
+    healthcare=physiotherapist: ES:Tag:healthcare=physiotherapist
     healthcare=podiatrist: ES:Tag:healthcare=podiatrist
+    healthcare=postpartum_care: ES:Tag:healthcare=postpartum care
+    healthcare=psychotherapist: ES:Tag:healthcare=psychotherapist
+    healthcare=rehabilitation: ES:Tag:healthcare=rehabilitation
+    healthcare=sample_collection: ES:Tag:healthcare=sample collection
+    healthcare=speech_therapist: ES:Tag:healthcare=speech therapist
     healthcare=vaccination_centre: ES:Tag:healthcare=vaccination centre
+    healthcare=yes: ES:Tag:healthcare=yes
+    hedge=hedge_bank: ES:Tag:hedge=hedge bank
     highway=bridleway: ES:Tag:highway=bridleway
     highway=bus_guideway: ES:Tag:highway=bus guideway
     highway=bus_stop: ES:Tag:highway=bus stop
     highway=busway: ES:Tag:highway=busway
-    highway=byway: ES:Tag:highway=byway
+    highway=construction: ES:Tag:highway=construction
     highway=corridor: ES:Tag:highway=corridor
     highway=crossing: ES:Tag:highway=crossing
     highway=cycleway: ES:Tag:highway=cycleway
@@ -12820,6 +14656,7 @@ es:
     highway=emergency_bay: ES:Tag:highway=emergency bay
     highway=escape: ES:Tag:highway=escape
     highway=footway: ES:Tag:highway=footway
+    highway=give_way: ES:Tag:highway=give way
     highway=living_street: ES:Tag:highway=living street
     highway=milestone: ES:Tag:highway=milestone
     highway=mini_roundabout: ES:Tag:highway=mini roundabout
@@ -12841,6 +14678,7 @@ es:
     highway=secondary: ES:Tag:highway=secondary
     highway=secondary_link: ES:Tag:highway=secondary link
     highway=service: ES:Tag:highway=service
+    highway=services: ES:Tag:highway=services
     highway=speed_camera: ES:Tag:highway=speed camera
     highway=speed_display: ES:Tag:highway=speed display
     highway=steps: ES:Tag:highway=steps
@@ -12848,7 +14686,9 @@ es:
     highway=street_lamp: ES:Tag:highway=street lamp
     highway=tertiary: ES:Tag:highway=tertiary
     highway=tertiary_link: ES:Tag:highway=tertiary link
+    highway=toll_gantry: ES:Tag:highway=toll gantry
     highway=track: ES:Tag:highway=track
+    highway=traffic_mirror: ES:Tag:highway=traffic mirror
     highway=traffic_signals: ES:Tag:highway=traffic signals
     highway=trailhead: ES:Tag:highway=trailhead
     highway=trunk: ES:Tag:highway=trunk
@@ -12856,33 +14696,74 @@ es:
     highway=turning_circle: ES:Tag:highway=turning circle
     highway=turning_loop: ES:Tag:highway=turning loop
     highway=unclassified: ES:Tag:highway=unclassified
+    historic=aircraft: ES:Tag:historic=aircraft
     historic=aqueduct: ES:Tag:historic=aqueduct
     historic=archaeological_site: ES:Tag:historic=archaeological site
+    historic=battlefield: ES:Tag:historic=battlefield
+    historic=bomb_crater: ES:Tag:historic=bomb crater
     historic=boundary_stone: ES:Tag:historic=boundary stone
+    historic=building: ES:Tag:historic=building
+    historic=cannon: ES:Tag:historic=cannon
     historic=castle: ES:Tag:historic=castle
+    historic=castle_wall: ES:Tag:historic=castle wall
     historic=cemetery: ES:Tag:historic=cemetery
+    historic=charcoal_pile: ES:Tag:historic=charcoal pile
+    historic=church: ES:Tag:historic=church
+    historic=city_gate: ES:Tag:historic=city gate
+    historic=citywalls: ES:Tag:historic=citywalls
+    historic=creamery: ES:Tag:historic=creamery
     historic=district: ES:Tag:historic=district
     historic=farm: ES:Tag:historic=farm
+    historic=flood_mark: ES:Tag:historic=flood mark
     historic=fort: ES:Tag:historic=fort
+    historic=gallows: ES:Tag:historic=gallows
     historic=heritage: ES:Tag:historic=heritage
+    historic=highwater_mark: ES:Tag:historic=highwater mark
+    historic=locomotive: ES:Tag:historic=locomotive
     historic=manor: ES:Tag:historic=manor
     historic=memorial: ES:Tag:historic=memorial
     historic=milestone: ES:Tag:historic=milestone
     historic=mine: ES:Tag:historic=mine
+    historic=mine_shaft: ES:Tag:historic=mine shaft
     historic=monastery: ES:Tag:historic=monastery
     historic=monument: ES:Tag:historic=monument
+    historic=optical_telegraph: ES:Tag:historic=optical telegraph
+    historic=pa: ES:Tag:historic=pa
     historic=pillory: ES:Tag:historic=pillory
+    historic=railway_car: ES:Tag:historic=railway car
     historic=ruins: ES:Tag:historic=ruins
+    historic=rune_stone: ES:Tag:historic=rune stone
+    historic=ship: ES:Tag:historic=ship
+    historic=stone: ES:Tag:historic=stone
+    historic=tank: ES:Tag:historic=tank
     historic=tomb: ES:Tag:historic=tomb
+    historic=tower: ES:Tag:historic=tower
+    historic=vehicle: ES:Tag:historic=vehicle
     historic=wayside_cross: ES:Tag:historic=wayside cross
     historic=wayside_shrine: ES:Tag:historic=wayside shrine
     historic=wreck: ES:Tag:historic=wreck
+    historic=yes: ES:Tag:historic=yes
+    ice_road=yes: ES:Tag:ice road=yes
+    indoor=yes: ES:Tag:indoor=yes
     industrial=auto_wrecker: ES:Tag:industrial=auto wrecker
+    industrial=bakery: ES:Tag:industrial=bakery
+    industrial=brickyard: ES:Tag:industrial=brickyard
     industrial=depot: ES:Tag:industrial=depot
+    industrial=distributor: ES:Tag:industrial=distributor
     industrial=factory: ES:Tag:industrial=factory
+    industrial=grinding_mill: ES:Tag:industrial=grinding mill
+    industrial=heating_station: ES:Tag:industrial=heating station
     industrial=mine: ES:Tag:industrial=mine
+    industrial=oil: ES:Tag:industrial=oil
+    industrial=port: ES:Tag:industrial=port
+    industrial=salt_pond: ES:Tag:industrial=salt pond
+    industrial=sawmill: ES:Tag:industrial=sawmill
     industrial=scrap_yard: ES:Tag:industrial=scrap yard
+    industrial=shipyard: ES:Tag:industrial=shipyard
+    industrial=slaughterhouse: ES:Tag:industrial=slaughterhouse
     industrial=warehouse: ES:Tag:industrial=warehouse
+    industrial=well_cluster: ES:Tag:industrial=well cluster
+    industrial=wellsite: ES:Tag:industrial=wellsite
     information=board: ES:Tag:information=board
     information=guidepost: ES:Tag:information=guidepost
     information=map: ES:Tag:information=map
@@ -12898,12 +14779,14 @@ es:
     landcover=grass: ES:Tag:landcover=grass
     landcover=trees: ES:Tag:landcover=trees
     landuse=allotments: ES:Tag:landuse=allotments
+    landuse=animal_keeping: ES:Tag:landuse=animal keeping
     landuse=apiary: ES:Tag:landuse=apiary
     landuse=aquaculture: ES:Tag:landuse=aquaculture
     landuse=basin: ES:Tag:landuse=basin
     landuse=brownfield: ES:Tag:landuse=brownfield
     landuse=cemetery: ES:Tag:landuse=cemetery
     landuse=commercial: ES:Tag:landuse=commercial
+    landuse=conservation: ES:Tag:landuse=conservation
     landuse=construction: ES:Tag:landuse=construction
     landuse=depot: ES:Tag:landuse=depot
     landuse=education: ES:Tag:landuse=education
@@ -12911,26 +14794,37 @@ es:
     landuse=farmyard: ES:Tag:landuse=farmyard
     landuse=flowerbed: ES:Tag:landuse=flowerbed
     landuse=forest: ES:Tag:landuse=forest
+    landuse=forestry: ES:Tag:landuse=forestry
     landuse=garages: ES:Tag:landuse=garages
     landuse=grass: ES:Tag:landuse=grass
+    landuse=greenery: ES:Tag:landuse=greenery
     landuse=greenfield: ES:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: ES:Tag:landuse=greenhouse horticulture
+    landuse=harbour: ES:Tag:landuse=harbour
+    landuse=highway: ES:Tag:landuse=highway
     landuse=industrial: ES:Tag:landuse=industrial
     landuse=landfill: ES:Tag:landuse=landfill
+    landuse=logging: ES:Tag:landuse=logging
     landuse=meadow: ES:Tag:landuse=meadow
     landuse=meadow_orchard: ES:Tag:landuse=meadow orchard
     landuse=military: ES:Tag:landuse=military
     landuse=orchard: ES:Tag:landuse=orchard
+    landuse=peat_cutting: ES:Tag:landuse=peat cutting
     landuse=plant_nursery: ES:Tag:landuse=plant nursery
+    landuse=port: ES:Tag:landuse=port
     landuse=quarry: ES:Tag:landuse=quarry
+    landuse=railway: ES:Tag:landuse=railway
     landuse=recreation_ground: ES:Tag:landuse=recreation ground
+    landuse=religious: ES:Tag:landuse=religious
     landuse=reservoir: ES:Tag:landuse=reservoir
+    landuse=reservoir_watershed: ES:Tag:landuse=reservoir watershed
     landuse=residential: ES:Tag:landuse=residential
     landuse=retail: ES:Tag:landuse=retail
     landuse=salt_pond: ES:Tag:landuse=salt pond
     landuse=traffic_island: ES:Tag:landuse=traffic island
     landuse=village_green: ES:Tag:landuse=village green
     landuse=vineyard: ES:Tag:landuse=vineyard
+    landuse=winter_sports: ES:Tag:landuse=winter sports
     leaf_cycle=deciduous: ES:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: ES:Tag:leaf cycle=evergreen
     leaf_cycle=mixed: ES:Tag:leaf cycle=mixed
@@ -12944,6 +14838,7 @@ es:
     leisure=amusement_arcade: ES:Tag:leisure=amusement arcade
     leisure=bandstand: ES:Tag:leisure=bandstand
     leisure=barefoot: ES:Tag:leisure=barefoot
+    leisure=beach_resort: ES:Tag:leisure=beach resort
     leisure=bird_hide: ES:Tag:leisure=bird hide
     leisure=bleachers: ES:Tag:leisure=bleachers
     leisure=bowling_alley: ES:Tag:leisure=bowling alley
@@ -12976,43 +14871,71 @@ es:
     leisure=sports_centre: ES:Tag:leisure=sports centre
     leisure=sports_hall: ES:Tag:leisure=sports hall
     leisure=stadium: ES:Tag:leisure=stadium
+    leisure=summer_camp: ES:Tag:leisure=summer camp
     leisure=swimming_area: ES:Tag:leisure=swimming area
     leisure=swimming_pool: ES:Tag:leisure=swimming pool
     leisure=tanning_salon: ES:Tag:leisure=tanning salon
     leisure=track: ES:Tag:leisure=track
+    leisure=trampoline_park: ES:Tag:leisure=trampoline park
     leisure=water_park: ES:Tag:leisure=water park
     leisure=wildlife_hide: ES:Tag:leisure=wildlife hide
     lifeguard=tower: ES:Tag:lifeguard=tower
+    line=bay: ES:Tag:line=bay
+    line=busbar: ES:Tag:line=busbar
+    location=outdoor: ES:Tag:location=outdoor
+    lock=yes: ES:Tag:lock=yes
     man_made=adit: ES:Tag:man made=adit
     man_made=archimedes_screw: ES:Tag:man made=archimedes screw
+    man_made=beacon: ES:Tag:man made=beacon
     man_made=beehive: ES:Tag:man made=beehive
     man_made=breakwater: ES:Tag:man made=breakwater
     man_made=bridge: ES:Tag:man made=bridge
+    man_made=bunker_silo: ES:Tag:man made=bunker silo
+    man_made=carpet_hanger: ES:Tag:man made=carpet hanger
     man_made=chimney: ES:Tag:man made=chimney
     man_made=clearcut: ES:Tag:man made=clearcut
+    man_made=column: ES:Tag:man made=column
+    man_made=communications_tower: ES:Tag:man made=communications tower
     man_made=compass_rose: ES:Tag:man made=compass rose
+    man_made=crane: ES:Tag:man made=crane
     man_made=cross: ES:Tag:man made=cross
     man_made=cutline: ES:Tag:man made=cutline
+    man_made=dovecote: ES:Tag:man made=dovecote
     man_made=drinking_fountain: ES:Tag:man made=drinking fountain
     man_made=dyke: ES:Tag:man made=dyke
     man_made=embankment: ES:Tag:man made=embankment
     man_made=flagpole: ES:Tag:man made=flagpole
     man_made=gantry: ES:Tag:man made=gantry
+    man_made=gasometer: ES:Tag:man made=gasometer
     man_made=geoglyph: ES:Tag:man made=geoglyph
+    man_made=goods_conveyor: ES:Tag:man made=goods conveyor
+    man_made=groyne: ES:Tag:man made=groyne
+    man_made=guard_stone: ES:Tag:man made=guard stone
+    man_made=kiln: ES:Tag:man made=kiln
+    man_made=lighthouse: ES:Tag:man made=lighthouse
     man_made=manhole: ES:Tag:man made=manhole
     man_made=mast: ES:Tag:man made=mast
     man_made=mineshaft: ES:Tag:man made=mineshaft
     man_made=monitoring_station: ES:Tag:man made=monitoring station
     man_made=nesting_site: ES:Tag:man made=nesting site
+    man_made=obelisk: ES:Tag:man made=obelisk
     man_made=observatory: ES:Tag:man made=observatory
+    man_made=offshore_platform: ES:Tag:man made=offshore platform
+    man_made=petroleum_well: ES:Tag:man made=petroleum well
     man_made=pier: ES:Tag:man made=pier
+    man_made=pipeline: ES:Tag:man made=pipeline
     man_made=planter: ES:Tag:man made=planter
     man_made=power_wind: ES:Tag:man made=power wind
+    man_made=pump: ES:Tag:man made=pump
     man_made=pumping_rig: ES:Tag:man made=pumping rig
     man_made=pumping_station: ES:Tag:man made=pumping station
     man_made=reservoir_covered: ES:Tag:man made=reservoir covered
+    man_made=silo: ES:Tag:man made=silo
+    man_made=snow_fence: ES:Tag:man made=snow fence
+    man_made=snow_net: ES:Tag:man made=snow net
     man_made=storage_tank: ES:Tag:man made=storage tank
     man_made=street_cabinet: ES:Tag:man made=street cabinet
+    man_made=stupa: ES:Tag:man made=stupa
     man_made=surveillance: ES:Tag:man made=surveillance
     man_made=survey_point: ES:Tag:man made=survey point
     man_made=tailings_pond: ES:Tag:man made=tailings pond
@@ -13020,6 +14943,7 @@ es:
     man_made=tell: ES:Tag:man made=tell
     man_made=threshing_floor: ES:Tag:man made=threshing floor
     man_made=tower: ES:Tag:man made=tower
+    man_made=video_wall: ES:Tag:man made=video wall
     man_made=wastewater_plant: ES:Tag:man made=wastewater plant
     man_made=water_tap: ES:Tag:man made=water tap
     man_made=water_tower: ES:Tag:man made=water tower
@@ -13028,52 +14952,91 @@ es:
     man_made=watermill: ES:Tag:man made=watermill
     man_made=wildlife_crossing: ES:Tag:man made=wildlife crossing
     man_made=wildlife_opening: ES:Tag:man made=wildlife opening
+    man_made=windmill: ES:Tag:man made=windmill
     man_made=windpump: ES:Tag:man made=windpump
     man_made=works: ES:Tag:man made=works
+    man_made=yes: ES:Tag:man made=yes
     manhole=drain: ES:Tag:manhole=drain
     memorial:type=stolperstein: ES:Tag:memorial:type=stolperstein
     memorial=blue_plaque: ES:Tag:memorial=blue plaque
     memorial=bust: ES:Tag:memorial=bust
+    memorial=cenotaph: ES:Tag:memorial=cenotaph
     memorial=cross: ES:Tag:memorial=cross
+    memorial=flood_mark: ES:Tag:memorial=flood mark
     memorial=ghost_bike: ES:Tag:memorial=ghost bike
     memorial=obelisk: ES:Tag:memorial=obelisk
     memorial=plaque: ES:Tag:memorial=plaque
+    memorial=sculpture: ES:Tag:memorial=sculpture
     memorial=statue: ES:Tag:memorial=statue
     memorial=stele: ES:Tag:memorial=stele
     memorial=stolperstein: ES:Tag:memorial=stolperstein
     memorial=stone: ES:Tag:memorial=stone
     memorial=war_memorial: ES:Tag:memorial=war memorial
+    military=airfield: ES:Tag:military=airfield
     military=barracks: ES:Tag:military=barracks
     military=base: ES:Tag:military=base
+    military=bunker: ES:Tag:military=bunker
+    military=checkpoint: ES:Tag:military=checkpoint
+    military=danger_area: ES:Tag:military=danger area
     military=naval_base: ES:Tag:military=naval base
+    military=nuclear_explosion_site: ES:Tag:military=nuclear explosion site
+    military=obstacle_course: ES:Tag:military=obstacle course
+    military=office: ES:Tag:military=office
+    military=range: ES:Tag:military=range
     military=training_area: ES:Tag:military=training area
+    military=trench: ES:Tag:military=trench
+    mooring=guest: ES:Tag:mooring=guest
+    mountain_pass=yes: ES:Tag:mountain pass=yes
     name=Dollarama: ES:Tag:name=Dollarama
     name=Herfy: ES:Tag:name=Herfy
+    narrow=yes: ES:Tag:narrow=yes
+    natural=anthill: ES:Tag:natural=anthill
+    natural=arch: ES:Tag:natural=arch
     natural=arete: ES:Tag:natural=arete
+    natural=atoll: ES:Tag:natural=atoll
     natural=avalanche_dam: ES:Tag:natural=avalanche dam
     natural=bare_rock: ES:Tag:natural=bare rock
     natural=bay: ES:Tag:natural=bay
     natural=beach: ES:Tag:natural=beach
+    natural=birds_nest: ES:Tag:natural=birds nest
     natural=blowhole: ES:Tag:natural=blowhole
+    natural=cape: ES:Tag:natural=cape
     natural=cave_entrance: ES:Tag:natural=cave entrance
     natural=cliff: ES:Tag:natural=cliff
     natural=coastline: ES:Tag:natural=coastline
+    natural=col: ES:Tag:natural=col
+    natural=couloir: ES:Tag:natural=couloir
+    natural=crevasse: ES:Tag:natural=crevasse
     natural=desert: ES:Tag:natural=desert
+    natural=dune: ES:Tag:natural=dune
     natural=earth_bank: ES:Tag:natural=earth bank
     natural=esker: ES:Tag:natural=esker
     natural=fell: ES:Tag:natural=fell
+    natural=fumarole: ES:Tag:natural=fumarole
+    natural=geothermal: ES:Tag:natural=geothermal
+    natural=geothermal_area: ES:Tag:natural=geothermal area
+    natural=geothermal_field: ES:Tag:natural=geothermal field
     natural=geyser: ES:Tag:natural=geyser
     natural=glacier: ES:Tag:natural=glacier
     natural=gorge: ES:Tag:natural=gorge
+    natural=grass: ES:Tag:natural=grass
     natural=grassland: ES:Tag:natural=grassland
+    natural=gully: ES:Tag:natural=gully
     natural=heath: ES:Tag:natural=heath
     natural=hill: ES:Tag:natural=hill
+    natural=hot_spring: ES:Tag:natural=hot spring
+    natural=isthmus: ES:Tag:natural=isthmus
+    natural=landform: ES:Tag:natural=landform
+    natural=landslide: ES:Tag:natural=landslide
     natural=meadow: ES:Tag:natural=meadow
     natural=moor: ES:Tag:natural=moor
     natural=mountain_range: ES:Tag:natural=mountain range
     natural=mud: ES:Tag:natural=mud
     natural=naled: ES:Tag:natural=naled
     natural=peak: ES:Tag:natural=peak
+    natural=peninsula: ES:Tag:natural=peninsula
+    natural=plant: ES:Tag:natural=plant
+    natural=reef: ES:Tag:natural=reef
     natural=ridge: ES:Tag:natural=ridge
     natural=riverbed: ES:Tag:natural=riverbed
     natural=rock: ES:Tag:natural=rock
@@ -13084,14 +15047,19 @@ es:
     natural=shingle: ES:Tag:natural=shingle
     natural=shoal: ES:Tag:natural=shoal
     natural=shrub: ES:Tag:natural=shrub
+    natural=shrubbery: ES:Tag:natural=shrubbery
     natural=sinkhole: ES:Tag:natural=sinkhole
     natural=spring: ES:Tag:natural=spring
     natural=stone: ES:Tag:natural=stone
+    natural=strait: ES:Tag:natural=strait
+    natural=termite_mound: ES:Tag:natural=termite mound
     natural=tree: ES:Tag:natural=tree
     natural=tree_row: ES:Tag:natural=tree row
     natural=tree_stump: ES:Tag:natural=tree stump
+    natural=tundra: ES:Tag:natural=tundra
     natural=valley: ES:Tag:natural=valley
     natural=volcano: ES:Tag:natural=volcano
+    natural=wallow: ES:Tag:natural=wallow
     natural=water: ES:Tag:natural=water
     natural=wetland: ES:Tag:natural=wetland
     natural=wood: ES:Tag:natural=wood
@@ -13106,19 +15074,26 @@ es:
     office=advertising_agency: ES:Tag:office=advertising agency
     office=architect: ES:Tag:office=architect
     office=association: ES:Tag:office=association
+    office=chamber: ES:Tag:office=chamber
     office=charity: ES:Tag:office=charity
     office=company: ES:Tag:office=company
+    office=construction_company: ES:Tag:office=construction company
     office=consulting: ES:Tag:office=consulting
+    office=courier: ES:Tag:office=courier
     office=coworking: ES:Tag:office=coworking
+    office=diplomatic: ES:Tag:office=diplomatic
     office=educational_institution: ES:Tag:office=educational institution
     office=employment_agency: ES:Tag:office=employment agency
     office=energy_supplier: ES:Tag:office=energy supplier
     office=engineer: ES:Tag:office=engineer
     office=estate_agent: ES:Tag:office=estate agent
     office=financial: ES:Tag:office=financial
+    office=financial_advisor: ES:Tag:office=financial advisor
     office=forestry: ES:Tag:office=forestry
     office=foundation: ES:Tag:office=foundation
+    office=geodesist: ES:Tag:office=geodesist
     office=government: ES:Tag:office=government
+    office=graphic_design: ES:Tag:office=graphic design
     office=guide: ES:Tag:office=guide
     office=insurance: ES:Tag:office=insurance
     office=it: ES:Tag:office=it
@@ -13131,11 +15106,14 @@ es:
     office=occupational_safety: ES:Tag:office=occupational safety
     office=parish: ES:Tag:office=parish
     office=political_party: ES:Tag:office=political party
+    office=politician: ES:Tag:office=politician
     office=private_investigator: ES:Tag:office=private investigator
     office=property_management: ES:Tag:office=property management
+    office=publisher: ES:Tag:office=publisher
     office=quango: ES:Tag:office=quango
     office=religion: ES:Tag:office=religion
     office=research: ES:Tag:office=research
+    office=security: ES:Tag:office=security
     office=surveyor: ES:Tag:office=surveyor
     office=tax: ES:Tag:office=tax
     office=tax_advisor: ES:Tag:office=tax advisor
@@ -13147,13 +15125,17 @@ es:
     office=water_utility: ES:Tag:office=water utility
     office=yes: ES:Tag:office=yes
     oneway:bicycle=yes: ES:Tag:oneway:bicycle=yes
+    oneway=-1: ES:Tag:oneway=-1
     oneway=reversible: ES:Tag:oneway=reversible
+    opening_hours=24/7: ES:Tag:opening hours=24/7
     operator=GRDF: ES:Tag:operator=GRDF
     parking=lane: ES:Tag:parking=lane
     parking=multi-storey: ES:Tag:parking=multi-storey
     parking=street_side: ES:Tag:parking=street side
+    parking=surface: ES:Tag:parking=surface
     parking=underground: ES:Tag:parking=underground
     passenger=yes: ES:Tag:passenger=yes
+    passing_places=yes: ES:Tag:passing places=yes
     place=allotments: ES:Tag:place=allotments
     place=archipelago: ES:Tag:place=archipelago
     place=borough: ES:Tag:place=borough
@@ -13196,14 +15178,36 @@ es:
     police=storage: ES:Tag:police=storage
     police=training_area: ES:Tag:police=training area
     police=yes: ES:Tag:police=yes
+    power=cable: ES:Tag:power=cable
+    power=catenary_mast: ES:Tag:power=catenary mast
+    power=compensator: ES:Tag:power=compensator
+    power=connection: ES:Tag:power=connection
+    power=converter: ES:Tag:power=converter
     power=generator: ES:Tag:power=generator
     power=heliostat: ES:Tag:power=heliostat
+    power=insulator: ES:Tag:power=insulator
     power=line: ES:Tag:power=line
+    power=minor_line: ES:Tag:power=minor line
     power=plant: ES:Tag:power=plant
     power=pole: ES:Tag:power=pole
+    power=portal: ES:Tag:power=portal
     power=substation: ES:Tag:power=substation
+    power=switch: ES:Tag:power=switch
+    power=switchgear: ES:Tag:power=switchgear
+    power=terminal: ES:Tag:power=terminal
     power=tower: ES:Tag:power=tower
     power=transformer: ES:Tag:power=transformer
+    protect_class=11: ES:Tag:protect class=11
+    protect_class=13: ES:Tag:protect class=13
+    protect_class=19: ES:Tag:protect class=19
+    protect_class=1a: ES:Tag:protect class=1a
+    protect_class=1b: ES:Tag:protect class=1b
+    protect_class=2: ES:Tag:protect class=2
+    protect_class=21: ES:Tag:protect class=21
+    protect_class=3: ES:Tag:protect class=3
+    protect_class=4: ES:Tag:protect class=4
+    protect_class=5: ES:Tag:protect class=5
+    protect_class=6: ES:Tag:protect class=6
     public_transport=platform: ES:Tag:public transport=platform
     public_transport=station: ES:Tag:public transport=station
     public_transport=stop_area: ES:Tag:public transport=stop area
@@ -13211,33 +15215,70 @@ es:
     pump=manual: ES:Tag:pump=manual
     pump=no: ES:Tag:pump=no
     pump=powered: ES:Tag:pump=powered
+    railway=abandoned: ES:Tag:railway=abandoned
+    railway=buffer_stop: ES:Tag:railway=buffer stop
+    railway=construction: ES:Tag:railway=construction
     railway=crossing: ES:Tag:railway=crossing
+    railway=crossing_box: ES:Tag:railway=crossing box
+    railway=derail: ES:Tag:railway=derail
     railway=disused: ES:Tag:railway=disused
+    railway=funicular: ES:Tag:railway=funicular
+    railway=halt: ES:Tag:railway=halt
     railway=level_crossing: ES:Tag:railway=level crossing
     railway=light_rail: ES:Tag:railway=light rail
     railway=milestone: ES:Tag:railway=milestone
+    railway=miniature: ES:Tag:railway=miniature
     railway=monorail: ES:Tag:railway=monorail
     railway=narrow_gauge: ES:Tag:railway=narrow gauge
     railway=platform: ES:Tag:railway=platform
+    railway=preserved: ES:Tag:railway=preserved
     railway=rail: ES:Tag:railway=rail
+    railway=railway_crossing: ES:Tag:railway=railway crossing
+    railway=roundhouse: ES:Tag:railway=roundhouse
+    railway=signal: ES:Tag:railway=signal
+    railway=signal_box: ES:Tag:railway=signal box
     railway=station: ES:Tag:railway=station
     railway=stop: ES:Tag:railway=stop
     railway=subway: ES:Tag:railway=subway
     railway=subway_entrance: ES:Tag:railway=subway entrance
+    railway=switch: ES:Tag:railway=switch
     railway=tram: ES:Tag:railway=tram
+    railway=tram_level_crossing: ES:Tag:railway=tram level crossing
     railway=tram_stop: ES:Tag:railway=tram stop
+    railway=traverser: ES:Tag:railway=traverser
+    railway=turntable: ES:Tag:railway=turntable
+    railway=wash: ES:Tag:railway=wash
+    railway=water_crane: ES:Tag:railway=water crane
     railway=yard: ES:Tag:railway=yard
     recycling_type=centre: ES:Tag:recycling type=centre
     religion=christian: ES:Tag:religion=christian
+    residential=apartments: ES:Tag:residential=apartments
+    residential=halting_site: ES:Tag:residential=halting site
+    residential=rural: ES:Tag:residential=rural
+    residential=trailer_park: ES:Tag:residential=trailer park
     residential=university: ES:Tag:residential=university
+    residential=urban: ES:Tag:residential=urban
+    resource=aggregate: ES:Tag:resource=aggregate
+    resource=gravel: ES:Tag:resource=gravel
+    resource=sand: ES:Tag:resource=sand
     roller_coaster=track: ES:Tag:roller coaster=track
+    route=bicycle: ES:Tag:route=bicycle
     route=bus: ES:Tag:route=bus
+    route=canoe: ES:Tag:route=canoe
+    route=detour: ES:Tag:route=detour
     route=ferry: ES:Tag:route=ferry
+    route=foot: ES:Tag:route=foot
     route=hiking: ES:Tag:route=hiking
+    route=horse: ES:Tag:route=horse
+    route=inline_skates: ES:Tag:route=inline skates
     route=light_rail: ES:Tag:route=light rail
     route=monorail: ES:Tag:route=monorail
+    route=mtb: ES:Tag:route=mtb
+    route=piste: ES:Tag:route=piste
     route=railway: ES:Tag:route=railway
     route=road: ES:Tag:route=road
+    route=running: ES:Tag:route=running
+    route=ski: ES:Tag:route=ski
     route=subway: ES:Tag:route=subway
     route=train: ES:Tag:route=train
     route=tram: ES:Tag:route=tram
@@ -13253,146 +15294,239 @@ es:
     service=emergency_access: ES:Tag:service=emergency access
     service=parking_aisle: ES:Tag:service=parking aisle
     service=siding: ES:Tag:service=siding
+    service=spur: ES:Tag:service=spur
+    service=yard: ES:Tag:service=yard
+    shelter_type=Wetterpilz: ES:Tag:shelter type=Wetterpilz
     shelter_type=basic_hut: ES:Tag:shelter type=basic hut
+    shelter_type=changing_rooms: ES:Tag:shelter type=changing rooms
+    shelter_type=field_shelter: ES:Tag:shelter type=field shelter
+    shelter_type=gazebo: ES:Tag:shelter type=gazebo
     shelter_type=lean_to: ES:Tag:shelter type=lean to
+    shelter_type=pavilion: ES:Tag:shelter type=pavilion
     shelter_type=public_transport: ES:Tag:shelter type=public transport
     shop=agrarian: ES:Tag:shop=agrarian
     shop=alcohol: ES:Tag:shop=alcohol
     shop=anime: ES:Tag:shop=anime
+    shop=antiques: ES:Tag:shop=antiques
     shop=appliance: ES:Tag:shop=appliance
     shop=art: ES:Tag:shop=art
+    shop=atv: ES:Tag:shop=atv
     shop=baby_goods: ES:Tag:shop=baby goods
+    shop=bag: ES:Tag:shop=bag
     shop=bakery: ES:Tag:shop=bakery
     shop=bathroom_furnishing: ES:Tag:shop=bathroom furnishing
+    shop=bbq: ES:Tag:shop=bbq
     shop=beauty: ES:Tag:shop=beauty
     shop=bed: ES:Tag:shop=bed
     shop=beverages: ES:Tag:shop=beverages
     shop=bicycle: ES:Tag:shop=bicycle
+    shop=boat: ES:Tag:shop=boat
+    shop=boat_parts: ES:Tag:shop=boat parts
+    shop=boat_repair: ES:Tag:shop=boat repair
     shop=bookmaker: ES:Tag:shop=bookmaker
     shop=books: ES:Tag:shop=books
+    shop=boutique: ES:Tag:shop=boutique
+    shop=brewing_supplies: ES:Tag:shop=brewing supplies
     shop=butcher: ES:Tag:shop=butcher
+    shop=camera: ES:Tag:shop=camera
+    shop=candles: ES:Tag:shop=candles
     shop=cannabis: ES:Tag:shop=cannabis
+    shop=canoe_hire: ES:Tag:shop=canoe hire
     shop=car: ES:Tag:shop=car
     shop=car_parts: ES:Tag:shop=car parts
     shop=car_repair: ES:Tag:shop=car repair
+    shop=caravan: ES:Tag:shop=caravan
     shop=carpet: ES:Tag:shop=carpet
     shop=charity: ES:Tag:shop=charity
     shop=cheese: ES:Tag:shop=cheese
     shop=chemist: ES:Tag:shop=chemist
     shop=chocolate: ES:Tag:shop=chocolate
     shop=clothes: ES:Tag:shop=clothes
+    shop=coffee: ES:Tag:shop=coffee
     shop=collector: ES:Tag:shop=collector
     shop=computer: ES:Tag:shop=computer
     shop=confectionery: ES:Tag:shop=confectionery
     shop=convenience: ES:Tag:shop=convenience
     shop=copyshop: ES:Tag:shop=copyshop
+    shop=cosmetics: ES:Tag:shop=cosmetics
+    shop=country_store: ES:Tag:shop=country store
     shop=craft: ES:Tag:shop=craft
     shop=curtain: ES:Tag:shop=curtain
     shop=dairy: ES:Tag:shop=dairy
     shop=deli: ES:Tag:shop=deli
+    shop=dentures: ES:Tag:shop=dentures
     shop=department_store: ES:Tag:shop=department store
     shop=doityourself: ES:Tag:shop=doityourself
+    shop=doors: ES:Tag:shop=doors
     shop=dry_cleaning: ES:Tag:shop=dry cleaning
+    shop=e-cigarette: ES:Tag:shop=e-cigarette
     shop=electrical: ES:Tag:shop=electrical
     shop=electronics: ES:Tag:shop=electronics
     shop=energy: ES:Tag:shop=energy
+    shop=equestrian: ES:Tag:shop=equestrian
     shop=erotic: ES:Tag:shop=erotic
+    shop=esoteric: ES:Tag:shop=esoteric
     shop=estate_agent: ES:Tag:shop=estate agent
     shop=fabric: ES:Tag:shop=fabric
     shop=farm: ES:Tag:shop=farm
+    shop=fashion: ES:Tag:shop=fashion
+    shop=fashion_accesories: ES:Tag:shop=fashion accesories
     shop=fashion_accessories: ES:Tag:shop=fashion accessories
     shop=fireplace: ES:Tag:shop=fireplace
+    shop=fireworks: ES:Tag:shop=fireworks
     shop=fishing: ES:Tag:shop=fishing
+    shop=flooring: ES:Tag:shop=flooring
     shop=florist: ES:Tag:shop=florist
     shop=food: ES:Tag:shop=food
+    shop=frame: ES:Tag:shop=frame
+    shop=free_flying: ES:Tag:shop=free flying
+    shop=frozen_food: ES:Tag:shop=frozen food
+    shop=fuel: ES:Tag:shop=fuel
     shop=funeral_directors: ES:Tag:shop=funeral directors
     shop=furniture: ES:Tag:shop=furniture
     shop=games: ES:Tag:shop=games
     shop=garden_centre: ES:Tag:shop=garden centre
+    shop=garden_furniture: ES:Tag:shop=garden furniture
     shop=gas: ES:Tag:shop=gas
     shop=general: ES:Tag:shop=general
     shop=gift: ES:Tag:shop=gift
     shop=glaziery: ES:Tag:shop=glaziery
+    shop=golf: ES:Tag:shop=golf
     shop=greengrocer: ES:Tag:shop=greengrocer
     shop=grocery: ES:Tag:shop=grocery
+    shop=groundskeeping: ES:Tag:shop=groundskeeping
+    shop=haberdashery: ES:Tag:shop=haberdashery
     shop=hairdresser: ES:Tag:shop=hairdresser
+    shop=hairdresser_supply: ES:Tag:shop=hairdresser supply
     shop=hardware: ES:Tag:shop=hardware
     shop=health_food: ES:Tag:shop=health food
     shop=hearing_aids: ES:Tag:shop=hearing aids
+    shop=hifi: ES:Tag:shop=hifi
+    shop=honey: ES:Tag:shop=honey
+    shop=hookah: ES:Tag:shop=hookah
+    shop=household_linen: ES:Tag:shop=household linen
     shop=houseware: ES:Tag:shop=houseware
     shop=hunting: ES:Tag:shop=hunting
     shop=hvac: ES:Tag:shop=hvac
     shop=ice_cream: ES:Tag:shop=ice cream
     shop=insurance: ES:Tag:shop=insurance
+    shop=interior_decoration: ES:Tag:shop=interior decoration
     shop=jetski: ES:Tag:shop=jetski
     shop=jewelry: ES:Tag:shop=jewelry
     shop=kiosk: ES:Tag:shop=kiosk
     shop=kitchen: ES:Tag:shop=kitchen
+    shop=lamps: ES:Tag:shop=lamps
     shop=laundry: ES:Tag:shop=laundry
+    shop=leather: ES:Tag:shop=leather
+    shop=lighting: ES:Tag:shop=lighting
     shop=locksmith: ES:Tag:shop=locksmith
     shop=lottery: ES:Tag:shop=lottery
     shop=mall: ES:Tag:shop=mall
+    shop=maps: ES:Tag:shop=maps
     shop=massage: ES:Tag:shop=massage
     shop=medical: ES:Tag:shop=medical
     shop=medical_supply: ES:Tag:shop=medical supply
+    shop=military_surplus: ES:Tag:shop=military surplus
+    shop=mobile_home: ES:Tag:shop=mobile home
     shop=mobile_phone: ES:Tag:shop=mobile phone
+    shop=mobility_scooter: ES:Tag:shop=mobility scooter
     shop=model: ES:Tag:shop=model
     shop=money_lender: ES:Tag:shop=money lender
     shop=motorcycle: ES:Tag:shop=motorcycle
+    shop=motorcycle_parts: ES:Tag:shop=motorcycle parts
     shop=motorcycle_repair: ES:Tag:shop=motorcycle repair
+    shop=motorsports: ES:Tag:shop=motorsports
     shop=music: ES:Tag:shop=music
     shop=musical_instrument: ES:Tag:shop=musical instrument
     shop=newsagent: ES:Tag:shop=newsagent
     shop=nutrition_supplements: ES:Tag:shop=nutrition supplements
     shop=nuts: ES:Tag:shop=nuts
     shop=optician: ES:Tag:shop=optician
+    shop=organic: ES:Tag:shop=organic
     shop=outdoor: ES:Tag:shop=outdoor
+    shop=outpost: ES:Tag:shop=outpost
     shop=paint: ES:Tag:shop=paint
     shop=party: ES:Tag:shop=party
+    shop=pasta: ES:Tag:shop=pasta
     shop=pastry: ES:Tag:shop=pastry
     shop=pawnbroker: ES:Tag:shop=pawnbroker
     shop=perfumery: ES:Tag:shop=perfumery
+    shop=pest_control: ES:Tag:shop=pest control
     shop=pet: ES:Tag:shop=pet
     shop=pet_grooming: ES:Tag:shop=pet grooming
     shop=photo: ES:Tag:shop=photo
+    shop=plant_hire: ES:Tag:shop=plant hire
     shop=pottery: ES:Tag:shop=pottery
+    shop=power_tools: ES:Tag:shop=power tools
+    shop=printer_ink: ES:Tag:shop=printer ink
+    shop=printing: ES:Tag:shop=printing
+    shop=psychic: ES:Tag:shop=psychic
     shop=pyrotechnics: ES:Tag:shop=pyrotechnics
     shop=radiotechnics: ES:Tag:shop=radiotechnics
+    shop=religion: ES:Tag:shop=religion
     shop=rental: ES:Tag:shop=rental
+    shop=repair: ES:Tag:shop=repair
     shop=rice: ES:Tag:shop=rice
+    shop=robot: ES:Tag:shop=robot
+    shop=scooter: ES:Tag:shop=scooter
+    shop=scuba_diving: ES:Tag:shop=scuba diving
     shop=seafood: ES:Tag:shop=seafood
     shop=second_hand: ES:Tag:shop=second hand
     shop=security: ES:Tag:shop=security
     shop=sewing: ES:Tag:shop=sewing
     shop=shoe_repair: ES:Tag:shop=shoe repair
     shop=shoes: ES:Tag:shop=shoes
+    shop=shopping_centre: ES:Tag:shop=shopping centre
+    shop=skate: ES:Tag:shop=skate
+    shop=ski: ES:Tag:shop=ski
+    shop=snowmobile: ES:Tag:shop=snowmobile
+    shop=souvenir: ES:Tag:shop=souvenir
+    shop=spices: ES:Tag:shop=spices
     shop=sports: ES:Tag:shop=sports
+    shop=stairs: ES:Tag:shop=stairs
     shop=stationery: ES:Tag:shop=stationery
     shop=storage_rental: ES:Tag:shop=storage rental
     shop=supermarket: ES:Tag:shop=supermarket
     shop=surf: ES:Tag:shop=surf
+    shop=swimming_pool: ES:Tag:shop=swimming pool
     shop=tailor: ES:Tag:shop=tailor
     shop=tattoo: ES:Tag:shop=tattoo
     shop=tea: ES:Tag:shop=tea
+    shop=telecommunication: ES:Tag:shop=telecommunication
     shop=ticket: ES:Tag:shop=ticket
     shop=tiles: ES:Tag:shop=tiles
+    shop=tobacco: ES:Tag:shop=tobacco
+    shop=tool_hire: ES:Tag:shop=tool hire
     shop=toys: ES:Tag:shop=toys
+    shop=tractor: ES:Tag:shop=tractor
     shop=trade: ES:Tag:shop=trade
+    shop=trailer: ES:Tag:shop=trailer
     shop=travel_agency: ES:Tag:shop=travel agency
+    shop=trophy: ES:Tag:shop=trophy
+    shop=truck: ES:Tag:shop=truck
+    shop=truck_repair: ES:Tag:shop=truck repair
     shop=tyres: ES:Tag:shop=tyres
     shop=vacant: ES:Tag:shop=vacant
+    shop=vacuum_cleaner: ES:Tag:shop=vacuum cleaner
     shop=variety_store: ES:Tag:shop=variety store
+    shop=video: ES:Tag:shop=video
     shop=video_games: ES:Tag:shop=video games
     shop=watches: ES:Tag:shop=watches
     shop=water: ES:Tag:shop=water
+    shop=water_sports: ES:Tag:shop=water sports
     shop=weapons: ES:Tag:shop=weapons
     shop=wholesale: ES:Tag:shop=wholesale
+    shop=wigs: ES:Tag:shop=wigs
     shop=window_blind: ES:Tag:shop=window blind
+    shop=windows: ES:Tag:shop=windows
     shop=wine: ES:Tag:shop=wine
+    shop=wool: ES:Tag:shop=wool
     shop=yes: ES:Tag:shop=yes
     sinkhole=estavelle: ES:Tag:sinkhole=estavelle
+    site_type=megalith: ES:Tag:site type=megalith
     site_type=petroglyph: ES:Tag:site type=petroglyph
     site_type=settlement: ES:Tag:site type=settlement
+    site_type=tumulus: ES:Tag:site type=tumulus
     social_facility=assisted_living: ES:Tag:social facility=assisted living
     social_facility=clothing_bank: ES:Tag:social facility=clothing bank
     social_facility=food_bank: ES:Tag:social facility=food bank
@@ -13401,54 +15535,200 @@ es:
     social_facility=outreach: ES:Tag:social facility=outreach
     social_facility=soup_kitchen: ES:Tag:social facility=soup kitchen
     source:geometry=Bing: ES:Tag:source:geometry=Bing
+    source=extrapolation: ES:Tag:source=extrapolation
+    source=historical: ES:Tag:source=historical
+    source=image: ES:Tag:source=image
+    source=knowledge: ES:Tag:source=knowledge
+    source=survey: ES:Tag:source=survey
+    source=voice: ES:Tag:source=voice
+    sport=10pin: ES:Tag:sport=10pin
+    sport=8pin: ES:Tag:sport=8pin
+    sport=9pin: ES:Tag:sport=9pin
+    sport=aikido: ES:Tag:sport=aikido
+    sport=american_football: ES:Tag:sport=american football
+    sport=american_handball: ES:Tag:sport=american handball
+    sport=archery: ES:Tag:sport=archery
+    sport=athletics: ES:Tag:sport=athletics
+    sport=australian_football: ES:Tag:sport=australian football
+    sport=badminton: ES:Tag:sport=badminton
+    sport=balle_pelote: ES:Tag:sport=balle pelote
+    sport=bandy: ES:Tag:sport=bandy
+    sport=baseball: ES:Tag:sport=baseball
     sport=basketball: ES:Tag:sport=basketball
+    sport=batting_cage: ES:Tag:sport=batting cage
+    sport=beachvolleyball: ES:Tag:sport=beachvolleyball
+    sport=biathlon: ES:Tag:sport=biathlon
+    sport=billiards: ES:Tag:sport=billiards
+    sport=bmx: ES:Tag:sport=bmx
+    sport=bobsleigh: ES:Tag:sport=bobsleigh
     sport=boules: ES:Tag:sport=boules
+    sport=bowls: ES:Tag:sport=bowls
+    sport=boxing: ES:Tag:sport=boxing
     sport=bullfighting: ES:Tag:sport=bullfighting
+    sport=canadian_football: ES:Tag:sport=canadian football
+    sport=canoe: ES:Tag:sport=canoe
+    sport=canoe_polo: ES:Tag:sport=canoe polo
     sport=chess: ES:Tag:sport=chess
+    sport=cliff_diving: ES:Tag:sport=cliff diving
     sport=climbing: ES:Tag:sport=climbing
+    sport=climbing_adventure: ES:Tag:sport=climbing adventure
     sport=cockfighting: ES:Tag:sport=cockfighting
+    sport=cricket: ES:Tag:sport=cricket
     sport=cricket_nets: ES:Tag:sport=cricket nets
+    sport=croquet: ES:Tag:sport=croquet
+    sport=crossfit: ES:Tag:sport=crossfit
+    sport=curling: ES:Tag:sport=curling
+    sport=cycle_polo: ES:Tag:sport=cycle polo
     sport=cycling: ES:Tag:sport=cycling
+    sport=darts: ES:Tag:sport=darts
+    sport=disc_golf: ES:Tag:sport=disc golf
+    sport=dog_agility: ES:Tag:sport=dog agility
     sport=dog_racing: ES:Tag:sport=dog racing
     sport=equestrian: ES:Tag:sport=equestrian
+    sport=fencing: ES:Tag:sport=fencing
+    sport=field_hockey: ES:Tag:sport=field hockey
+    sport=fitness: ES:Tag:sport=fitness
+    sport=five-a-side: ES:Tag:sport=five-a-side
+    sport=floorball: ES:Tag:sport=floorball
+    sport=four_square: ES:Tag:sport=four square
+    sport=free_flying: ES:Tag:sport=free flying
     sport=futsal: ES:Tag:sport=futsal
+    sport=gaelic_games: ES:Tag:sport=gaelic games
+    sport=gaga: ES:Tag:sport=gaga
     sport=golf: ES:Tag:sport=golf
+    sport=gymnastics: ES:Tag:sport=gymnastics
     sport=handball: ES:Tag:sport=handball
+    sport=hapkido: ES:Tag:sport=hapkido
     sport=horse_racing: ES:Tag:sport=horse racing
+    sport=horseshoes: ES:Tag:sport=horseshoes
+    sport=ice_hockey: ES:Tag:sport=ice hockey
+    sport=ice_skating: ES:Tag:sport=ice skating
+    sport=ice_stock: ES:Tag:sport=ice stock
+    sport=judo: ES:Tag:sport=judo
+    sport=karate: ES:Tag:sport=karate
+    sport=karting: ES:Tag:sport=karting
+    sport=kickboxing: ES:Tag:sport=kickboxing
+    sport=kitesurfing: ES:Tag:sport=kitesurfing
+    sport=korfball: ES:Tag:sport=korfball
+    sport=krachtbal: ES:Tag:sport=krachtbal
+    sport=lacrosse: ES:Tag:sport=lacrosse
+    sport=laser_tag: ES:Tag:sport=laser tag
+    sport=long_jump: ES:Tag:sport=long jump
+    sport=martial_arts: ES:Tag:sport=martial arts
+    sport=miniature_golf: ES:Tag:sport=miniature golf
     sport=model_aerodrome: ES:Tag:sport=model aerodrome
     sport=motocross: ES:Tag:sport=motocross
     sport=motor: ES:Tag:sport=motor
     sport=multi: ES:Tag:sport=multi
+    sport=netball: ES:Tag:sport=netball
+    sport=nine_mens_morris: ES:Tag:sport=nine mens morris
+    sport=obstacle_course: ES:Tag:sport=obstacle course
     sport=orienteering: ES:Tag:sport=orienteering
     sport=paddle_tennis: ES:Tag:sport=paddle tennis
     sport=padel: ES:Tag:sport=padel
     sport=paintball: ES:Tag:sport=paintball
+    sport=parachuting: ES:Tag:sport=parachuting
+    sport=parkour: ES:Tag:sport=parkour
     sport=pelota: ES:Tag:sport=pelota
+    sport=pesäpallo: ES:Tag:sport=pesäpallo
+    sport=pickleball: ES:Tag:sport=pickleball
+    sport=pilates: ES:Tag:sport=pilates
+    sport=pole_dance: ES:Tag:sport=pole dance
+    sport=polo: ES:Tag:sport=polo
+    sport=racquet: ES:Tag:sport=racquet
+    sport=rc_car: ES:Tag:sport=rc car
+    sport=roller_hockey: ES:Tag:sport=roller hockey
+    sport=roller_skating: ES:Tag:sport=roller skating
+    sport=rowing: ES:Tag:sport=rowing
+    sport=rugby: ES:Tag:sport=rugby
+    sport=rugby_league: ES:Tag:sport=rugby league
+    sport=rugby_union: ES:Tag:sport=rugby union
+    sport=running: ES:Tag:sport=running
+    sport=sailing: ES:Tag:sport=sailing
+    sport=scuba_diving: ES:Tag:sport=scuba diving
     sport=shooting: ES:Tag:sport=shooting
+    sport=shot-put: ES:Tag:sport=shot-put
+    sport=shuffleboard: ES:Tag:sport=shuffleboard
+    sport=skateboard: ES:Tag:sport=skateboard
+    sport=ski_jumping: ES:Tag:sport=ski jumping
+    sport=skiing: ES:Tag:sport=skiing
+    sport=snooker: ES:Tag:sport=snooker
     sport=soccer: ES:Tag:sport=soccer
+    sport=softball: ES:Tag:sport=softball
+    sport=speedway: ES:Tag:sport=speedway
+    sport=squash: ES:Tag:sport=squash
+    sport=sumo: ES:Tag:sport=sumo
     sport=surfing: ES:Tag:sport=surfing
     sport=swimming: ES:Tag:sport=swimming
+    sport=table_soccer: ES:Tag:sport=table soccer
     sport=table_tennis: ES:Tag:sport=table tennis
+    sport=taekwondo: ES:Tag:sport=taekwondo
     sport=tennis: ES:Tag:sport=tennis
+    sport=tetherball: ES:Tag:sport=tetherball
+    sport=toboggan: ES:Tag:sport=toboggan
+    sport=trampoline: ES:Tag:sport=trampoline
+    sport=trugo: ES:Tag:sport=trugo
+    sport=ultimate: ES:Tag:sport=ultimate
     sport=volleyball: ES:Tag:sport=volleyball
+    sport=wakeboarding: ES:Tag:sport=wakeboarding
     sport=water_polo: ES:Tag:sport=water polo
+    sport=water_ski: ES:Tag:sport=water ski
+    sport=weightlifting: ES:Tag:sport=weightlifting
+    sport=wrestling: ES:Tag:sport=wrestling
     sport=yoga: ES:Tag:sport=yoga
+    sport=zurkhaneh_sport: ES:Tag:sport=zurkhaneh sport
     station=subway: ES:Tag:station=subway
+    stile=stepover: ES:Tag:stile=stepover
     street_vendor=yes: ES:Tag:street vendor=yes
     substation=distribution: ES:Tag:substation=distribution
     substation=minor_distribution: ES:Tag:substation=minor distribution
     substation=transmission: ES:Tag:substation=transmission
+    surface=acrylic: ES:Tag:surface=acrylic
+    surface=artificial_turf: ES:Tag:surface=artificial turf
     surface=asphalt: ES:Tag:surface=asphalt
+    surface=carpet: ES:Tag:surface=carpet
+    surface=chipseal: ES:Tag:surface=chipseal
+    surface=clay: ES:Tag:surface=clay
+    surface=cobblestone: ES:Tag:surface=cobblestone
     surface=compacted: ES:Tag:surface=compacted
     surface=concrete: ES:Tag:surface=concrete
+    surface=concrete:lanes: ES:Tag:surface=concrete:lanes
+    surface=concrete:plates: ES:Tag:surface=concrete:plates
+    surface=dirt: ES:Tag:surface=dirt
+    surface=earth: ES:Tag:surface=earth
+    surface=fine_gravel: ES:Tag:surface=fine gravel
+    surface=grass: ES:Tag:surface=grass
+    surface=grass_paver: ES:Tag:surface=grass paver
+    surface=gravel: ES:Tag:surface=gravel
+    surface=ground: ES:Tag:surface=ground
+    surface=ice: ES:Tag:surface=ice
+    surface=metal: ES:Tag:surface=metal
+    surface=metal_grid: ES:Tag:surface=metal grid
+    surface=mud: ES:Tag:surface=mud
     surface=paved: ES:Tag:surface=paved
+    surface=paving_stones: ES:Tag:surface=paving stones
+    surface=pebblestone: ES:Tag:surface=pebblestone
+    surface=rock: ES:Tag:surface=rock
+    surface=salt: ES:Tag:surface=salt
+    surface=sand: ES:Tag:surface=sand
+    surface=sett: ES:Tag:surface=sett
+    surface=snow: ES:Tag:surface=snow
+    surface=stepping_stones: ES:Tag:surface=stepping stones
     surface=tartan: ES:Tag:surface=tartan
+    surface=unhewn_cobblestone: ES:Tag:surface=unhewn cobblestone
     surface=unpaved: ES:Tag:surface=unpaved
+    surface=wood: ES:Tag:surface=wood
+    surface=woodchips: ES:Tag:surface=woodchips
     switch=disconnector: ES:Tag:switch=disconnector
     tactile_paving=no: ES:Tag:tactile paving=no
+    tactile_paving=yes: ES:Tag:tactile paving=yes
     telecom=connection_point: ES:Tag:telecom=connection point
+    telecom=data_center: ES:Tag:telecom=data center
+    telecom=distribution_point: ES:Tag:telecom=distribution point
+    telecom=exchange: ES:Tag:telecom=exchange
     telecom=service_device: ES:Tag:telecom=service device
     theatre:type=open_air: ES:Tag:theatre:type=open air
+    tidal=yes: ES:Tag:tidal=yes
     toll=yes: ES:Tag:toll=yes
     tomb=cenotaph: ES:Tag:tomb=cenotaph
     tomb=columbarium: ES:Tag:tomb=columbarium
@@ -13461,7 +15741,9 @@ es:
     tourism=aquarium: ES:Tag:tourism=aquarium
     tourism=artwork: ES:Tag:tourism=artwork
     tourism=attraction: ES:Tag:tourism=attraction
+    tourism=camp_pitch: ES:Tag:tourism=camp pitch
     tourism=camp_site: ES:Tag:tourism=camp site
+    tourism=caravan_site: ES:Tag:tourism=caravan site
     tourism=chalet: ES:Tag:tourism=chalet
     tourism=gallery: ES:Tag:tourism=gallery
     tourism=guest_house: ES:Tag:tourism=guest house
@@ -13476,6 +15758,8 @@ es:
     tourism=viewpoint: ES:Tag:tourism=viewpoint
     tourism=wilderness_hut: ES:Tag:tourism=wilderness hut
     tourism=wine_cellar: ES:Tag:tourism=wine cellar
+    tourism=yes: ES:Tag:tourism=yes
+    tourism=zoo: ES:Tag:tourism=zoo
     tower:type=bell_tower: ES:Tag:tower:type=bell tower
     tower:type=communication: ES:Tag:tower:type=communication
     tower:type=cooling: ES:Tag:tower:type=cooling
@@ -13483,6 +15767,11 @@ es:
     tower:type=minaret: ES:Tag:tower:type=minaret
     tower:type=observation: ES:Tag:tower:type=observation
     tower:type=watchtower: ES:Tag:tower:type=watchtower
+    tracktype=grade1: ES:Tag:tracktype=grade1
+    tracktype=grade2: ES:Tag:tracktype=grade2
+    tracktype=grade3: ES:Tag:tracktype=grade3
+    tracktype=grade4: ES:Tag:tracktype=grade4
+    tracktype=grade5: ES:Tag:tracktype=grade5
     traffic_calming=bump: ES:Tag:traffic calming=bump
     traffic_calming=cushion: ES:Tag:traffic calming=cushion
     traffic_calming=dip: ES:Tag:traffic calming=dip
@@ -13497,44 +15786,129 @@ es:
     trees=olive_trees: ES:Tag:trees=olive trees
     tunnel=building_passage: ES:Tag:tunnel=building passage
     tunnel=culvert: ES:Tag:tunnel=culvert
+    tunnel=flooded: ES:Tag:tunnel=flooded
+    tunnel=yes: ES:Tag:tunnel=yes
     type=public_transport: ES:Tag:type=public transport
     type=waterway: ES:Tag:type=waterway
+    vending=SIM_cards: ES:Tag:vending=SIM cards
+    vending=admission_tickets: ES:Tag:vending=admission tickets
+    vending=animal_feed: ES:Tag:vending=animal feed
+    vending=art: ES:Tag:vending=art
+    vending=bicycle_tube: ES:Tag:vending=bicycle tube
     vending=books: ES:Tag:vending=books
+    vending=bottle_return: ES:Tag:vending=bottle return
     vending=bread: ES:Tag:vending=bread
+    vending=candles: ES:Tag:vending=candles
     vending=chemist: ES:Tag:vending=chemist
+    vending=chewing_gums: ES:Tag:vending=chewing gums
+    vending=cigarettes: ES:Tag:vending=cigarettes
+    vending=coffee: ES:Tag:vending=coffee
     vending=condoms: ES:Tag:vending=condoms
+    vending=contact_lenses: ES:Tag:vending=contact lenses
+    vending=drinks: ES:Tag:vending=drinks
+    vending=e-cigarettes: ES:Tag:vending=e-cigarettes
+    vending=electronics: ES:Tag:vending=electronics
+    vending=elongated_coin: ES:Tag:vending=elongated coin
     vending=excrement_bags: ES:Tag:vending=excrement bags
+    vending=feminine_hygiene: ES:Tag:vending=feminine hygiene
+    vending=first_aid: ES:Tag:vending=first aid
     vending=fishing_bait: ES:Tag:vending=fishing bait
     vending=fishing_tackle: ES:Tag:vending=fishing tackle
+    vending=flower_seeds: ES:Tag:vending=flower seeds
     vending=flowers: ES:Tag:vending=flowers
+    vending=food: ES:Tag:vending=food
+    vending=fuel: ES:Tag:vending=fuel
     vending=ice_cream: ES:Tag:vending=ice cream
+    vending=ice_cubes: ES:Tag:vending=ice cubes
     vending=milk: ES:Tag:vending=milk
+    vending=newspapers: ES:Tag:vending=newspapers
     vending=parcel_mail_in: ES:Tag:vending=parcel mail in
     vending=parcel_pickup: ES:Tag:vending=parcel pickup
+    vending=parcel_pickup;parcel_mail_in: ES:Tag:vending=parcel pickup;parcel mail
+      in
     vending=parking_tickets: ES:Tag:vending=parking tickets
+    vending=pizza: ES:Tag:vending=pizza
     vending=public_transport_tickets: ES:Tag:vending=public transport tickets
+    vending=stamps: ES:Tag:vending=stamps
+    vending=sweets: ES:Tag:vending=sweets
+    vending=syringes: ES:Tag:vending=syringes
+    vending=telephone_vouchers: ES:Tag:vending=telephone vouchers
+    vending=toll: ES:Tag:vending=toll
+    vending=toys: ES:Tag:vending=toys
+    vending=water: ES:Tag:vending=water
+    wall=brick: ES:Tag:wall=brick
+    wall=castle_wall: ES:Tag:wall=castle wall
+    wall=concrete: ES:Tag:wall=concrete
+    wall=concrete_block: ES:Tag:wall=concrete block
     wall=dry_stone: ES:Tag:wall=dry stone
+    wall=flint: ES:Tag:wall=flint
+    wall=flood_wall: ES:Tag:wall=flood wall
+    wall=gabion:value: ES:Tag:wall=gabion:value
+    wall=no: ES:Tag:wall=no
     wall=noise_barrier: ES:Tag:wall=noise barrier
+    wall=pise:value: ES:Tag:wall=pise:value
+    wall=seawall: ES:Tag:wall=seawall
+    wall=stone: ES:Tag:wall=stone
+    wall=stone_wall: ES:Tag:wall=stone wall
     wall=tire_barrier: ES:Tag:wall=tire barrier
+    waste=cigarettes: ES:Tag:waste=cigarettes
+    waste=dog_excrement: ES:Tag:waste=dog excrement
+    waste=drugs: ES:Tag:waste=drugs
+    waste=oil: ES:Tag:waste=oil
+    waste=organic: ES:Tag:waste=organic
+    waste=pizza_box: ES:Tag:waste=pizza box
+    waste=rubble: ES:Tag:waste=rubble
+    waste=sharps: ES:Tag:waste=sharps
+    waste=trash: ES:Tag:waste=trash
+    water=basin: ES:Tag:water=basin
     water=canal: ES:Tag:water=canal
+    water=ditch: ES:Tag:water=ditch
+    water=dock: ES:Tag:water=dock
+    water=drain: ES:Tag:water=drain
     water=fish_pass: ES:Tag:water=fish pass
+    water=harbour: ES:Tag:water=harbour
     water=lagoon: ES:Tag:water=lagoon
     water=lake: ES:Tag:water=lake
+    water=lock: ES:Tag:water=lock
+    water=moat: ES:Tag:water=moat
+    water=oxbow: ES:Tag:water=oxbow
     water=pond: ES:Tag:water=pond
+    water=rapids: ES:Tag:water=rapids
+    water=reflecting_pool: ES:Tag:water=reflecting pool
     water=reservoir: ES:Tag:water=reservoir
     water=river: ES:Tag:water=river
+    water=stream: ES:Tag:water=stream
+    water=stream_pool: ES:Tag:water=stream pool
     water=wastewater: ES:Tag:water=wastewater
+    waterway=boat_lift: ES:Tag:waterway=boat lift
+    waterway=boatyard: ES:Tag:waterway=boatyard
     waterway=canal: ES:Tag:waterway=canal
     waterway=dam: ES:Tag:waterway=dam
+    waterway=derelict_canal: ES:Tag:waterway=derelict canal
     waterway=ditch: ES:Tag:waterway=ditch
     waterway=dock: ES:Tag:waterway=dock
     waterway=drain: ES:Tag:waterway=drain
+    waterway=dredged_area: ES:Tag:waterway=dredged area
+    waterway=drystream: ES:Tag:waterway=drystream
+    waterway=fairway: ES:Tag:waterway=fairway
+    waterway=fish_pass: ES:Tag:waterway=fish pass
+    waterway=floating_barrier: ES:Tag:waterway=floating barrier
+    waterway=fuel: ES:Tag:waterway=fuel
+    waterway=lock_gate: ES:Tag:waterway=lock gate
     waterway=milestone: ES:Tag:waterway=milestone
+    waterway=portage: ES:Tag:waterway=portage
+    waterway=pressurised: ES:Tag:waterway=pressurised
     waterway=rapids: ES:Tag:waterway=rapids
     waterway=river: ES:Tag:waterway=river
     waterway=riverbank: ES:Tag:waterway=riverbank
+    waterway=security_lock: ES:Tag:waterway=security lock
+    waterway=sluice_gate: ES:Tag:waterway=sluice gate
+    waterway=soakhole: ES:Tag:waterway=soakhole
     waterway=stream: ES:Tag:waterway=stream
+    waterway=tidal_channel: ES:Tag:waterway=tidal channel
+    waterway=turning_point: ES:Tag:waterway=turning point
     waterway=water_point: ES:Tag:waterway=water point
+    waterway=waterfall: ES:Tag:waterway=waterfall
     waterway=weir: ES:Tag:waterway=weir
     wetland=bog: ES:Tag:wetland=bog
     wetland=mangrove: ES:Tag:wetland=mangrove
@@ -13559,6 +15933,7 @@ et:
 fa:
   key:
     addr: Fa:Key:addr
+    alt_name: Fa:Key:alt name
     area: Fa:Key:area
     barrier: Fa:Key:barrier
     bridge: Fa:Key:bridge
@@ -13592,6 +15967,7 @@ fa:
     highway=tertiary: Fa:Tag:highway=tertiary
     highway=track: Fa:Tag:highway=track
     highway=unclassified: Fa:Tag:highway=unclassified
+    junction=jughandle: Fa:Tag:junction=jughandle
     junction=yes: Fa:Tag:junction=yes
     man_made=qanat: Fa:Tag:man made=qanat
     man_made=water_tower: Fa:Tag:man made=water tower
@@ -13647,6 +16023,7 @@ fi:
     waterway: Fi:Key:waterway
     wheelchair: Fi:Key:wheelchair
     width: Fi:Key:width
+    winter_service: Fi:Key:winter service
   tag:
     amenity=atm: Fi:Tag:amenity=atm
     amenity=baby_hatch: Fi:Tag:amenity=baby hatch
@@ -13735,12 +16112,16 @@ fr:
     animated: FR:Key:animated
     architect: FR:Key:architect
     area: FR:Key:area
+    area:highway: FR:Key:area:highway
     artist_name: FR:Key:artist name
     artwork_type: FR:Key:artwork type
     attraction: FR:Key:attraction
+    authentication: FR:Key:authentication
+    avalanche_transceiver: FR:Key:avalanche transceiver
     backcountry: FR:Key:backcountry
     backrest: FR:Key:backrest
     backward: FR:Key:backward
+    bakehouse: FR:Key:bakehouse
     barrier: FR:Key:barrier
     baseball: FR:Key:baseball
     basin: FR:Key:basin
@@ -13764,6 +16145,7 @@ fr:
     building:flats: FR:Key:building:flats
     building:levels: FR:Key:building:levels
     building:material: FR:Key:building:material
+    building:min_level: FR:Key:building:min level
     building:part: FR:Key:building:part
     building:prefabricated: FR:Key:building:prefabricated
     building:use: FR:Key:building:use
@@ -13771,16 +16153,19 @@ fr:
     bus: FR:Key:bus
     busway: FR:Key:busway
     cafe: FR:Key:cafe
+    camera:direction: FR:Key:camera:direction
     camp_site: FR:Key:camp site
     capacity: FR:Key:capacity
     capacity:disabled: FR:Key:capacity:disabled
     cargo: FR:Key:cargo
     cargo_bike: FR:Key:cargo bike
     carpool: FR:Key:carpool
+    carriage: FR:Key:carriage
     cash_withdrawal: FR:Key:cash withdrawal
     changesets_count: FR:Key:changesets count
     charge: FR:Key:charge
     check_date: FR:Key:check date
+    circuits: FR:Key:circuits
     class:bicycle:commute: FR:Key:class:bicycle:commute
     clothes: FR:Key:clothes
     club: FR:Key:club
@@ -13789,10 +16174,13 @@ fr:
     colour: FR:Key:colour
     comment: FR:Key:comment
     communication:bos: FR:Key:communication:bos
+    community: FR:Key:community
     community_centre: FR:Key:community centre
     community_centre:for: FR:Key:community centre:for
+    compensator: FR:Key:compensator
     connection_point: FR:Key:connection point
     construction: FR:Key:construction
+    consulate: FR:Key:consulate
     contact: FR:Key:contact
     contact:email: FR:Key:contact:email
     contact:facebook: FR:Key:contact:facebook
@@ -13811,13 +16199,18 @@ fr:
     cuisine: FR:Key:cuisine
     currency: FR:Key:currency
     cutting: FR:Key:cutting
+    cycle_barrier: FR:Key:cycle barrier
+    cycle_barrier:installation: FR:Key:cycle barrier:installation
     cyclestreet: FR:Key:cyclestreet
     cycleway: FR:Key:cycleway
     cycleway:lane: FR:Key:cycleway:lane
     cycleway:left: FR:Key:cycleway:left
+    defensive_works: FR:Key:defensive works
+    deflection: FR:Key:deflection
     delivery: FR:Key:delivery
     denomination: FR:Key:denomination
     denotation: FR:Key:denotation
+    departures_board: FR:Key:departures board
     description: FR:Key:description
     design: FR:Key:design
     designation: FR:Key:designation
@@ -13838,6 +16231,7 @@ fr:
     divider: FR:Key:divider
     dog: FR:Key:dog
     door: FR:Key:door
+    drain: FR:Key:drain
     drink: FR:Key:drink
     drinking_water: FR:Key:drinking water
     drinking_water:refill: FR:Key:drinking water:refill
@@ -13894,6 +16288,7 @@ fr:
     handrail: FR:Key:handrail
     happy_hours: FR:Key:happy hours
     hazard: FR:Key:hazard
+    health_facility:CD: FR:Key:health facility:CD
     healthcare: FR:Key:healthcare
     height: FR:Key:height
     heritage: FR:Key:heritage
@@ -13909,9 +16304,11 @@ fr:
     incline: FR:Key:incline
     indoor: FR:Key:indoor
     information: FR:Key:information
+    inlet: FR:Key:inlet
     inscription: FR:Key:inscription
     int_name: FR:Key:int name
     intermittent: FR:Key:intermittent
+    internet_access:ssid: FR:Key:internet access:ssid
     interval: FR:Key:interval
     junction: FR:Key:junction
     kerb: FR:Key:kerb
@@ -13968,7 +16365,9 @@ fr:
     min_age: FR:Key:min age
     minage: FR:Key:minage
     monitoring:bicycle: FR:Key:monitoring:bicycle
+    monitoring:groundwater: FR:Key:monitoring:groundwater
     monitoring:meteoric_activity: FR:Key:monitoring:meteoric activity
+    monitoring:noise: FR:Key:monitoring:noise
     monitoring:water_level: FR:Key:monitoring:water level
     mooring: FR:Key:mooring
     motorboat: FR:Key:motorboat
@@ -13997,6 +16396,7 @@ fr:
     open_air: FR:Key:open air
     openbenches:id: FR:Key:openbenches:id
     openfire: FR:Key:openfire
+    opening: FR:Key:opening
     opening_date: FR:Key:opening date
     opening_hours: FR:Key:opening hours
     opening_hours:covid19: FR:Key:opening hours:covid19
@@ -14005,12 +16405,16 @@ fr:
     operator:type: FR:Key:operator:type
     organic: FR:Key:organic
     outdoor_seating: FR:Key:outdoor seating
+    outlet: FR:Key:outlet
+    overlap: FR:Key:overlap
     overtaking: FR:Key:overtaking
+    overtaking:hgv: FR:Key:overtaking:hgv
     owner: FR:Key:owner
     par: FR:Key:par
     parking: FR:Key:parking
     parking:condition: FR:Key:parking:condition
     parking:lane: FR:Key:parking:lane
+    parking:orientation: FR:Key:parking:orientation
     parking_space: FR:Key:parking space
     paved:date: FR:Key:paved:date
     payment: FR:Key:payment
@@ -14049,6 +16453,7 @@ fr:
     ref:ERDF:gdo: FR:Key:ref:ERDF:gdo
     ref:EU:EVSE: FR:Key:ref:EU:EVSE
     ref:FR:42C: FR:Key:ref:FR:42C
+    ref:FR:ANFR: FR:Key:ref:FR:ANFR
     ref:FR:ARCEP: FR:Key:ref:FR:ARCEP
     ref:FR:CEF: FR:Key:ref:FR:CEF
     ref:FR:CNC: FR:Key:ref:FR:CNC
@@ -14056,6 +16461,7 @@ fr:
     ref:FR:DREAL: FR:Key:ref:FR:DREAL
     ref:FR:FANTOIR: FR:Key:ref:FR:FANTOIR
     ref:FR:FINESS: FR:Key:ref:FR:FINESS
+    ref:FR:Joconde: FR:Key:ref:FR:Joconde
     ref:FR:MemorialGenWeb: FR:Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: FR:Key:ref:FR:NAF
     ref:FR:Orange: FR:Key:ref:FR:Orange
@@ -14067,6 +16473,10 @@ fr:
     ref:FR:SFR: FR:Key:ref:FR:SFR
     ref:FR:SIREN: FR:Key:ref:FR:SIREN
     ref:FR:SIRET: FR:Key:ref:FR:SIRET
+    ref:FR:SNCF: FR:Key:ref:FR:SNCF
+    ref:FR:SNCF-Réseau: FR:Key:ref:FR:SNCF-Réseau
+    ref:FR:SNCF_Reseau: FR:Key:ref:FR:SNCF Reseau
+    ref:FR:SNCF_Réseau: FR:Key:ref:FR:SNCF Réseau
     ref:FR:commune: FR:Key:ref:FR:commune
     ref:FR:gdo: FR:Key:ref:FR:gdo
     ref:FR:museofile: FR:Key:ref:FR:museofile
@@ -14081,8 +16491,12 @@ fr:
     reservation: FR:Key:reservation
     residential: FR:Key:residential
     resource: FR:Key:resource
+    reusable_packaging: FR:Key:reusable packaging
+    reusable_packaging:accept: FR:Key:reusable packaging:accept
+    reusable_packaging:offer: FR:Key:reusable packaging:offer
     right: FR:Key:right
     roof:direction: FR:Key:roof:direction
+    roof:levels: FR:Key:roof:levels
     roof:material: FR:Key:roof:material
     roof:shape: FR:Key:roof:shape
     room: FR:Key:room
@@ -14097,6 +16511,7 @@ fr:
     self_checkout: FR:Key:self checkout
     self_service: FR:Key:self service
     service: FR:Key:service
+    service:bicycle:rental: FR:Key:service:bicycle:rental
     service_times: FR:Key:service times
     shelter: FR:Key:shelter
     shelter_type: FR:Key:shelter type
@@ -14108,6 +16523,7 @@ fr:
     sinkhole: FR:Key:sinkhole
     size: FR:Key:size
     smoothness: FR:Key:smoothness
+    snowmobile: FR:Key:snowmobile
     social_facility: FR:Key:social facility
     social_facility:for: FR:Key:social facility:for
     source: FR:Key:source
@@ -14115,6 +16531,7 @@ fr:
     source:maxspeed: FR:Key:source:maxspeed
     source:maxwidth: FR:Key:source:maxwidth
     source:name:br: FR:Key:source:name:br
+    spacing: FR:Key:spacing
     species: FR:Key:species
     species:fr: FR:Key:species:fr
     species:wikidata: FR:Key:species:wikidata
@@ -14125,6 +16542,7 @@ fr:
     step:contrast: FR:Key:step:contrast
     step_count: FR:Key:step count
     stop: FR:Key:stop
+    substation: FR:Key:substation
     support: FR:Key:support
     surface: FR:Key:surface
     surveillance: FR:Key:surveillance
@@ -14173,11 +16591,13 @@ fr:
     voltage: FR:Key:voltage
     voltage:primary: FR:Key:voltage:primary
     voltage:secondary: FR:Key:voltage:secondary
+    voltage:tertiary: FR:Key:voltage:tertiary
     waste: FR:Key:waste
     water: FR:Key:water
     water_source: FR:Key:water source
     waterway: FR:Key:waterway
     website: FR:Key:website
+    website:booking: FR:Key:website:booking
     wetland: FR:Key:wetland
     wheelchair: FR:Key:wheelchair
     wheelchair:description: FR:Key:wheelchair:description
@@ -14187,9 +16607,12 @@ fr:
     wikimedia_commons: FR:Key:wikimedia commons
     wikipedia: FR:Key:wikipedia
     windings: FR:Key:windings
+    windings:auto: FR:Key:windings:auto
+    winter_service: FR:Key:winter service
     xmas:feature: FR:Key:xmas:feature
     year_of_construction: FR:Key:year of construction
     zero_waste: FR:Key:zero waste
+    zone:maxspeed: FR:Key:zone:maxspeed
     zoo: FR:Key:zoo
   tag:
     Bascule_publique: FR:Tag:Bascule publique
@@ -14218,7 +16641,6 @@ fr:
     advertising=wall_painting: FR:Tag:advertising=wall painting
     aerialway=cable_car: FR:Tag:aerialway=cable car
     aerialway=chair_lift: FR:Tag:aerialway=chair lift
-    aeroway=aerodrome: FR:Tag:aeroway=aerodrome
     aeroway=airtanker_base: FR:Tag:aeroway=airtanker base
     aeroway=apron: FR:Tag:aeroway=apron
     aeroway=gate: FR:Tag:aeroway=gate
@@ -14234,6 +16656,7 @@ fr:
     amenity=animal_shelter: FR:Tag:amenity=animal shelter
     amenity=arts_centre: FR:Tag:amenity=arts centre
     amenity=atm: FR:Tag:amenity=atm
+    amenity=baking_oven: FR:Tag:amenity=baking oven
     amenity=bank: FR:Tag:amenity=bank
     amenity=bar: FR:Tag:amenity=bar
     amenity=bbq: FR:Tag:amenity=bbq
@@ -14269,6 +16692,7 @@ fr:
     amenity=dentist: FR:Tag:amenity=dentist
     amenity=device_charging_station: FR:Tag:amenity=device charging station
     amenity=doctors: FR:Tag:amenity=doctors
+    amenity=dog_parking: FR:Tag:amenity=dog parking
     amenity=dog_toilet: FR:Tag:amenity=dog toilet
     amenity=drinking_water: FR:Tag:amenity=drinking water
     amenity=driver_training: FR:Tag:amenity=driver training
@@ -14278,6 +16702,7 @@ fr:
     amenity=events_venue: FR:Tag:amenity=events venue
     amenity=fast_food: FR:Tag:amenity=fast food
     amenity=feeding_place: FR:Tag:amenity=feeding place
+    amenity=fire_hydrant: FR:Tag:amenity=fire hydrant
     amenity=fire_station: FR:Tag:amenity=fire station
     amenity=food_court: FR:Tag:amenity=food court
     amenity=fountain: FR:Tag:amenity=fountain
@@ -14307,9 +16732,12 @@ fr:
     amenity=music_school: FR:Tag:amenity=music school
     amenity=nightclub: FR:Tag:amenity=nightclub
     amenity=nursing_home: FR:Tag:amenity=nursing home
+    amenity=nutritionist: FR:Tag:amenity=nutritionist
+    amenity=parcel_locker: FR:Tag:amenity=parcel locker
     amenity=parking: FR:Tag:amenity=parking
     amenity=parking_entrance: FR:Tag:amenity=parking entrance
     amenity=parking_space: FR:Tag:amenity=parking space
+    amenity=payment_centre: FR:Tag:amenity=payment centre
     amenity=pharmacy: FR:Tag:amenity=pharmacy
     amenity=photo_booth: FR:Tag:amenity=photo booth
     amenity=place_of_mourning: FR:Tag:amenity=place of mourning
@@ -14339,9 +16767,11 @@ fr:
     amenity=taxi: FR:Tag:amenity=taxi
     amenity=telephone: FR:Tag:amenity=telephone
     amenity=theatre: FR:Tag:amenity=theatre
+    amenity=ticket_validator: FR:Tag:amenity=ticket validator
     amenity=toilets: FR:Tag:amenity=toilets
     amenity=townhall: FR:Tag:amenity=townhall
     amenity=toy_library: FR:Tag:amenity=toy library
+    amenity=traffic_park: FR:Tag:amenity=traffic park
     amenity=trolley_bay: FR:Tag:amenity=trolley bay
     amenity=university: FR:Tag:amenity=university
     amenity=vacuum_cleaner: FR:Tag:amenity=vacuum cleaner
@@ -14415,7 +16845,9 @@ fr:
     bridge=movable: FR:Tag:bridge=movable
     bridge=trestle: FR:Tag:bridge=trestle
     bridge=viaduct: FR:Tag:bridge=viaduct
+    building:prefabricated=yes: FR:Tag:building:prefabricated=yes
     building=apartments: FR:Tag:building=apartments
+    building=bakehouse: FR:Tag:building=bakehouse
     building=barn: FR:Tag:building=barn
     building=bridge: FR:Tag:building=bridge
     building=cabin: FR:Tag:building=cabin
@@ -14453,14 +16885,27 @@ fr:
     building=sports_hall: FR:Tag:building=sports hall
     building=stable: FR:Tag:building=stable
     building=stadium: FR:Tag:building=stadium
+    building=stilt_house: FR:Tag:building=stilt house
     building=sty: FR:Tag:building=sty
     building=tent: FR:Tag:building=tent
     building=terrace: FR:Tag:building=terrace
     building=warehouse: FR:Tag:building=warehouse
     cafe=time-cafe: FR:Tag:cafe=time-cafe
     cemetery=war_cemetery: FR:Tag:cemetery=war cemetery
+    club=cadet: FR:Tag:club=cadet
     club=sport: FR:Tag:club=sport
+    compensator=filter: FR:Tag:compensator=filter
+    compensator=series_capacitor: FR:Tag:compensator=series capacitor
+    compensator=series_reactor: FR:Tag:compensator=series reactor
+    compensator=shunt_capacitor: FR:Tag:compensator=shunt capacitor
+    compensator=shunt_reactor: FR:Tag:compensator=shunt reactor
+    compensator=statcom: FR:Tag:compensator=statcom
+    compensator=static_var: FR:Tag:compensator=static var
+    compensator=synchronous_condenser: FR:Tag:compensator=synchronous condenser
+    compensator=voltage_regulator: FR:Tag:compensator=voltage regulator
     construction=yes: FR:Tag:construction=yes
+    consulate=consulate_general: FR:Tag:consulate=consulate general
+    consulate=residence: FR:Tag:consulate=residence
     craft=agricultural_engines: FR:Tag:craft=agricultural engines
     craft=bakery: FR:Tag:craft=bakery
     craft=basket_maker: FR:Tag:craft=basket maker
@@ -14541,6 +16986,7 @@ fr:
     craft=welder: FR:Tag:craft=welder
     craft=window_construction: FR:Tag:craft=window construction
     craft=winery: FR:Tag:craft=winery
+    crossing=unmarked: FR:Tag:crossing=unmarked
     crossing=zebra: FR:Tag:crossing=zebra
     crossing_ref=zebra: FR:Tag:crossing ref=zebra
     cuisine=coffee_shop: FR:Tag:cuisine=coffee shop
@@ -14550,6 +16996,10 @@ fr:
     cycleway=opposite: FR:Tag:cycleway=opposite
     cycleway=opposite_lane: FR:Tag:cycleway=opposite lane
     cycleway=share_busway: FR:Tag:cycleway=share busway
+    cycleway=shared_lane: FR:Tag:cycleway=shared lane
+    diplomatic=consulate: FR:Tag:diplomatic=consulate
+    diplomatic=embassy: FR:Tag:diplomatic=embassy
+    diplomatic=liaison: FR:Tag:diplomatic=liaison
     disused=yes: FR:Tag:disused=yes
     emergency=access_point: FR:Tag:emergency=access point
     emergency=ambulance_station: FR:Tag:emergency=ambulance station
@@ -14579,6 +17029,7 @@ fr:
     footway=access_aisle: FR:Tag:footway=access aisle
     footway=crossing: FR:Tag:footway=crossing
     footway=sidewalk: FR:Tag:footway=sidewalk
+    footway=traffic_island: FR:Tag:footway=traffic island
     generator:method=combustion: FR:Tag:generator:method=combustion
     generator:method=fission: FR:Tag:generator:method=fission
     generator:method=fusion: FR:Tag:generator:method=fusion
@@ -14609,10 +17060,12 @@ fr:
     healthcare=doctor: FR:Tag:healthcare=doctor
     healthcare=laboratory: FR:Tag:healthcare=laboratory
     healthcare=physiotherapist: FR:Tag:healthcare=physiotherapist
+    healthcare=sample_collection: FR:Tag:healthcare=sample collection
     healthcare=vaccination_centre: FR:Tag:healthcare=vaccination centre
     highway=bridleway: FR:Tag:highway=bridleway
     highway=bus_guideway: FR:Tag:highway=bus guideway
     highway=bus_stop: FR:Tag:highway=bus stop
+    highway=busway: FR:Tag:highway=busway
     highway=crossing: FR:Tag:highway=crossing
     highway=cycleway: FR:Tag:highway=cycleway
     highway=elevator: FR:Tag:highway=elevator
@@ -14643,6 +17096,7 @@ fr:
     highway=stop: FR:Tag:highway=stop
     highway=street_lamp: FR:Tag:highway=street lamp
     highway=tertiary: FR:Tag:highway=tertiary
+    highway=toll_gantry: FR:Tag:highway=toll gantry
     highway=track: FR:Tag:highway=track
     highway=traffic_mirror: FR:Tag:highway=traffic mirror
     highway=traffic_signals: FR:Tag:highway=traffic signals
@@ -14719,6 +17173,7 @@ fr:
     landuse=plant_nursery: FR:Tag:landuse=plant nursery
     landuse=pond: FR:Tag:landuse=pond
     landuse=quarry: FR:Tag:landuse=quarry
+    landuse=recreation_ground: FR:Tag:landuse=recreation ground
     landuse=religious: FR:Tag:landuse=religious
     landuse=residential: FR:Tag:landuse=residential
     landuse=retail: FR:Tag:landuse=retail
@@ -14742,7 +17197,6 @@ fr:
     leisure=hackerspace: FR:Tag:leisure=hackerspace
     leisure=horse_riding: FR:Tag:leisure=horse riding
     leisure=ice_rink: FR:Tag:leisure=ice rink
-    leisure=miniature_golf: FR:Tag:leisure=miniature golf
     leisure=outdoor_seating: FR:Tag:leisure=outdoor seating
     leisure=paddling_pool: FR:Tag:leisure=paddling pool
     leisure=park: FR:Tag:leisure=park
@@ -14767,17 +17221,20 @@ fr:
     line_attachment=suspension: FR:Tag:line attachment=suspension
     line_management=branch: FR:Tag:line management=branch
     line_management=split: FR:Tag:line management=split
+    location=underground: FR:Tag:location=underground
     man_made=adit: FR:Tag:man made=adit
     man_made=architecture_line: FR:Tag:man made=architecture line
     man_made=beehive: FR:Tag:man made=beehive
     man_made=bridge: FR:Tag:man made=bridge
     man_made=carpet_hanger: FR:Tag:man made=carpet hanger
     man_made=cellar_entrance: FR:Tag:man made=cellar entrance
+    man_made=cross: FR:Tag:man made=cross
     man_made=cutline: FR:Tag:man made=cutline
     man_made=dovecote: FR:Tag:man made=dovecote
     man_made=embankment: FR:Tag:man made=embankment
     man_made=flagpole: FR:Tag:man made=flagpole
     man_made=flare: FR:Tag:man made=flare
+    man_made=gantry: FR:Tag:man made=gantry
     man_made=ice_house: FR:Tag:man made=ice house
     man_made=insect_hotel: FR:Tag:man made=insect hotel
     man_made=kiln: FR:Tag:man made=kiln
@@ -14794,6 +17251,7 @@ fr:
     man_made=street_cabinet: FR:Tag:man made=street cabinet
     man_made=surveillance: FR:Tag:man made=surveillance
     man_made=survey_point: FR:Tag:man made=survey point
+    man_made=torii: FR:Tag:man made=torii
     man_made=tower: FR:Tag:man made=tower
     man_made=utility_pole: FR:Tag:man made=utility pole
     man_made=wastewater_plant: FR:Tag:man made=wastewater plant
@@ -14812,6 +17270,7 @@ fr:
     marker=plate: FR:Tag:marker=plate
     marker=post: FR:Tag:marker=post
     marker=stone: FR:Tag:marker=stone
+    material=concrete: FR:Tag:material=concrete
     medical=aed: FR:Tag:medical=aed
     memorial=ghost_bike: FR:Tag:memorial=ghost bike
     memorial=plaque: FR:Tag:memorial=plaque
@@ -14828,6 +17287,7 @@ fr:
     natural=isthmus: FR:Tag:natural=isthmus
     natural=peak: FR:Tag:natural=peak
     natural=peninsula: FR:Tag:natural=peninsula
+    natural=rock: FR:Tag:natural=rock
     natural=saddle: FR:Tag:natural=saddle
     natural=scree: FR:Tag:natural=scree
     natural=scrub: FR:Tag:natural=scrub
@@ -14859,13 +17319,30 @@ fr:
     office=ngo: FR:Tag:office=ngo
     office=parish: FR:Tag:office=parish
     office=political_party: FR:Tag:office=political party
+    office=publisher: FR:Tag:office=publisher
     office=religion: FR:Tag:office=religion
     office=supervised_injection_site: FR:Tag:office=supervised injection site
+    office=travel_agent: FR:Tag:office=travel agent
+    opening_hours:signed=no: FR:Tag:opening hours:signed=no
+    operator=EDF: FR:Tag:operator=EDF
     operator=ERDF: FR:Tag:operator=ERDF
     operator=Enedis: FR:Tag:operator=Enedis
     operator=GRDF: FR:Tag:operator=GRDF
+    operator=GRTgaz: FR:Tag:operator=GRTgaz
+    operator=Orange: FR:Tag:operator=Orange
     operator=RTE: FR:Tag:operator=RTE
+    operator=Régie_Gaz_Électricité_de_Sallanches: FR:Tag:operator=Régie Gaz Électricité
+      de Sallanches
+    operator=SNCF_Réseau: FR:Tag:operator=SNCF Réseau
+    outdoor_seating=terrace: FR:Tag:outdoor seating=terrace
+    outlet=bell_mouth: FR:Tag:outlet=bell mouth
+    outlet=direct: FR:Tag:outlet=direct
+    outlet=noise_barrier: FR:Tag:outlet=noise barrier
+    outlet=screen: FR:Tag:outlet=screen
+    outlet=sock: FR:Tag:outlet=sock
+    outlet=valve: FR:Tag:outlet=valve
     parking=street_side: FR:Tag:parking=street side
+    parking=surface: FR:Tag:parking=surface
     pipeline=substation: FR:Tag:pipeline=substation
     pipeline=valve: FR:Tag:pipeline=valve
     piste:type=nordic: FR:Tag:piste:type=nordic
@@ -14897,6 +17374,7 @@ fr:
     power=sub_station: FR:Tag:power=sub station
     power=substation: FR:Tag:power=substation
     power=switch: FR:Tag:power=switch
+    power=switchgear: FR:Tag:power=switchgear
     power=terminal: FR:Tag:power=terminal
     power=tower: FR:Tag:power=tower
     power=transformer: FR:Tag:power=transformer
@@ -14905,6 +17383,8 @@ fr:
     public_transport=stop_area: FR:Tag:public transport=stop area
     public_transport=stop_position: FR:Tag:public transport=stop position
     pump=powered: FR:Tag:pump=powered
+    railway=abandoned: FR:Tag:railway=abandoned
+    railway=crossing: FR:Tag:railway=crossing
     railway=disused: FR:Tag:railway=disused
     railway=funicular: FR:Tag:railway=funicular
     railway=halt: FR:Tag:railway=halt
@@ -14919,6 +17399,7 @@ fr:
     railway=switch: FR:Tag:railway=switch
     railway=tram: FR:Tag:railway=tram
     railway=tram_stop: FR:Tag:railway=tram stop
+    railway=wash: FR:Tag:railway=wash
     railway=water_crane: FR:Tag:railway=water crane
     recycling_type=centre: FR:Tag:recycling type=centre
     religion=buddhist: FR:Tag:religion=buddhist
@@ -14956,6 +17437,7 @@ fr:
     shelter_type=basic_hut: FR:Tag:shelter type=basic hut
     shelter_type=changing_rooms: FR:Tag:shelter type=changing rooms
     shelter_type=lean_to: FR:Tag:shelter type=lean to
+    shelter_type=public_transport: FR:Tag:shelter type=public transport
     shop=agrarian: FR:Tag:shop=agrarian
     shop=alcohol: FR:Tag:shop=alcohol
     shop=anime: FR:Tag:shop=anime
@@ -14988,7 +17470,6 @@ fr:
     shop=doityourself: FR:Tag:shop=doityourself
     shop=dry_cleaning: FR:Tag:shop=dry cleaning
     shop=e-cigarette: FR:Tag:shop=e-cigarette
-    shop=electronics: FR:Tag:shop=electronics
     shop=erotic: FR:Tag:shop=erotic
     shop=farm: FR:Tag:shop=farm
     shop=fashion: FR:Tag:shop=fashion
@@ -14999,6 +17480,7 @@ fr:
     shop=funeral_directors: FR:Tag:shop=funeral directors
     shop=furnace: FR:Tag:shop=furnace
     shop=furniture: FR:Tag:shop=furniture
+    shop=games: FR:Tag:shop=games
     shop=garden_centre: FR:Tag:shop=garden centre
     shop=general: FR:Tag:shop=general
     shop=gift: FR:Tag:shop=gift
@@ -15015,6 +17497,7 @@ fr:
     shop=kitchen: FR:Tag:shop=kitchen
     shop=laundry: FR:Tag:shop=laundry
     shop=mall: FR:Tag:shop=mall
+    shop=massage: FR:Tag:shop=massage
     shop=medical_supply: FR:Tag:shop=medical supply
     shop=military_surplus: FR:Tag:shop=military surplus
     shop=mobile_phone: FR:Tag:shop=mobile phone
@@ -15033,6 +17516,7 @@ fr:
     shop=shoes: FR:Tag:shop=shoes
     shop=stationery: FR:Tag:shop=stationery
     shop=supermarket: FR:Tag:shop=supermarket
+    shop=tattoo: FR:Tag:shop=tattoo
     shop=ticket: FR:Tag:shop=ticket
     shop=toys: FR:Tag:shop=toys
     shop=trade: FR:Tag:shop=trade
@@ -15040,9 +17524,11 @@ fr:
     shop=variety_store: FR:Tag:shop=variety store
     shop=video: FR:Tag:shop=video
     shop=video_games: FR:Tag:shop=video games
+    shop=weapons: FR:Tag:shop=weapons
     shop=window_blind: FR:Tag:shop=window blind
     sinkhole=estavelle: FR:Tag:sinkhole=estavelle
     social_facility=ambulatory_care: FR:Tag:social facility=ambulatory care
+    sport=10pin: FR:Tag:sport=10pin
     sport=8pin: FR:Tag:sport=8pin
     sport=archery: FR:Tag:sport=archery
     sport=billiards: FR:Tag:sport=billiards
@@ -15066,7 +17552,13 @@ fr:
     sport=swimming: FR:Tag:sport=swimming
     sport=table_soccer: FR:Tag:sport=table soccer
     sport=table_tennis: FR:Tag:sport=table tennis
+    substation=converter: FR:Tag:substation=converter
+    substation=distribution: FR:Tag:substation=distribution
+    substation=industrial: FR:Tag:substation=industrial
+    substation=minor_distribution: FR:Tag:substation=minor distribution
     substation=traction: FR:Tag:substation=traction
+    substation=transition: FR:Tag:substation=transition
+    substation=transmission: FR:Tag:substation=transmission
     switch=circuit_breaker: FR:Tag:switch=circuit breaker
     switch=disconnector: FR:Tag:switch=disconnector
     switch=earthing: FR:Tag:switch=earthing
@@ -15103,6 +17595,7 @@ fr:
     tourism=viewpoint: FR:Tag:tourism=viewpoint
     tourism=wilderness_hut: FR:Tag:tourism=wilderness hut
     tourism=zoo: FR:Tag:tourism=zoo
+    tower:construction=lattice: FR:Tag:tower:construction=lattice
     tower:type=bell_tower: FR:Tag:tower:type=bell tower
     tower:type=communication: FR:Tag:tower:type=communication
     tower:type=hose: FR:Tag:tower:type=hose
@@ -15124,8 +17617,10 @@ fr:
     transformer=converter: FR:Tag:transformer=converter
     transformer=distribution: FR:Tag:transformer=distribution
     transformer=generator: FR:Tag:transformer=generator
+    transformer=main: FR:Tag:transformer=main
     transformer=phase_angle_regulator: FR:Tag:transformer=phase angle regulator
     transformer=traction: FR:Tag:transformer=traction
+    tunnel=building_passage: FR:Tag:tunnel=building passage
     tunnel=culvert: FR:Tag:tunnel=culvert
     tunnel=flooded: FR:Tag:tunnel=flooded
     type=waterway: FR:Tag:type=waterway
@@ -15134,6 +17629,8 @@ fr:
     usage=penstock: FR:Tag:usage=penstock
     usage=spillway: FR:Tag:usage=spillway
     usage=tailrace: FR:Tag:usage=tailrace
+    usage=transmission: FR:Tag:usage=transmission
+    utility=heating: FR:Tag:utility=heating
     utility=power: FR:Tag:utility=power
     utility=street_lighting: FR:Tag:utility=street lighting
     utility=telecom: FR:Tag:utility=telecom
@@ -15141,6 +17638,7 @@ fr:
     valve=butterfly: FR:Tag:valve=butterfly
     valve=gate: FR:Tag:valve=gate
     valve=globe: FR:Tag:valve=globe
+    valve=hollow_jet: FR:Tag:valve=hollow jet
     valve=needle: FR:Tag:valve=needle
     valve=plug: FR:Tag:valve=plug
     vending=bread: FR:Tag:vending=bread
@@ -15161,9 +17659,11 @@ fr:
     vending=sweets: FR:Tag:vending=sweets
     vending=water: FR:Tag:vending=water
     wall=no: FR:Tag:wall=no
+    waste=cigarettes: FR:Tag:waste=cigarettes
     waste=dog_excrement: FR:Tag:waste=dog excrement
     water=pond: FR:Tag:water=pond
     water=reservoir: FR:Tag:water=reservoir
+    water=river: FR:Tag:water=river
     waterway=boatyard: FR:Tag:waterway=boatyard
     waterway=canal: FR:Tag:waterway=canal
     waterway=dam: FR:Tag:waterway=dam
@@ -15176,10 +17676,13 @@ fr:
     waterway=river: FR:Tag:waterway=river
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
+    waterway=tidal_channel: FR:Tag:waterway=tidal channel
     waterway=waterfall: FR:Tag:waterway=waterfall
     waterway=weir: FR:Tag:waterway=weir
+    wetland=mangrove: FR:Tag:wetland=mangrove
     wetland=marsh: FR:Tag:wetland=marsh
     wetland=reedbed: FR:Tag:wetland=reedbed
+    wetland=saltern: FR:Tag:wetland=saltern
     wetland=swamp: FR:Tag:wetland=swamp
     zoo=aviary: FR:Tag:zoo=aviary
     zoo=birds: FR:Tag:zoo=birds
@@ -15245,6 +17748,7 @@ hr:
   tag:
     amenity=atm: Hr:Tag:amenity=atm
     amenity=bank: Hr:Tag:amenity=bank
+    amenity=school: Hr:Tag:amenity=school
 ht:
   key:
     intermittent: Ht:Key:intermittent
@@ -15309,6 +17813,7 @@ id:
     waterway=tidal_channel: Id:Tag:waterway=tidal channel
 it:
   key:
+    abandoned: IT:Key:abandoned
     abutters: IT:Key:abutters
     access: IT:Key:access
     addr: IT:Key:addr
@@ -15337,6 +17842,7 @@ it:
     cables: IT:Key:cables
     capacity: IT:Key:capacity
     circuits: IT:Key:circuits
+    cocktails: IT:Key:cocktails
     communication:amateur_radio:callsign: IT:Key:communication:amateur radio:callsign
     communication:amateur_radio:repeater: IT:Key:communication:amateur radio:repeater
     communication:bos: IT:Key:communication:bos
@@ -15344,6 +17850,8 @@ it:
     construction: IT:Key:construction
     contact: IT:Key:contact
     contact:facebook: IT:Key:contact:facebook
+    contact:twitter: IT:Key:contact:twitter
+    covered: IT:Key:covered
     craft: IT:Key:craft
     crossing: IT:Key:crossing
     cutting: IT:Key:cutting
@@ -15366,6 +17874,8 @@ it:
     est_width: IT:Key:est width
     fee: IT:Key:fee
     fence_type: IT:Key:fence type
+    fireplace: IT:Key:fireplace
+    floating: IT:Key:floating
     ford: IT:Key:ford
     fruit: IT:Key:fruit
     fuel: IT:Key:fuel
@@ -15384,6 +17894,7 @@ it:
     lanes:psv: IT:Key:lanes:psv
     leisure: IT:Key:leisure
     length: IT:Key:length
+    lit_by_led: IT:Key:lit by led
     lock: IT:Key:lock
     man_made: IT:Key:man made
     manhole: IT:Key:manhole
@@ -15457,11 +17968,13 @@ it:
     sidewalk: IT:Key:sidewalk
     smoothness: IT:Key:smoothness
     sport: IT:Key:sport
+    stamps: IT:Key:stamps
     stop: IT:Key:stop
     surface: IT:Key:surface
     surveillance: IT:Key:surveillance
     tank_trap: IT:Key:tank trap
     taxi: IT:Key:taxi
+    telecom: IT:Key:telecom
     tourism: IT:Key:tourism
     tracktype: IT:Key:tracktype
     traffic_calming: IT:Key:traffic calming
@@ -15478,6 +17991,7 @@ it:
     zone:maxspeed: IT:Key:zone:maxspeed
   tag:
     access=customers: IT:Tag:access=customers
+    aerialway=magic_carpet: IT:Tag:aerialway=magic carpet
     aeroway=aerodrome: IT:Tag:aeroway=aerodrome
     aeroway=airstrip: IT:Tag:aeroway=airstrip
     aeroway=apron: IT:Tag:aeroway=apron
@@ -15507,8 +18021,10 @@ it:
     amenity=cafe: IT:Tag:amenity=cafe
     amenity=cinema: IT:Tag:amenity=cinema
     amenity=college: IT:Tag:amenity=college
+    amenity=dancing_school: IT:Tag:amenity=dancing school
     amenity=dentist: IT:Tag:amenity=dentist
     amenity=dive_centre: IT:Tag:amenity=dive centre
+    amenity=dog_parking: IT:Tag:amenity=dog parking
     amenity=driving_school: IT:Tag:amenity=driving school
     amenity=fast_food: IT:Tag:amenity=fast food
     amenity=fire_station: IT:Tag:amenity=fire station
@@ -15518,8 +18034,11 @@ it:
     amenity=hunting_stand: IT:Tag:amenity=hunting stand
     amenity=ice_cream: IT:Tag:amenity=ice cream
     amenity=kindergarten: IT:Tag:amenity=kindergarten
+    amenity=lavoir: IT:Tag:amenity=lavoir
     amenity=milk_dispenser: IT:Tag:amenity=milk dispenser
+    amenity=parcel_locker: IT:Tag:amenity=parcel locker
     amenity=parking: IT:Tag:amenity=parking
+    amenity=payment_terminal: IT:Tag:amenity=payment terminal
     amenity=pharmacy: IT:Tag:amenity=pharmacy
     amenity=photo_booth: IT:Tag:amenity=photo booth
     amenity=place_of_worship: IT:Tag:amenity=place of worship
@@ -15530,10 +18049,13 @@ it:
     amenity=recycling: IT:Tag:amenity=recycling
     amenity=restaurant: IT:Tag:amenity=restaurant
     amenity=school: IT:Tag:amenity=school
+    amenity=ski_school: IT:Tag:amenity=ski school
     amenity=spa: IT:Tag:amenity=spa
     amenity=taxi: IT:Tag:amenity=taxi
     amenity=university: IT:Tag:amenity=university
     amenity=waste_basket: IT:Tag:amenity=waste basket
+    amenity=watering_place: IT:Tag:amenity=watering place
+    amenity=weighbridge: IT:Tag:amenity=weighbridge
     barrier=block: IT:Tag:barrier=block
     barrier=bollard: IT:Tag:barrier=bollard
     barrier=border_control: IT:Tag:barrier=border control
@@ -15567,6 +18089,7 @@ it:
     barrier=rope: IT:Tag:barrier=rope
     barrier=sally_port: IT:Tag:barrier=sally port
     barrier=spikes: IT:Tag:barrier=spikes
+    barrier=step: IT:Tag:barrier=step
     barrier=stile: IT:Tag:barrier=stile
     barrier=sump_buster: IT:Tag:barrier=sump buster
     barrier=swing_gate: IT:Tag:barrier=swing gate
@@ -15575,6 +18098,7 @@ it:
     barrier=turnstile: IT:Tag:barrier=turnstile
     barrier=wall: IT:Tag:barrier=wall
     bridge=boardwalk: IT:Tag:bridge=boardwalk
+    building=bridge: IT:Tag:building=bridge
     building=hospital: IT:Tag:building=hospital
     building=residential: IT:Tag:building=residential
     building=retail: IT:Tag:building=retail
@@ -15660,6 +18184,7 @@ it:
     esperanto=yes: IT:Tag:esperanto=yes
     footway=crossing: IT:Tag:footway=crossing
     footway=sidewalk: IT:Tag:footway=sidewalk
+    generator:source=nuclear: IT:Tag:generator:source=nuclear
     geological=moraine: IT:Tag:geological=moraine
     geological=outcrop: IT:Tag:geological=outcrop
     geological=palaeontological_site: IT:Tag:geological=palaeontological site
@@ -15691,6 +18216,7 @@ it:
     highway=trunk_link: IT:Tag:highway=trunk link
     historic=archaeological_site: IT:Tag:historic=archaeological site
     historic=locomotive: IT:Tag:historic=locomotive
+    historic=monument: IT:Tag:historic=monument
     historic=paleontological_site: IT:Tag:historic=paleontological site
     historic=wayside_shrine: IT:Tag:historic=wayside shrine
     industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
@@ -15709,10 +18235,14 @@ it:
     leisure=garden: IT:Tag:leisure=garden
     leisure=marina: IT:Tag:leisure=marina
     leisure=nature_reserve: IT:Tag:leisure=nature reserve
+    leisure=park: IT:Tag:leisure=park
     leisure=playground: IT:Tag:leisure=playground
     leisure=swimming_pool: IT:Tag:leisure=swimming pool
     leisure=track: IT:Tag:leisure=track
     man_made=cairn: IT:Tag:man made=cairn
+    man_made=compass_rose: IT:Tag:man made=compass rose
+    man_made=courtyard: IT:Tag:man made=courtyard
+    man_made=flare: IT:Tag:man made=flare
     man_made=goods_conveyor: IT:Tag:man made=goods conveyor
     man_made=mast: IT:Tag:man made=mast
     man_made=works: IT:Tag:man made=works
@@ -15727,6 +18257,7 @@ it:
     natural=tree_row: IT:Tag:natural=tree row
     natural=wetland: IT:Tag:natural=wetland
     office=foundation: IT:Tag:office=foundation
+    office=graphic_design: IT:Tag:office=graphic design
     office=it: IT:Tag:office=it
     oneway=alternating: IT:Tag:oneway=alternating
     parking=street_side: IT:Tag:parking=street side
@@ -15812,6 +18343,7 @@ it:
     shop=newsagent: IT:Tag:shop=newsagent
     shop=pastry: IT:Tag:shop=pastry
     shop=pet_grooming: IT:Tag:shop=pet grooming
+    shop=pottery: IT:Tag:shop=pottery
     shop=radiotechnics: IT:Tag:shop=radiotechnics
     shop=robot: IT:Tag:shop=robot
     shop=seafood: IT:Tag:shop=seafood
@@ -15830,9 +18362,13 @@ it:
     sport=roller_hockey: IT:Tag:sport=roller hockey
     sport=surfing: IT:Tag:sport=surfing
     summit:cross=yes: IT:Tag:summit:cross=yes
+    telecom=data_center: IT:Tag:telecom=data center
+    telecom=exchange: IT:Tag:telecom=exchange
     tourism=aquarium: IT:Tag:tourism=aquarium
     tourism=artwork: IT:Tag:tourism=artwork
     tourism=museum: IT:Tag:tourism=museum
+    tourism=picnic_site: IT:Tag:tourism=picnic site
+    vending=parcel_pickup: IT:Tag:vending=parcel pickup
     vending=parking_tickets: IT:Tag:vending=parking tickets
     vending=toll: IT:Tag:vending=toll
     waterway=ditch: IT:Tag:waterway=ditch
@@ -16038,7 +18574,6 @@ ja:
     destination:lanes: JA:Key:destination:lanes
     detour: JA:Key:detour
     diameter: JA:Key:diameter
-    diaper: JA:Key:diaper
     diet: JA:Key:diet
     diet:*: JA:Key:diet:*
     direction: JA:Key:direction
@@ -16068,6 +18603,7 @@ ja:
     entrance: JA:Key:entrance
     est_width: JA:Key:est width
     evacuation_route: JA:Key:evacuation route
+    exhibit: JA:Key:exhibit
     exit: JA:Key:exit
     exit_to: JA:Key:exit to
     expressway: JA:Key:expressway
@@ -16248,6 +18784,7 @@ ja:
     microbrewery: JA:Key:microbrewery
     milestone_type: JA:Key:milestone type
     military: JA:Key:military
+    military_service: JA:Key:military service
     min_age: JA:Key:min age
     min_height: JA:Key:min height
     minspeed: JA:Key:minspeed
@@ -16342,7 +18879,6 @@ ja:
     post_box:type: JA:Key:post box:type
     postal_code: JA:Key:postal code
     power: JA:Key:power
-    power_source: JA:Key:power source
     power_supply: JA:Key:power supply
     priority: JA:Key:priority
     priority_road: JA:Key:priority road
@@ -16649,6 +19185,7 @@ ja:
     amenity=doctors: JA:Tag:amenity=doctors
     amenity=dojo: JA:Tag:amenity=dojo
     amenity=drinking_water: JA:Tag:amenity=drinking water
+    amenity=driver_training: JA:Tag:amenity=driver training
     amenity=driving_school: JA:Tag:amenity=driving school
     amenity=embassy: JA:Tag:amenity=embassy
     amenity=emergency_phone: JA:Tag:amenity=emergency phone
@@ -16727,6 +19264,7 @@ ja:
     amenity=taxi: JA:Tag:amenity=taxi
     amenity=telephone: JA:Tag:amenity=telephone
     amenity=theatre: JA:Tag:amenity=theatre
+    amenity=ticket_validator: JA:Tag:amenity=ticket validator
     amenity=toilets: JA:Tag:amenity=toilets
     amenity=townhall: JA:Tag:amenity=townhall
     amenity=university: JA:Tag:amenity=university
@@ -16740,6 +19278,10 @@ ja:
     amenity=water_point: JA:Tag:amenity=water point
     amenity=watering_place: JA:Tag:amenity=watering place
     amenity=winery: JA:Tag:amenity=winery
+    artwork_type=bust: JA:Tag:artwork type=bust
+    artwork_type=mural: JA:Tag:artwork type=mural
+    artwork_type=sculpture: JA:Tag:artwork type=sculpture
+    artwork_type=statue: JA:Tag:artwork type=statue
     assembly_point:earthquake=yes: JA:Tag:assembly point:earthquake=yes
     assembly_point:tsunami=yes: JA:Tag:assembly point:tsunami=yes
     atm=yes: JA:Tag:atm=yes
@@ -16874,6 +19416,7 @@ ja:
     bus=no: JA:Tag:bus=no
     busway=opposite_lane: JA:Tag:busway=opposite lane
     castle_type=fortress: JA:Tag:castle type=fortress
+    castle_type=shiro: JA:Tag:castle type=shiro
     cemetery=grave: JA:Tag:cemetery=grave
     club=fan: JA:Tag:club=fan
     craft=agricultural_engines: JA:Tag:craft=agricultural engines
@@ -17027,6 +19570,7 @@ ja:
     golf=driving_range: JA:Tag:golf=driving range
     golf=fairway: JA:Tag:golf=fairway
     goods=destination: JA:Tag:goods=destination
+    government=audit: JA:Tag:government=audit
     government=ministry: JA:Tag:government=ministry
     government=prosecutor: JA:Tag:government=prosecutor
     government=register_office: JA:Tag:government=register office
@@ -17146,6 +19690,7 @@ ja:
     junction=circular: JA:Tag:junction=circular
     junction=roundabout: JA:Tag:junction=roundabout
     junction=yes: JA:Tag:junction=yes
+    landcover=trees: JA:Tag:landcover=trees
     landuse=allotments: JA:Tag:landuse=allotments
     landuse=aquaculture: JA:Tag:landuse=aquaculture
     landuse=basin: JA:Tag:landuse=basin
@@ -17155,6 +19700,7 @@ ja:
     landuse=commercial: JA:Tag:landuse=commercial
     landuse=construction: JA:Tag:landuse=construction
     landuse=depot: JA:Tag:landuse=depot
+    landuse=education: JA:Tag:landuse=education
     landuse=farm: JA:Tag:landuse=farm
     landuse=farmland: JA:Tag:landuse=farmland
     landuse=farmyard: JA:Tag:landuse=farmyard
@@ -17237,6 +19783,7 @@ ja:
     man_made=breakwater: JA:Tag:man made=breakwater
     man_made=bridge: JA:Tag:man made=bridge
     man_made=bunker_silo: JA:Tag:man made=bunker silo
+    man_made=cairn: JA:Tag:man made=cairn
     man_made=campanile: JA:Tag:man made=campanile
     man_made=chimney: JA:Tag:man made=chimney
     man_made=clearcut: JA:Tag:man made=clearcut
@@ -17292,6 +19839,7 @@ ja:
     microbrewery=yes: JA:Tag:microbrewery=yes
     military=airfield: JA:Tag:military=airfield
     military=ammunition: JA:Tag:military=ammunition
+    military=base: JA:Tag:military=base
     military=bunker: JA:Tag:military=bunker
     military=checkpoint: JA:Tag:military=checkpoint
     military=danger_area: JA:Tag:military=danger area
@@ -17311,6 +19859,7 @@ ja:
     natural=bay: JA:Tag:natural=bay
     natural=beach: JA:Tag:natural=beach
     natural=blowhole: JA:Tag:natural=blowhole
+    natural=cape: JA:Tag:natural=cape
     natural=cave_entrance: JA:Tag:natural=cave entrance
     natural=cliff: JA:Tag:natural=cliff
     natural=coastline: JA:Tag:natural=coastline
@@ -17322,10 +19871,12 @@ ja:
     natural=grassland: JA:Tag:natural=grassland
     natural=heath: JA:Tag:natural=heath
     natural=hot_spring: JA:Tag:natural=hot spring
+    natural=isthmus: JA:Tag:natural=isthmus
     natural=land: JA:Tag:natural=land
     natural=moor: JA:Tag:natural=moor
     natural=mud: JA:Tag:natural=mud
     natural=peak: JA:Tag:natural=peak
+    natural=peninsula: JA:Tag:natural=peninsula
     natural=ridge: JA:Tag:natural=ridge
     natural=riverbed: JA:Tag:natural=riverbed
     natural=rock: JA:Tag:natural=rock
@@ -17338,6 +19889,7 @@ ja:
     natural=sinkhole: JA:Tag:natural=sinkhole
     natural=spring: JA:Tag:natural=spring
     natural=stone: JA:Tag:natural=stone
+    natural=strait: JA:Tag:natural=strait
     natural=tree: JA:Tag:natural=tree
     natural=tree_row: JA:Tag:natural=tree row
     natural=tree_stump: JA:Tag:natural=tree stump
@@ -17487,6 +20039,7 @@ ja:
     service=siding: JA:Tag:service=siding
     service=spur: JA:Tag:service=spur
     service=yard: JA:Tag:service=yard
+    shelter_type=gazebo: JA:Tag:shelter type=gazebo
     shop=alcohol: JA:Tag:shop=alcohol
     shop=anime: JA:Tag:shop=anime
     shop=antiques: JA:Tag:shop=antiques
@@ -17585,6 +20138,7 @@ ja:
     shop=medical: JA:Tag:shop=medical
     shop=medical_supply: JA:Tag:shop=medical supply
     shop=mobile_phone: JA:Tag:shop=mobile phone
+    shop=mobility_scooter: JA:Tag:shop=mobility scooter
     shop=model: JA:Tag:shop=model
     shop=money_lender: JA:Tag:shop=money lender
     shop=moneylender: JA:Tag:shop=moneylender
@@ -17712,17 +20266,25 @@ ja:
     vehicle=destination: JA:Tag:vehicle=destination
     vending=bread: JA:Tag:vending=bread
     vending=excrement_bags: JA:Tag:vending=excrement bags
+    vending=fishing_bait: JA:Tag:vending=fishing bait
+    vending=food: JA:Tag:vending=food
     vending=fuel: JA:Tag:vending=fuel
+    vending=ice_cream: JA:Tag:vending=ice cream
     vending=milk: JA:Tag:vending=milk
     vending=parcel_pickup: JA:Tag:vending=parcel pickup
     vending=parcel_pickup;parcel_mail_in: JA:Tag:vending=parcel pickup;parcel mail
       in
     vending=parking_tickets: JA:Tag:vending=parking tickets
     vending=photo: JA:Tag:vending=photo
+    vending=public_transport_tickets: JA:Tag:vending=public transport tickets
     wall=no: JA:Tag:wall=no
     wall=noise_barrier: JA:Tag:wall=noise barrier
     water=intermittent: JA:Tag:water=intermittent
+    water=lake: JA:Tag:water=lake
     water=lock: JA:Tag:water=lock
+    water=pond: JA:Tag:water=pond
+    water=reservoir: JA:Tag:water=reservoir
+    water=river: JA:Tag:water=river
     water=wastewater: JA:Tag:water=wastewater
     waterway=boat_lift: JA:Tag:waterway=boat lift
     waterway=boatyard: JA:Tag:waterway=boatyard
@@ -17763,6 +20325,8 @@ ko:
     addr: Ko:Key:addr
     aerialway: Ko:Key:aerialway
     amenity: Ko:Key:amenity
+    building: Ko:Key:building
+    building:levels: Ko:Key:building:levels
     crossing: Ko:Key:crossing
     denotation: Ko:Key:denotation
     drink: Ko:Key:drink
@@ -17770,6 +20334,7 @@ ko:
     emergency: Ko:Key:emergency
     highway: Ko:Key:highway
     intermittent: Ko:Key:intermittent
+    landuse: Ko:Key:landuse
     leisure: Ko:Key:leisure
     level: Ko:Key:level
     line: Ko:Key:line
@@ -17777,11 +20342,15 @@ ko:
     name: Ko:Key:name
     operator:type: Ko:Key:operator:type
     reservation: Ko:Key:reservation
+    roundtrip: Ko:Key:roundtrip
     self_service: Ko:Key:self service
+    shop: Ko:Key:shop
     smoothness: Ko:Key:smoothness
     tenant: Ko:Key:tenant
     townhall:type: Ko:Key:townhall:type
     tracktype: Ko:Key:tracktype
+    traffic_signals:floor_vibration: Ko:Key:traffic signals:floor vibration
+    traffic_signals:sound: Ko:Key:traffic signals:sound
     tunnel: Ko:Key:tunnel
     turn: Ko:Key:turn
     wheelchair: Ko:Key:wheelchair
@@ -17789,13 +20358,33 @@ ko:
   tag:
     access=designated: Ko:Tag:access=designated
     aerialway=cable_car: Ko:Tag:aerialway=cable car
+    amenity=cafe: Ko:Tag:amenity=cafe
+    amenity=college: Ko:Tag:amenity=college
+    amenity=drinking_water: Ko:Tag:amenity=drinking water
+    amenity=driving_school: Ko:Tag:amenity=driving school
+    amenity=fast_food: Ko:Tag:amenity=fast food
+    amenity=food_court: Ko:Tag:amenity=food court
     amenity=fuel: Ko:Tag:amenity=fuel
+    amenity=ice_cream: Ko:Tag:amenity=ice cream
+    amenity=kindergarten: Ko:Tag:amenity=kindergarten
+    amenity=language_school: Ko:Tag:amenity=language school
+    amenity=library: Ko:Tag:amenity=library
+    amenity=music_school: Ko:Tag:amenity=music school
     amenity=prep_school: Ko:Tag:amenity=prep school
+    amenity=public_bookcase: Ko:Tag:amenity=public bookcase
+    amenity=restaurant: Ko:Tag:amenity=restaurant
+    amenity=school: Ko:Tag:amenity=school
     amenity=taxi: Ko:Tag:amenity=taxi
     amenity=townhall: Ko:Tag:amenity=townhall
     barrier=kerb: Ko:Tag:barrier=kerb
+    building:part=porch: Ko:Tag:building:part=porch
     building=abandoned: Ko:Tag:building=abandoned
+    building=apartments: Ko:Tag:building=apartments
+    building=cabin: Ko:Tag:building=cabin
+    building=parking: Ko:Tag:building=parking
+    building=shrine: Ko:Tag:building=shrine
     craft=tailor: Ko:Tag:craft=tailor
+    crossing=traffic_signals: Ko:Tag:crossing=traffic signals
     ford=stepping_stones: Ko:Tag:ford=stepping stones
     highway=bus_stop: Ko:Tag:highway=bus stop
     highway=elevator: Ko:Tag:highway=elevator
@@ -17809,21 +20398,34 @@ ko:
     highway=stop: Ko:Tag:highway=stop
     highway=tertiary: Ko:Tag:highway=tertiary
     highway=track: Ko:Tag:highway=track
+    highway=traffic_signals: Ko:Tag:highway=traffic signals
     highway=trunk: Ko:Tag:highway=trunk
+    junction=yes: Ko:Tag:junction=yes
+    landuse=allotments: Ko:Tag:landuse=allotments
+    landuse=commercial: Ko:Tag:landuse=commercial
+    landuse=construction: Ko:Tag:landuse=construction
+    landuse=education: Ko:Tag:landuse=education
     landuse=farmland: Ko:Tag:landuse=farmland
+    landuse=farmyard: Ko:Tag:landuse=farmyard
+    landuse=forest: Ko:Tag:landuse=forest
+    landuse=industrial: Ko:Tag:landuse=industrial
+    landuse=residential: Ko:Tag:landuse=residential
     landuse=retail: Ko:Tag:landuse=retail
     landuse=traffic_island: Ko:Tag:landuse=traffic island
     leisure=disc_golf_course: Ko:Tag:leisure=disc golf course
     leisure=garden: Ko:Tag:leisure=garden
+    man_made=hongsalmun: Ko:Tag:man made=hongsalmun
     man_made=mast: Ko:Tag:man made=mast
     man_made=surveillance: Ko:Tag:man made=surveillance
     natural=grassland: Ko:Tag:natural=grassland
     natural=spring: Ko:Tag:natural=spring
     natural=tree: Ko:Tag:natural=tree
+    noname=yes: Ko:Tag:noname=yes
     place=hamlet: Ko:Tag:place=hamlet
     place=town: Ko:Tag:place=town
     shop=convenience: Ko:Tag:shop=convenience
     shop=cosmetics: Ko:Tag:shop=cosmetics
+    shop=energy: Ko:Tag:shop=energy
     shop=garden_centre: Ko:Tag:shop=garden centre
     shop=gift: Ko:Tag:shop=gift
     tourism=attraction: Ko:Tag:tourism=attraction
@@ -17853,6 +20455,7 @@ ne:
 nl:
   key:
     AND_nosr_r: NL:Key:AND nosr r
+    access: NL:Key:access
     addr: NL:Key:addr
     addr:city: NL:Key:addr:city
     addr:country: NL:Key:addr:country
@@ -17866,6 +20469,7 @@ nl:
     bench: NL:Key:bench
     bicycle: NL:Key:bicycle
     bicycle_road: NL:Key:bicycle road
+    bollard: NL:Key:bollard
     building: NL:Key:building
     circumference: NL:Key:circumference
     color: NL:Key:color
@@ -17923,19 +20527,24 @@ nl:
     amenity=parking: NL:Tag:amenity=parking
     amenity=post_office: NL:Tag:amenity=post office
     amenity=toilets: NL:Tag:amenity=toilets
+    amenity=university: NL:Tag:amenity=university
     amenity=vending_machine: NL:Tag:amenity=vending machine
     amenity=waste_basket: NL:Tag:amenity=waste basket
     barrier=bollard: NL:Tag:barrier=bollard
     barrier=fence: NL:Tag:barrier=fence
     barrier=hedge: NL:Tag:barrier=hedge
     barrier=sump_buster: NL:Tag:barrier=sump buster
+    building=castle: NL:Tag:building=castle
     building=entrance: NL:Tag:building=entrance
+    emergency=access_point: NL:Tag:emergency=access point
+    emergency=yes: NL:Tag:emergency=yes
     footway=sidewalk: NL:Tag:footway=sidewalk
     healthcare=blood_donation: NL:Tag:healthcare=blood donation
     highway=emergency_bay: NL:Tag:highway=emergency bay
     highway=footway: NL:Tag:highway=footway
     highway=motorway: NL:Tag:highway=motorway
     highway=path: NL:Tag:highway=path
+    highway=residential: NL:Tag:highway=residential
     highway=trailhead: NL:Tag:highway=trailhead
     historic=monument: NL:Tag:historic=monument
     information=tactile_map: NL:Tag:information=tactile map
@@ -17947,6 +20556,19 @@ nl:
     leisure=playground: NL:Tag:leisure=playground
     man_made=windmill: NL:Tag:man made=windmill
     natural=tree: NL:Tag:natural=tree
+    network=NL:A: NL:Tag:network=NL:A
+    network=NL:N: NL:Tag:network=NL:N
+    network=NL:R:Ommen: NL:Tag:network=NL:R:Ommen
+    network=NL:R:Schouwen: NL:Tag:network=NL:R:Schouwen
+    network=NL:R:Spaarnwoude: NL:Tag:network=NL:R:Spaarnwoude
+    network=NL:R:Voorthuizen: NL:Tag:network=NL:R:Voorthuizen
+    network=NL:S:Amsterdam: NL:Tag:network=NL:S:Amsterdam
+    network=NL:S:Den_Haag: NL:Tag:network=NL:S:Den Haag
+    network=NL:S:Heerlen: NL:Tag:network=NL:S:Heerlen
+    network=NL:S:Nijmegen: NL:Tag:network=NL:S:Nijmegen
+    network=NL:S:Rotterdam: NL:Tag:network=NL:S:Rotterdam
+    network=NL:S:Zaanstad: NL:Tag:network=NL:S:Zaanstad
+    network=e-road: NL:Tag:network=e-road
     office=architect: NL:Tag:office=architect
     office=yes: NL:Tag:office=yes
     public_transport=platform: NL:Tag:public transport=platform
@@ -18110,6 +20732,7 @@ pl:
     construction_end_expected: Pl:Key:construction end expected
     construction_start_expected: Pl:Key:construction start expected
     contact: Pl:Key:contact
+    contact:phone: Pl:Key:contact:phone
     content: Pl:Key:content
     conveying: Pl:Key:conveying
     country: Pl:Key:country
@@ -18191,6 +20814,8 @@ pl:
     government: Pl:Key:government
     grades: Pl:Key:grades
     handrail: Pl:Key:handrail
+    hazard: Pl:Key:hazard
+    hazmat: Pl:Key:hazmat
     healthcare: Pl:Key:healthcare
     healthcare:speciality: Pl:Key:healthcare:speciality
     height: Pl:Key:height
@@ -18235,7 +20860,6 @@ pl:
     junction: Pl:Key:junction
     kerb: Pl:Key:kerb
     landfill:waste: Pl:Key:landfill:waste
-    landmark: Pl:Key:landmark
     landuse: Pl:Key:landuse
     lanes: Pl:Key:lanes
     lanes:psv: Pl:Key:lanes:psv
@@ -18267,6 +20891,8 @@ pl:
     maxspeed:practical: Pl:Key:maxspeed:practical
     maxstay: Pl:Key:maxstay
     maxweight: Pl:Key:maxweight
+    maxweightrating: Pl:Key:maxweightrating
+    maxweightrating:hgv: Pl:Key:maxweightrating:hgv
     maxwidth: Pl:Key:maxwidth
     maxwidth:physical: Pl:Key:maxwidth:physical
     megalith_type: Pl:Key:megalith type
@@ -18296,6 +20922,7 @@ pl:
     note: Pl:Key:note
     nudism: Pl:Key:nudism
     office: Pl:Key:office
+    old_addr:housenumber: Pl:Key:old addr:housenumber
     old_name: Pl:Key:old name
     old_ref: Pl:Key:old ref
     oneway: Pl:Key:oneway
@@ -18309,9 +20936,12 @@ pl:
     overtaking: Pl:Key:overtaking
     owner: Pl:Key:owner
     ownership: Pl:Key:ownership
+    parcel_mail_in: Pl:Key:parcel mail in
+    parcel_pickup: Pl:Key:parcel pickup
     parish: Pl:Key:parish
     parking: Pl:Key:parking
     parking:lane: Pl:Key:parking:lane
+    parking:orientation: Pl:Key:parking:orientation
     passenger_information_display: Pl:Key:passenger information display
     passing_places: Pl:Key:passing places
     payment: Pl:Key:payment
@@ -18342,6 +20972,7 @@ pl:
     recycling_type: Pl:Key:recycling type
     reef: Pl:Key:reef
     ref: Pl:Key:ref
+    ref:csioz: Pl:Key:ref:csioz
     reference_point: Pl:Key:reference point
     reg_ref: Pl:Key:reg ref
     religion: Pl:Key:religion
@@ -18352,6 +20983,7 @@ pl:
     residential: Pl:Key:residential
     resource: Pl:Key:resource
     roof:colour: Pl:Key:roof:colour
+    roof:direction: Pl:Key:roof:direction
     roof:material: Pl:Key:roof:material
     roof:shape: Pl:Key:roof:shape
     room: Pl:Key:room
@@ -18362,6 +20994,7 @@ pl:
     'ruins:': 'Pl:Key:ruins:'
     sac_scale: Pl:Key:sac scale
     seamark:fixme: Pl:Key:seamark:fixme
+    seamark:marine_farm:category: Pl:Key:seamark:marine farm:category
     seasonal: Pl:Key:seasonal
     second_hand: Pl:Key:second hand
     segregated: Pl:Key:segregated
@@ -18401,6 +21034,7 @@ pl:
     symbol: Pl:Key:symbol
     tactile_paving: Pl:Key:tactile paving
     takeaway: Pl:Key:takeaway
+    tank_cleaning_truck: Pl:Key:tank cleaning truck
     target: Pl:Key:target
     taxon: Pl:Key:taxon
     tents: Pl:Key:tents
@@ -18429,8 +21063,10 @@ pl:
     trees: Pl:Key:trees
     trolley_wire: Pl:Key:trolley wire
     trolleybus: Pl:Key:trolleybus
+    truck_wash: Pl:Key:truck wash
     tunnel: Pl:Key:tunnel
     turn: Pl:Key:turn
+    turn:bicycle:lanes: Pl:Key:turn:bicycle:lanes
     turn:lanes: Pl:Key:turn:lanes
     type: Pl:Key:type
     unisex: Pl:Key:unisex
@@ -18466,6 +21102,7 @@ pl:
     access=license: Pl:Tag:access=license
     access=no: Pl:Tag:access=no
     access=official: Pl:Tag:access=official
+    access=permissive: Pl:Tag:access=permissive
     access=private: Pl:Tag:access=private
     actuator=hydraulic_cylinder: Pl:Tag:actuator=hydraulic cylinder
     advertising=billboard: Pl:Tag:advertising=billboard
@@ -18481,6 +21118,7 @@ pl:
     advertising=wall_painting: Pl:Tag:advertising=wall painting
     aeroway=hangar: Pl:Tag:aeroway=hangar
     aeroway=helipad: Pl:Tag:aeroway=helipad
+    aeroway=tower: Pl:Tag:aeroway=tower
     allotments=plot: Pl:Tag:allotments=plot
     amenity=administration: Pl:Tag:amenity=administration
     amenity=animal_boarding: Pl:Tag:amenity=animal boarding
@@ -18572,6 +21210,7 @@ pl:
     amenity=music_venue: Pl:Tag:amenity=music venue
     amenity=nightclub: Pl:Tag:amenity=nightclub
     amenity=nursing_home: Pl:Tag:amenity=nursing home
+    amenity=parcel_locker: Pl:Tag:amenity=parcel locker
     amenity=parking: Pl:Tag:amenity=parking
     amenity=parking_entrance: Pl:Tag:amenity=parking entrance
     amenity=parking_space: Pl:Tag:amenity=parking space
@@ -18670,6 +21309,7 @@ pl:
     barrier=wall: Pl:Tag:barrier=wall
     bicycle=use_sidepath: Pl:Tag:bicycle=use sidepath
     boundary=administrative: Pl:Tag:boundary=administrative
+    boundary=border_zone: Pl:Tag:boundary=border zone
     boundary=civil: Pl:Tag:boundary=civil
     boundary=economic: Pl:Tag:boundary=economic
     boundary=historic: Pl:Tag:boundary=historic
@@ -18792,9 +21432,12 @@ pl:
     castle_type=palace: Pl:Tag:castle type=palace
     castle_type=stately: Pl:Tag:castle type=stately
     cemetery=grave: Pl:Tag:cemetery=grave
+    cemetery=sector: Pl:Tag:cemetery=sector
     club=fan: Pl:Tag:club=fan
+    club=linux: Pl:Tag:club=linux
     club=scout: Pl:Tag:club=scout
     club=sport: Pl:Tag:club=sport
+    company=logistics: Pl:Tag:company=logistics
     construction=footpath: Pl:Tag:construction=footpath
     craft=agricultural_engines: Pl:Tag:craft=agricultural engines
     craft=bakery: Pl:Tag:craft=bakery
@@ -18827,6 +21470,7 @@ pl:
     craft=jeweller: Pl:Tag:craft=jeweller
     craft=joiner: Pl:Tag:craft=joiner
     craft=key_cutter: Pl:Tag:craft=key cutter
+    craft=metal_construction: Pl:Tag:craft=metal construction
     craft=oil_mill: Pl:Tag:craft=oil mill
     craft=painter: Pl:Tag:craft=painter
     craft=pottery: Pl:Tag:craft=pottery
@@ -18836,6 +21480,7 @@ pl:
     craft=stonemason: Pl:Tag:craft=stonemason
     craft=sun_protection: Pl:Tag:craft=sun protection
     craft=tailor: Pl:Tag:craft=tailor
+    craft=tinsmith: Pl:Tag:craft=tinsmith
     craft=watchmaker: Pl:Tag:craft=watchmaker
     craft=window_construction: Pl:Tag:craft=window construction
     craft=winery: Pl:Tag:craft=winery
@@ -18865,6 +21510,7 @@ pl:
     emergency=suction_point: Pl:Tag:emergency=suction point
     emergency=water_rescue_station: Pl:Tag:emergency=water rescue station
     emergency=water_tank: Pl:Tag:emergency=water tank
+    entrance=garage: Pl:Tag:entrance=garage
     entrance=main: Pl:Tag:entrance=main
     fast_food=cafeteria: Pl:Tag:fast food=cafeteria
     footway=crossing: Pl:Tag:footway=crossing
@@ -18872,9 +21518,12 @@ pl:
     ford=stepping_stones: Pl:Tag:ford=stepping stones
     garden:type=botanical: Pl:Tag:garden:type=botanical
     geological=moraine: Pl:Tag:geological=moraine
+    government=cadaster: Pl:Tag:government=cadaster
     government=customs: Pl:Tag:government=customs
     government=ministry: Pl:Tag:government=ministry
     government=prosecutor: Pl:Tag:government=prosecutor
+    hazard=minefield: Pl:Tag:hazard=minefield
+    hazard=quicksand: Pl:Tag:hazard=quicksand
     healthcare=dentist: Pl:Tag:healthcare=dentist
     healthcare=dialysis: Pl:Tag:healthcare=dialysis
     healthcare=doctor: Pl:Tag:healthcare=doctor
@@ -18945,6 +21594,7 @@ pl:
     historic=tree_shrine: Pl:Tag:historic=tree shrine
     historic=wayside_cross: Pl:Tag:historic=wayside cross
     historic=wayside_shrine: Pl:Tag:historic=wayside shrine
+    indoormark=beacon: Pl:Tag:indoormark=beacon
     industrial=aluminium_smelting: Pl:Tag:industrial=aluminium smelting
     industrial=auto_wrecker: Pl:Tag:industrial=auto wrecker
     industrial=bakery: Pl:Tag:industrial=bakery
@@ -18977,6 +21627,7 @@ pl:
     information=office: Pl:Tag:information=office
     information=terminal: Pl:Tag:information=terminal
     internet_access=wlan: Pl:Tag:internet access=wlan
+    irrigation=pivot: Pl:Tag:irrigation=pivot
     junction=roundabout: Pl:Tag:junction=roundabout
     landcover=grass: Pl:Tag:landcover=grass
     landcover=trees: Pl:Tag:landcover=trees
@@ -19166,6 +21817,7 @@ pl:
     megalith_type=stone_ship: Pl:Tag:megalith type=stone ship
     megalith_type=tholos: Pl:Tag:megalith type=tholos
     megalith_type=well: Pl:Tag:megalith type=well
+    memorial=bench: Pl:Tag:memorial=bench
     memorial=blue_plaque: Pl:Tag:memorial=blue plaque
     memorial=bust: Pl:Tag:memorial=bust
     memorial=obelisk: Pl:Tag:memorial=obelisk
@@ -19236,6 +21888,7 @@ pl:
     natural=shingle: Pl:Tag:natural=shingle
     natural=shoal: Pl:Tag:natural=shoal
     natural=shrub: Pl:Tag:natural=shrub
+    natural=shrubbery: Pl:Tag:natural=shrubbery
     natural=sinkhole: Pl:Tag:natural=sinkhole
     natural=spring: Pl:Tag:natural=spring
     natural=stone: Pl:Tag:natural=stone
@@ -19254,6 +21907,7 @@ pl:
     office=association: Pl:Tag:office=association
     office=charity: Pl:Tag:office=charity
     office=company: Pl:Tag:office=company
+    office=courier: Pl:Tag:office=courier
     office=educational_institution: Pl:Tag:office=educational institution
     office=employment_agency: Pl:Tag:office=employment agency
     office=energy_supplier: Pl:Tag:office=energy supplier
@@ -19286,8 +21940,11 @@ pl:
     oneway=alternating: Pl:Tag:oneway=alternating
     oneway=reversible: Pl:Tag:oneway=reversible
     parking:lane:hgv=on_street: Pl:Tag:parking:lane:hgv=on street
+    parking=layby: Pl:Tag:parking=layby
     parking=multi-storey: Pl:Tag:parking=multi-storey
+    parking=street_side: Pl:Tag:parking=street side
     parking=underground: Pl:Tag:parking=underground
+    path=crossing: Pl:Tag:path=crossing
     place=allotments: Pl:Tag:place=allotments
     place=archipelago: Pl:Tag:place=archipelago
     place=borough: Pl:Tag:place=borough
@@ -19317,6 +21974,19 @@ pl:
     place=suburb: Pl:Tag:place=suburb
     place=town: Pl:Tag:place=town
     place=village: Pl:Tag:place=village
+    playground=balancebeam: Pl:Tag:playground=balancebeam
+    playground=bridge: Pl:Tag:playground=bridge
+    playground=climbingframe: Pl:Tag:playground=climbingframe
+    playground=climbingwall: Pl:Tag:playground=climbingwall
+    playground=hopscotch: Pl:Tag:playground=hopscotch
+    playground=map: Pl:Tag:playground=map
+    playground=playhouse: Pl:Tag:playground=playhouse
+    playground=sandpit: Pl:Tag:playground=sandpit
+    playground=sledding: Pl:Tag:playground=sledding
+    playground=slide: Pl:Tag:playground=slide
+    playground=structure: Pl:Tag:playground=structure
+    playground=teenshelter: Pl:Tag:playground=teenshelter
+    playground=youth_bench: Pl:Tag:playground=youth bench
     power=cable: Pl:Tag:power=cable
     power=cable_distribution_cabinet: Pl:Tag:power=cable distribution cabinet
     power=catenary_mast: Pl:Tag:power=catenary mast
@@ -19374,6 +22044,7 @@ pl:
     railway=water_crane: Pl:Tag:railway=water crane
     railway=water_tower: Pl:Tag:railway=water tower
     railway=yard: Pl:Tag:railway=yard
+    refrigerated=yes: Pl:Tag:refrigerated=yes
     religion=christian: Pl:Tag:religion=christian
     religion=jewish: Pl:Tag:religion=jewish
     religion=muslim: Pl:Tag:religion=muslim
@@ -19388,6 +22059,7 @@ pl:
     route=horse: Pl:Tag:route=horse
     route=running: Pl:Tag:route=running
     route=tram: Pl:Tag:route=tram
+    seamark:type=marine_farm: Pl:Tag:seamark:type=marine farm
     service=alley: Pl:Tag:service=alley
     service=drive-through: Pl:Tag:service=drive-through
     service=driveway: Pl:Tag:service=driveway
@@ -19522,10 +22194,12 @@ pl:
     shop=photo: Pl:Tag:shop=photo
     shop=pottery: Pl:Tag:shop=pottery
     shop=printer_ink: Pl:Tag:shop=printer ink
+    shop=psychic: Pl:Tag:shop=psychic
     shop=pyrotechnics: Pl:Tag:shop=pyrotechnics
     shop=radiotechnics: Pl:Tag:shop=radiotechnics
     shop=religion: Pl:Tag:shop=religion
     shop=rental: Pl:Tag:shop=rental
+    shop=rice: Pl:Tag:shop=rice
     shop=scuba_diving: Pl:Tag:shop=scuba diving
     shop=seafood: Pl:Tag:shop=seafood
     shop=second_hand: Pl:Tag:shop=second hand
@@ -19550,8 +22224,11 @@ pl:
     shop=tool_hire: Pl:Tag:shop=tool hire
     shop=toys: Pl:Tag:shop=toys
     shop=trade: Pl:Tag:shop=trade
+    shop=trailer: Pl:Tag:shop=trailer
     shop=travel_agency: Pl:Tag:shop=travel agency
     shop=trophy: Pl:Tag:shop=trophy
+    shop=truck: Pl:Tag:shop=truck
+    shop=truck_repair: Pl:Tag:shop=truck repair
     shop=tyres: Pl:Tag:shop=tyres
     shop=vacant: Pl:Tag:shop=vacant
     shop=vacuum_cleaner: Pl:Tag:shop=vacuum cleaner
@@ -19622,6 +22299,8 @@ pl:
     tower:type=observation: Pl:Tag:tower:type=observation
     traffic_calming=island: Pl:Tag:traffic calming=island
     traffic_calming=table: Pl:Tag:traffic calming=table
+    traffic_sign=PL:D-42: Pl:Tag:traffic sign=PL:D-42
+    traffic_sign=PL:D-43: PL:Tag:traffic sign=PL:D-43
     traffic_sign=city_limit: Pl:Tag:traffic sign=city limit
     tunnel=culvert: Pl:Tag:tunnel=culvert
     type=public_transport: Pl:Tag:type=public transport
@@ -19632,6 +22311,7 @@ pl:
     vending=cigarettes: Pl:Tag:vending=cigarettes
     vending=drinks: Pl:Tag:vending=drinks
     vending=feminine_hygiene: Pl:Tag:vending=feminine hygiene
+    vending=flowers: Pl:Tag:vending=flowers
     vending=food: Pl:Tag:vending=food
     vending=fuel: Pl:Tag:vending=fuel
     vending=milk: Pl:Tag:vending=milk
@@ -19640,6 +22320,7 @@ pl:
       in
     vending=parking_tickets: Pl:Tag:vending=parking tickets
     vending=public_transport_tickets: Pl:Tag:vending=public transport tickets
+    vending=raw_milk: Pl:Tag:vending=raw milk
     vending=sweets: Pl:Tag:vending=sweets
     wall=dry_stone: Pl:Tag:wall=dry stone
     wall=no: Pl:Tag:wall=no
@@ -19697,6 +22378,7 @@ pl:
     wood=deciduous: Pl:Tag:wood=deciduous
     wood=evergreen: Pl:Tag:wood=evergreen
     wood=mixed: Pl:Tag:wood=mixed
+    zone=parking: Pl:Tag:zone=parking
     zoo=aviary: Pl:Tag:zoo=aviary
     zoo=birds: Pl:Tag:zoo=birds
     zoo=butterfly: Pl:Tag:zoo=butterfly
@@ -19742,6 +22424,7 @@ pt:
     cables: Pt:Key:cables
     capacity: Pt:Key:capacity
     charge: Pt:Key:charge
+    communication:mobile_phone: Pt:Key:communication:mobile phone
     construction: Pt:Key:construction
     contact: Pt:Key:contact
     country: Pt:Key:country
@@ -19764,6 +22447,8 @@ pt:
     electrified: Pt:Key:electrified
     embankment: Pt:Key:embankment
     emergency: Pt:Key:emergency
+    fee: Pt:Key:fee
+    fee:conditional: Pt:Key:fee:conditional
     fence_type: Pt:Key:fence type
     fenced: Pt:Key:fenced
     ferry: Pt:Key:ferry
@@ -19839,6 +22524,7 @@ pt:
     overtaking: Pt:Key:overtaking
     park_ride: Pt:Key:park ride
     parking: Pt:Key:parking
+    parking:orientation: Pt:Key:parking:orientation
     passing_places: Pt:Key:passing places
     place: Pt:Key:place
     placement: Pt:Key:placement
@@ -19847,6 +22533,7 @@ pt:
     population: Pt:Key:population
     postal_code: Pt:Key:postal code
     power: Pt:Key:power
+    priority: Pt:Key:priority
     product: Pt:Key:product
     psv: Pt:Key:psv
     public_transport: Pt:Key:public transport
@@ -19854,10 +22541,12 @@ pt:
     railway: Pt:Key:railway
     recording: Pt:Key:recording
     ref: Pt:Key:ref
+    ref:CNES: Pt:Key:ref:CNES
     ref:INEP: Pt:Key:ref:INEP
     ref:bag: Pt:Key:ref:bag
     ref:vatin: Pt:Key:ref:vatin
     religion: Pt:Key:religion
+    residential: Pt:Key:residential
     roof:material: Pt:Key:roof:material
     rooms: Pt:Key:rooms
     route: Pt:Key:route
@@ -19868,7 +22557,6 @@ pt:
     segregated: Pt:Key:segregated
     service: Pt:Key:service
     service_times: Pt:Key:service times
-    sett:style=portuguese: Pt:Key:sett:style=portuguese
     shop: Pt:Key:shop
     sidewalk: Pt:Key:sidewalk
     ski: Pt:Key:ski
@@ -19885,6 +22573,7 @@ pt:
     tactile_paving: Pt:Key:tactile paving
     takeaway: Pt:Key:takeaway
     tiger: Pt:Key:tiger
+    toll:hgv: Pt:Key:toll:hgv
     tourism: Pt:Key:tourism
     tracktype: Pt:Key:tracktype
     traffic_calming: Pt:Key:traffic calming
@@ -19934,7 +22623,6 @@ pt:
     aeroway=windsock: Pt:Tag:aeroway=windsock
     amenity=animal_boarding: Pt:Tag:amenity=animal boarding
     amenity=animal_shelter: Pt:Tag:amenity=animal shelter
-    amenity=architect_office: Pt:Tag:amenity=architect office
     amenity=archive: Pt:Tag:amenity=archive
     amenity=arts_centre: Pt:Tag:amenity=arts centre
     amenity=atm: Pt:Tag:amenity=atm
@@ -20094,6 +22782,7 @@ pt:
     building=shed: Pt:Tag:building=shed
     building=university: Pt:Tag:building=university
     building=yes: Pt:Tag:building=yes
+    castle_type=stately: Pt:Tag:castle type=stately
     craft=agricultural_engines: Pt:Tag:craft=agricultural engines
     craft=atelier: Pt:Tag:craft=atelier
     craft=basket_maker: Pt:Tag:craft=basket maker
@@ -20271,6 +22960,7 @@ pt:
     leisure=swimming_pool: Pt:Tag:leisure=swimming pool
     leisure=track: Pt:Tag:leisure=track
     leisure=water_park: Pt:Tag:leisure=water park
+    lottery=yes: Pt:Tag:lottery=yes
     man_made=adit: Pt:Tag:man made=adit
     man_made=antenna: Pt:Tag:man made=antenna
     man_made=beacon: Pt:Tag:man made=beacon
@@ -20414,6 +23104,7 @@ pt:
     railway=tram: Pt:Tag:railway=tram
     railway=tram_stop: Pt:Tag:railway=tram stop
     railway=turntable: Pt:Tag:railway=turntable
+    residential=university: Pt:Tag:residential=university
     route=bus: Pt:Tag:route=bus
     route=detour: Pt:Tag:route=detour
     route=ferry: Pt:Tag:route=ferry
@@ -20427,6 +23118,7 @@ pt:
     service=siding: Pt:Tag:service=siding
     service=spur: Pt:Tag:service=spur
     service=yard: Pt:Tag:service=yard
+    sett:style=portuguese: Pt:Tag:sett:style=portuguese
     shop=alcohol: Pt:Tag:shop=alcohol
     shop=anime: Pt:Tag:shop=anime
     shop=art: Pt:Tag:shop=art
@@ -20521,6 +23213,7 @@ pt:
     shop=scuba_diving: Pt:Tag:shop=scuba diving
     shop=seafood: Pt:Tag:shop=seafood
     shop=second_hand: Pt:Tag:shop=second hand
+    shop=security: Pt:Tag:shop=security
     shop=sewing: Pt:Tag:shop=sewing
     shop=shoes: Pt:Tag:shop=shoes
     shop=spices: Pt:Tag:shop=spices
@@ -20543,8 +23236,10 @@ pt:
     sport=10pin: Pt:Tag:sport=10pin
     sport=9pin: Pt:Tag:sport=9pin
     sport=golf: Pt:Tag:sport=golf
+    sport=rc_car: Pt:Tag:sport=rc car
     sport=soccer: Pt:Tag:sport=soccer
     surface=sett: Pt:Tag:surface=sett
+    surface=unpaved: Pt:Tag:surface=unpaved
     tourism=alpine_hut: Pt:Tag:tourism=alpine hut
     tourism=artwork: Pt:Tag:tourism=artwork
     tourism=attraction: Pt:Tag:tourism=attraction
@@ -20777,7 +23472,6 @@ pt-br:
     aeroway=terminal: Pt-br:Tag:aeroway=terminal
     aeroway=windsock: Pt-br:Tag:aeroway=windsock
     amenity=animal_boarding: Pt-br:Tag:amenity=animal boarding
-    amenity=architect_office: Pt-br:Tag:amenity=architect office
     amenity=arts_centre: Pt-br:Tag:amenity=arts centre
     amenity=atm: Pt-br:Tag:amenity=atm
     amenity=baby_hatch: Pt-br:Tag:amenity=baby hatch
@@ -21296,6 +23990,9 @@ ru:
   key:
     3dmr: RU:Key:3dmr
     AlpinRes_ID: RU:Key:AlpinRes ID
+    CLC:code: RU:Key:CLC:code
+    EH_ref: RU:Key:EH ref
+    HE_ref: RU:Key:HE ref
     abandoned: RU:Key:abandoned
     'abandoned:': 'RU:Key:abandoned:'
     abandoned:place: RU:Key:abandoned:place
@@ -21336,13 +24033,16 @@ ru:
     addr:unit: RU:Key:addr:unit
     advertising: RU:Key:advertising
     aerialway: RU:Key:aerialway
+    aerodrome:type: RU:Key:aerodrome:type
     aeroway: RU:Key:aeroway
+    after_school: RU:Key:after school
     agricultural: RU:Key:agricultural
     alt_name: RU:Key:alt name
     amenity: RU:Key:amenity
     animal: RU:Key:animal
     architect: RU:Key:architect
     area: RU:Key:area
+    area:aeroway: RU:Key:area:aeroway
     area:highway: RU:Key:area:highway
     artist_name: RU:Key:artist name
     artwork_type: RU:Key:artwork type
@@ -21350,15 +24050,22 @@ ru:
     attraction: RU:Key:attraction
     attribution: RU:Key:attribution
     atv:sales: RU:Key:atv:sales
+    baby: RU:Key:baby
     baby_feeding: RU:Key:baby feeding
     backcountry: RU:Key:backcountry
     backward: RU:Key:backward
     balcony: RU:Key:balcony
     barrier: RU:Key:barrier
+    basin: RU:Key:basin
+    beacon: RU:Key:beacon
+    beacon:type: RU:Key:beacon:type
     beds: RU:Key:beds
     bench: RU:Key:bench
     bicycle: RU:Key:bicycle
+    bicycle:backward: RU:Key:bicycle:backward
+    bicycle:forward: RU:Key:bicycle:forward
     bicycle_parking: RU:Key:bicycle parking
+    bicycle_road: RU:Key:bicycle road
     bike_ride: RU:Key:bike ride
     bin: RU:Key:bin
     board:title: RU:Key:board:title
@@ -21373,23 +24080,35 @@ ru:
     brand:wikidata: RU:Key:brand:wikidata
     brewery: RU:Key:brewery
     bridge: RU:Key:bridge
+    bridge:alt_name: RU:Key:bridge:alt name
+    bridge:loc_name: RU:Key:bridge:loc name
     bridge:movable: RU:Key:bridge:movable
     bridge:name: RU:Key:bridge:name
+    bridge:official_name: RU:Key:bridge:official name
+    bridge:old_name: RU:Key:bridge:old name
+    bridge:ref: RU:Key:bridge:ref
+    bridge:short_name: RU:Key:bridge:short name
     bridge:structure: RU:Key:bridge:structure
     bridge:support: RU:Key:bridge:support
-    bridge_name: RU:Key:bridge name
     building: RU:Key:building
     building:architecture: RU:Key:building:architecture
+    building:cladding: RU:Key:building:cladding
+    building:color: RU:Key:building:color
+    building:colour: RU:Key:building:colour
     building:condition: RU:Key:building:condition
+    building:fireproof: RU:Key:building:fireproof
     building:flats: RU:Key:building:flats
-    building:height: RU:Key:building:height
+    building:foundation_height: RU:Key:building:foundation height
     building:levels: RU:Key:building:levels
     building:levels:underground: RU:Key:building:levels:underground
     building:material: RU:Key:building:material
     building:min_level: RU:Key:building:min level
+    building:obm: RU:Key:building:obm
     building:part: RU:Key:building:part
     building:parts: RU:Key:building:parts
+    building:place: RU:Key:building:place
     building:prefabricated: RU:Key:building:prefabricated
+    building:ruian:type: RU:Key:building:ruian:type
     building:soft_storey: RU:Key:building:soft storey
     building:structure: RU:Key:building:structure
     building:units: RU:Key:building:units
@@ -21398,19 +24117,32 @@ ru:
     building:use:pl: RU:Key:building:use:pl
     bunker_type: RU:Key:bunker type
     bus: RU:Key:bus
-    cabin:rental: RU:Key:cabin:rental
+    bus:lanes: RU:Key:bus:lanes
+    bus_bay: RU:Key:bus bay
+    bus_class: RU:Key:bus class
+    bus_class:length: RU:Key:bus class:length
     cabins: RU:Key:cabins
+    cable_number: RU:Key:cable number
     cafe: RU:Key:cafe
+    camera:type: RU:Key:camera:type
     camp_site: RU:Key:camp site
     camp_type: RU:Key:camp type
+    campers: RU:Key:campers
     capacity: RU:Key:capacity
     capacity:charging: RU:Key:capacity:charging
     capacity:disabled: RU:Key:capacity:disabled
     capital: RU:Key:capital
     caravan: RU:Key:caravan
     castle_type: RU:Key:castle type
+    castle_type:de: RU:Key:castle type:de
     cemetery: RU:Key:cemetery
+    changing_table: RU:Key:changing table
+    changing_table:count: RU:Key:changing table:count
+    changing_table:fee: RU:Key:changing table:fee
+    changing_table:location: RU:Key:changing table:location
+    charge: RU:Key:charge
     check_date: RU:Key:check date
+    check_date:opening_hours: RU:Key:check date:opening hours
     checkpoint: RU:Key:checkpoint
     church:type: RU:Key:church:type
     city_limit: RU:Key:city limit
@@ -21425,6 +24157,7 @@ ru:
     company: RU:Key:company
     compressed_air: RU:Key:compressed air
     condo: RU:Key:condo
+    consecrated: RU:Key:consecrated
     construction: RU:Key:construction
     consulting: RU:Key:consulting
     contact: RU:Key:contact
@@ -21443,18 +24176,38 @@ ru:
     cuisine: RU:Key:cuisine
     currency: RU:Key:currency
     cutting: RU:Key:cutting
+    cycle_barrier: RU:Key:cycle barrier
+    cycle_barrier:installation: RU:Key:cycle barrier:installation
+    cycle_highway: RU:Key:cycle highway
+    cycle_network: RU:Key:cycle network
+    cyclestreet: RU:Key:cyclestreet
     cyclestreets_id: RU:Key:cyclestreets id
+    cycleway: RU:Key:cycleway
+    cycleway:both: RU:Key:cycleway:both
+    cycleway:buffer: RU:Key:cycleway:buffer
+    cycleway:foot: RU:Key:cycleway:foot
+    cycleway:lane: RU:Key:cycleway:lane
+    cycleway:left: RU:Key:cycleway:left
+    cycleway:left:lane: RU:Key:cycleway:left:lane
     cycleway:left:oneway: RU:Key:cycleway:left:oneway
+    cycleway:right: RU:Key:cycleway:right
+    cycleway:right:lane: RU:Key:cycleway:right:lane
     cycleway:right:oneway: RU:Key:cycleway:right:oneway
+    cycleway:right:surface: RU:Key:cycleway:right:surface
+    cycleway:segregated: RU:Key:cycleway:segregated
+    cycleway:surface: RU:Key:cycleway:surface
+    dance:style: RU:Key:dance:style
+    dance:teaching: RU:Key:dance:teaching
     delivery: RU:Key:delivery
+    delivery:partner: RU:Key:delivery:partner
     denomination: RU:Key:denomination
+    department: RU:Key:department
     departures_board: RU:Key:departures board
     description: RU:Key:description
     description:ru: RU:Key:description:ru
     design:code:SPb: RU:Key:design:code:SPb
     design:ref: RU:Key:design:ref
     designation: RU:Key:designation
-    diaper: RU:Key:diaper
     diplomatic: RU:Key:diplomatic
     direction: RU:Key:direction
     dispensing: RU:Key:dispensing
@@ -21462,6 +24215,8 @@ ru:
     'disused:': 'RU:Key:disused:'
     disused:shop: RU:Key:disused:shop
     dog: RU:Key:dog
+    double_tracked_motor_vehicle: RU:Key:double tracked motor vehicle
+    drain: RU:Key:drain
     drink:beer: RU:Key:drink:beer
     drinking_water: RU:Key:drinking water
     drinking_water:legal: RU:Key:drinking water:legal
@@ -21469,21 +24224,29 @@ ru:
     drive_through: RU:Key:drive through
     driving_side: RU:Key:driving side
     dryer: RU:Key:dryer
+    easy_overtaking: RU:Key:easy overtaking
+    education: RU:Key:education
     ele: RU:Key:ele
     electric_bicycle: RU:Key:electric bicycle
+    electricity: RU:Key:electricity
     electrified: RU:Key:electrified
     email: RU:Key:email
     embankment: RU:Key:embankment
     emergency: RU:Key:emergency
     engineer: RU:Key:engineer
     entrance: RU:Key:entrance
+    esr:user: RU:Key:esr:user
     est_width: RU:Key:est width
     exhibit: RU:Key:exhibit
     exit: RU:Key:exit
+    factory: RU:Key:factory
+    faculty: RU:Key:faculty
     fast_food: RU:Key:fast food
     fax: RU:Key:fax
+    fdep:landuse_code: RU:Key:fdep:landuse code
     fee: RU:Key:fee
     feeding:type: RU:Key:feeding:type
+    female: RU:Key:female
     fence_type: RU:Key:fence type
     ferry: RU:Key:ferry
     fire_boundary: RU:Key:fire boundary
@@ -21491,11 +24254,16 @@ ru:
     fire_operator: RU:Key:fire operator
     fire_rank: RU:Key:fire rank
     fire_station:type: RU:Key:fire station:type
+    fireplace: RU:Key:fireplace
     fixme: RU:Key:fixme
+    flats: RU:Key:flats
+    flood_date: RU:Key:flood date
     foot: RU:Key:foot
     footway: RU:Key:footway
     ford: RU:Key:ford
+    fortification_type: RU:Key:fortification type
     forward: RU:Key:forward
+    fountain: RU:Key:fountain
     fuel: RU:Key:fuel
     fuel:cng: RU:Key:fuel:cng
     fuel:lpg: RU:Key:fuel:lpg
@@ -21508,24 +24276,32 @@ ru:
     generator:source: RU:Key:generator:source
     genus: RU:Key:genus
     government: RU:Key:government
+    grades: RU:Key:grades
     grassland: RU:Key:grassland
     group_only: RU:Key:group only
+    guest_house: RU:Key:guest house
+    guide: RU:Key:guide
     guidepost:hiking: RU:Key:guidepost:hiking
     gvr:code: RU:Key:gvr:code
     handrail: RU:Key:handrail
     hazard: RU:Key:hazard
+    hazard:animal: RU:Key:hazard:animal
     hazmat: RU:Key:hazmat
     healthcare: RU:Key:healthcare
     height: RU:Key:height
     heritage: RU:Key:heritage
+    heritage:operator: RU:Key:heritage:operator
     hgv: RU:Key:hgv
     highway: RU:Key:highway
     hiking: RU:Key:hiking
     historic: RU:Key:historic
+    historic:civilization: RU:Key:historic:civilization
     horse: RU:Key:horse
     horse_scale: RU:Key:horse scale
     iata: RU:Key:iata
     ice_road: RU:Key:ice road
+    icn_ref: RU:Key:icn ref
+    ifr: RU:Key:ifr
     image: RU:Key:image
     incline: RU:Key:incline
     indoor: RU:Key:indoor
@@ -21537,12 +24313,16 @@ ru:
     intermittent: RU:Key:intermittent
     internet_access: RU:Key:internet access
     is_in: RU:Key:is in
+    isced:level: RU:Key:isced:level
+    isced:level:1997: RU:Key:isced:level:1997
+    isced:level:2011: RU:Key:isced:level:2011
     jetski:rental: RU:Key:jetski:rental
     junction: RU:Key:junction
     karaoke: RU:Key:karaoke
     kerb: RU:Key:kerb
     ladder: RU:Key:ladder
     lamp_mount: RU:Key:lamp mount
+    landfill:waste: RU:Key:landfill:waste
     landmark: RU:Key:landmark
     landuse: RU:Key:landuse
     lanes: RU:Key:lanes
@@ -21567,6 +24347,7 @@ ru:
     manhole: RU:Key:manhole
     mapillary: RU:Key:mapillary
     material: RU:Key:material
+    mattress: RU:Key:mattress
     max_age: RU:Key:max age
     maxaxleload: RU:Key:maxaxleload
     maxbogieweight: RU:Key:maxbogieweight
@@ -21578,36 +24359,51 @@ ru:
     maxtents: RU:Key:maxtents
     maxweight: RU:Key:maxweight
     maxweight:signed: RU:Key:maxweight:signed
+    maxweightrating: RU:Key:maxweightrating
     maxwidth: RU:Key:maxwidth
     mcrb:criteria: RU:Key:mcrb:criteria
+    measurement: RU:Key:measurement
     memorial: RU:Key:memorial
     memorial:subject: RU:Key:memorial:subject
     memorial:type: RU:Key:memorial:type
     military: RU:Key:military
     min_height: RU:Key:min height
+    mindistance: RU:Key:mindistance
     minspeed: RU:Key:minspeed
+    monitoring:groundwater: RU:Key:monitoring:groundwater
     moped: RU:Key:moped
     motor_vehicle: RU:Key:motor vehicle
+    motorcar: RU:Key:motorcar
     motorcycle: RU:Key:motorcycle
     motorcycle:parking: RU:Key:motorcycle:parking
     motorcycle:rental: RU:Key:motorcycle:rental
     motorcycle:storage: RU:Key:motorcycle:storage
+    motorcycle:type: RU:Key:motorcycle:type
     motorroad: RU:Key:motorroad
     mountain_pass: RU:Key:mountain pass
+    mtb:description: RU:Key:mtb:description
     mtb:scale: RU:Key:mtb:scale
+    museum_type: RU:Key:museum type
     name: RU:Key:name
+    name:be: RU:Key:name:be
     name:ru: RU:Key:name:ru
     name:ru:word_stress: RU:Key:name:ru:word stress
+    name:vi-Hani: RU:Key:name:vi-Hani
     nat_name: RU:Key:nat name
     nat_ref: RU:Key:nat ref
     natural: RU:Key:natural
+    navigationaid: RU:Key:navigationaid
+    ncn: RU:Key:ncn
     ncn_milepost: RU:Key:ncn milepost
+    ncn_ref: RU:Key:ncn ref
     network: RU:Key:network
     next_check_date: RU:Key:next check date
+    no_overtaking: RU:Key:no overtaking
     noaddress: RU:Key:noaddress
     noexit: RU:Key:noexit
     nohousenumber: RU:Key:nohousenumber
     note: RU:Key:note
+    nursery: RU:Key:nursery
     office: RU:Key:office
     office/Обзор_офисов: RU:Key:office/Обзор офисов
     official_name: RU:Key:official name
@@ -21616,9 +24412,12 @@ ru:
     old_ref: RU:Key:old ref
     oneway: RU:Key:oneway
     oneway:bicycle: RU:Key:oneway:bicycle
+    openfire: RU:Key:openfire
     opening_date: RU:Key:opening date
     opening_hours: RU:Key:opening hours
+    opening_hours:covid19: RU:Key:opening hours:covid19
     opening_hours:kitchen: RU:Key:opening hours:kitchen
+    opening_hours:reception: RU:Key:opening hours:reception
     operator: RU:Key:operator
     operator:ref:inn: RU:Key:operator:ref:inn
     operator:type: RU:Key:operator:type
@@ -21630,6 +24429,12 @@ ru:
     park_ride: RU:Key:park ride
     parking: RU:Key:parking
     parking:condition: RU:Key:parking:condition
+    parking:condition:both: RU:Key:parking:condition:both
+    parking:condition:both:maxstay: RU:Key:parking:condition:both:maxstay
+    parking:condition:left: RU:Key:parking:condition:left
+    parking:condition:right: RU:Key:parking:condition:right
+    parking:condition:right:maxstay: RU:Key:parking:condition:right:maxstay
+    parking:condition:right:time_interval: RU:Key:parking:condition:right:time interval
     parking:lane: RU:Key:parking:lane
     parking:lane:both: RU:Key:parking:lane:both
     parking:lane:left: RU:Key:parking:lane:left
@@ -21645,6 +24450,7 @@ ru:
     payment:coins: RU:Key:payment:coins
     payment:credit_cards: RU:Key:payment:credit cards
     payment:notes: RU:Key:payment:notes
+    pets: RU:Key:pets
     phone: RU:Key:phone
     picnic_table: RU:Key:picnic table
     pipeline: RU:Key:pipeline
@@ -21656,7 +24462,7 @@ ru:
     population: RU:Key:population
     postal_code: RU:Key:postal code
     power: RU:Key:power
-    power_source: RU:Key:power source
+    preschool: RU:Key:preschool
     previous: RU:Key:previous
     previous:access: RU:Key:previous:access
     previous:vehicle: RU:Key:previous:vehicle
@@ -21670,11 +24476,15 @@ ru:
     ramp: RU:Key:ramp
     ramp:bicycle: RU:Key:ramp:bicycle
     recycling:fire_extinguishers: RU:Key:recycling:fire extinguishers
+    recycling:plastic_bottle_caps: RU:Key:recycling:plastic bottle caps
+    recycling:plastic_bottle_tops: RU:Key:recycling:plastic bottle tops
     recycling_type: RU:Key:recycling type
     ref: RU:Key:ref
     ref:RS:nkd: RU:Key:ref:RS:nkd
     ref:mobil-parken.de: RU:Key:ref:mobil-parken.de
     ref:ruian:building: RU:Key:ref:ruian:building
+    ref:sprockhoff: RU:Key:ref:sprockhoff
+    ref:whc: RU:Key:ref:whc
     reference: RU:Key:reference
     refitted: RU:Key:refitted
     reg_name: RU:Key:reg name
@@ -21682,33 +24492,49 @@ ru:
     religion: RU:Key:religion
     rental: RU:Key:rental
     research: RU:Key:research
+    reservation: RU:Key:reservation
     reservoir_type: RU:Key:reservoir type
     residential: RU:Key:residential
     resort: RU:Key:resort
     resource: RU:Key:resource
+    review_requested: RU:Key:review requested
     rhn_ref: RU:Key:rhn ref
     right: RU:Key:right
     roof:direction: RU:Key:roof:direction
     roof:material: RU:Key:roof:material
     room: RU:Key:room
     rooms: RU:Key:rooms
+    roundtrip: RU:Key:roundtrip
     route: RU:Key:route
     rtsa_scale: RU:Key:rtsa scale
     ruined: RU:Key:ruined
     'ruined:': 'RU:Key:ruined:'
     ruins: RU:Key:ruins
     sac_scale: RU:Key:sac scale
+    sailboat: RU:Key:sailboat
     salt: RU:Key:salt
     sanitary_dump_station: RU:Key:sanitary dump station
+    school: RU:Key:school
+    school:type: RU:Key:school:type
+    scuba_diving:rental: RU:Key:scuba diving:rental
+    sculpture_type: RU:Key:sculpture type
     seasonal: RU:Key:seasonal
     seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime
     second_hand: RU:Key:second hand
     service: RU:Key:service
+    service:bicycle: RU:Key:service:bicycle
+    service:bicycle:cleaning: RU:Key:service:bicycle:cleaning
+    service:bicycle:diy: RU:Key:service:bicycle:diy
+    service:bicycle:pump: RU:Key:service:bicycle:pump
+    service:bicycle:rental: RU:Key:service:bicycle:rental
+    service:bicycle:repair: RU:Key:service:bicycle:repair
+    service:bicycle:retail: RU:Key:service:bicycle:retail
     service_times: RU:Key:service times
     shelter: RU:Key:shelter
     shelter_type: RU:Key:shelter type
     shooting: RU:Key:shooting
     shop: RU:Key:shop
+    shoulder: RU:Key:shoulder
     side_road: RU:Key:side road
     sidewalk: RU:Key:sidewalk
     sinkhole: RU:Key:sinkhole
@@ -21726,6 +24552,7 @@ ru:
     sport: RU:Key:sport
     start_date: RU:Key:start date
     step_count: RU:Key:step count
+    stove: RU:Key:stove
     substance: RU:Key:substance
     supervised: RU:Key:supervised
     surface: RU:Key:surface
@@ -21733,22 +24560,30 @@ ru:
     survey:date: RU:Key:survey:date
     sustrans_ref: RU:Key:sustrans ref
     swimming: RU:Key:swimming
+    swimming_pool: RU:Key:swimming pool
     symbol: RU:Key:symbol
     tactile_paving: RU:Key:tactile paving
     taxon: RU:Key:taxon
     technology: RU:Key:technology
+    television: RU:Key:television
+    tents: RU:Key:tents
+    terrace: RU:Key:terrace
     todo: RU:Key:todo
     toilets: RU:Key:toilets
     toilets:wheelchair: RU:Key:toilets:wheelchair
     toll: RU:Key:toll
     tourism: RU:Key:tourism
     tower:type: RU:Key:tower:type
+    townhall:type: RU:Key:townhall:type
     tracktype: RU:Key:tracktype
     traffic_calming: RU:Key:traffic calming
     traffic_sign: RU:Key:traffic sign
     traffic_signals: RU:Key:traffic signals
+    traffic_signals:sections: RU:Key:traffic signals:sections
+    traffic_signals:timing: RU:Key:traffic signals:timing
     trail_visibility: RU:Key:trail visibility
     trailer:rental: RU:Key:trailer:rental
+    training: RU:Key:training
     tram: RU:Key:tram
     trolley_wire: RU:Key:trolley wire
     trolleybus: RU:Key:trolleybus
@@ -21758,8 +24593,10 @@ ru:
     type: RU:Key:type
     url: RU:Key:url
     usage: RU:Key:usage
+    vaccination: RU:Key:vaccination
     vehicle: RU:Key:vehicle
     vending: RU:Key:vending
+    view: RU:Key:view
     visibility: RU:Key:visibility
     voltage: RU:Key:voltage
     washing_machine: RU:Key:washing machine
@@ -21776,10 +24613,16 @@ ru:
     wikipedia: RU:Key:wikipedia
     wikipedia:ru: RU:Key:wikipedia:ru
     winter_road: RU:Key:winter road
+    winter_service: RU:Key:winter service
     wood: RU:Key:wood
     xmas:feature: RU:Key:xmas:feature
     zone:traffic: RU:Key:zone:traffic
   tag:
+    abutters=commercial: RU:Tag:abutters=commercial
+    abutters=industrial: RU:Tag:abutters=industrial
+    abutters=mixed: RU:Tag:abutters=mixed
+    abutters=residential: RU:Tag:abutters=residential
+    abutters=retail: RU:Tag:abutters=retail
     access=customers: RU:Tag:access=customers
     access=delivery: RU:Tag:access=delivery
     access=designated: RU:Tag:access=designated
@@ -21790,24 +24633,46 @@ ru:
     access=permissive: RU:Tag:access=permissive
     access=private: RU:Tag:access=private
     access=unknown: RU:Tag:access=unknown
-    access=yes: RU:Tag:access=yes
     advertising=board: RU:Tag:advertising=board
     advertising=flag: RU:Tag:advertising=flag
     advertising=screen: RU:Tag:advertising=screen
     advertising=sculpture: RU:Tag:advertising=sculpture
     advertising=wall_painting: RU:Tag:advertising=wall painting
     aerodrome:type=airfield: RU:Tag:aerodrome:type=airfield
+    aerodrome:type=gliding: RU:Tag:aerodrome:type=gliding
+    aerodrome:type=international: RU:Tag:aerodrome:type=international
+    aerodrome:type=military: RU:Tag:aerodrome:type=military
+    aerodrome:type=private: RU:Tag:aerodrome:type=private
+    aerodrome:type=regional: RU:Tag:aerodrome:type=regional
     aeroway=aerodrome: RU:Tag:aeroway=aerodrome
+    aeroway=aircraft_crossing: RU:Tag:aeroway=aircraft crossing
+    aeroway=airport: RU:Tag:aeroway=airport
+    aeroway=airstrip: RU:Tag:aeroway=airstrip
+    aeroway=airtanker_base: RU:Tag:aeroway=airtanker base
     aeroway=apron: RU:Tag:aeroway=apron
+    aeroway=arresting_gear: RU:Tag:aeroway=arresting gear
+    aeroway=fuel: RU:Tag:aeroway=fuel
     aeroway=gate: RU:Tag:aeroway=gate
     aeroway=hangar: RU:Tag:aeroway=hangar
     aeroway=helipad: RU:Tag:aeroway=helipad
     aeroway=heliport: RU:Tag:aeroway=heliport
+    aeroway=highway_strip: RU:Tag:aeroway=highway strip
+    aeroway=holding_position: RU:Tag:aeroway=holding position
+    aeroway=landingpad: RU:Tag:aeroway=landingpad
+    aeroway=launchpad: RU:Tag:aeroway=launchpad
     aeroway=navigationaid: RU:Tag:aeroway=navigationaid
+    aeroway=papi: RU:Tag:aeroway=papi
+    aeroway=parking_position: RU:Tag:aeroway=parking position
     aeroway=runway: RU:Tag:aeroway=runway
+    aeroway=spaceport: RU:Tag:aeroway=spaceport
+    aeroway=stopway: RU:Tag:aeroway=stopway
+    aeroway=taxilane: RU:Tag:aeroway=taxilane
     aeroway=taxiway: RU:Tag:aeroway=taxiway
     aeroway=terminal: RU:Tag:aeroway=terminal
+    aeroway=tower: RU:Tag:aeroway=tower
     aeroway=windsock: RU:Tag:aeroway=windsock
+    airmark=beacon: RU:Tag:airmark=beacon
+    allotments=plot: RU:Tag:allotments=plot
     amenity=animal_boarding: RU:Tag:amenity=animal boarding
     amenity=animal_breeding: RU:Tag:amenity=animal breeding
     amenity=animal_shelter: RU:Tag:amenity=animal shelter
@@ -21827,6 +24692,7 @@ ru:
     amenity=biergarten: RU:Tag:amenity=biergarten
     amenity=binoculars: RU:Tag:amenity=binoculars
     amenity=bird_bath: RU:Tag:amenity=bird bath
+    amenity=boat_rental: RU:Tag:amenity=boat rental
     amenity=boat_storage: RU:Tag:amenity=boat storage
     amenity=border_control: RU:Tag:amenity=border control
     amenity=brothel: RU:Tag:amenity=brothel
@@ -21853,16 +24719,19 @@ ru:
     amenity=coworking_space: RU:Tag:amenity=coworking space
     amenity=crematorium: RU:Tag:amenity=crematorium
     amenity=customs: RU:Tag:amenity=customs
+    amenity=dancing_school: RU:Tag:amenity=dancing school
     amenity=dentist: RU:Tag:amenity=dentist
     amenity=device_charging_station: RU:Tag:amenity=device charging station
     amenity=doctors: RU:Tag:amenity=doctors
     amenity=dog_bin: RU:Tag:amenity=dog bin
     amenity=dog_toilet: RU:Tag:amenity=dog toilet
     amenity=dojo: RU:Tag:amenity=dojo
+    amenity=dormitory: RU:Tag:amenity=dormitory
     amenity=dressing_room: RU:Tag:amenity=dressing room
     amenity=drinking_water: RU:Tag:amenity=drinking water
     amenity=driver_training: RU:Tag:amenity=driver training
     amenity=driving_school: RU:Tag:amenity=driving school
+    amenity=education: RU:Tag:amenity=education
     amenity=embassy: RU:Tag:amenity=embassy
     amenity=fast_food: RU:Tag:amenity=fast food
     amenity=feeding_place: RU:Tag:amenity=feeding place
@@ -21885,6 +24754,7 @@ ru:
     amenity=hospital: RU:Tag:amenity=hospital
     amenity=hunting_stand: RU:Tag:amenity=hunting stand
     amenity=ice_cream: RU:Tag:amenity=ice cream
+    amenity=karaoke_box: RU:Tag:amenity=karaoke box
     amenity=kick-scooter_rental: RU:Tag:amenity=kick-scooter rental
     amenity=kindergarten: RU:Tag:amenity=kindergarten
     amenity=kitchen: RU:Tag:amenity=kitchen
@@ -21896,12 +24766,14 @@ ru:
     amenity=love_hotel: RU:Tag:amenity=love hotel
     amenity=marae: RU:Tag:amenity=marae
     amenity=marketplace: RU:Tag:amenity=marketplace
+    amenity=mist_spraying_cooler: RU:Tag:amenity=mist spraying cooler
     amenity=mobile_library: RU:Tag:amenity=mobile library
     amenity=monastery: RU:Tag:amenity=monastery
     amenity=mortuary: RU:Tag:amenity=mortuary
     amenity=motorcycle_parking: RU:Tag:amenity=motorcycle parking
     amenity=music_school: RU:Tag:amenity=music school
     amenity=nightclub: RU:Tag:amenity=nightclub
+    amenity=nursery: RU:Tag:amenity=nursery
     amenity=nursing_home: RU:Tag:amenity=nursing home
     amenity=parking: RU:Tag:amenity=parking
     amenity=parking_entrance: RU:Tag:amenity=parking entrance
@@ -21914,6 +24786,8 @@ ru:
     amenity=polling_station: RU:Tag:amenity=polling station
     amenity=post_box: RU:Tag:amenity=post box
     amenity=post_office: RU:Tag:amenity=post office
+    amenity=prep_school: RU:Tag:amenity=prep school
+    amenity=preschool: RU:Tag:amenity=preschool
     amenity=prison: RU:Tag:amenity=prison
     amenity=prison_camp: RU:Tag:amenity=prison camp
     amenity=pub: RU:Tag:amenity=pub
@@ -21925,6 +24799,7 @@ ru:
     amenity=rescue_station: RU:Tag:amenity=rescue station
     amenity=research_institute: RU:Tag:amenity=research institute
     amenity=restaurant: RU:Tag:amenity=restaurant
+    amenity=sailing_school: RU:Tag:amenity=sailing school
     amenity=sanatorium: RU:Tag:amenity=sanatorium
     amenity=sanitary_dump_station: RU:Tag:amenity=sanitary dump station
     amenity=sauna: RU:Tag:amenity=sauna
@@ -21933,11 +24808,13 @@ ru:
     amenity=shelter: RU:Tag:amenity=shelter
     amenity=shop: RU:Tag:amenity=shop
     amenity=shower: RU:Tag:amenity=shower
+    amenity=ski_school: RU:Tag:amenity=ski school
     amenity=smoking_area: RU:Tag:amenity=smoking area
     amenity=social_facility: RU:Tag:amenity=social facility
     amenity=stables: RU:Tag:amenity=stables
     amenity=stool: RU:Tag:amenity=stool
     amenity=stripclub: RU:Tag:amenity=stripclub
+    amenity=student_accommodation: RU:Tag:amenity=student accommodation
     amenity=studio: RU:Tag:amenity=studio
     amenity=swingerclub: RU:Tag:amenity=swingerclub
     amenity=table: RU:Tag:amenity=table
@@ -21948,8 +24825,10 @@ ru:
     amenity=toilets: RU:Tag:amenity=toilets
     amenity=tourist_bus_parking: RU:Tag:amenity=tourist bus parking
     amenity=townhall: RU:Tag:amenity=townhall
+    amenity=toy_library: RU:Tag:amenity=toy library
     amenity=training: RU:Tag:amenity=training
     amenity=trolley_bay: RU:Tag:amenity=trolley bay
+    amenity=tuition: RU:Tag:amenity=tuition
     amenity=university: RU:Tag:amenity=university
     amenity=vacuum_cleaner: RU:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: RU:Tag:amenity=vehicle inspection
@@ -21961,6 +24840,8 @@ ru:
     amenity=washing_machine: RU:Tag:amenity=washing machine
     amenity=waste_basket: RU:Tag:amenity=waste basket
     amenity=waste_disposal: RU:Tag:amenity=waste disposal
+    amenity=waste_dump_site: RU:Tag:amenity=waste dump site
+    amenity=waste_transfer_station: RU:Tag:amenity=waste transfer station
     amenity=water_point: RU:Tag:amenity=water point
     amenity=watering_place: RU:Tag:amenity=watering place
     amenity=weighbridge: RU:Tag:amenity=weighbridge
@@ -21969,6 +24850,7 @@ ru:
     animated=trivision_blades: RU:Tag:animated=trivision blades
     animated=winding_posters: RU:Tag:animated=winding posters
     anthropogenic=yes: RU:Tag:anthropogenic=yes
+    area:highway=cycleway: RU:Tag:area:highway=cycleway
     artwork_type=architecture: RU:Tag:artwork type=architecture
     artwork_type=bust: RU:Tag:artwork type=bust
     artwork_type=mural: RU:Tag:artwork type=mural
@@ -21979,11 +24861,13 @@ ru:
     atm=yes: RU:Tag:atm=yes
     attraction=alpine_coaster: RU:Tag:attraction=alpine coaster
     attraction=animal: RU:Tag:attraction=animal
+    attraction=boat_ride: RU:Tag:attraction=boat ride
     attraction=maze: RU:Tag:attraction=maze
     attraction=roller_coaster: RU:Tag:attraction=roller coaster
     attraction=summer_toboggan: RU:Tag:attraction=summer toboggan
     attraction=train: RU:Tag:attraction=train
     attraction=water_slide: RU:Tag:attraction=water slide
+    baby_hatch=yes: RU:Tag:baby hatch=yes
     barrier=block: RU:Tag:barrier=block
     barrier=bollard: RU:Tag:barrier=bollard
     barrier=border_control: RU:Tag:barrier=border control
@@ -22015,7 +24899,9 @@ ru:
     barrier=log: RU:Tag:barrier=log
     barrier=retaining_wall: RU:Tag:barrier=retaining wall
     barrier=sally_port: RU:Tag:barrier=sally port
+    barrier=sliding_beam: RU:Tag:barrier=sliding beam
     barrier=sliding_gate: RU:Tag:barrier=sliding gate
+    barrier=steeplechase_jump: RU:Tag:barrier=steeplechase jump
     barrier=stile: RU:Tag:barrier=stile
     barrier=swing_gate: RU:Tag:barrier=swing gate
     barrier=tank_trap: RU:Tag:barrier=tank trap
@@ -22024,30 +24910,66 @@ ru:
     barrier=wall: RU:Tag:barrier=wall
     barrier=wicket_gate: RU:Tag:barrier=wicket gate
     barrier=yes: RU:Tag:barrier=yes
+    basin=cooling: RU:Tag:basin=cooling
+    basin=detention: RU:Tag:basin=detention
+    basin=evaporation: RU:Tag:basin=evaporation
+    basin=infiltration: RU:Tag:basin=infiltration
+    basin=retention: RU:Tag:basin=retention
+    bbq=yes: RU:Tag:bbq=yes
+    beacon:type=DVOR: RU:Tag:beacon:type=DVOR
+    beacon:type=ILS: RU:Tag:beacon:type=ILS
+    beacon:type=NDB: RU:Tag:beacon:type=NDB
+    beacon:type=TACAN: RU:Tag:beacon:type=TACAN
+    beacon:type=VOR: RU:Tag:beacon:type=VOR
+    bicycle:backward=use_sidepath: RU:Tag:bicycle:backward=use sidepath
+    bicycle:forward=use_sidepath: RU:Tag:bicycle:forward=use sidepath
     bicycle=designated: RU:Tag:bicycle=designated
+    bicycle=dismount: RU:Tag:bicycle=dismount
+    bicycle=no: RU:Tag:bicycle=no
+    bicycle=permissive: RU:Tag:bicycle=permissive
+    bicycle=use_sidepath: RU:Tag:bicycle=use sidepath
     bicycle=yes: RU:Tag:bicycle=yes
     board_type=board: RU:Tag:board type=board
     boat:rental=yes: RU:Tag:boat:rental=yes
+    border_zone=5km_zone: RU:Tag:border zone=5km zone
     boundary=administrative: RU:Tag:boundary=administrative
+    boundary=border_zone: RU:Tag:boundary=border zone
     boundary=forest_compartment: RU:Tag:boundary=forest compartment
-    boundary=forestry_compartment: RU:Tag:boundary=forestry compartment
     boundary=place: RU:Tag:boundary=place
     boundary=postal_code: RU:Tag:boundary=postal code
     boundary=protected_area: RU:Tag:boundary=protected area
+    boundary=water_protection_area: RU:Tag:boundary=water protection area
     bridge:movable=bascule: RU:Tag:bridge:movable=bascule
     bridge:movable=drawbridge: RU:Tag:bridge:movable=drawbridge
     bridge:movable=lift: RU:Tag:bridge:movable=lift
+    bridge:movable=retractable: RU:Tag:bridge:movable=retractable
     bridge:movable=submersible: RU:Tag:bridge:movable=submersible
     bridge:movable=swing: RU:Tag:bridge:movable=swing
+    bridge:movable=tilt: RU:Tag:bridge:movable=tilt
     bridge:movable=transporter: RU:Tag:bridge:movable=transporter
     bridge:structure=arch: RU:Tag:bridge:structure=arch
     bridge:structure=beam: RU:Tag:bridge:structure=beam
     bridge:structure=cable-stayed: RU:Tag:bridge:structure=cable-stayed
+    bridge:structure=floating: RU:Tag:bridge:structure=floating
     bridge:structure=humpback: RU:Tag:bridge:structure=humpback
+    bridge:structure=simple-suspension: RU:Tag:bridge:structure=simple-suspension
     bridge:structure=suspension: RU:Tag:bridge:structure=suspension
+    bridge:structure=truss: RU:Tag:bridge:structure=truss
+    bridge:support=abutment: RU:Tag:bridge:support=abutment
+    bridge:support=lift_pier: RU:Tag:bridge:support=lift pier
+    bridge:support=pier: RU:Tag:bridge:support=pier
+    bridge:support=pivot_pier: RU:Tag:bridge:support=pivot pier
+    bridge:support=pylon: RU:Tag:bridge:support=pylon
     bridge=aqueduct: RU:Tag:bridge=aqueduct
+    bridge=boardwalk: RU:Tag:bridge=boardwalk
     bridge=cantilever: RU:Tag:bridge=cantilever
     bridge=covered: RU:Tag:bridge=covered
+    bridge=drawbridge: RU:Tag:bridge=drawbridge
+    bridge=movable: RU:Tag:bridge=movable
+    bridge=simple_brunnel: RU:Tag:bridge=simple brunnel
+    bridge=trestle: RU:Tag:bridge=trestle
+    bridge=viaduct: RU:Tag:bridge=viaduct
+    building:prefabricated=yes: RU:Tag:building:prefabricated=yes
     building=*: RU:Tag:building=*
     building=Y: RU:Tag:building=Y
     building=abandoned: RU:Tag:building=abandoned
@@ -22056,6 +24978,7 @@ ru:
     building=bakehouse: RU:Tag:building=bakehouse
     building=barn: RU:Tag:building=barn
     building=barracks: RU:Tag:building=barracks
+    building=beach_hut: RU:Tag:building=beach hut
     building=boathouse: RU:Tag:building=boathouse
     building=brewery: RU:Tag:building=brewery
     building=bridge: RU:Tag:building=bridge
@@ -22079,6 +25002,7 @@ ru:
     building=container: RU:Tag:building=container
     building=convent: RU:Tag:building=convent
     building=cowshed: RU:Tag:building=cowshed
+    building=data_center: RU:Tag:building=data center
     building=demountable: RU:Tag:building=demountable
     building=detached: RU:Tag:building=detached
     building=digester: RU:Tag:building=digester
@@ -22088,6 +25012,7 @@ ru:
     building=factory: RU:Tag:building=factory
     building=farm: RU:Tag:building=farm
     building=farm_auxiliary: RU:Tag:building=farm auxiliary
+    building=fire_lookout: RU:Tag:building=fire lookout
     building=fire_station: RU:Tag:building=fire station
     building=font: RU:Tag:building=font
     building=fort: RU:Tag:building=fort
@@ -22120,6 +25045,7 @@ ru:
     building=palace: RU:Tag:building=palace
     building=parking: RU:Tag:building=parking
     building=pavilion: RU:Tag:building=pavilion
+    building=porch: RU:Tag:building=porch
     building=presbytery: RU:Tag:building=presbytery
     building=proposed: RU:Tag:building=proposed
     building=public: RU:Tag:building=public
@@ -22166,14 +25092,17 @@ ru:
     building=warehouse: RU:Tag:building=warehouse
     building=water_tower: RU:Tag:building=water tower
     building=wayside_shrine: RU:Tag:building=wayside shrine
+    building=windmill: RU:Tag:building=windmill
     building=yes: RU:Tag:building=yes
     bunker_type=pillbox: RU:Tag:bunker type=pillbox
     cafe=time-cafe: RU:Tag:cafe=time-cafe
     cafe=time_cafe: RU:Tag:cafe=time cafe
     camp_site=basic: RU:Tag:camp site=basic
+    camp_site=camp_pitch: RU:Tag:camp site=camp pitch
     camp_site=deluxe: RU:Tag:camp site=deluxe
     camp_site=serviced: RU:Tag:camp site=serviced
     camp_site=standard: RU:Tag:camp site=standard
+    castle_type=castrum: RU:Tag:castle type=castrum
     castle_type=defensive: RU:Tag:castle type=defensive
     castle_type=fortress: RU:Tag:castle type=fortress
     castle_type=kremlin: RU:Tag:castle type=kremlin
@@ -22183,11 +25112,16 @@ ru:
     castle_type=stately: RU:Tag:castle type=stately
     cemetery=grave: RU:Tag:cemetery=grave
     cemetery=sector: RU:Tag:cemetery=sector
+    cemetery=war_cemetery: RU:Tag:cemetery=war cemetery
+    clothes=women;men;children: RU:Tag:clothes=women;men;children
+    club=bicycle: RU:Tag:club=bicycle
     club=social: RU:Tag:club=social
     company=aerospace: RU:Tag:company=aerospace
     company=it: RU:Tag:company=it
     company=logistics: RU:Tag:company=logistics
     company=software_development: RU:Tag:company=software development
+    content=slurry: RU:Tag:content=slurry
+    covered=no: RU:Tag:covered=no
     craft=agricultural_engines: RU:Tag:craft=agricultural engines
     craft=bakery: RU:Tag:craft=bakery
     craft=basket_maker: RU:Tag:craft=basket maker
@@ -22216,45 +25150,96 @@ ru:
     craft=winery: RU:Tag:craft=winery
     crop=grape: RU:Tag:crop=grape
     crop=hop: RU:Tag:crop=hop
+    cuisine=kebab: RU:Tag:cuisine=kebab
+    cycle_network=EuroVelo: RU:Tag:cycle network=EuroVelo
+    cycle_network=US: RU:Tag:cycle network=US
+    cycle_network=US:USA: RU:Tag:cycle network=US:USA
+    cycleway:both=lane: RU:Tag:cycleway:both=lane
+    cycleway:both=no: RU:Tag:cycleway:both=no
+    cycleway:foot=designated: RU:Tag:cycleway:foot=designated
+    cycleway:foot=no: RU:Tag:cycleway:foot=no
     cycleway:left=lane: RU:Tag:cycleway:left=lane
+    cycleway:left=no: RU:Tag:cycleway:left=no
+    cycleway:left=opposite_lane: RU:Tag:cycleway:left=opposite lane
     cycleway:left=share_busway: RU:Tag:cycleway:left=share busway
+    cycleway:left=track: RU:Tag:cycleway:left=track
     cycleway:right=lane: RU:Tag:cycleway:right=lane
+    cycleway:right=no: RU:Tag:cycleway:right=no
+    cycleway:right=opposite_lane: RU:Tag:cycleway:right=opposite lane
     cycleway:right=share_busway: RU:Tag:cycleway:right=share busway
+    cycleway:right=shared_lane: RU:Tag:cycleway:right=shared lane
+    cycleway:right=track: RU:Tag:cycleway:right=track
+    cycleway=asl: RU:Tag:cycleway=asl
+    cycleway=bike_box: RU:Tag:cycleway=bike box
+    cycleway=lane: RU:Tag:cycleway=lane
+    cycleway=no: RU:Tag:cycleway=no
+    cycleway=opposite: RU:Tag:cycleway=opposite
     cycleway=opposite_lane: RU:Tag:cycleway=opposite lane
+    cycleway=opposite_track: RU:Tag:cycleway=opposite track
+    cycleway=separate: RU:Tag:cycleway=separate
     cycleway=share_busway: RU:Tag:cycleway=share busway
+    cycleway=shared_lane: RU:Tag:cycleway=shared lane
+    cycleway=sidepath: RU:Tag:cycleway=sidepath
+    cycleway=track: RU:Tag:cycleway=track
+    defensive=bergfried: RU:Tag:defensive=bergfried
+    defensive=donjon: RU:Tag:defensive=donjon
+    defensive=keep: RU:Tag:defensive=keep
+    diplomatic=consulate_general: RU:Tag:diplomatic=consulate general
+    dog=designated: RU:Tag:dog=designated
     dog=leashed: RU:Tag:dog=leashed
     dog=no: RU:Tag:dog=no
     dog=unleashed: RU:Tag:dog=unleashed
     dog=yes: RU:Tag:dog=yes
+    drain=disperse: RU:Tag:drain=disperse
+    drain=no: RU:Tag:drain=no
+    education=centre: RU:Tag:education=centre
+    education=exercise_area: RU:Tag:education=exercise area
+    education=school: RU:Tag:education=school
     emergency=ambulance_station: RU:Tag:emergency=ambulance station
+    emergency=emergency_ward_entrance: RU:Tag:emergency=emergency ward entrance
     emergency=fire_extinguisher: RU:Tag:emergency=fire extinguisher
     emergency=fire_hose: RU:Tag:emergency=fire hose
     emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
     emergency=fire_water_pond: RU:Tag:emergency=fire water pond
+    emergency=landing_site: RU:Tag:emergency=landing site
     emergency=phone: RU:Tag:emergency=phone
     emergency=suction_point: RU:Tag:emergency=suction point
     emergency=water_tank: RU:Tag:emergency=water tank
     entrance=garage: RU:Tag:entrance=garage
     entrance=staircase: RU:Tag:entrance=staircase
+    entrance=yes: RU:Tag:entrance=yes
+    faculty=aerospace: RU:Tag:faculty=aerospace
+    faculty=engineering: RU:Tag:faculty=engineering
     fast_food=cafeteria: RU:Tag:fast food=cafeteria
     foot=designated: RU:Tag:foot=designated
+    foot=destination: RU:Tag:foot=destination
+    foot=permissive: RU:Tag:foot=permissive
     foot=yes: RU:Tag:foot=yes
     footway=access_aisle: RU:Tag:footway=access aisle
     footway=crossing: RU:Tag:footway=crossing
     footway=sidewalk: RU:Tag:footway=sidewalk
     footway=traffic_island: RU:Tag:footway=traffic island
     ford=yes: RU:Tag:ford=yes
+    fortification_type=hill_fort: RU:Tag:fortification type=hill fort
+    fortification_type=limes: RU:Tag:fortification type=limes
+    fortification_type=ring_ditch: RU:Tag:fortification type=ring ditch
+    fortification_type=ringfort: RU:Tag:fortification type=ringfort
+    fortification_type=sconce: RU:Tag:fortification type=sconce
     generator:method=anaerobic_digestion: RU:Tag:generator:method=anaerobic digestion
     generator:source=hydro: RU:Tag:generator:source=hydro
     generator:type=boiler: RU:Tag:generator:type=boiler
     geological=palaeontological_site: RU:Tag:geological=palaeontological site
+    geological=volcanic_lava_field: RU:Tag:geological=volcanic lava field
+    glideslope=yes: RU:Tag:glideslope=yes
     government=administrative: RU:Tag:government=administrative
     government=aerospace: RU:Tag:government=aerospace
+    government=archive: RU:Tag:government=archive
     government=audit: RU:Tag:government=audit
     government=bailiff: RU:Tag:government=bailiff
     government=border_control: RU:Tag:government=border control
     government=cadaster: RU:Tag:government=cadaster
     government=customs: RU:Tag:government=customs
+    government=data_protection: RU:Tag:government=data protection
     government=education: RU:Tag:government=education
     government=healthcare: RU:Tag:government=healthcare
     government=it: RU:Tag:government=it
@@ -22267,10 +25252,17 @@ ru:
     government=statistics: RU:Tag:government=statistics
     government=tax: RU:Tag:government=tax
     government=youth_welfare_department: RU:Tag:government=youth welfare department
+    hazard=animal_crossing: RU:Tag:hazard=animal crossing
+    hazard=horse_riders: RU:Tag:hazard=horse riders
+    hazard=landslide: RU:Tag:hazard=landslide
+    hazard=leeches: RU:Tag:hazard=leeches
+    hazard=turn: RU:Tag:hazard=turn
     healthcare=blood_donation: RU:Tag:healthcare=blood donation
     healthcare=doctor: RU:Tag:healthcare=doctor
     healthcare=laboratory: RU:Tag:healthcare=laboratory
     healthcare=sample_collection: RU:Tag:healthcare=sample collection
+    healthcare=vaccination_centre: RU:Tag:healthcare=vaccination centre
+    heritage:operator=nrhp: RU:Tag:heritage:operator=nrhp
     highway=bridleway: RU:Tag:highway=bridleway
     highway=bus_guideway: RU:Tag:highway=bus guideway
     highway=bus_stop: RU:Tag:highway=bus stop
@@ -22318,17 +25310,25 @@ ru:
     highway=trunk_link: RU:Tag:highway=trunk link
     highway=turning_circle: RU:Tag:highway=turning circle
     highway=unclassified: RU:Tag:highway=unclassified
+    historic=abandoned: RU:Tag:historic=abandoned
     historic=aircraft: RU:Tag:historic=aircraft
     historic=aqueduct: RU:Tag:historic=aqueduct
     historic=archaeological_site: RU:Tag:historic=archaeological site
     historic=battlefield: RU:Tag:historic=battlefield
+    historic=bomb_crater: RU:Tag:historic=bomb crater
     historic=boundary_stone: RU:Tag:historic=boundary stone
+    historic=building: RU:Tag:historic=building
     historic=cannon: RU:Tag:historic=cannon
     historic=castle: RU:Tag:historic=castle
     historic=castle_wall: RU:Tag:historic=castle wall
+    historic=cemetery: RU:Tag:historic=cemetery
+    historic=charcoal_pile: RU:Tag:historic=charcoal pile
+    historic=church: RU:Tag:historic=church
     historic=city_gate: RU:Tag:historic=city gate
     historic=citywalls: RU:Tag:historic=citywalls
+    historic=district: RU:Tag:historic=district
     historic=farm: RU:Tag:historic=farm
+    historic=flood_mark: RU:Tag:historic=flood mark
     historic=fort: RU:Tag:historic=fort
     historic=gallows: RU:Tag:historic=gallows
     historic=heritage: RU:Tag:historic=heritage
@@ -22354,11 +25354,43 @@ ru:
     historic=wayside_cross: RU:Tag:historic=wayside cross
     historic=wayside_shrine: RU:Tag:historic=wayside shrine
     historic=wreck: RU:Tag:historic=wreck
+    historic=yes: RU:Tag:historic=yes
     horse=designated: RU:Tag:horse=designated
     horse=dismount: RU:Tag:horse=dismount
+    industrial=aluminium_smelting: RU:Tag:industrial=aluminium smelting
+    industrial=auto_wrecker: RU:Tag:industrial=auto wrecker
+    industrial=bakery: RU:Tag:industrial=bakery
+    industrial=brewery: RU:Tag:industrial=brewery
+    industrial=brickyard: RU:Tag:industrial=brickyard
+    industrial=communication: RU:Tag:industrial=communication
+    industrial=depot: RU:Tag:industrial=depot
+    industrial=distributor: RU:Tag:industrial=distributor
     industrial=factory: RU:Tag:industrial=factory
+    industrial=fish_farm: RU:Tag:industrial=fish farm
+    industrial=food_industry: RU:Tag:industrial=food industry
+    industrial=food_processing: RU:Tag:industrial=food processing
+    industrial=furniture: RU:Tag:industrial=furniture
+    industrial=grinding_mill: RU:Tag:industrial=grinding mill
+    industrial=heating_station: RU:Tag:industrial=heating station
+    industrial=ice_factory: RU:Tag:industrial=ice factory
+    industrial=integrated_circuit: RU:Tag:industrial=integrated circuit
+    industrial=machine_shop: RU:Tag:industrial=machine shop
+    industrial=mine: RU:Tag:industrial=mine
+    industrial=mobile_equipment: RU:Tag:industrial=mobile equipment
+    industrial=oil: RU:Tag:industrial=oil
+    industrial=oil_mill: RU:Tag:industrial=oil mill
+    industrial=port: RU:Tag:industrial=port
+    industrial=rice_mill: RU:Tag:industrial=rice mill
+    industrial=salt_pond: RU:Tag:industrial=salt pond
+    industrial=sawmill: RU:Tag:industrial=sawmill
+    industrial=scrap_yard: RU:Tag:industrial=scrap yard
+    industrial=shipyard: RU:Tag:industrial=shipyard
+    industrial=slaughterhouse: RU:Tag:industrial=slaughterhouse
+    industrial=steelmaking: RU:Tag:industrial=steelmaking
     industrial=warehouse: RU:Tag:industrial=warehouse
     industrial=well_cluster: RU:Tag:industrial=well cluster
+    industrial=wellsite: RU:Tag:industrial=wellsite
+    industrial=winery: RU:Tag:industrial=winery
     information=audioguide: RU:Tag:information=audioguide
     information=board: RU:Tag:information=board
     information=guidepost: RU:Tag:information=guidepost
@@ -22368,43 +25400,84 @@ ru:
     information=tactile_model: RU:Tag:information=tactile model
     information=terminal: RU:Tag:information=terminal
     information=visitor_centre: RU:Tag:information=visitor centre
+    junction=circular: RU:Tag:junction=circular
     junction=roundabout: RU:Tag:junction=roundabout
+    landcover=grass: RU:Tag:landcover=grass
+    landmark=windsock: RU:Tag:landmark=windsock
+    landuse=agriculture: RU:Tag:landuse=agriculture
     landuse=allotments: RU:Tag:landuse=allotments
     landuse=animal_keeping: RU:Tag:landuse=animal keeping
+    landuse=apiary: RU:Tag:landuse=apiary
+    landuse=aquaculture: RU:Tag:landuse=aquaculture
     landuse=basin: RU:Tag:landuse=basin
     landuse=brownfield: RU:Tag:landuse=brownfield
     landuse=cemetery: RU:Tag:landuse=cemetery
+    landuse=churchyard: RU:Tag:landuse=churchyard
+    landuse=civic_admin: RU:Tag:landuse=civic admin
     landuse=commercial: RU:Tag:landuse=commercial
+    landuse=conservation: RU:Tag:landuse=conservation
     landuse=construction: RU:Tag:landuse=construction
     landuse=depot: RU:Tag:landuse=depot
+    landuse=education: RU:Tag:landuse=education
     landuse=farm: RU:Tag:landuse=farm
     landuse=farmland: RU:Tag:landuse=farmland
+    landuse=farmyard: RU:Tag:landuse=farmyard
+    landuse=field: RU:Tag:landuse=field
+    landuse=fish_pond: RU:Tag:landuse=fish pond
+    landuse=fishfarm: RU:Tag:landuse=fishfarm
     landuse=flowerbed: RU:Tag:landuse=flowerbed
     landuse=forest: RU:Tag:landuse=forest
+    landuse=forestry: RU:Tag:landuse=forestry
     landuse=garages: RU:Tag:landuse=garages
     landuse=grass: RU:Tag:landuse=grass
+    landuse=greenery: RU:Tag:landuse=greenery
+    landuse=greenfield: RU:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: RU:Tag:landuse=greenhouse horticulture
+    landuse=harbour: RU:Tag:landuse=harbour
+    landuse=highway: RU:Tag:landuse=highway
+    landuse=house: RU:Tag:landuse=house
     landuse=industrial: RU:Tag:landuse=industrial
     landuse=institutional: RU:Tag:landuse=institutional
     landuse=landfill: RU:Tag:landuse=landfill
+    landuse=livestock: RU:Tag:landuse=livestock
     landuse=logging: RU:Tag:landuse=logging
     landuse=meadow: RU:Tag:landuse=meadow
+    landuse=meadow_orchard: RU:Tag:landuse=meadow orchard
     landuse=military: RU:Tag:landuse=military
+    landuse=observatory: RU:Tag:landuse=observatory
     landuse=orchard: RU:Tag:landuse=orchard
     landuse=peat_cutting: RU:Tag:landuse=peat cutting
     landuse=plant_nursery: RU:Tag:landuse=plant nursery
+    landuse=plantation: RU:Tag:landuse=plantation
     landuse=pond: RU:Tag:landuse=pond
     landuse=port: RU:Tag:landuse=port
+    landuse=prison: RU:Tag:landuse=prison
+    landuse=public_works: RU:Tag:landuse=public works
     landuse=quarry: RU:Tag:landuse=quarry
+    landuse=radio: RU:Tag:landuse=radio
     landuse=railway: RU:Tag:landuse=railway
     landuse=recreation_ground: RU:Tag:landuse=recreation ground
+    landuse=religious: RU:Tag:landuse=religious
+    landuse=research: RU:Tag:landuse=research
     landuse=reservoir: RU:Tag:landuse=reservoir
+    landuse=reservoir_watershed: RU:Tag:landuse=reservoir watershed
     landuse=residential: RU:Tag:landuse=residential
     landuse=retail: RU:Tag:landuse=retail
     landuse=salt_pond: RU:Tag:landuse=salt pond
+    landuse=school: RU:Tag:landuse=school
+    landuse=shrubs: RU:Tag:landuse=shrubs
+    landuse=street: RU:Tag:landuse=street
+    landuse=traffic_island: RU:Tag:landuse=traffic island
+    landuse=trees: RU:Tag:landuse=trees
     landuse=turbary: RU:Tag:landuse=turbary
     landuse=village_green: RU:Tag:landuse=village green
     landuse=vineyard: RU:Tag:landuse=vineyard
+    landuse=well: RU:Tag:landuse=well
+    landuse=wellsite: RU:Tag:landuse=wellsite
+    landuse=wholesale: RU:Tag:landuse=wholesale
+    landuse=winter_sports: RU:Tag:landuse=winter sports
+    landuse=wood: RU:Tag:landuse=wood
+    landuse=yes: RU:Tag:landuse=yes
     leaf_cycle=deciduous: RU:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: RU:Tag:leaf cycle=evergreen
     leaf_cycle=mixed: RU:Tag:leaf cycle=mixed
@@ -22412,27 +25485,43 @@ ru:
     leaf_type=leafless: RU:Tag:leaf type=leafless
     leaf_type=mixed: RU:Tag:leaf type=mixed
     leaf_type=needleleaved: RU:Tag:leaf type=needleleaved
+    leisure=adult_gaming_centre: RU:Tag:leisure=adult gaming centre
+    leisure=amusement_arcade: RU:Tag:leisure=amusement arcade
+    leisure=arena: RU:Tag:leisure=arena
+    leisure=axe_throwing: RU:Tag:leisure=axe throwing
     leisure=bandstand: RU:Tag:leisure=bandstand
+    leisure=bbq: RU:Tag:leisure=bbq
+    leisure=beach: RU:Tag:leisure=beach
     leisure=beach_resort: RU:Tag:leisure=beach resort
     leisure=bird_hide: RU:Tag:leisure=bird hide
+    leisure=bleachers: RU:Tag:leisure=bleachers
+    leisure=bowling_alley: RU:Tag:leisure=bowling alley
+    leisure=casino: RU:Tag:leisure=casino
+    leisure=club: RU:Tag:leisure=club
     leisure=common: RU:Tag:leisure=common
     leisure=dance: RU:Tag:leisure=dance
+    leisure=disc_golf_course: RU:Tag:leisure=disc golf course
     leisure=dog_park: RU:Tag:leisure=dog park
     leisure=escape_game: RU:Tag:leisure=escape game
     leisure=firepit: RU:Tag:leisure=firepit
     leisure=fishing: RU:Tag:leisure=fishing
     leisure=fitness_centre: RU:Tag:leisure=fitness centre
     leisure=fitness_station: RU:Tag:leisure=fitness station
+    leisure=gambling: RU:Tag:leisure=gambling
     leisure=garden: RU:Tag:leisure=garden
     leisure=hackerspace: RU:Tag:leisure=hackerspace
     leisure=horse_riding: RU:Tag:leisure=horse riding
+    leisure=hot_spring: RU:Tag:leisure=hot spring
     leisure=ice_rink: RU:Tag:leisure=ice rink
+    leisure=indoor_play: RU:Tag:leisure=indoor play
     leisure=marina: RU:Tag:leisure=marina
     leisure=miniature_golf: RU:Tag:leisure=miniature golf
     leisure=park: RU:Tag:leisure=park
     leisure=pitch: RU:Tag:leisure=pitch
     leisure=playground: RU:Tag:leisure=playground
     leisure=resort: RU:Tag:leisure=resort
+    leisure=schoolyard: RU:Tag:leisure=schoolyard
+    leisure=ski_playground: RU:Tag:leisure=ski playground
     leisure=slipway: RU:Tag:leisure=slipway
     leisure=sports_centre: RU:Tag:leisure=sports centre
     leisure=sports_hall: RU:Tag:leisure=sports hall
@@ -22440,14 +25529,18 @@ ru:
     leisure=summer_camp: RU:Tag:leisure=summer camp
     leisure=swimming_pool: RU:Tag:leisure=swimming pool
     leisure=track: RU:Tag:leisure=track
+    leisure=video_arcade: RU:Tag:leisure=video arcade
     leisure=water_park: RU:Tag:leisure=water park
     leisure=wildlife_hide: RU:Tag:leisure=wildlife hide
+    localizer=yes: RU:Tag:localizer=yes
     location=overground: RU:Tag:location=overground
     location=overhead: RU:Tag:location=overhead
     location=underground: RU:Tag:location=underground
     location=underwater: RU:Tag:location=underwater
+    logistics=aerospace: RU:Tag:logistics=aerospace
     man_made=adit: RU:Tag:man made=adit
     man_made=animal_trap: RU:Tag:man made=animal trap
+    man_made=archimedes_screw: RU:Tag:man made=archimedes screw
     man_made=architecture_line: RU:Tag:man made=architecture line
     man_made=beacon: RU:Tag:man made=beacon
     man_made=beehive: RU:Tag:man made=beehive
@@ -22469,8 +25562,12 @@ ru:
     man_made=embankment: RU:Tag:man made=embankment
     man_made=flagpole: RU:Tag:man made=flagpole
     man_made=flare: RU:Tag:man made=flare
+    man_made=floating_storage: RU:Tag:man made=floating storage
+    man_made=fuel_column: RU:Tag:man made=fuel column
+    man_made=gas_well: RU:Tag:man made=gas well
     man_made=geoglyph: RU:Tag:man made=geoglyph
     man_made=guard_stone: RU:Tag:man made=guard stone
+    man_made=launch_pad: RU:Tag:man made=launch pad
     man_made=lighthouse: RU:Tag:man made=lighthouse
     man_made=mast: RU:Tag:man made=mast
     man_made=mineshaft: RU:Tag:man made=mineshaft
@@ -22479,10 +25576,13 @@ ru:
     man_made=nesting_site: RU:Tag:man made=nesting site
     man_made=obelisk: RU:Tag:man made=obelisk
     man_made=observatory: RU:Tag:man made=observatory
+    man_made=offshore_platform: RU:Tag:man made=offshore platform
+    man_made=oil_well: RU:Tag:man made=oil well
     man_made=petroleum_well: RU:Tag:man made=petroleum well
     man_made=pier: RU:Tag:man made=pier
     man_made=pillar: RU:Tag:man made=pillar
     man_made=pipeline: RU:Tag:man made=pipeline
+    man_made=pumping_rig: RU:Tag:man made=pumping rig
     man_made=pumping_station: RU:Tag:man made=pumping station
     man_made=reservoir_covered: RU:Tag:man made=reservoir covered
     man_made=silo: RU:Tag:man made=silo
@@ -22493,6 +25593,7 @@ ru:
     man_made=survey_point: RU:Tag:man made=survey point
     man_made=telescope: RU:Tag:man made=telescope
     man_made=tower: RU:Tag:man made=tower
+    man_made=wastewater_basin: RU:Tag:man made=wastewater basin
     man_made=wastewater_plant: RU:Tag:man made=wastewater plant
     man_made=water_tap: RU:Tag:man made=water tap
     man_made=water_tower: RU:Tag:man made=water tower
@@ -22505,15 +25606,26 @@ ru:
     man_made=works: RU:Tag:man made=works
     manhole=drain: RU:Tag:manhole=drain
     maxweight:signed=no: RU:Tag:maxweight:signed=no
+    medical_system:western=yes: RU:Tag:medical system:western=yes
+    memorial=cenotaph: RU:Tag:memorial=cenotaph
+    memorial=flood_mark: RU:Tag:memorial=flood mark
     memorial=ghost_bike: RU:Tag:memorial=ghost bike
+    memorial=obelisk: RU:Tag:memorial=obelisk
     memorial=stele: RU:Tag:memorial=stele
     microbrewery=yes: RU:Tag:microbrewery=yes
     military=airfield: RU:Tag:military=airfield
     military=barracks: RU:Tag:military=barracks
     military=bunker: RU:Tag:military=bunker
     military=checkpoint: RU:Tag:military=checkpoint
+    military=depot: RU:Tag:military=depot
     military=naval_base: RU:Tag:military=naval base
     military=training_area: RU:Tag:military=training area
+    military=trench: RU:Tag:military=trench
+    motorcycle:type=electric: RU:Tag:motorcycle:type=electric
+    motorcycle:type=sportbike: RU:Tag:motorcycle:type=sportbike
+    museum=aerospace: RU:Tag:museum=aerospace
+    museum=agriculture: RU:Tag:museum=agriculture
+    museum=aviation: RU:Tag:museum=aviation
     name=Продукты: RU:Tag:name=Продукты
     natural=arete: RU:Tag:natural=arete
     natural=bare_rock: RU:Tag:natural=bare rock
@@ -22548,6 +25660,9 @@ ru:
     natural=water: RU:Tag:natural=water
     natural=wetland: RU:Tag:natural=wetland
     natural=wood: RU:Tag:natural=wood
+    navigationaid=als: RU:Tag:navigationaid=als
+    navigationaid=papi: RU:Tag:navigationaid=papi
+    navigationaid=vasi: RU:Tag:navigationaid=vasi
     network=lhn: RU:Tag:network=lhn
     network=rhn: RU:Tag:network=rhn
     noname=yes: RU:Tag:noname=yes
@@ -22594,6 +25709,7 @@ ru:
     office=occupational_safety: RU:Tag:office=occupational safety
     office=parish: RU:Tag:office=parish
     office=political_party: RU:Tag:office=political party
+    office=politician: RU:Tag:office=politician
     office=private_investigator: RU:Tag:office=private investigator
     office=property_management: RU:Tag:office=property management
     office=publisher: RU:Tag:office=publisher
@@ -22617,8 +25733,12 @@ ru:
     office=visa: RU:Tag:office=visa
     office=water_utility: RU:Tag:office=water utility
     office=yes: RU:Tag:office=yes
+    oneway:bicycle=yes: RU:Tag:oneway:bicycle=yes
     oneway:moped=no: RU:Tag:oneway:moped=no
+    oneway=alternating: RU:Tag:oneway=alternating
+    oneway=reversible: RU:Tag:oneway=reversible
     opening_hours=24/7: RU:Tag:opening hours=24/7
+    outlet=direct: RU:Tag:outlet=direct
     overtaking=backward: RU:Tag:overtaking=backward
     overtaking=both: RU:Tag:overtaking=both
     overtaking=forward: RU:Tag:overtaking=forward
@@ -22631,8 +25751,11 @@ ru:
     parking=street_side: RU:Tag:parking=street side
     parking=surface: RU:Tag:parking=surface
     parking=underground: RU:Tag:parking=underground
+    path=sidewalk: RU:Tag:path=sidewalk
     pipeline=marker: RU:Tag:pipeline=marker
     pipeline=substation: RU:Tag:pipeline=substation
+    pipeline=surge_tank: RU:Tag:pipeline=surge tank
+    pipeline=valve: RU:Tag:pipeline=valve
     place=allotments: RU:Tag:place=allotments
     place=archipelago: RU:Tag:place=archipelago
     place=city: RU:Tag:place=city
@@ -22642,14 +25765,29 @@ ru:
     place=isolated_dwelling: RU:Tag:place=isolated dwelling
     place=locality: RU:Tag:place=locality
     place=neighbourhood: RU:Tag:place=neighbourhood
+    place=plot: RU:Tag:place=plot
     place=quarter: RU:Tag:place=quarter
     place=square: RU:Tag:place=square
     place=suburb: RU:Tag:place=suburb
     place=town: RU:Tag:place=town
     place=village: RU:Tag:place=village
+    playground=balancebeam: RU:Tag:playground=balancebeam
+    playground=bridge: RU:Tag:playground=bridge
+    playground=climbingframe: RU:Tag:playground=climbingframe
+    playground=climbingwall: RU:Tag:playground=climbingwall
+    playground=funnel_ball: RU:Tag:playground=funnel ball
+    playground=hopscotch: RU:Tag:playground=hopscotch
+    playground=horizontal_bar: RU:Tag:playground=horizontal bar
+    playground=map: RU:Tag:playground=map
+    playground=playhouse: RU:Tag:playground=playhouse
+    playground=sandpit: RU:Tag:playground=sandpit
+    playground=sledding: RU:Tag:playground=sledding
     playground=slide: RU:Tag:playground=slide
     playground=structure: RU:Tag:playground=structure
+    playground=teenshelter: RU:Tag:playground=teenshelter
+    playground=youth_bench: RU:Tag:playground=youth bench
     police=barracks: RU:Tag:police=barracks
+    police=car_pound: RU:Tag:police=car pound
     power=compensator: RU:Tag:power=compensator
     power=generator: RU:Tag:power=generator
     power=heliostat: RU:Tag:power=heliostat
@@ -22662,13 +25800,28 @@ ru:
     power=substation: RU:Tag:power=substation
     power=tower: RU:Tag:power=tower
     power=transformer: RU:Tag:power=transformer
+    product=beer: RU:Tag:product=beer
+    product=bricks: RU:Tag:product=bricks
+    product=concrete: RU:Tag:product=concrete
+    product=electronics: RU:Tag:product=electronics
+    product=food: RU:Tag:product=food
+    product=furniture: RU:Tag:product=furniture
+    product=machinery: RU:Tag:product=machinery
+    product=oil: RU:Tag:product=oil
+    product=packaging: RU:Tag:product=packaging
+    product=rice: RU:Tag:product=rice
+    product=steel: RU:Tag:product=steel
+    product=sugar: RU:Tag:product=sugar
     public_transport=platform: RU:Tag:public transport=platform
     public_transport=station: RU:Tag:public transport=station
     public_transport=stop_position: RU:Tag:public transport=stop position
+    pump=manual: RU:Tag:pump=manual
+    pump=no: RU:Tag:pump=no
     pump=powered: RU:Tag:pump=powered
     railway=abandoned: RU:Tag:railway=abandoned
     railway=crossing: RU:Tag:railway=crossing
     railway=disused: RU:Tag:railway=disused
+    railway=halt: RU:Tag:railway=halt
     railway=level_crossing: RU:Tag:railway=level crossing
     railway=light_rail: RU:Tag:railway=light rail
     railway=miniature: RU:Tag:railway=miniature
@@ -22677,25 +25830,45 @@ ru:
     railway=rail: RU:Tag:railway=rail
     railway=railway_crossing: RU:Tag:railway=railway crossing
     railway=roundhouse: RU:Tag:railway=roundhouse
+    railway=signal_box: RU:Tag:railway=signal box
     railway=station: RU:Tag:railway=station
+    railway=stop: RU:Tag:railway=stop
     railway=subway: RU:Tag:railway=subway
     railway=subway_entrance: RU:Tag:railway=subway entrance
     railway=tram: RU:Tag:railway=tram
     railway=turntable: RU:Tag:railway=turntable
+    railway=wash: RU:Tag:railway=wash
+    recycling_type=centre: RU:Tag:recycling type=centre
     religion=pagan: RU:Tag:religion=pagan
     religion=zoroastrian: RU:Tag:religion=zoroastrian
+    rental=quadracycle: RU:Tag:rental=quadracycle
+    rental=ski: RU:Tag:rental=ski
     request_stop=yes: RU:Tag:request stop=yes
+    research=aerospace: RU:Tag:research=aerospace
     residential=apartments: RU:Tag:residential=apartments
+    residential=condominium: RU:Tag:residential=condominium
+    residential=halting_site: RU:Tag:residential=halting site
     residential=rural: RU:Tag:residential=rural
+    residential=trailer_park: RU:Tag:residential=trailer park
+    residential=university: RU:Tag:residential=university
     residential=urban: RU:Tag:residential=urban
+    route=bicycle: RU:Tag:route=bicycle
     route=bus: RU:Tag:route=bus
     route=ferry: RU:Tag:route=ferry
+    route=hiking: RU:Tag:route=hiking
     route=horse: RU:Tag:route=horse
+    route=mtb: RU:Tag:route=mtb
     route=railway: RU:Tag:route=railway
     route=share_taxi: RU:Tag:route=share taxi
     route=train: RU:Tag:route=train
     route=tram: RU:Tag:route=tram
     route=transhumance: RU:Tag:route=transhumance
+    school=entrance: RU:Tag:school=entrance
+    seamark:wreck:category=dangerous: RU:Tag:seamark:wreck:category=dangerous
+    seamark:wreck:category=hull_showing: RU:Tag:seamark:wreck:category=hull showing
+    seamark:wreck:category=non-dangerous: RU:Tag:seamark:wreck:category=non-dangerous
+    service:vehicle:tyres=yes: RU:Tag:service:vehicle:tyres=yes
+    service=aircraft_control: RU:Tag:service=aircraft control
     service=alley: RU:Tag:service=alley
     service=crossover: RU:Tag:service=crossover
     service=dealer: RU:Tag:service=dealer
@@ -22815,6 +25988,7 @@ ru:
     shop=second_hand: RU:Tag:shop=second hand
     shop=security: RU:Tag:shop=security
     shop=ship_chandler: RU:Tag:shop=ship chandler
+    shop=shoe_repair: RU:Tag:shop=shoe repair
     shop=shoes: RU:Tag:shop=shoes
     shop=spices: RU:Tag:shop=spices
     shop=sports: RU:Tag:shop=sports
@@ -22843,22 +26017,43 @@ ru:
     site_type=fortification: RU:Tag:site type=fortification
     social_facility=group_home: RU:Tag:social facility=group home
     sport=archery: RU:Tag:sport=archery
+    sport=cycling: RU:Tag:sport=cycling
     sport=dog_racing: RU:Tag:sport=dog racing
     sport=equestrian: RU:Tag:sport=equestrian
+    sport=funnel_ball: RU:Tag:sport=funnel ball
     sport=futsal: RU:Tag:sport=futsal
     sport=horse_racing: RU:Tag:sport=horse racing
+    sport=model_aerodrome: RU:Tag:sport=model aerodrome
     sport=motocross: RU:Tag:sport=motocross
     sport=motor: RU:Tag:sport=motor
     sport=scuba_diving: RU:Tag:sport=scuba diving
     sport=shooting: RU:Tag:sport=shooting
+    substance=water: RU:Tag:substance=water
     summit:cross=yes: RU:Tag:summit:cross=yes
+    surface=chipseal: RU:Tag:surface=chipseal
+    surface=compacted: RU:Tag:surface=compacted
+    surface=concrete: RU:Tag:surface=concrete
+    swimming_pool=yes: RU:Tag:swimming pool=yes
     tank_trap=czech_hedgehog: RU:Tag:tank trap=czech hedgehog
+    toll:designated=yes: RU:Tag:toll:designated=yes
     tomb=cenotaph: RU:Tag:tomb=cenotaph
+    tomb=columbarium: RU:Tag:tomb=columbarium
+    tomb=crypt: RU:Tag:tomb=crypt
+    tomb=hypogeum: RU:Tag:tomb=hypogeum
+    tomb=mausoleum: RU:Tag:tomb=mausoleum
+    tomb=pyramid: RU:Tag:tomb=pyramid
+    tomb=rock-cut: RU:Tag:tomb=rock-cut
+    tomb=sarcophagus: RU:Tag:tomb=sarcophagus
+    tomb=table: RU:Tag:tomb=table
+    tomb=tumulus: RU:Tag:tomb=tumulus
+    tomb=vault: RU:Tag:tomb=vault
     tomb=war_grave: RU:Tag:tomb=war grave
+    tourism=alpine_hut: RU:Tag:tourism=alpine hut
     tourism=apartment: RU:Tag:tourism=apartment
     tourism=aquarium: RU:Tag:tourism=aquarium
     tourism=artwork: RU:Tag:tourism=artwork
     tourism=attraction: RU:Tag:tourism=attraction
+    tourism=bed_and_breakfast: RU:Tag:tourism=bed and breakfast
     tourism=camp_pitch: RU:Tag:tourism=camp pitch
     tourism=camp_site: RU:Tag:tourism=camp site
     tourism=caravan_site: RU:Tag:tourism=caravan site
@@ -22871,27 +26066,51 @@ ru:
     tourism=motel: RU:Tag:tourism=motel
     tourism=museum: RU:Tag:tourism=museum
     tourism=picnic_site: RU:Tag:tourism=picnic site
+    tourism=resort: RU:Tag:tourism=resort
     tourism=theme_park: RU:Tag:tourism=theme park
     tourism=trail_riding_rest: RU:Tag:tourism=trail riding rest
     tourism=trail_riding_station: RU:Tag:tourism=trail riding station
     tourism=viewpoint: RU:Tag:tourism=viewpoint
     tourism=wilderness_hut: RU:Tag:tourism=wilderness hut
+    tourism=wine_cellar: RU:Tag:tourism=wine cellar
     tourism=yes: RU:Tag:tourism=yes
     tourism=zoo: RU:Tag:tourism=zoo
     tower:type=bell_tower: RU:Tag:tower:type=bell tower
     tower:type=cooling: RU:Tag:tower:type=cooling
+    tower:type=defensive: RU:Tag:tower:type=defensive
     tower:type=lighting: RU:Tag:tower:type=lighting
     trade=wood: RU:Tag:trade=wood
     traffic_calming=hump: RU:Tag:traffic calming=hump
     traffic_calming=table: RU:Tag:traffic calming=table
+    traffic_sign=NL:L51: RU:Tag:traffic sign=NL:L51
     traffic_sign=city_limit: RU:Tag:traffic sign=city limit
     tunnel=building_passage: RU:Tag:tunnel=building passage
     tunnel=culvert: RU:Tag:tunnel=culvert
+    type=health: RU:Tag:type=health
     type=site: RU:Tag:type=site
     type=waterway: RU:Tag:type=waterway
+    usage=facility: RU:Tag:usage=facility
+    usage=flare_header: RU:Tag:usage=flare header
+    usage=flowline: RU:Tag:usage=flowline
+    usage=gathering: RU:Tag:usage=gathering
+    usage=injection: RU:Tag:usage=injection
+    usage=penstock: RU:Tag:usage=penstock
+    usage=spillway: RU:Tag:usage=spillway
+    vehicle=no: RU:Tag:vehicle=no
+    vending=bicycle_tube: RU:Tag:vending=bicycle tube
     vending=excrement_bags: RU:Tag:vending=excrement bags
     vending=parcel_pickup: RU:Tag:vending=parcel pickup
     vending=parking_tickets: RU:Tag:vending=parking tickets
+    wall=noise_barrier: RU:Tag:wall=noise barrier
+    waste=cigarettes: RU:Tag:waste=cigarettes
+    waste=dog_excrement: RU:Tag:waste=dog excrement
+    waste=drugs: RU:Tag:waste=drugs
+    waste=oil: RU:Tag:waste=oil
+    waste=organic: RU:Tag:waste=organic
+    waste=pizza_box: RU:Tag:waste=pizza box
+    waste=rubble: RU:Tag:waste=rubble
+    waste=sharps: RU:Tag:waste=sharps
+    waste=trash: RU:Tag:waste=trash
     water=basin: RU:Tag:water=basin
     water=canal: RU:Tag:water=canal
     water=ditch: RU:Tag:water=ditch
@@ -22922,18 +26141,26 @@ ru:
     waterway=dock: RU:Tag:waterway=dock
     waterway=drain: RU:Tag:waterway=drain
     waterway=drystream: RU:Tag:waterway=drystream
+    waterway=fairway: RU:Tag:waterway=fairway
     waterway=fish_pass: RU:Tag:waterway=fish pass
     waterway=lock_gate: RU:Tag:waterway=lock gate
+    waterway=offshore_field: RU:Tag:waterway=offshore field
     waterway=rapids: RU:Tag:waterway=rapids
     waterway=river: RU:Tag:waterway=river
     waterway=riverbank: RU:Tag:waterway=riverbank
+    waterway=spillway: RU:Tag:waterway=spillway
     waterway=stream: RU:Tag:waterway=stream
     waterway=turning_point: RU:Tag:waterway=turning point
+    waterway=water_point: RU:Tag:waterway=water point
     waterway=waterfall: RU:Tag:waterway=waterfall
     waterway=weir: RU:Tag:waterway=weir
     wood=coniferous: RU:Tag:wood=coniferous
     wood=mixed: RU:Tag:wood=mixed
+    zoo=aviary: RU:Tag:zoo=aviary
+    zoo=birds: RU:Tag:zoo=birds
+    zoo=butterfly: RU:Tag:zoo=butterfly
     zoo=enclosure: RU:Tag:zoo=enclosure
+    zoo=falconry: RU:Tag:zoo=falconry
     zoo=petting_zoo: RU:Tag:zoo=petting zoo
     zoo=reptile: RU:Tag:zoo=reptile
     zoo=safari_park: RU:Tag:zoo=safari park
@@ -22953,6 +26180,14 @@ sk:
 sq:
   key:
     highway: Sq:Key:highway
+sr:
+  key:
+    ref:RS:grad: Sr:Key:ref:RS:grad
+    ref:RS:naselje: Sr:Key:ref:RS:naselje
+    ref:RS:okrug: Sr:Key:ref:RS:okrug
+    ref:RS:opstina: Sr:Key:ref:RS:opstina
+    ref:RS:pokrajina: Sr:Key:ref:RS:pokrajina
+    ref:sr:maticni_broj: Sr:Key:ref:sr:maticni broj
 sv:
   key:
     access: Sv:Key:access
@@ -22974,6 +26209,9 @@ sv:
 talk:
   key:
     real_fire: Talk:Key:real fire
+tl:
+  tag:
+    fast_food=cafeteria: Tl:Tag:fast food=cafeteria
 tr:
   key:
     amenity: Tr:Key:amenity
@@ -22993,6 +26231,7 @@ tr:
     highway=trunk: Tr:Tag:highway=trunk
 uk:
   key:
+    abandoned:building: Uk:Key:abandoned:building
     abutters: Uk:Key:abutters
     access: Uk:Key:access
     addr: Uk:Key:addr
@@ -23032,10 +26271,12 @@ uk:
     bicycle_parking: Uk:Key:bicycle parking
     border_type: Uk:Key:border type
     boundary: Uk:Key:boundary
+    brand: Uk:Key:brand
     bridge: Uk:Key:bridge
     building: Uk:Key:building
     building:levels: Uk:Key:building:levels
     capital: Uk:Key:capital
+    cemetery: Uk:Key:cemetery
     colonnade: Uk:Key:colonnade
     comment: Uk:Key:comment
     covered: Uk:Key:covered
@@ -23043,10 +26284,12 @@ uk:
     crane:type: Uk:Key:crane:type
     crossing: Uk:Key:crossing
     cutting: Uk:Key:cutting
+    'damage:': 'Uk:Key:damage:'
     date: Uk:Key:date
     denotation: Uk:Key:denotation
     description: Uk:Key:description
     destination: Uk:Key:destination
+    'destroyed:': 'Uk:Key:destroyed:'
     embankment: Uk:Key:embankment
     emergency: Uk:Key:emergency
     entrance: Uk:Key:entrance
@@ -23084,6 +26327,7 @@ uk:
     name:de: Uk:Key:name:de
     name:el: Uk:Key:name:el
     name:en: Uk:Key:name:en
+    name:etymology: Uk:Key:name:etymology
     name:fr: Uk:Key:name:fr
     name:ja: Uk:Key:name:ja
     name:lg: Uk:Key:name:lg
@@ -23105,6 +26349,7 @@ uk:
     operator: Uk:Key:operator
     park_ride: Uk:Key:park ride
     place: Uk:Key:place
+    placement: Uk:Key:placement
     playground: Uk:Key:playground
     police: Uk:Key:police
     population: Uk:Key:population
@@ -23160,6 +26405,7 @@ uk:
     aeroway=heliport: Uk:Tag:aeroway=heliport
     aeroway=runway: Uk:Tag:aeroway=runway
     aeroway=terminal: Uk:Tag:aeroway=terminal
+    allotments=plot: Uk:Tag:allotments=plot
     amenity=atm: Uk:Tag:amenity=atm
     amenity=bank: Uk:Tag:amenity=bank
     amenity=bench: Uk:Tag:amenity=bench
@@ -23173,6 +26419,7 @@ uk:
     amenity=hospital: Uk:Tag:amenity=hospital
     amenity=kindergarten: Uk:Tag:amenity=kindergarten
     amenity=kiosk: Uk:Tag:amenity=kiosk
+    amenity=parcel_locker: Uk:Tag:amenity=parcel locker
     amenity=park: Uk:Tag:amenity=park
     amenity=parking: Uk:Tag:amenity=parking
     amenity=payment_terminal: Uk:Tag:amenity=payment terminal
@@ -23186,12 +26433,16 @@ uk:
     barrier=retaining_wall: Uk:Tag:barrier=retaining wall
     barrier=wicket_gate: Uk:Tag:barrier=wicket gate
     boundary=administrative: Uk:Tag:boundary=administrative
+    boundary=forest_compartment: Uk:Tag:boundary=forest compartment
     boundary=historic: Uk:Tag:boundary=historic
     boundary=postal_code: Uk:Tag:boundary=postal code
     building=cabin: Uk:Tag:building=cabin
     building=church: Uk:Tag:building=church
     building=commercial: Uk:Tag:building=commercial
+    building=detached: Uk:Tag:building=detached
     building=hospital: Uk:Tag:building=hospital
+    cemetery=grave: Uk:Tag:cemetery=grave
+    cemetery=sector: Uk:Tag:cemetery=sector
     craft=agricultural_engines: Uk:Tag:craft=agricultural engines
     craft=bookbinder: Uk:Tag:craft=bookbinder
     emergency=fire_hydrant: Uk:Tag:emergency=fire hydrant
@@ -23227,6 +26478,7 @@ uk:
     highway=motorway_link: Uk:Tag:highway=motorway link
     highway=path: Uk:Tag:highway=path
     highway=pedestrian: Uk:Tag:highway=pedestrian
+    highway=platform: Uk:Tag:highway=platform
     highway=primary: Uk:Tag:highway=primary
     highway=raceway: Uk:Tag:highway=raceway
     highway=residential: Uk:Tag:highway=residential
@@ -23234,6 +26486,7 @@ uk:
     highway=secondary: Uk:Tag:highway=secondary
     highway=service: Uk:Tag:highway=service
     highway=steps: Uk:Tag:highway=steps
+    highway=street_lamp: Uk:Tag:highway=street lamp
     highway=tertiary: Uk:Tag:highway=tertiary
     highway=track: Uk:Tag:highway=track
     highway=traffic_mirror: Uk:Tag:highway=traffic mirror
@@ -23263,6 +26516,7 @@ uk:
     man_made=embankment: Uk:Tag:man made=embankment
     man_made=pier: Uk:Tag:man made=pier
     man_made=water_well: Uk:Tag:man made=water well
+    museum=children: Uk:Tag:museum=children
     natural=bare_rock: Uk:Tag:natural=bare rock
     natural=birds_nest: Uk:Tag:natural=birds nest
     natural=cliff: Uk:Tag:natural=cliff
@@ -23274,6 +26528,7 @@ uk:
     natural=scrub: Uk:Tag:natural=scrub
     natural=tree: Uk:Tag:natural=tree
     natural=tree_row: Uk:Tag:natural=tree row
+    natural=tree_stump: Uk:Tag:natural=tree stump
     natural=valley: Uk:Tag:natural=valley
     natural=water: Uk:Tag:natural=water
     natural=wood: Uk:Tag:natural=wood
@@ -23282,6 +26537,7 @@ uk:
     office=architect: Uk:Tag:office=architect
     office=company: Uk:Tag:office=company
     office=employment_agency: Uk:Tag:office=employment agency
+    office=energy_supplier: Uk:Tag:office=energy supplier
     office=estate_agent: Uk:Tag:office=estate agent
     office=government: Uk:Tag:office=government
     office=insurance: Uk:Tag:office=insurance
@@ -23335,6 +26591,7 @@ uk:
     shop=antiques: Uk:Tag:shop=antiques
     shop=baby_goods: Uk:Tag:shop=baby goods
     shop=bicycle: Uk:Tag:shop=bicycle
+    shop=games: Uk:Tag:shop=games
     shop=optician: Uk:Tag:shop=optician
     shop=second_hand: Uk:Tag:shop=second hand
     sport=Swimming: Uk:Tag:sport=Swimming
@@ -23348,6 +26605,9 @@ uk:
     waterway=dam: Uk:Tag:waterway=dam
     waterway=riverbank: Uk:Tag:waterway=riverbank
     waterway=weir: Uk:Tag:waterway=weir
+user:
+  key:
+    Community: User:Key:Community
 vi:
   key:
     addr: Vi:Key:addr
@@ -23403,34 +26663,60 @@ yue:
     man_made=gasometer: Yue:Tag:man made=gasometer
     residential=university: Yue:Tag:residential=university
     tourism=attraction: Yue:Tag:tourism=attraction
+zh hans:
+  key:
+    name:etymology: Zh hans:Key:name:etymology
 zh-hans:
   key:
+    abutters: Zh-hans:Key:abutters
     access: Zh-hans:Key:access
     amenity: Zh-hans:Key:amenity
+    attraction: Zh-hans:Key:attraction
     building: Zh-hans:Key:building
     building:part: Zh-hans:Key:building:part
     china_class: Zh-hans:Key:china class
     china_population: Zh-hans:Key:china population
+    construction: Zh-hans:Key:construction
     cuisine: Zh-hans:Key:cuisine
+    cycleway: Zh-hans:Key:cycleway
+    cycleway:both: Zh-hans:Key:cycleway:both
     ele: Zh-hans:Key:ele
     entrance: Zh-hans:Key:entrance
+    exit_to: Zh-hans:Key:exit to
+    fixme:osmchina: Zh-hans:Key:fixme:osmchina
     foot: Zh-hans:Key:foot
+    gauge: Zh-hans:Key:gauge
+    generator:source: Zh-hans:Key:generator:source
+    healthcare: Zh-hans:Key:healthcare
     height: Zh-hans:Key:height
+    highspeed: Zh-hans:Key:highspeed
     highway: Zh-hans:Key:highway
+    informal: Zh-hans:Key:informal
     landuse: Zh-hans:Key:landuse
+    layer: Zh-hans:Key:layer
     leisure: Zh-hans:Key:leisure
+    material: Zh-hans:Key:material
+    military: Zh-hans:Key:military
     motorcycle: Zh-hans:Key:motorcycle
     name: Zh-hans:Key:name
+    name:etymology: Zh-hans:Key:name:etymology
     oneway: Zh-hans:Key:oneway
+    opening_hours:covid19: Zh-hans:Key:opening hours:covid19
     overtaking: Zh-hans:Key:overtaking
+    parking: Zh-hans:Key:parking
     parking:lane: Zh-hans:Key:parking:lane
     place: Zh-hans:Key:place
+    place:CN: Zh-hans:Key:place:CN
+    place:cn: Zh-hans:Key:place:cn
     plant:method: Zh-hans:Key:plant:method
     population: Zh-hans:Key:population
+    power: Zh-hans:Key:power
+    proposed: Zh-hans:Key:proposed
     railway: Zh-hans:Key:railway
     railway:etcs: Zh-hans:Key:railway:etcs
     railway:lzb: Zh-hans:Key:railway:lzb
     ref: Zh-hans:Key:ref
+    removed:building: Zh-hans:Key:removed:building
     residential: Zh-hans:Key:residential
     roof:direction: Zh-hans:Key:roof:direction
     roof:shape: Zh-hans:Key:roof:shape
@@ -23438,55 +26724,121 @@ zh-hans:
     surface: Zh-hans:Key:surface
     toll: Zh-hans:Key:toll
     turn: Zh-hans:Key:turn
+    uic_ref: Zh-hans:Key:uic ref
     waterway: Zh-hans:Key:waterway
     wheelchair: Zh-hans:Key:wheelchair
   tag:
+    admin_level=2: Zh-hans:Tag:admin level=2
     amenity=bar: Zh-hans:Tag:amenity=bar
     amenity=cafe: Zh-hans:Tag:amenity=cafe
+    amenity=crematorium: Zh-hans:Tag:amenity=crematorium
+    amenity=driver_training: Zh-hans:Tag:amenity=driver training
+    amenity=driving_school: Zh-hans:Tag:amenity=driving school
+    amenity=fuel: Zh-hans:Tag:amenity=fuel
+    amenity=grave_yard: Zh-hans:Tag:amenity=grave yard
+    amenity=kindergarten: Zh-hans:Tag:amenity=kindergarten
+    amenity=mortuary: Zh-hans:Tag:amenity=mortuary
+    amenity=parcel_locker: Zh-hans:Tag:amenity=parcel locker
+    amenity=shelter: Zh-hans:Tag:amenity=shelter
     amenity=toilets: Zh-hans:Tag:amenity=toilets
     barrier=toll_booth: Zh-hans:Tag:barrier=toll booth
     barrier=wall: Zh-hans:Tag:barrier=wall
+    books=textbook: Zh-hans:Tag:books=textbook
     boundary=administrative: Zh-hans:Tag:boundary=administrative
     bridge:structure=humpback: Zh-hans:Tag:bridge:structure=humpback
+    building=apartments: Zh-hans:Tag:building=apartments
     building=detached: Zh-hans:Tag:building=detached
+    building=office: Zh-hans:Tag:building=office
+    building=service: Zh-hans:Tag:building=service
+    cemetery=grave: Zh-hans:Tag:cemetery=grave
+    cuisine=hot_pot: Zh-hans:Tag:cuisine=hot pot
     emergency=emergency_ward_entrance: Zh-hans:Tag:emergency=emergency ward entrance
     generator:source=wind: Zh-hans:Tag:generator:source=wind
     highway=bus_stop: Zh-hans:Tag:highway=bus stop
+    highway=cycleway: Zh-hans:Tag:highway=cycleway
+    highway=escape: Zh-hans:Tag:highway=escape
     highway=footway: Zh-hans:Tag:highway=footway
+    highway=living_street: Zh-hans:Tag:highway=living street
+    highway=motorway: Zh-hans:Tag:highway=motorway
+    highway=motorway_junction: Zh-hans:Tag:highway=motorway junction
+    highway=motorway_link: Zh-hans:Tag:highway=motorway link
+    highway=pedestrian: Zh-hans:Tag:highway=pedestrian
+    highway=primary: Zh-hans:Tag:highway=primary
+    highway=primary_link: Zh-hans:Tag:highway=primary link
     highway=residential: Zh-hans:Tag:highway=residential
+    highway=road: Zh-hans:Tag:highway=road
+    highway=secondary: Zh-hans:Tag:highway=secondary
+    highway=secondary_link: Zh-hans:Tag:highway=secondary link
+    highway=service: Zh-hans:Tag:highway=service
+    highway=speed_camera: Zh-hans:Tag:highway=speed camera
     highway=tertiary: Zh-hans:Tag:highway=tertiary
+    highway=tertiary_link: Zh-hans:Tag:highway=tertiary link
     highway=toll_gantry: Zh-hans:Tag:highway=toll gantry
+    highway=track: Zh-hans:Tag:highway=track
     highway=traffic_signals: Zh-hans:Tag:highway=traffic signals
+    highway=trunk: Zh-hans:Tag:highway=trunk
+    highway=trunk_link: Zh-hans:Tag:highway=trunk link
+    highway=unclassified: Zh-hans:Tag:highway=unclassified
     historic=stone: Zh-hans:Tag:historic=stone
     industrial=slaughterhouse: Zh-hans:Tag:industrial=slaughterhouse
+    landuse=allotments: Zh-hans:Tag:landuse=allotments
     landuse=commercial: Zh-hans:Tag:landuse=commercial
+    landuse=construction: Zh-hans:Tag:landuse=construction
     landuse=forest: Zh-hans:Tag:landuse=forest
+    landuse=greenhouse_horticulture: Zh-hans:Tag:landuse=greenhouse horticulture
+    landuse=military: Zh-hans:Tag:landuse=military
+    leisure=nature_reserve: Zh-hans:Tag:leisure=nature reserve
+    line=bay: Zh-hans:Tag:line=bay
+    line=busbar: Zh-hans:Tag:line=busbar
     man_made=antenna: Zh-hans:Tag:man made=antenna
     man_made=dyke: Zh-hans:Tag:man made=dyke
     man_made=flagpole: Zh-hans:Tag:man made=flagpole
     natural=sand: Zh-hans:Tag:natural=sand
+    natural=shrubbery: Zh-hans:Tag:natural=shrubbery
     natural=wood: Zh-hans:Tag:natural=wood
     network=CN:AH: Zh-hans:Tag:network=CN:AH
     network=CN:JS: Zh-hans:Tag:network=CN:JS
     network=CN:expressway: Zh-hans:Tag:network=CN:expressway
     network=CN:national: Zh-hans:Tag:network=CN:national
     office=government: Zh-hans:Tag:office=government
+    office=political_party: Zh-hans:Tag:office=political party
     place=hamlet: Zh-hans:Tag:place=hamlet
+    power=cable: Zh-hans:Tag:power=cable
+    power=catenary_mast: Zh-hans:Tag:power=catenary mast
+    power=compensator: Zh-hans:Tag:power=compensator
+    power=converter: Zh-hans:Tag:power=converter
+    power=generator: Zh-hans:Tag:power=generator
+    power=heliostat: Zh-hans:Tag:power=heliostat
+    power=insulator: Zh-hans:Tag:power=insulator
     power=line: Zh-hans:Tag:power=line
+    power=minor_line: Zh-hans:Tag:power=minor line
+    power=portal: Zh-hans:Tag:power=portal
+    power=substation: Zh-hans:Tag:power=substation
+    power=switch: Zh-hans:Tag:power=switch
+    power=terminal: Zh-hans:Tag:power=terminal
     power=tower: Zh-hans:Tag:power=tower
+    power=transformer: Zh-hans:Tag:power=transformer
+    public_transport=stop_position: Zh-hans:Tag:public transport=stop position
     railway=light_rail: Zh-hans:Tag:railway=light rail
+    railway=monorail: Zh-hans:Tag:railway=monorail
     railway=subway: Zh-hans:Tag:railway=subway
     railway=subway_entrance: Zh-hans:Tag:railway=subway entrance
     railway=traverser: Zh-hans:Tag:railway=traverser
+    railway=yard: Zh-hans:Tag:railway=yard
     route=light_rail: Zh-hans:Tag:route=light rail
+    route=road: Zh-hans:Tag:route=road
     route=subway: Zh-hans:Tag:route=subway
+    service=drive-through: Zh-hans:Tag:service=drive-through
     service=parking_aisle: Zh-hans:Tag:service=parking aisle
+    shop=storage_rental: Zh-hans:Tag:shop=storage rental
     station=light_rail: Zh-hans:Tag:station=light rail
     station=subway: Zh-hans:Tag:station=subway
     substation=transmission: Zh-hans:Tag:substation=transmission
     surface=acrylic: Zh-hans:Tag:surface=acrylic
     surface=artificial_turf: Zh-hans:Tag:surface=artificial turf
     surface=tartan: Zh-hans:Tag:surface=tartan
+    tourism=aquarium: Zh-hans:Tag:tourism=aquarium
+    tourism=attraction: Zh-hans:Tag:tourism=attraction
     vending=ice_cream: Zh-hans:Tag:vending=ice cream
     waterway=river: Zh-hans:Tag:waterway=river
     waterway=weir: Zh-hans:Tag:waterway=weir
@@ -23541,6 +26893,7 @@ zh-hant:
     amenity=toilets: Zh-hant:Tag:amenity=toilets
     barrier=toll_booth: Zh-hant:Tag:barrier=toll booth
     building=roof: Zh-hant:Tag:building=roof
+    healthcare=postpartum_care: Zh-hant:Tag:healthcare=postpartum care
     highway=bus_guideway: Zh-hant:Tag:highway=bus guideway
     highway=bus_stop: Zh-hant:Tag:highway=bus stop
     highway=footway: Zh-hant:Tag:highway=footway
diff --git a/lib/country.rb b/lib/country.rb
index f6f679125..ca547a972 100644
--- a/lib/country.rb
+++ b/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
diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index fd0855fc9..f847ec84e 100644
--- a/lib/nominatim.rb
+++ b/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
diff --git a/script/statistics b/script/statistics
index 05ed637a8..9b27bf08f 100755
--- a/script/statistics
+++ b/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>"
diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 8fa09f4d7..762df6648 100644
--- a/test/models/trace_test.rb
+++ b/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
diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index f539dd739..b9b989c07 100644
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -125,10 +125,27 @@ class IssuesTest < ApplicationSystemTestCase
     check :reassign
     click_on "Add Comment"
 
+    assert_content "and the issue was reassigned"
+    assert_current_path issues_path(:status => "open")
+
     issue.reload
     assert_equal "moderator", issue.assigned_role
   end
 
+  def test_reassign_issue_as_super_user
+    issue = create(:issue)
+    sign_in_as(create(:super_user))
+
+    visit issue_path(issue)
+
+    fill_in :issue_comment_body, :with => "reassigning to moderators"
+    check :reassign
+    click_on "Add Comment"
+
+    assert_content "and the issue was reassigned"
+    assert_current_path issue_path(issue)
+  end
+
   def test_issue_index_with_multiple_roles
     user1 = create(:user)
     user2 = create(:user)
diff --git a/test/system/site_test.rb b/test/system/site_test.rb
index 6dd8550d1..2809feb93 100644
--- a/test/system/site_test.rb
+++ b/test/system/site_test.rb
@@ -38,13 +38,24 @@ class SiteTest < ApplicationSystemTestCase
     tooltip.assert_text "not available"
   end
 
+  test "tooltip shows for query button when zoomed in" do
+    visit "/#map=14/0/0"
+
+    assert_no_selector ".tooltip"
+    button = find ".control-query .control-button"
+    button.hover
+    tooltip = find ".tooltip"
+    tooltip.assert_text "Query features"
+    tooltip.assert_no_text "Zoom in"
+  end
+
   [
     "#edit_tab",
     ".control-note .control-button",
     ".control-query .control-button"
   ].each do |selector|
     test "tooltips on low zoom levels for disabled control '#{selector}'" do
-      visit "/#map=1/1/1"
+      visit "/#map=10/0/0"
 
       assert_no_selector ".tooltip"
       find(selector).hover
diff --git a/yarn.lock b/yarn.lock
index ef80ad034..72312b045 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,14 +2,14 @@
 # yarn lockfile v1
 
 
-"@eslint/eslintrc@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
-  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
+"@eslint/eslintrc@^1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d"
+  integrity sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.2"
+    espree "^9.4.0"
     globals "^13.15.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -17,20 +17,51 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@humanwhocodes/config-array@^0.9.2":
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.2.tgz#68be55c737023009dfc5fe245d51181bb6476914"
-  integrity sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==
+"@humanwhocodes/config-array@^0.10.4":
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.4.tgz#01e7366e57d2ad104feea63e72248f22015c520c"
+  integrity sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
     minimatch "^3.0.4"
 
+"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
+  integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -41,10 +72,10 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.7.1:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+acorn@^8.8.0:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
+  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
 ajv@^6.10.0, ajv@^6.12.4:
   version "6.12.4"
@@ -74,6 +105,11 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -87,6 +123,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 bs-custom-file-input@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/bs-custom-file-input/-/bs-custom-file-input-1.3.4.tgz#c275cb8d4f1c02ba026324292509fa9a747dbda8"
@@ -151,6 +194,13 @@ deep-is@^0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -189,12 +239,14 @@ eslint-visitor-keys@^3.3.0:
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
 eslint@^8.0.0:
-  version "8.20.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.20.0.tgz#048ac56aa18529967da8354a478be4ec0a2bc81b"
-  integrity sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==
-  dependencies:
-    "@eslint/eslintrc" "^1.3.0"
-    "@humanwhocodes/config-array" "^0.9.2"
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040"
+  integrity sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==
+  dependencies:
+    "@eslint/eslintrc" "^1.3.1"
+    "@humanwhocodes/config-array" "^0.10.4"
+    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
+    "@humanwhocodes/module-importer" "^1.0.1"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -204,14 +256,17 @@ eslint@^8.0.0:
     eslint-scope "^7.1.1"
     eslint-utils "^3.0.0"
     eslint-visitor-keys "^3.3.0"
-    espree "^9.3.2"
+    espree "^9.4.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
+    find-up "^5.0.0"
     functional-red-black-tree "^1.0.1"
     glob-parent "^6.0.1"
     globals "^13.15.0"
+    globby "^11.1.0"
+    grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
@@ -227,14 +282,13 @@ eslint@^8.0.0:
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^9.3.2:
-  version "9.3.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596"
-  integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
+espree@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
+  integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
   dependencies:
-    acorn "^8.7.1"
+    acorn "^8.8.0"
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
@@ -272,6 +326,17 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-glob@^3.2.9:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -282,6 +347,13 @@ fast-levenshtein@^2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fastq@^1.6.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+  dependencies:
+    reusify "^1.0.4"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -289,6 +361,21 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -326,6 +413,13 @@ get-intrinsic@^1.0.2:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+glob-parent@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-parent@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
@@ -352,6 +446,23 @@ globals@^13.15.0:
   dependencies:
     type-fest "^0.20.2"
 
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
@@ -405,13 +516,18 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-glob@^4.0.0, is-glob@^4.0.3:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -462,11 +578,31 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+micromatch@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  dependencies:
+    braces "^3.0.2"
+    picomatch "^2.3.1"
+
 minimatch@^3.0.4, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -508,6 +644,20 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -515,6 +665,11 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -525,6 +680,16 @@ path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -542,6 +707,11 @@ qs@^6.9.4:
   dependencies:
     side-channel "^1.0.4"
 
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
 regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
@@ -552,6 +722,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
 rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -559,6 +734,13 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -580,6 +762,11 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -604,6 +791,13 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -623,11 +817,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-v8-compile-cache@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
-  integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
-
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -644,3 +833,8 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==