Merge branch 'master' into moderation

.rubocop.yml

@@ -41,12 +41,18 @@ Naming/FileName:
 Rails/ApplicationRecord:
   Enabled: false
 
+Rails/CreateTableWithTimestamps:
+  Enabled: false
+
 Rails/HasManyOrHasOneDependent:
   Enabled: false
 
 Rails/HttpPositionalArguments:
   Enabled: false
 
+Rails/InverseOf:
+  Enabled: false
+
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'

.rubocop_todo.yml

@@ -55,11 +55,6 @@ Lint/InterpolationCheck:
   Exclude:
     - 'test/controllers/node_controller_test.rb'
 
-# Offense count: 2
-Lint/RescueWithoutErrorClass:
-  Exclude:
-    - 'app/helpers/browse_helper.rb'
-
 # Offense count: 2
 Lint/ShadowingOuterLocalVariable:
   Exclude:
@@ -82,7 +77,7 @@ Metrics/BlockNesting:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1796
+  Max: 1797
 
 # Offense count: 71
 Metrics/CyclomaticComplexity:
@@ -227,3 +222,8 @@ Style/NumericLiterals:
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
   Enabled: false
+
+# Offense count: 2
+Style/RescueStandardError:
+  Exclude:
+    - 'app/helpers/browse_helper.rb'

.travis.yml

@@ -15,6 +15,8 @@ env:
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:
   - cp config/example.application.yml config/application.yml
+  - ruby -C lib/quad_tile extconf.rb
+  - make -C lib/quad_tile
   - psql -U postgres -c "CREATE DATABASE openstreetmap"
   - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap
   - make -C db/functions libpgosm.so

Gemfile

@@ -13,7 +13,7 @@ gem "psych", :platforms => :ruby_20
 gem "json"
 
 # Use postgres as the database
-gem "pg"
+gem "pg", "~> 0.18"
 
 # Use SCSS for stylesheets
 gem "sass-rails", "~> 5.0"
@@ -48,7 +48,7 @@ gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
-gem "paperclip", "~> 4.0"
+gem "paperclip", "~> 5.2"
 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"
 gem "record_tag_helper"

Gemfile.lock

@@ -48,20 +48,20 @@ GEM
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)
     arel (8.0.0)
-    ast (2.3.0)
+    ast (2.4.0)
-    autoprefixer-rails (7.1.6)
+    autoprefixer-rails (8.0.0)
       execjs
     bigdecimal (1.1.0)
     builder (3.2.3)
-    canonical-rails (0.2.1)
+    canonical-rails (0.2.2)
       rails (>= 4.1, < 5.2)
-    capybara (2.16.1)
+    capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      xpath (>= 2.0, < 4.0)
     climate_control (0.2.0)
     cliver (0.3.2)
     cocaine (0.5.8)
@@ -73,8 +73,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    composite_primary_keys (10.0.1)
+    composite_primary_keys (10.0.2)
-      activerecord (~> 5.1.0)
+      activerecord (~> 5.1.0, >= 5.1.4)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
@@ -90,7 +90,7 @@ GEM
     dynamic_form (1.1.4)
     erubi (1.7.0)
     execjs (2.7.0)
-    exifr (1.3.2)
+    exifr (1.3.3)
     factory_bot (4.8.2)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.8.2)
@@ -98,20 +98,20 @@ GEM
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
+    ffi (1.9.21)
     fspath (3.1.0)
     geoip (1.6.3)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     hashdiff (0.3.7)
-    hashie (3.5.6)
+    hashie (3.5.7)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    i18n-js (3.0.2)
+    i18n-js (3.0.4)
       i18n (~> 0.6, >= 0.6.6)
-    image_optim (0.26.0)
+    image_optim (0.26.1)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (~> 1.5)
@@ -138,9 +138,9 @@ GEM
       actionpack
       jsonify (< 0.4.0)
     jwt (1.5.6)
-    kgio (2.11.0)
+    kgio (2.11.2)
     libv8 (3.16.14.19)
-    libxml-ruby (3.0.0)
+    libxml-ruby (3.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -150,7 +150,7 @@ GEM
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store
-    loofah (2.1.1)
+    loofah (2.2.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
@@ -159,17 +159,17 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mimemagic (0.3.0)
+    mimemagic (0.3.2)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
+    minitest (5.11.3)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nio4r (2.1.0)
+    nio4r (2.2.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
-    nokogumbo (1.4.13)
+    nokogumbo (1.5.0)
       nokogiri
     oauth (0.4.7)
     oauth-plugin (0.5.1)
@@ -183,7 +183,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.7.1)
+    omniauth (1.8.1)
       hashie (>= 3.4.6, < 3.6.0)
       rack (>= 1.6.2, < 3)
     omniauth-facebook (4.0.0)
@@ -191,19 +191,18 @@ GEM
     omniauth-github (1.3.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-google-oauth2 (0.5.2)
+    omniauth-google-oauth2 (0.5.3)
-      jwt (~> 1.5)
+      jwt (>= 1.5)
-      multi_json (~> 1.3)
       omniauth (>= 1.1.1)
-      omniauth-oauth2 (>= 1.3.1)
+      omniauth-oauth2 (>= 1.5)
     omniauth-mediawiki (0.0.3)
       jwt (~> 1.0)
       omniauth-oauth (~> 1.0)
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-oauth2 (1.4.0)
+    omniauth-oauth2 (1.5.0)
-      oauth2 (~> 1.0)
+      oauth2 (~> 1.1)
       omniauth (~> 1.2)
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
@@ -212,27 +211,27 @@ GEM
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
-    paperclip (4.3.7)
+    paperclip (5.2.1)
-      activemodel (>= 3.2.0)
+      activemodel (>= 4.2.0)
-      activesupport (>= 3.2.0)
+      activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
-      mimemagic (= 0.3.0)
+      mimemagic (~> 0.3.0)
-    parallel (1.12.0)
+    parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
     pg (0.21.0)
-    poltergeist (1.16.0)
+    poltergeist (1.17.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
     progress (3.4.0)
-    psych (2.2.4)
+    psych (3.0.2)
-    public_suffix (3.0.1)
+    public_suffix (3.0.2)
-    puma (3.11.0)
+    puma (3.11.2)
     r2 (0.2.7)
-    rack (2.0.3)
+    rack (2.0.4)
     rack-cors (1.0.2)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
@@ -270,8 +269,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
+    rainbow (3.0.0)
-      rake
     rake (12.3.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
@@ -280,25 +278,26 @@ GEM
       actionview (~> 5.x)
     redcarpet (3.4.0)
     ref (2.0.0)
-    request_store (1.3.2)
+    request_store (1.4.0)
-    rinku (2.0.3)
+      rack (>= 1.4)
+    rinku (2.0.4)
     rotp (3.3.0)
-    rubocop (0.51.0)
+    rubocop (0.52.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-openid (2.7.0)
     ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sanitize (4.5.0)
+    sanitize (4.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4.1)
+      nokogumbo (~> 1.4)
-    sass (3.5.3)
+    sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -309,7 +308,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    secure_headers (5.0.3)
+    secure_headers (5.0.5)
       useragent (>= 0.15.0)
     simplecov (0.14.1)
       docile (~> 1.1.0)
@@ -331,25 +330,25 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    tins (1.16.0)
+    tins (1.16.3)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (3.2.0)
+    uglifier (4.1.6)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
-    useragent (0.16.8)
+    useragent (0.16.10)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.1.16)
-    webmock (3.1.1)
+    webmock (3.3.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    xpath (2.1.0)
+    xpath (3.0.0)
-      nokogiri (~> 1.3)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -393,8 +392,8 @@ DEPENDENCIES
   omniauth-openid
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.0)
-  paperclip (~> 4.0)
+  paperclip (~> 5.2)
-  pg
+  pg (~> 0.18)
   poltergeist
   psych
   puma (~> 3.7)

INSTALL.md

@@ -32,7 +32,7 @@ sudo apt-get install ruby2.3 libruby2.3 ruby2.3-dev \
                      libmagickwand-dev libxml2-dev libxslt1-dev nodejs \
                      apache2 apache2-dev build-essential git-core \
                      postgresql postgresql-contrib libpq-dev postgresql-server-dev-all \
-                     libsasl2-dev imagemagick
+                     libsasl2-dev imagemagick libffi-dev
 sudo gem2.3 install bundler
 ```
 
@@ -47,7 +47,7 @@ sudo yum install ruby ruby-devel rubygem-rdoc rubygem-bundler rubygems \
                  libxml2-devel js \
                  gcc gcc-c++ git \
                  postgresql postgresql-server postgresql-contrib postgresql-devel \
-                 perl-podlators ImageMagick
+                 perl-podlators ImageMagick libffi-devel
 ```
 
 If you didn't already have PostgreSQL installed then create a PostgreSQL instance and start the server:

app/assets/images/sprite.svg

@@ -1,290 +1,68 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="300" height="200" viewBox="0, 0, 300, 200">
-<svg
+  <g id="background">
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+    <path d="M0,0 L300,0 L300,200 L0,200 z" fill="#B3B3B3" id="rect6890" display="none"/>
-   xmlns:cc="http://creativecommons.org/ns#"
+  </g>
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  <g id="Layer_1">
-   xmlns:svg="http://www.w3.org/2000/svg"
+    <g id="query">
-   xmlns="http://www.w3.org/2000/svg"
+      <text transform="matrix(1, 0, 0, 1, 276.165, 12.5)" id="tspan3023">
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        <tspan x="-3.665" y="6.012" font-family="Helvetica-Bold" font-size="12" fill="#FFFFFF">?</tspan>
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+      </text>
-   width="300"
+      <path d="M263,1 C263,1 272,8 272,8 C270.944,8.587 269.888,9.173 268.832,9.76 L271.863,16.375 C272.209,17.128 271.878,18.018 271.125,18.364 C270.372,18.709 269.482,18.378 269.136,17.625 L266.201,11.221 C265.134,11.814 264.067,12.407 263,13 L263,1 z" fill="#FFFFFF"/>
-   height="200"
+    </g>
-   id="svg2"
+    <g id="add-note-grey">
-   version="1.1"
+      <path d="M242,31 L242,24 L243,23 L253,23 L254,24 L254,31 L253,32 L250,32 L248,35 L246,32 L243,32 z" fill="#CCCCCC" id="path3386"/>
-   inkscape:version="0.91 r13725"
+      <path d="M257,33 L257,35 L259,35 L259,37 L257,37 L257,39 L255,39 L255,37 L253,37 L253,35 L255,35 L255,33 L257,33 z" fill="#CCCCCC"/>
-   inkscape:export-filename="/home/tom/rails/app/assets/images/sprite.png"
+    </g>
-   inkscape:export-xdpi="90"
+    <g id="add-note">
-   inkscape:export-ydpi="90"
+      <path d="M257,12 L257,14 L259,14 L259,16 L257,16 L257,18 L255,18 L255,16 L253,16 L253,14 L255,14 L255,12 L257,12 z" fill="#FFFFFF"/>
-   sodipodi:docname="sprite.svg">
+      <path d="M242,11 L242,4 L243,3 L253,3 L254,4 L254,11 L253,12 L250,12 L248,15 L246,12 L243,12 z" fill="#FFFFFF" id="path11741"/>
-  <defs
+    </g>
-     id="defs4" />
+    <g id="check-green">
-  <sodipodi:namedview
+      <path d="M224,28 L226,28 L229,31 L233.773,25 L236,25 L236,27 L231,33 L230,34 L228,34 L227,33 L224,30 z" fill="#70CD8F" id="path3361-4"/>
-     id="base"
+    </g>
-     pagecolor="#ffffff"
+    <g id="check">
-     bordercolor="#666666"
+      <path d="M224,8 L226,8 L229,11 L233.773,5 L236,5 L236,7 L231,13 L230,14 L228,14 L227,13 L224,10 z" fill="#222222" id="path10883"/>
-     borderopacity="1.0"
+    </g>
-     inkscape:pageopacity="0.0"
+    <g id="close-grey">
-     inkscape:pageshadow="2"
+      <path d="M205.938,25.156 L204.938,26.156 L204.938,27.156 L207.938,30.156 L204.938,33.156 L204.938,34.156 L205.938,35.156 L206.938,35.156 L209.938,32.156 L212.938,35.156 L213.938,35.156 L214.938,34.156 L214.938,33.156 L211.938,30.156 L214.938,27.156 L214.938,26.156 L213.938,25.156 L212.938,25.156 L209.938,28.156 L206.938,25.156 L205.938,25.156 z" fill="#999999" id="path3059"/>
-     inkscape:zoom="16"
+    </g>
-     inkscape:cx="258.2457"
+    <g id="close">
-     inkscape:cy="193.60262"
+      <path d="M206,5 L205,6 L205,7 L208,10 L205,13 L205,14 L206,15 L207,15 L210,12 L213,15 L214,15 L215,14 L215,13 L212,10 L215,7 L215,6 L214,5 L213,5 L210,8 L207,5 L206,5 z" fill="#CCCCCC" id="path10879"/>
-     inkscape:document-units="px"
+    </g>
-     inkscape:current-layer="layer1"
+    <g id="link">
-     showgrid="false"
+      <path d="M185,6 L183,8 L183,12 L185,14 L187,14 L185,12 L185,8 L190,8 L190,11 L192,11 L192,8 L190,6 L187,6 L185,6 z M192,6 L194,8 L194,12 L189,12 L189,9 L187,9 L187,12 L189,14 L194,14 L196,12 L196,8 L194,6 L192,6 z" fill="#0000FF" id="path4118"/>
-     inkscape:window-width="1366"
+    </g>
-     inkscape:window-height="702"
+    <g id="clipboard">
-     inkscape:window-x="0"
+      <path d="M170,1 L169,2 L169,3 L168,3 L167,4 L167,6 L174,6 L174,4 L173,3 L172,3 L172,2 L171,1 L170,1 z M165,4 L164,5 L164,16 L165,17 L176,17 L177,16 L177,5 L176,4 L175,4 L175,5 L175,7 L175,15 L166,15 L166,7 L166,5 L166,4 L165,4 z M168,8 L168,9 L173,9 L173,8 L168,8 z M168,10 L168,11 L173,11 L173,10 L168,10 z M168,12 L168,13 L171,13 L171,12 L168,12 z" fill="#FFFFFF" id="path6924"/>
-     inkscape:window-y="27"
+    </g>
-     inkscape:window-maximized="1"
+    <g id="export">
-     showguides="true"
+      <path d="M155,2 L154,3 L154,5 L152,5 C146,5 146,12 146,12 C146,12 148,8 152,8 C152.667,8 153.333,8 154,8 L154,10 L155,11 L159,6.5 L155,2 z M142,6 L141,7 L141,16 L142,17 L152,17 L153,16 L153,14 L153,11 L153,10 L152,10 C151.68,10 151.34,10.073 151,10.188 L151,13 L151,15 L145.438,15 C145.139,15.069 144.829,15.069 144.531,15 L143,15 L143,13.375 C142.967,13.168 142.967,12.957 143,12.75 L143,10 L143,8 L144.531,8 C144.875,7.331 145.323,6.652 145.875,6 L145,6 L142,6 z" fill="#FFFFFF" id="path6920"/>
-     inkscape:guide-bbox="true"
+    </g>
-     inkscape:object-paths="true"
+    <g id="info">
-     inkscape:object-nodes="true">
+      <path d="M129,3 L128,4 L128,6 L129,7 L131,7 L132,6 L132,4 L131,3 z M129,9 L128,10 L128,16 L129,17 L131,17 L132,16 L132,10 L131,9 z" fill="#FFFFFF" id="path6912"/>
-    <inkscape:grid
+    </g>
-       type="xygrid"
+    <g id="layers">
-       id="grid2985"
+      <path d="M109.5,3 L103,6 L103,7 L109.5,10 L110.5,10 L117,7 L117,6 L110.5,3 L109.5,3 z M104.094,9.5 L103,10 L103,11 L109.5,14 L110.5,14 L117,11 L117,10 L115.906,9.5 L110.5,12 L109.5,12 L104.094,9.5 z M104.094,13.5 L103,14 L103,15 L109.5,18 L110.5,18 L117,15 L117,14 L115.906,13.5 L110.5,16 L109.5,16 L104.094,13.5 z" fill="#FFFFFF" id="path6922"/>
-       empspacing="5"
+    </g>
-       visible="true"
+    <g id="locate-green">
-       enabled="true"
+      <path d="M84,30 L84,28 L94,24 L96,24 L96,26 L92,36 L90,36 L90,30 z" fill="#70CD8F" id="path6918-2"/>
-       snapvisiblegridlinesonly="true" />
+    </g>
-    <sodipodi:guide
+    <g id="locate">
-       orientation="1,0"
+      <path d="M84,10 L84,8 L94,4 L96,4 L96,6 L92,16 L90,16 L90,10 z" fill="#FFFFFF" id="path6918"/>
-       position="20,185"
+    </g>
-       id="guide6892" />
+    <g id="minus">
-    <sodipodi:guide
+      <path d="M65,8 L76,8 L77,9 L77,10 L76,11 L65,11 L64,10 L64,9 z" fill="#FFFFFF" id="path6916"/>
-       orientation="1,0"
+    </g>
-       position="40,185"
+    <g id="plus">
-       id="guide6894" />
+      <path d="M57,9 L56,8 L52,8 L52,4 L51,3 L50,3 L49,4 L49,8 L45,8 L44,9 L44,10 L45,11 L49,11 L49,15 L50,16 L51,16 L52,15 L52,11 L56,11 L57,10 L57,9 z" fill="#FFFFFF" id="path6914"/>
-    <sodipodi:guide
+    </g>
-       orientation="1,0"
+    <g id="heart">
-       position="60,180"
+      <path d="M24,8 C24,6.172 25,4 27.75,4 C29.578,4 30.5,6 30.5,6 C30.5,6 31.422,4 33.25,4 C36,4 37,6.172 37,8 C37,13 30.5,16 30.5,16 C30.5,16 24,13 24,8 z" fill="#000000" id="path3843"/>
-       id="guide6896" />
+    </g>
-    <sodipodi:guide
+    <g id="search">
-       orientation="1,0"
+      <path d="M11.5,3 C14.538,3 17,5.462 17,8.5 C17,11.538 14.538,14 11.5,14 C10.494,14 9.561,13.722 8.75,13.25 L5,17 L4,17 L3,16 L3,15 L6.75,11.25 C6.278,10.439 6,9.506 6,8.5 C6,5.462 8.462,3 11.5,3 z M12,5 L11,5 L9,6 L8,8 L8,9 L9,11 L11,12 L12,12 L14,11 L15,9 L15,8 L14,6 L12,5 z" fill="#999999" id="path10739"/>
-       position="80,185"
-       id="guide6898" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="100,185"
-       id="guide6900" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="120,175"
-       id="guide6902" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="140,185"
-       id="guide6904" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="160,190"
-       id="guide6906" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="180,180"
-       id="guide6908" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="50,180"
-       id="guide6910" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="200,180"
-       id="guide10867" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="180,160"
-       id="guide10873" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="220,190"
-       id="guide10875" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="240,160"
-       id="guide10881" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="230,140"
-       id="guide10887" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="260,195"
-       id="guide11761" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="280,153.875"
-       id="guide3019" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="background"
-     style="display:none">
-    <rect
-       style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect6890"
-       width="300"
-       height="200"
-       x="0"
-       y="0" />
     </g>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-852.36218)">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 24,860.36218 c 0,-1.82764 1,-4 3.75,-4 1.827643,0 2.75,2 2.75,2 0,0 0.922357,-2 2.75,-2 2.75,0 3.75,2.17236 3.75,4 0,5 -6.5,8 -6.5,8 0,0 -6.5,-3 -6.5,-8 z"
-       id="path3843"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscsscs" />
-    <path
-       sodipodi:nodetypes="cccccccccccc"
-       inkscape:connector-curvature="0"
-       id="path3361-4"
-       d="m 224,880.36218 2,0 3,3 4.7735,-6 2.2265,0 0,2 -5,6 -1,1 -2,0 -1,-1 -3,-3 z"
-       style="color:#000000;fill:#70cd8f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
-       sodipodi:nodetypes="cccccccccccccccccc"
-       d="m 129,855.3622 -1.00001,1 0,2 1.00001,1 2.00002,0 1,-1 0,-2 -1.00002,-1 z m 2e-5,6 -1.00001,1 0,6 1.00001,1 1.99998,0 1.00004,-1 -3e-5,-6 -1,-1 z"
-       id="path6912"
-       style="font-size:16.71258354000000068px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
-       inkscape:connector-curvature="0"
-       id="path6914"
-       d="m 57,861.36216 -1,-1 -4,0 0,-4 -1,-0.99999 -1,0 -1,1 0,4 -4,0 -1,0.99999 0,1 1,1 4,0 0,3.99999 1,1.00002 1,0 1,-1.00001 0,-3.99999 4,-10e-6 1,-0.99998 0,-1.00002 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 65,860.36216 11,-2e-5 1,1.00002 0,1.00002 -1,0.99997 -11,3e-5 -1,-1.00003 0,-1 z"
-       id="path6916"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc"
-       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
-       sodipodi:nodetypes="ccccccccc"
-       inkscape:connector-curvature="0"
-       id="path6918"
-       d="m 84,862.36218 0,-2.00001 10,-3.99999 2,1e-5 0,1.99998 -4,10 -2,10e-6 0,-6 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
-       id="path6920"
-       d="m 155,854.3622 -1,1 0,2 -2,0 c -6,0 -6,7 -6,7 0,0 2,-4 6,-4 0.66667,0 1.33333,0 2,0 l 0,2 1,1 4,-4.5 -4,-4.5 z m -13,4 -1,1 0,9 1,1 10,0 1,-1 0,-2 0,-3 0,-1 -1,0 c -0.3202,-10e-5 -0.6603,0.073 -1,0.1875 l 0,2.8125 0,2 -5.5625,0 a 2.0002,2.0002 0 0 1 -0.90625,0 l -1.53125,0 0,-1.625 a 2.0002,2.0002 0 0 1 0,-0.625 l 0,-2.75 0,-2 1.53125,0 c 0.3433,-0.6691 0.79175,-1.3477 1.34375,-2 l -0.875,0 -3,0 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 109.50003,855.3622 -6.50002,3 1e-5,1 6.49998,3 1.00002,0 6.49999,-3 1e-5,-1 -6.50001,-3 -0.99998,0 z m -5.40621,6.5 -1.09377,0.5 -3e-5,1 6.49999,3 1,0 6.50001,-3 0,-1 -1.0937,-0.5 -5.40631,2.5 -0.99998,0 -5.40621,-2.5 z m 0,4 -1.09379,0.5 -2e-5,1 6.50001,3 1.00001,0 6.5,-3 -10e-6,-1 -1.0937,-0.5 -5.40631,2.5 -0.99999,0 -5.4062,-2.5 z"
-       id="path6922"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
-       inkscape:connector-curvature="0"
-       id="path6924"
-       d="m 170,853.3622 -1,1 0,1 -1,0 -1,1 0,2 7,0 0,-2 -1,-1 -1,0 0,-1 -1,-1 -1,0 z m -5,3 -1,1 0,11 1,1 11,0 1,-1 0,-11 -1,-1 -1,0 0,1 0,2 0,8 -9,0 0,-8 0,-2 0,-1 -1,0 z m 3,4 0,1 5,0 0,-1 -5,0 z m 0,2 0,1 5,0 0,-1 -5,0 z m 0,2 0,1 3,0 0,-1 -3,0 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/Dropbox/new-osm/community-landing-fg-dropdown.png"
-       inkscape:connector-curvature="0"
-       id="path10739"
-       d="m 11.5,855.36218 c 3.0376,0 5.5,2.46243 5.5,5.5 0,3.03757 -2.4624,5.5 -5.5,5.5 -1.0061,0 -1.9387,-0.27827 -2.75,-0.75 l -3.75,3.75 -1,0 -1,-1 0,-1 3.75,-3.75 C 6.2783,862.80084 6,861.86831 6,860.86218 c 0,-3.03757 2.4624,-5.5 5.5,-5.5 z m 0.5,2 -1,0 -2,1 -1,2 0,1 1,2 2,1 1,0 2,-1 1,-2 0,-1 -1,-2 -2,-1 z"
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
-       id="path10879"
-       d="m 206,857.36218 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z"
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 224,860.36218 2,0 3,3 4.7735,-6 2.2265,0 0,2 -5,6 -1,1 -2,0 -1,-1 -3,-3 z"
-       id="path10883"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccc" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 244,864.36218 0,-7 1,-1 10,0 1,1 0,7 -1,1 -3,0 -2,3 -2,-3 -3,0 z"
-       id="path11741"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccc" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
-       sodipodi:nodetypes="ccccccccc"
-       inkscape:connector-curvature="0"
-       id="path6918-2"
-       d="m 84,882.36218 0,-2.00001 10,-3.99999 2,1e-5 0,1.99998 -4,10 -2,10e-6 0,-6 z"
-       style="color:#000000;fill:#70cd8f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 185 6 L 183 8 L 183 12 L 185 14 L 187 14 L 185 12 L 185 8 L 190 8 L 190 11 L 192 11 L 192 8 L 190 6 L 187 6 L 185 6 z M 192 6 L 194 8 L 194 12 L 189 12 L 189 9 L 187 9 L 187 12 L 189 14 L 194 14 L 196 12 L 196 8 L 194 6 L 192 6 z "
-       transform="translate(0,852.36218)"
-       id="path4118" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 205.9375,877.51843 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z"
-       id="path3059"
-       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <text
-       xml:space="preserve"
-       style="font-size:20px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:'DejaVu Sans', Sans, sans-serif"
-       x="264.8125"
-       y="869.62622"
-       id="text3021"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3023"
-         x="264.8125"
-         y="869.62622">?</tspan></text>
-    <path
-       sodipodi:nodetypes="cccccccccccc"
-       inkscape:connector-curvature="0"
-       id="path3386"
-       d="m 244,884.36218 0,-7 1,-1 10,0 1,1 0,7 -1,1 -3,0 -2,3 -2,-3 -3,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;enable-background:accumulate" />
   </g>
 </svg>

app/assets/javascripts/index/directions.js

@@ -4,10 +4,9 @@
 OSM.Directions = function (map) {
   var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result
   var awaitingRoute;   // true if we've asked the engine for a route and are waiting to hear back
-  var dragging;        // true if the user is dragging a start/end point
   var chosenEngine;
 
-  var popup = L.popup();
+  var popup = L.popup({autoPanPadding: [100, 100]});
 
   var polyline = L.polyline([], {
     color: '#03f',
@@ -45,26 +44,33 @@ OSM.Directions = function (map) {
     });
 
     endpoint.marker.on('drag dragend', function (e) {
-      dragging = (e.type === 'drag');
+      var dragging = (e.type === 'drag');
       if (dragging && !chosenEngine.draggable) return;
       if (dragging && awaitingRoute) return;
       endpoint.setLatLng(e.target.getLatLng());
       if (map.hasLayer(polyline)) {
-        getRoute();
+        getRoute(false, !dragging);
       }
     });
 
     input.on("change", function (e) {
+      awaitingGeocode = true;
+      
       // make text the same in both text boxes
       var value = e.target.value;
       endpoint.setValue(value);
     });
 
-    endpoint.setValue = function(value) {
+    endpoint.setValue = function(value, latlng) {
       endpoint.value = value;
       delete endpoint.latlng;
       input.val(value);
+
+      if (latlng) {
+        endpoint.setLatLng(latlng);
+      } else {
         endpoint.getGeocode();
+      }
     };
 
     endpoint.getGeocode = function() {
@@ -84,16 +90,13 @@ OSM.Directions = function (map) {
           return;
         }
 
-        input.val(json[0].display_name);
+        endpoint.setLatLng(L.latLng(json[0]));
 
-        endpoint.latlng = L.latLng(json[0]);
+        input.val(json[0].display_name);
-        endpoint.marker
-          .setLatLng(endpoint.latlng)
-          .addTo(map);
 
         if (awaitingGeocode) {
           awaitingGeocode = false;
-          getRoute();
+          getRoute(true, true);
         }
       });
     };
@@ -111,6 +114,17 @@ OSM.Directions = function (map) {
     return endpoint;
   }
 
+  $(".directions_form .reverse_directions").on("click", function() {
+    var from = endpoints[0].latlng,
+        to = endpoints[1].latlng;
+
+    OSM.router.route("/directions?" + querystring.stringify({
+      from: $("#route_to").val(),
+      to: $("#route_from").val(),
+      route: to.lat + "," + to.lng + ";" + from.lat + "," + from.lng
+    }));
+  });
+
   $(".directions_form .close").on("click", function(e) {
     e.preventDefault();
     var route_from = endpoints[0].value;
@@ -147,7 +161,7 @@ OSM.Directions = function (map) {
     });
   }
 
-  function getRoute() {
+  function getRoute(fitRoute, reportErrors) {
     // Cancel any route that is already in progress
     if (awaitingRoute) awaitingRoute.abort();
 
@@ -191,7 +205,7 @@ OSM.Directions = function (map) {
       if (err) {
         map.removeLayer(polyline);
 
-        if (!dragging) {
+        if (reportErrors) {
           $('#sidebar_content').html('<p class="search_results_error">' + I18n.t('javascripts.directions.errors.no_route') + '</p>');
         }
 
@@ -202,7 +216,7 @@ OSM.Directions = function (map) {
         .setLatLngs(route.line)
         .addTo(map);
 
-      if (!dragging) {
+      if (fitRoute) {
         map.fitBounds(polyline.getBounds().pad(0.05));
       }
 
@@ -305,13 +319,13 @@ OSM.Directions = function (map) {
     chosenEngine = engines[e.target.selectedIndex];
     $.cookie('_osm_directions_engine', chosenEngine.id, { expires: expiry, path: '/' });
     if (map.hasLayer(polyline)) {
-      getRoute();
+      getRoute(true, true);
     }
   });
 
   $(".directions_form").on("submit", function(e) {
     e.preventDefault();
-    getRoute();
+    getRoute(true, true);
   });
 
   $(".routing_marker").on('dragstart', function (e) {
@@ -344,28 +358,24 @@ OSM.Directions = function (map) {
       pt.y += 20;
       var ll = map.containerPointToLatLng(pt);
       endpoints[type === 'from' ? 0 : 1].setLatLng(ll);
-      getRoute();
+      getRoute(true, true);
     });
 
     var params = querystring.parse(location.search.substring(1)),
-      route = (params.route || '').split(';');
+        route = (params.route || '').split(';'),
+        from = route[0] && L.latLng(route[0].split(',')),
+        to = route[1] && L.latLng(route[1].split(','));
 
     if (params.engine) {
       setEngine(params.engine);
     }
 
-    endpoints[0].setValue(params.from || "");
+    endpoints[0].setValue(params.from || "", from);
-    endpoints[1].setValue(params.to || "");
+    endpoints[1].setValue(params.to || "", to);
 
-    var o = route[0] && L.latLng(route[0].split(',')),
+    map.setSidebarOverlaid(!from || !to);
-        d = route[1] && L.latLng(route[1].split(','));
 
-    if (o) endpoints[0].setLatLng(o);
+    getRoute(true, true);
-    if (d) endpoints[1].setLatLng(d);
-
-    map.setSidebarOverlaid(!o || !d);
-
-    getRoute();
   };
 
   page.load = function() {

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

@@ -95,9 +95,41 @@ function OSRMEngine() {
         Array.prototype.push.apply(line, step_geometry);
 
         var instText = "<b>" + (idx + 1) + ".</b> ";
-        var name = step.name ? "<b>" + step.name + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
+        var destinations = "<b>" + step.destinations + "</b>";
+        var namedRoad = true;
+        var name;
+
+        if (step.name && step.ref) {
+          name = "<b>" + step.name + " (" + step.ref + ")</b>";
+        } else if (step.name) {
+          name = "<b>" + step.name + "</b>";
+        } else if (step.ref) {
+          name = "<b>" + step.ref + "</b>";
+        } else {
+          name = I18n.t('javascripts.directions.instructions.unnamed');
+          namedRoad = false;
+        }
+
         if (step.maneuver.type.match(/rotary|roundabout/)) {
+          if (step.maneuver.exit) {
             instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name } );
+          } else {
+            instText += I18n.t(template + '_without_exit', { name: name } );
+          }
+        } else if (step.maneuver.type.match(/on ramp|off ramp/)) {
+          if (step.destinations) {
+            if (namedRoad) {
+              instText += I18n.t(template + '_with_name_and_directions', { name: name, directions: destinations } );
+            } else {
+              instText += I18n.t(template + '_with_directions', { directions: destinations } );
+            }
+          } else {
+            if (namedRoad) {
+              instText += I18n.t(template + '_without_exit', { name: name });
+            } else {
+              instText += I18n.t(template + '_without_directions');
+            }
+          }
         } else {
           instText += I18n.t(template + '_without_exit', { name: name });
         }

app/assets/javascripts/leaflet.share.js

@@ -346,7 +346,7 @@ L.OSM.share = function (options) {
 
       $('#embed_html').val(
         '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' +
-          escapeHTML('http://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params)) +
+          escapeHTML(OSM.SERVER_PROTOCOL + '://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params)) +
           '" style="border: 1px solid black"></iframe><br/>' +
           '<small><a href="' + escapeHTML(map.getUrl(marker)) + '">' +
           escapeHTML(I18n.t('javascripts.share.view_larger_map')) + '</a></small>');

app/assets/javascripts/leaflet.zoom.js

@@ -53,7 +53,7 @@ L.OSM.Zoom = L.Control.extend({
 
 	_updateDisabled: function () {
 		var map = this._map,
-			className = 'leaflet-disabled';
+			className = 'disabled';
 
 		L.DomUtil.removeClass(this._zoomInButton, className);
 		L.DomUtil.removeClass(this._zoomOutButton, className);

app/assets/javascripts/osm.js.erb

@@ -6,6 +6,7 @@ OSM = {
 <% end %>
 
   MAX_REQUEST_AREA:        <%= MAX_REQUEST_AREA.to_json %>,
+  SERVER_PROTOCOL:         <%= SERVER_PROTOCOL.to_json %>,
   SERVER_URL:              <%= SERVER_URL.to_json %>,
   API_VERSION:             <%= API_VERSION.to_json %>,
   STATUS:                  <%= STATUS.to_json %>,

app/assets/stylesheets/common.scss

@@ -1002,6 +1002,11 @@ header .search_forms,
       vertical-align: middle;
     }
   }
+
+  a.reverse_directions {
+    cursor: pointer;
+    margin: 0px 0px 5px 25px;
+  }
 }
 
 /* Rules for the map key which appears in the popout sidebar */

app/controllers/amf_controller.rb

@@ -508,14 +508,10 @@ class AmfController < ApplicationController
     rels = []
     if searchterm.to_i > 0
       rel = Relation.where(:id => searchterm.to_i).first
-      if rel && rel.visible
+      rels.push([rel.id, rel.tags, rel.members, rel.version]) if rel && rel.visible
-        rels.push([rel.id, rel.tags, rel.members, rel.version])
-      end
     else
       RelationTag.where("v like ?", "%#{searchterm}%").limit(11).each do |t|
-        if t.relation.visible
+        rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version]) if t.relation.visible
-          rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version])
-        end
       end
     end
     rels
@@ -558,9 +554,7 @@ class AmfController < ApplicationController
             mid = renumberednodes[mid] if m[0] == "Node"
             mid = renumberedways[mid] if m[0] == "Way"
           end
-          if mid
+          typedmembers << [m[0], mid, m[2].delete("\000-\037\ufffe\uffff", "^\011\012\015")] if mid
-            typedmembers << [m[0], mid, m[2].delete("\000-\037\ufffe\uffff", "^\011\012\015")]
-          end
         end
 
         # assign new contents
@@ -748,9 +742,7 @@ class AmfController < ApplicationController
             return [-4, "node", id]
           end
 
-          unless visible || node.ways.empty?
+          return -1, "Point #{id} has since become part of a way, so you cannot save it as a POI.", id, id, version unless visible || node.ways.empty?
-            return -1, "Point #{id} has since become part of a way, so you cannot save it as a POI.", id, id, version
-          end
         end
         # We always need a new node, based on the data that has been sent to us
         new_node = Node.new
@@ -793,9 +785,7 @@ class AmfController < ApplicationController
       n = Node.where(:id => id).first
       if n
         v = n.version
-        unless timestamp == ""
+        n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first unless timestamp == ""
-          n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first
-        end
       end
 
       if n

app/controllers/api_controller.rb

@@ -157,9 +157,7 @@ class ApiController < ApplicationController
     # - [0] in case some thing links to node 0 which doesn't exist. Shouldn't actually ever happen but it does. FIXME: file a ticket for this
     nodes_to_fetch = (list_of_way_nodes.uniq - node_ids) - [0]
 
-    unless nodes_to_fetch.empty?
+    nodes += Node.includes(:node_tags).find(nodes_to_fetch) unless nodes_to_fetch.empty?
-      nodes += Node.includes(:node_tags).find(nodes_to_fetch)
-    end
 
     visible_nodes = {}
     changeset_cache = {}

app/controllers/application_controller.rb

@@ -29,9 +29,7 @@ class ApplicationController < ActionController::Base
         end
       end
     elsif session[:token]
-      if self.current_user = User.authenticate(:token => session[:token])
+      session[:user] = current_user.id if self.current_user = User.authenticate(:token => session[:token])
-        session[:user] = current_user.id
-      end
     end
   rescue StandardError => ex
     logger.info("Exception authorizing user: #{ex}")
@@ -381,9 +379,7 @@ class ApplicationController < ActionController::Base
   ##
   # ensure that there is a "this_user" instance variable
   def lookup_this_user
-    unless @this_user = User.active.find_by(:display_name => params[:display_name])
+    render_unknown_user params[:display_name] unless @this_user = User.active.find_by(:display_name => params[:display_name])
-      render_unknown_user params[:display_name]
-    end
   end
 
   ##
@@ -469,9 +465,7 @@ class ApplicationController < ActionController::Base
       authdata = request.env["HTTP_AUTHORIZATION"].to_s.split
     end
     # only basic authentication supported
-    if authdata && authdata[0] == "Basic"
+    user, pass = Base64.decode64(authdata[1]).split(":", 2) if authdata && authdata[0] == "Basic"
-      user, pass = Base64.decode64(authdata[1]).split(":", 2)
-    end
     [user, pass]
   end
 

app/controllers/changeset_controller.rb

@@ -7,12 +7,12 @@ class ChangesetController < ApplicationController
   skip_before_action :verify_authenticity_token, :except => [:list]
   before_action :authorize_web, :only => [:list, :feed, :comments_feed]
   before_action :set_locale, :only => [:list, :feed, :comments_feed]
-  before_action :authorize, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment]
+  before_action :authorize, :only => [:create, :update, :upload, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment]
   before_action :require_moderator, :only => [:hide_comment, :unhide_comment]
-  before_action :require_allow_write_api, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment]
+  before_action :require_allow_write_api, :only => [:create, :update, :upload, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment]
-  before_action :require_public_data, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe]
+  before_action :require_public_data, :only => [:create, :update, :upload, :close, :comment, :subscribe, :unsubscribe]
-  before_action :check_api_writable, :only => [:create, :update, :delete, :upload, :include, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment]
+  before_action :check_api_writable, :only => [:create, :update, :upload, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment]
-  before_action :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed]
+  before_action :check_api_readable, :except => [:create, :update, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed]
   before_action(:only => [:list, :feed, :comments_feed]) { |c| c.check_database_readable(true) }
   around_action :api_call_handle_error, :except => [:list, :feed, :comments_feed]
   around_action :api_call_timeout, :except => [:list, :feed, :comments_feed, :upload]
@@ -296,9 +296,7 @@ class ChangesetController < ApplicationController
         changesets = changesets.where(:user_id => current_user.nearby)
       end
 
-      if @params[:max_id]
+      changesets = changesets.where("changesets.id <= ?", @params[:max_id]) if @params[:max_id]
-        changesets = changesets.where("changesets.id <= ?", @params[:max_id])
-      end
 
       @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments)
 
@@ -334,9 +332,7 @@ class ChangesetController < ApplicationController
 
     # Notify current subscribers of the new comment
     changeset.subscribers.visible.each do |user|
-      if current_user != user
+      Notifier.changeset_comment_notification(comment, user).deliver_now if current_user != user
-        Notifier.changeset_comment_notification(comment, user).deliver_now
-      end
     end
 
     # Add the commenter to the subscribers if necessary
@@ -357,7 +353,6 @@ class ChangesetController < ApplicationController
 
     # Find the changeset and check it is valid
     changeset = Changeset.find(id)
-    raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open?
     raise OSM::APIChangesetAlreadySubscribedError, changeset if changeset.subscribers.exists?(current_user.id)
 
     # Add the subscriber
@@ -378,7 +373,6 @@ class ChangesetController < ApplicationController
 
     # Find the changeset and check it is valid
     changeset = Changeset.find(id)
-    raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open?
     raise OSM::APIChangesetNotSubscribedError, changeset unless changeset.subscribers.exists?(current_user.id)
 
     # Remove the subscriber

app/controllers/diary_entry_controller.rb

@@ -65,9 +65,7 @@ class DiaryEntryController < ApplicationController
 
       # Notify current subscribers of the new comment
       @entry.subscribers.visible.each do |user|
-        if current_user != user
+        Notifier.diary_comment_notification(@diary_comment, user).deliver_now if current_user != user
-          Notifier.diary_comment_notification(@diary_comment, user).deliver_now
-        end
       end
 
       # Add the commenter to the subscribers if necessary
@@ -159,7 +157,7 @@ class DiaryEntryController < ApplicationController
         @entries = user.diary_entries
         @title = I18n.t("diary_entry.feed.user.title", :user => user.display_name)
         @description = I18n.t("diary_entry.feed.user.description", :user => user.display_name)
-        @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
+        @link = "#{SERVER_PROTOCOL}://#{SERVER_URL}/user/#{user.display_name}/diary"
       else
         head :not_found
         return
@@ -171,11 +169,11 @@ class DiaryEntryController < ApplicationController
         @entries = @entries.where(:language_code => params[:language])
         @title = I18n.t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
         @description = I18n.t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
-        @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
+        @link = "#{SERVER_PROTOCOL}://#{SERVER_URL}/diary/#{params[:language]}"
       else
         @title = I18n.t("diary_entry.feed.all.title")
         @description = I18n.t("diary_entry.feed.all.description")
-        @link = "http://#{SERVER_URL}/diary"
+        @link = "#{SERVER_PROTOCOL}://#{SERVER_URL}/diary"
       end
     end
 

app/controllers/export_controller.rb

@@ -19,7 +19,7 @@ class ExportController < ApplicationController
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
-      redirect_to "http://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
+      redirect_to "https://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
     end
   end
 

app/controllers/geocoder_controller.rb

@@ -112,9 +112,7 @@ class GeocoderController < ApplicationController
     maxlat = params[:maxlat]
 
     # get view box
-    if minlon && minlat && maxlon && maxlat
+    viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}" if minlon && minlat && maxlon && maxlat
-      viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}"
-    end
 
     # get objects to excude
     exclude = "&exclude_place_ids=#{params[:exclude]}" if params[:exclude]
@@ -153,9 +151,7 @@ class GeocoderController < ApplicationController
         rank = (place.attributes["place_rank"].to_i + 1) / 2
         prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name
         place.elements["extratags"].elements.each("tag") do |extratag|
-          if extratag.attributes["key"] == "place"
+          prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name if extratag.attributes["key"] == "place"
-            prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name
-          end
         end
       end
       prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name

app/controllers/node_controller.rb

@@ -40,9 +40,7 @@ class NodeController < ApplicationController
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
 
-    unless new_node && new_node.id == node.id
+    raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" unless new_node && new_node.id == node.id
-      raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})"
-    end
 
     node.update_from(new_node, current_user)
     render :plain => node.version.to_s
@@ -55,24 +53,18 @@ class NodeController < ApplicationController
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
 
-    unless new_node && new_node.id == node.id
+    raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" unless new_node && new_node.id == node.id
-      raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})"
-    end
     node.delete_with_history!(new_node, current_user)
     render :plain => node.version.to_s
   end
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.
   def nodes
-    unless params["nodes"]
+    raise OSM::APIBadUserInput, "The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]" unless params["nodes"]
-      raise OSM::APIBadUserInput, "The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]"
-    end
 
     ids = params["nodes"].split(",").collect(&:to_i)
 
-    if ids.empty?
+    raise OSM::APIBadUserInput, "No nodes were given to search for" if ids.empty?
-      raise OSM::APIBadUserInput, "No nodes were given to search for"
-    end
     doc = OSM::API.new.get_xml_doc
 
     Node.find(ids).each do |node|

app/controllers/notes_controller.rb

@@ -350,9 +350,7 @@ class NotesController < ApplicationController
     comment = note.comments.create!(attributes)
 
     note.comments.map(&:author).uniq.each do |user|
-      if notify && user && user != current_user && user.visible?
+      Notifier.note_comment_notification(comment, user).deliver_now if notify && user && user != current_user && user.visible?
-        Notifier.note_comment_notification(comment, user).deliver_now
-      end
     end
   end
 end

app/controllers/oauth_controller.rb

@@ -63,9 +63,7 @@ class OauthController < ApplicationController
                                     "&oauth_token=#{@token.token}"
                                 end
 
-          unless @token.oauth10?
+          @redirect_url.query += "&oauth_verifier=#{@token.verifier}" unless @token.oauth10?
-            @redirect_url.query += "&oauth_verifier=#{@token.verifier}"
-          end
 
           redirect_to @redirect_url.to_s
         end

app/controllers/relation_controller.rb

@@ -35,9 +35,7 @@ class RelationController < ApplicationController
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
 
-    unless new_relation && new_relation.id == relation.id
+    raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})" unless new_relation && new_relation.id == relation.id
-      raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})"
-    end
 
     relation.update_from new_relation, current_user
     render :plain => relation.version.to_s
@@ -123,15 +121,11 @@ class RelationController < ApplicationController
   end
 
   def relations
-    unless params["relations"]
+    raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"]
-      raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]"
-    end
 
     ids = params["relations"].split(",").collect(&:to_i)
 
-    if ids.empty?
+    raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty?
-      raise OSM::APIBadUserInput, "No relations were given to search for"
-    end
 
     doc = OSM::API.new.get_xml_doc
 

app/controllers/site_controller.rb

@@ -11,9 +11,7 @@ class SiteController < ApplicationController
   before_action :update_totp, :only => [:index]
 
   def index
-    unless STATUS == :database_readonly || STATUS == :database_offline
+    session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless STATUS == :database_readonly || STATUS == :database_offline
-      session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"])
-    end
   end
 
   def permalink
@@ -147,9 +145,7 @@ class SiteController < ApplicationController
   def redirect_map_params
     anchor = []
 
-    if params[:lat] && params[:lon]
+    anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" if params[:lat] && params[:lon]
-      anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}"
-    end
 
     if params[:layers]
       anchor << "layers=#{params.delete(:layers)}"
@@ -157,8 +153,6 @@ class SiteController < ApplicationController
       anchor << "layers=N"
     end
 
-    if anchor.present?
+    redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&")) if anchor.present?
-      redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&"))
-    end
   end
 end

app/controllers/trace_controller.rb

@@ -119,9 +119,7 @@ class TraceController < ApplicationController
         if @trace.id
           flash[:notice] = t "trace.create.trace_uploaded"
 
-          if current_user.traces.where(:inserted => false).count > 4
+          flash[:warning] = t "trace.trace_header.traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4
-            flash[:warning] = t "trace.trace_header.traces_waiting", :count => current_user.traces.where(:inserted => false).count
-          end
 
           redirect_to :action => :list, :display_name => current_user.display_name
         end
@@ -176,9 +174,7 @@ class TraceController < ApplicationController
         @trace.description = params[:trace][:description]
         @trace.tagstring = params[:trace][:tagstring]
         @trace.visibility = params[:trace][:visibility]
-        if @trace.save
+        redirect_to :action => "view", :display_name => current_user.display_name if @trace.save
-          redirect_to :action => "view", :display_name => current_user.display_name
-        end
       end
     end
   rescue ActiveRecord::RecordNotFound
@@ -205,9 +201,7 @@ class TraceController < ApplicationController
   def georss
     @traces = Trace.visible_to_all.visible
 
-    if params[:display_name]
+    @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] }) if params[:display_name]
-      @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] })
-    end
 
     @traces = @traces.tagged(params[:tag]) if params[:tag]
     @traces = @traces.order("timestamp DESC")

app/controllers/user_controller.rb

@@ -45,9 +45,7 @@ class UserController < ApplicationController
       if current_user
         current_user.terms_seen = true
 
-        if current_user.save
+        flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe if current_user.save
-          flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe
-        end
 
         if params[:referer]
           redirect_to params[:referer]
@@ -533,9 +531,7 @@ class UserController < ApplicationController
       session[:new_user].auth_provider = provider
       session[:new_user].auth_uid = uid
 
-      if email_verified && email == session[:new_user].email
+      session[:new_user].status = "active" if email_verified && email == session[:new_user].email
-        session[:new_user].status = "active"
-      end
 
       redirect_to :action => "terms"
     else

app/helpers/application_helper.rb

@@ -40,9 +40,7 @@ module ApplicationHelper
   end
 
   def if_user(user, tag = :div, &block)
-    if user
+    content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") if user
-      content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}")
-    end
   end
 
   def unless_user(user, tag = :div, &block)
@@ -110,9 +108,7 @@ module ApplicationHelper
     if current_user
       data[:user] = current_user.id.to_json
 
-      unless current_user.home_lon.nil? || current_user.home_lat.nil?
+      data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } unless current_user.home_lon.nil? || current_user.home_lat.nil?
-        data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon }
-      end
     end
 
     data[:location] = session[:location] if session[:location]

app/helpers/browse_helper.rb

@@ -8,18 +8,14 @@ module BrowseHelper
            object.id
          end
     name = t "printable_name.with_id", :id => id.to_s
-    if version
+    name = t "printable_name.with_version", :id => name, :version => object.version.to_s if version
-      name = t "printable_name.with_version", :id => name, :version => object.version.to_s
-    end
 
     # don't look at object tags if redacted, so as to avoid giving
     # away redacted version tag information.
     unless object.redacted?
       locale = I18n.locale.to_s
 
-      while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}")
+      locale = locale.sub(/-[^-]+/, "") while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}")
-        locale = locale.sub(/-[^-]+/, "")
-      end
 
       if object.tags.include? "name:#{locale}"
         name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["name:#{locale}"].to_s), :id => content_tag(:bdi, name)

app/models/changeset.rb

@@ -55,9 +55,6 @@ class Changeset < ActiveRecord::Base
 
   before_save :update_closed_at
 
-  # over-expansion factor to use when updating the bounding box
-  EXPAND = 0.1
-
   # maximum number of elements allowed in a changeset
   MAX_ELEMENTS = 10000
 
@@ -127,12 +124,9 @@ class Changeset < ActiveRecord::Base
   end
 
   ##
-  # expand the bounding box to include the given bounding box. also,
+  # expand the bounding box to include the given bounding box.
-  # expand a little bit more in the direction of the expansion, so that
-  # further expansions may be unnecessary. this is an optimisation
-  # suggested on the wiki page by kleptog.
   def update_bbox!(bbox_update)
-    bbox.expand!(bbox_update, EXPAND)
+    bbox.expand!(bbox_update)
 
     # update active record. rails 2.1's dirty handling should take care of
     # whether this object needs saving or not.
@@ -141,8 +135,7 @@ class Changeset < ActiveRecord::Base
 
   ##
   # the number of elements is also passed in so that we can ensure that
-  # a single changeset doesn't contain too many elements. this, of course,
+  # a single changeset doesn't contain too many elements.
-  # destroys the optimisation described in the bbox method above.
   def add_changes!(elements)
     self.num_changes += elements
   end

app/models/notifier.rb

@@ -9,6 +9,7 @@ class Notifier < ActionMailer::Base
   def signup_confirm(user, token)
     with_recipient_locale user do
       @url = url_for(:host => SERVER_URL,
+                     :protocol => SERVER_PROTOCOL,
                      :controller => "user", :action => "confirm",
                      :display_name => user.display_name,
                      :confirm_string => token.token)
@@ -22,6 +23,7 @@ class Notifier < ActionMailer::Base
     with_recipient_locale user do
       @address = user.new_email
       @url = url_for(:host => SERVER_URL,
+                     :protocol => SERVER_PROTOCOL,
                      :controller => "user", :action => "confirm_email",
                      :confirm_string => token.token)
 
@@ -33,6 +35,7 @@ class Notifier < ActionMailer::Base
   def lost_password(user, token)
     with_recipient_locale user do
       @url = url_for(:host => SERVER_URL,
+                     :protocol => SERVER_PROTOCOL,
                      :controller => "user", :action => "reset_password",
                      :token => token.token)
 
@@ -73,9 +76,11 @@ class Notifier < ActionMailer::Base
       @text = message.body
       @title = message.title
       @readurl = url_for(:host => SERVER_URL,
+                         :protocol => SERVER_PROTOCOL,
                          :controller => "message", :action => "read",
                          :message_id => message.id)
       @replyurl = url_for(:host => SERVER_URL,
+                          :protocol => SERVER_PROTOCOL,
                           :controller => "message", :action => "reply",
                           :message_id => message.id)
       @author = @from_user
@@ -95,18 +100,21 @@ class Notifier < ActionMailer::Base
       @text = comment.body
       @title = comment.diary_entry.title
       @readurl = url_for(:host => SERVER_URL,
+                         :protocol => SERVER_PROTOCOL,
                          :controller => "diary_entry",
                          :action => "view",
                          :display_name => comment.diary_entry.user.display_name,
                          :id => comment.diary_entry.id,
                          :anchor => "comment#{comment.id}")
       @commenturl = url_for(:host => SERVER_URL,
+                            :protocol => SERVER_PROTOCOL,
                             :controller => "diary_entry",
                             :action => "view",
                             :display_name => comment.diary_entry.user.display_name,
                             :id => comment.diary_entry.id,
                             :anchor => "newcomment")
       @replyurl = url_for(:host => SERVER_URL,
+                          :protocol => SERVER_PROTOCOL,
                           :controller => "message",
                           :action => "new",
                           :display_name => comment.user.display_name,
@@ -125,9 +133,11 @@ class Notifier < ActionMailer::Base
     with_recipient_locale friend.befriendee do
       @friend = friend
       @viewurl = url_for(:host => SERVER_URL,
+                         :protocol => SERVER_PROTOCOL,
                          :controller => "user", :action => "view",
                          :display_name => @friend.befriender.display_name)
       @friendurl = url_for(:host => SERVER_URL,
+                           :protocol => SERVER_PROTOCOL,
                            :controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)
       @author = @friend.befriender.display_name

app/models/relation.rb

@@ -182,9 +182,7 @@ class Relation < ActiveRecord::Base
   end
 
   def delete_with_history!(new_relation, user)
-    unless visible
+    raise OSM::APIAlreadyDeletedError.new("relation", new_relation.id) unless visible
-      raise OSM::APIAlreadyDeletedError.new("relation", new_relation.id)
-    end
 
     # need to start the transaction here, so that the database can
     # provide repeatable reads for the used-by checks. this means it
@@ -208,9 +206,7 @@ class Relation < ActiveRecord::Base
     Relation.transaction do
       lock!
       check_consistency(self, new_relation, user)
-      unless new_relation.preconditions_ok?(members)
+      raise OSM::APIPreconditionFailedError, "Cannot update relation #{id}: data or member data is invalid." unless new_relation.preconditions_ok?(members)
-        raise OSM::APIPreconditionFailedError, "Cannot update relation #{id}: data or member data is invalid."
-      end
       self.changeset_id = new_relation.changeset_id
       self.changeset = new_relation.changeset
       self.tags = new_relation.tags
@@ -222,9 +218,7 @@ class Relation < ActiveRecord::Base
 
   def create_with_history(user)
     check_create_consistency(self, user)
-    unless preconditions_ok?
+    raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid." unless preconditions_ok?
-      raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid."
-    end
     self.version = 0
     self.visible = true
     save_with_history!
@@ -259,9 +253,7 @@ class Relation < ActiveRecord::Base
       element = model.lock("for share").find_by(:id => m[1])
 
       # and check that it is OK to use.
-      unless element && element.visible? && element.preconditions_ok?
+      raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}" unless element && element.visible? && element.preconditions_ok?
-        raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}"
-      end
       hash[m[1]] = true
     end
 

app/models/user.rb

@@ -283,9 +283,7 @@ class User < ActiveRecord::Base
   ##
   # perform a spam check on a user
   def spam_check
-    if status == "active" && spam_score > SPAM_THRESHOLD
+    update(:status => "suspended") if status == "active" && spam_score > SPAM_THRESHOLD
-      update(:status => "suspended")
-    end
   end
 
   ##

app/models/way.rb

@@ -120,14 +120,10 @@ class Way < ActiveRecord::Base
     way_nodes.each do |nd|
       if visible_nodes
         # if there is a list of visible nodes then use that to weed out deleted nodes
-        if visible_nodes[nd.node_id]
+        ordered_nodes[nd.sequence_id] = nd.node_id.to_s if visible_nodes[nd.node_id]
-          ordered_nodes[nd.sequence_id] = nd.node_id.to_s
-        end
       else
         # otherwise, manually go to the db to check things
-        if nd.node && nd.node.visible?
+        ordered_nodes[nd.sequence_id] = nd.node_id.to_s if nd.node && nd.node.visible?
-          ordered_nodes[nd.sequence_id] = nd.node_id.to_s
-        end
       end
     end
 
@@ -184,9 +180,7 @@ class Way < ActiveRecord::Base
     Way.transaction do
       lock!
       check_consistency(self, new_way, user)
-      unless new_way.preconditions_ok?(nds)
+      raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid." unless new_way.preconditions_ok?(nds)
-        raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid."
-      end
 
       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset
@@ -199,9 +193,7 @@ class Way < ActiveRecord::Base
 
   def create_with_history(user)
     check_create_consistency(self, user)
-    unless preconditions_ok?
+    raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid." unless preconditions_ok?
-      raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid."
-    end
     self.version = 0
     self.visible = true
     save_with_history!
@@ -209,9 +201,7 @@ class Way < ActiveRecord::Base
 
   def preconditions_ok?(old_nodes = [])
     return false if nds.empty?
-    if nds.length > MAX_NUMBER_OF_WAY_NODES
+    raise OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES) if nds.length > MAX_NUMBER_OF_WAY_NODES
-      raise OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES)
-    end
 
     # check only the new nodes, for efficiency - old nodes having been checked last time and can't
     # be deleted when they're in-use.

app/views/layouts/_search.html.erb

@@ -23,6 +23,9 @@
       <select class="routing_engines" name="routing_engines"></select>
       <%= submit_tag t('site.search.submit_text'), :class => "routing_go", :data => { disable_with: false } %>
     </div>
+    <div class="line">
+      <a class="reverse_directions"><%= t('site.search.reverse_directions_text') %></a>
+    </div>
 
     <div class="loader_copy"><div class="loader"><%= image_tag "searching.gif" %></div></div>
   </form>

app/views/trace/_trace.html.erb

@@ -15,8 +15,7 @@
         (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
       <% end %>
       ... <%= t'trace.trace.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>
-      <%= link_to t('trace.trace.more'), {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => t('trace.trace.trace_details')} %> /
+      <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {:title => t('trace.trace.view_map')} %> /
-      <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {:title => t('trace.trace.view_map')} %> /
       <%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %>
       <span class="trace_<%= trace.visibility %>"><%= t('trace.trace.' + trace.visibility) %></span>
       <br />

app/views/trace/view.html.erb

@@ -25,7 +25,7 @@
     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
   <tr>
     <td><%= t'trace.view.start_coordinates' %></td>
-    <td><div class="geo"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to t('trace.view.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('trace.view.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
+    <td><div class="geo"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to t('trace.view.map'), :controller => 'site', :action => 'index', :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('trace.view.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
   </tr>
   <% end %>
   <tr>

app/views/user/api_read.builder

@@ -10,9 +10,7 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do
     else
       xml.tag! "contributor-terms", :agreed => @this_user.terms_agreed.present?
     end
-    if @this_user.image.file? || @this_user.image_use_gravatar
+    xml.tag! "img", :href => user_image_url(@this_user, :size => 256) if @this_user.image.file? || @this_user.image_use_gravatar
-      xml.tag! "img", :href => user_image_url(@this_user, :size => 256)
-    end
     xml.tag! "roles" do
       @this_user.roles.each do |role|
         xml.tag! role.role

config/application.rb

@@ -34,9 +34,7 @@ module OpenStreetMap
     config.paths["app/models"].skip_eager_load! if STATUS == :database_offline
 
     # Use memcached for caching if required
-    if defined?(MEMCACHE_SERVERS)
+    config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } if defined?(MEMCACHE_SERVERS)
-      config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" }
-    end
 
     # Use logstash for logging if required
     if defined?(LOGSTASH_PATH)

config/banners.yml

@@ -1,18 +1,12 @@
-sotmasia2017:
+fossgis2018:
-  id: sotmasia2017
+  id: fossgis2018
-  alt: State of the Map Asia 2017
+  alt: FOSSGIS Conference 2018
-  link: http://stateofthemap.asia/
+  link: https://fossgis-konferenz.de/2018/
-  img: banners/sotmasia-2017-banner.png
+  img: banners/fossgis2018.png
-  enddate: 2017-sep-25
+  enddate: 2018-mar-24
-sotmus2017:
+osmit2018:
-  id: sotmus2017
+  id: osmit2018
-  alt: State of the Map US 2017
+  alt: FOSS4G-IT 2018
-  link: https://2017.stateofthemap.us/
+  link: http://foss4g-it2018.gfoss.it/
-  img: banners/banner-sotmus2017.png
+  img: banners/foss4g-it2018-banner.png
-  enddate: 2017-oct-20
+  enddate: 2018-feb-22
-osmfmembership2017:
-  id: osmfmembership2017
-  alt: Join the OpenStreetMap Foundation
-  link: https://blog.openstreetmap.org/2017/09/25/join-the-openstreetmap-foundation-now-and-help-shape-the-future-of-the-project/
-  img: banners/osmf-membership-drive-2017.png
-  enddate: 2017-nov-11

config/environments/development.rb

@@ -35,9 +35,7 @@ Rails.application.configure do
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.
-  unless STATUS == :database_offline
+  config.active_record.migration_error = :page_load unless STATUS == :database_offline
-    config.active_record.migration_error = :page_load
-  end
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large

config/environments/production.rb

@@ -93,9 +93,7 @@ Rails.application.configure do
   end
 
   # Do not dump schema after migrations.
-  unless STATUS == :database_offline
+  config.active_record.dump_schema_after_migration = false unless STATUS == :database_offline
-    config.active_record.dump_schema_after_migration = false
-  end
 
   # Enable autoloading of dependencies.
   config.enable_dependency_loading = true

config/initializers/compressed_requests.rb

@@ -0,0 +1,42 @@
+module OpenStreetMap
+  class CompressedRequests
+    def initialize(app)
+      @app = app
+    end
+
+    def method_handled?(env)
+      %w[POST PUT].include? env["REQUEST_METHOD"]
+    end
+
+    def encoding_handled?(env)
+      %w[gzip deflate].include? env["HTTP_CONTENT_ENCODING"]
+    end
+
+    def call(env)
+      if method_handled?(env) && encoding_handled?(env)
+        extracted = decode(env["rack.input"], env["HTTP_CONTENT_ENCODING"])
+
+        env.delete("HTTP_CONTENT_ENCODING")
+        env["CONTENT_LENGTH"] = extracted.bytesize
+        env["rack.input"] = StringIO.new(extracted)
+      end
+
+      if env["HTTP_CONTENT_ENCODING"]
+        [415, {}, []]
+      else
+        @app.call(env)
+      end
+    end
+
+    def decode(input, content_encoding)
+      input.rewind
+
+      case content_encoding
+      when "gzip" then Zlib::GzipReader.new(input).read
+      when "deflate" then Zlib::Inflate.inflate(input.read)
+      end
+    end
+  end
+end
+
+Rails.configuration.middleware.use OpenStreetMap::CompressedRequests

config/initializers/cors.rb

@@ -7,9 +7,7 @@ module OpenStreetMap
   class Cors < Rack::Cors
     def call(env)
       status, headers, body = super env
-      if headers["Access-Control-Allow-Origin"]
+      headers["Cache-Control"] = "no-cache" if headers["Access-Control-Allow-Origin"]
-        headers["Cache-Control"] = "no-cache"
-      end
       [status, headers, body]
     end
   end

config/initializers/omniauth.rb

@@ -26,9 +26,7 @@ windowslive_options = { :name => "windowslive", :scope => "wl.signin,wl.emails"
 github_options = { :name => "github", :scope => "user:email" }
 wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://meta.wikimedia.org" } }
 
-if defined?(GOOGLE_OPENID_REALM)
+google_options[:openid_realm] = GOOGLE_OPENID_REALM if defined?(GOOGLE_OPENID_REALM)
-  google_options[:openid_realm] = GOOGLE_OPENID_REALM
-end
 
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :openid, openid_options

config/locales/af.yml

@@ -400,33 +400,26 @@ af:
           crematorium: Krematorium
           dentist: Tandarts
           doctors: Dokters
-          dormitory: Studentehuis
           drinking_water: Drinkwater
           driving_school: Bestuurskool
           embassy: Ambassade
-          emergency_phone: Noodtelefoon
           fast_food: Wegneemetes
           ferry_terminal: Pontterminaal
-          fire_hydrant: Brandkraan
           fire_station: Brandweerstasie
           food_court: Kosarea
           fountain: Fontein
           fuel: Brandstof
           gambling: Dobbelary
           grave_yard: Begraafplaas
-          gym: Fiksheidsentrum / Gim
-          health_centre: Gesondheidsentrum
           hospital: Hospitaal
           hunting_stand: Jagtoring
           ice_cream: Roomys
           kindergarten: Kleuterskool
           library: Biblioteek
-          market: Mark
           marketplace: Markplein
           monastery: Monnikeklooster
           motorcycle_parking: Motorfietsparkering
           nightclub: Nagklub
-          nursery: Kleuterskool
           nursing_home: Verpleging- en versorgingshuis
           office: Kantoor
           parking: Parkering
@@ -440,7 +433,6 @@ af:
           prison: Tronk
           pub: Kroeg
           public_building: Openbare Gebou
-          reception_area: Ontvangsarea
           recycling: Herwinningspunt
           restaurant: Restaurant
           retirement_home: Ouetehuis
@@ -530,7 +522,6 @@ af:
           trunk: Hoofroete
           trunk_link: Hoofroete
           unclassified: Ongeklassifiseerde pad
-          unsurfaced: Grondpad
           "yes": Straat
         historic:
           archaeological_site: Argeologiese werf
@@ -590,7 +581,6 @@ af:
         leisure:
           beach_resort: Strandoord
           bird_hide: Voëlkykhuisie
-          club: Klub
           dog_park: Hondepark
           fishing: Visvanggebied
           fitness_centre: Fiksheidsentrum
@@ -678,8 +668,6 @@ af:
           "yes": Kantoor
         place:
           allotments: Toekennings
-          block: Blokkeer
-          airport: Lughawe
           city: Stad
           country: Land
           county: Distrik
@@ -691,7 +679,6 @@ af:
           islet: Eilandjie
           isolated_dwelling: Geïsoleerde woning
           locality: Ligging
-          moor: Vleiland
           municipality: Munisipaliteit
           neighbourhood: Woonbuurt
           postcode: Poskode
@@ -708,10 +695,8 @@ af:
           abandoned: Verlate Spoorweg
           construction: Spoor in aanbou
           disused: Spoorweg in onbruik
-          disused_station: Spoorwegstasie in onbruik
           funicular: Kabelspoorweg
           halt: Treinhalte
-          historic_station: Historiese spoorwegstasie
           junction: Spoorwegkruising
           level_crossing: Spooroorgang
           light_rail: Ligte spoor
@@ -772,7 +757,6 @@ af:
           hairdresser: Haarkapper
           hardware: Hardewarewinkel
           hifi: Hoëtrou
-          insurance: Versekering
           jewelry: Juwelierswinkel
           kiosk: Kiosk
           laundry: Wassery
@@ -788,10 +772,8 @@ af:
           pet: Troeteldierwinkel
           pharmacy: Apteek
           photo: Fotowinkel
-          salon: Skoonheidssalon
           second_hand: Tweedehandswinkel
           shoes: Skoenwinkel
-          shopping_centre: Winkelsentrum
           sports: Sportwinkel
           stationery: Skryfbehoeftewinkel
           supermarket: Supermark

config/locales/aln.yml

@@ -271,29 +271,22 @@ aln:
           crematorium: Krematorium
           dentist: Mjeku i dhomve
           doctors: Mjekët
-          dormitory: Konvikt
           drinking_water: Pirja e ujit
           driving_school: Auto shkollë
           embassy: Ambasada
-          emergency_phone: Urgjencës Phone
           fast_food: Ushqim I shpejtë
           ferry_terminal: Terminali i Trageteve
-          fire_hydrant: Zjarri hydrant
           fire_station: Zjarrëfiksat
           fountain: Burim
           fuel: Lëndë djegëse
           grave_yard: Varrezë
-          gym: Qendra Kalitje fizike / palestër
-          health_centre: Qendër e Shëndetësore
           hospital: Spital
           hunting_stand: Gjuetia Stand
           ice_cream: Akullore
           kindergarten: Kopshti i fëmijëve
           library: Bibliotekë
-          market: Treg
           marketplace: Treg
           nightclub: Night Club
-          nursery: Fidanishte
           nursing_home: shtëpi pleqsh
           office: Zyrë
           parking: Parking
@@ -306,7 +299,6 @@ aln:
           prison: Burg
           pub: Pijetore
           public_building: Publike Ndërtimi
-          reception_area: Zona e pritjes
           recycling: Pika riciklimit
           restaurant: Restorant
           retirement_home: Daljes në pension Home
@@ -363,7 +355,6 @@ aln:
           trunk: rrugën kryesore
           trunk_link: rrugën kryesore
           unclassified: Paklasifikuara Road
-          unsurfaced: Rrugë pa sipërfaqe
         historic:
           archaeological_site: Arkeologjik Faqes
           battlefield: Fushë beteje
@@ -463,7 +454,6 @@ aln:
           wetland: Lagunat
           wood: Dru
         place:
-          airport: Aeroport
           city: Qyteti
           country: Veni
           county: Qark
@@ -474,7 +464,6 @@ aln:
           island: Ishull
           islet: Ishull
           locality: Lokalitet
-          moor: Knete
           municipality: Komuna
           postcode: Post kodi
           region: Regjioni
@@ -489,10 +478,8 @@ aln:
           abandoned: Braktisur hekurudhave
           construction: Hekurudhave në ndërtim
           disused: Hekurudhave papërdorur
-          disused_station: Stacioni hekurudhor Historike
           funicular: Me litar hekurudhave
           halt: Trajnimi Stop
-          historic_station: Stacioni hekurudhor Historike
           junction: Hekurudhave kryqëzim
           level_crossing: Kalim në nivel
           light_rail: hekurudhor Lehta
@@ -550,7 +537,6 @@ aln:
           hairdresser: Floktar
           hardware: dyqan mjet
           hifi: dyqan hi-fi
-          insurance: Sigurim
           jewelry: Bizhuteri Shop
           kiosk: kiosk
           laundry: Lavanderi
@@ -565,9 +551,7 @@ aln:
           outdoor: dyqan në natyrë
           pet: Shitore e kafshëve
           photo: dyqan fotografik
-          salon: Sallon
           shoes: dyqan këpucësh
-          shopping_centre: Qendra tregtare
           sports: Sport Dyqani
           stationery: dyqan shkrimi
           supermarket: Supermarket

config/locales/ar.yml

@@ -4,6 +4,7 @@
 # Author: Ali1
 # Author: Aude
 # Author: Ayatun
+# Author: Azouz.anis
 # Author: Bassem JARKAS
 # Author: ButterflyOfFire
 # Author: Fahad
@@ -455,33 +456,26 @@ ar:
           crematorium: محرقة جثث
           dentist: طبيب أسنان
           doctors: أطباء
-          dormitory: عنبر نوم
           drinking_water: مياه عذبة
           driving_school: مدرسة تعليم قيادة
           embassy: سفارة
-          emergency_phone: هاتف طوارئ
           fast_food: وجبات سريعة
           ferry_terminal: مرسى عبّارة
-          fire_hydrant: مواد مكافحة حرائق
           fire_station: فوج إطفاء
           food_court: مطعم وجبات سريعة
           fountain: نافورة
           fuel: وقود
           gambling: مقامرة
           grave_yard: مقبرة
-          gym: مركز للرشاقة/الرياضة
-          health_centre: مركز صحي
           hospital: مستشفى
           hunting_stand: مربط للصيد
           ice_cream: مثلجات
           kindergarten: حضانة أطفال
           library: مكتبة
-          market: سوق
           marketplace: سوق
           monastery: دير
           motorcycle_parking: مرآب دراجات نارية
           nightclub: نادي ليلي
-          nursery: رعاية تمريضية
           nursing_home: دار رعاية مسنين/معاقين
           office: مكتب
           parking: موقف سيارات
@@ -495,7 +489,6 @@ ar:
           prison: سجن
           pub: حانة
           public_building: مبنى عام
-          reception_area: منطقة استقبال
           recycling: نقطة إعادة تصنيع
           restaurant: مطعم
           retirement_home: بيت مسنين
@@ -582,6 +575,7 @@ ar:
           services: خدمات الطرق السريعة
           speed_camera: كاميرا كشف السرعة
           steps: درج
+          stop: إشارة وقوف
           street_lamp: مصباح شارع
           tertiary: طريق فرعي
           tertiary_link: طريق فرعي
@@ -591,7 +585,6 @@ ar:
           trunk: طريق رئيسي
           trunk_link: طريق رئيسي
           unclassified: طريق غير مصنّف
-          unsurfaced: طريق غير معبد
           "yes": طريق
         historic:
           archaeological_site: موقع أثري
@@ -619,6 +612,7 @@ ar:
           wayside_cross: صليب تذكاري
           wayside_shrine: مزار جانب طريق
           wreck: حطام
+          "yes": موقع تاريخي
         junction:
           "yes": تقاطع
         landuse:
@@ -656,7 +650,6 @@ ar:
         leisure:
           beach_resort: شاطئ منتجع
           bird_hide: مخبئ طيور
-          club: نادي
           common: أرض مشاع
           dog_park: حديقة كلاب
           fishing: منطقة صيد سمك
@@ -692,6 +685,7 @@ ar:
           airfield: منطقة عسكرية
           barracks: ثكنات
           bunker: دشمة
+          "yes": عسكري
         mountain_pass:
           "yes": ممر جبلي
         natural:
@@ -742,6 +736,7 @@ ar:
           estate_agent: سمسار مباني
           government: دائرة حكومية
           insurance: مكتب شركة تأمين
+          it: مكتب تقنية معلومات
           lawyer: محامي
           ngo: مكتب منظمة غير حكومية
           telecommunication: مكتب شركة إتصالات
@@ -749,8 +744,6 @@ ar:
           "yes": مكتب
         place:
           allotments: المخصصات
-          block: حظر
-          airport: مطار
           city: مدينة
           country: دولة
           county: مقاطعة
@@ -762,7 +755,6 @@ ar:
           islet: جزيرة صغيرة
           isolated_dwelling: سكن منعزل
           locality: محلة
-          moor: أرض جرداء
           municipality: البلدية
           neighbourhood: حي
           postcode: الرمز البريدي
@@ -779,10 +771,8 @@ ar:
           abandoned: سكة حديد مهجورة
           construction: سكة حديدية تحت الإنشاء
           disused: سكة حديد مهجورة
-          disused_station: محطة سكة حديدية مهجورة
           funicular: سكة حديدية معلقة
           halt: موقف قطار
-          historic_station: محطة سكة حديد تاريخية
           junction: تقاطع سكك حديدية
           level_crossing: تقاطع سكك حديدية
           light_rail: قطار خفيف
@@ -846,7 +836,6 @@ ar:
           hairdresser: مزين/مصفف شعر
           hardware: متجر عتاد
           hifi: متجر هاي فاي
-          insurance: بوليصات تأمين
           jewelry: متجر مجوهرات
           kiosk: كشك
           laundry: مصبغة
@@ -862,10 +851,8 @@ ar:
           pet: متجر حيوانات أليفة
           pharmacy: صيدلية
           photo: متجر صور
-          salon: صالون
           second_hand: متجر أغراض مستعملة
           shoes: متجر أحذية
-          shopping_centre: مركز التسوق
           sports: متجر رياضة
           stationery: محل قرطاسية
           supermarket: سوبرماركت
@@ -873,7 +860,7 @@ ar:
           toys: متجر ألعاب
           travel_agency: وكالة سفر
           video: متجر فيديو
-          wine: متجر نبيذ للبيع الخارجي
+          wine: محل لبيع النبيذ
           "yes": متجر
         tourism:
           alpine_hut: كوخ جبلي
@@ -1089,6 +1076,11 @@ ar:
     community_driven_title: نابعة من المجتمع المحلي
     open_data_title: البيانات المفتوحة
     legal_title: قانوني
+    legal_html: |-
+      هذا الموقع والعديد من الخدمات الأخرى ذات الصلة يتم تشغيلها رسميا من قبل <a href='https://osmfoundation.org/'>OpenStreetMapمؤسسة</a>(OSMF) نيابة عن المجتمع. يخضع استخدام جميع خدمات تشغيل OSMF الينا<a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+      Acceptable Use Policies</a> و <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
+      </a>
+      OpenStreetMap, الشعار المكبر و الخريطة هي<a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
     partners_title: الشركاء
   notifier:
     diary_comment_notification:
@@ -1301,6 +1293,7 @@ ar:
       where_am_i: أين أنا؟
       where_am_i_title: صِف الموقع الحالي باستخدام محرك البحث
       submit_text: اذهب
+      reverse_directions_text: اعكس الاتجاهات
     key:
       table:
         entry:

config/locales/arz.yml

@@ -242,29 +242,22 @@ arz:
           crematorium: محرقه جثث
           dentist: طبيب أسنان
           doctors: أطباء
-          dormitory: عنبر نوم
           drinking_water: مياه عذبة
           driving_school: مدرسه تعليم قيادة
           embassy: سفارة
-          emergency_phone: هاتف طوارئ
           fast_food: وجبات سريعة
           ferry_terminal: مرسى عبّارة
-          fire_hydrant: مواد مكافحه حرائق
           fire_station: فوج إطفاء
           fountain: نافورة
           fuel: وقود
           grave_yard: مقبرة
-          gym: مركز للرشاقة/الرياضة
-          health_centre: مركز صحي
           hospital: مستشفى
           hunting_stand: مربط للصيد
           ice_cream: مثلجات
           kindergarten: حضانه أطفال
           library: مكتبة
-          market: سوق
           marketplace: سوق
           nightclub: نادى ليلي
-          nursery: رعايه تمريضية
           nursing_home: دار رعايه مسنين/معاقين
           office: مكتب
           parking: موقف سيارات
@@ -277,7 +270,6 @@ arz:
           prison: سجن
           pub: حانة
           public_building: مبنى عام
-          reception_area: منطقه استقبال
           recycling: نقطه إعاده تصنيع
           restaurant: مطعم
           sauna: حمّام بخارى حار
@@ -329,7 +321,6 @@ arz:
           trunk: طريق رئيسي
           trunk_link: طريق رئيسي
           unclassified: طريق غير مصنّف
-          unsurfaced: طريق غير معبد
         historic:
           archaeological_site: موقع أثري
           battlefield: ساحه معركة
@@ -422,7 +413,6 @@ arz:
           wetland: أرض رطبة
           wood: حرج
         place:
-          airport: مطار
           city: مدينة
           country: دولة
           county: مقاطعة
@@ -433,7 +423,6 @@ arz:
           island: جزيرة
           islet: جزيره صغيرة
           locality: محلة
-          moor: أرض جرداء
           municipality: بلدية
           postcode: الرمز البريدي
           region: منطقة
@@ -447,9 +436,7 @@ arz:
           abandoned: سكه حديد مهجورة
           construction: سكه حديديه تحت الإنشاء
           disused: سكه حديد مهجورة
-          disused_station: محطه سكه حديد مهجورة
           halt: موقف قطار
-          historic_station: محطه سكه حديد تاريخية
           junction: تقاطع سكك حديدية
           level_crossing: تقاطع سكك حديدية
           monorail: قطار ذات سكه حديد واحدة
@@ -495,7 +482,6 @@ arz:
           grocery: بقالة
           hairdresser: مزين/مصفف شعر
           hardware: متجر عتاد
-          insurance: بوليسات تأمين
           jewelry: متجر مجوهرات
           kiosk: كشك
           laundry: مصبغة
@@ -510,9 +496,7 @@ arz:
           outdoor: متجر للنشاطات الخارجية
           pet: متجر حيوانات أليفة
           photo: متجر صور
-          salon: صالون
           shoes: متجر أحذية
-          shopping_centre: مركز التسوق
           sports: متجر رياضة
           stationery: محل قرطاسية
           supermarket: سوبرماركت

config/locales/ast.yml

@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Enolp
+# Author: Fitoschido
 # Author: Macofe
 # Author: Xuacu
 ---
@@ -339,7 +340,7 @@ ast:
       map_image: Imaxe del mapa (amuesa la capa estándar)
       embeddable_html: HTML pa embrivir
       licence: Llicencia
-      export_details: Los datos d'OpenStreetMap tan llicenciaos baxo la <a href="http://opendatacommons.org/licenses/odbl/1.0/">llicencia
+      export_details: Los datos d'OpenStreetMap tan llicenciaos baxo la <a href="https://opendatacommons.org/licenses/odbl/1.0/">llicencia
         Open Data Commons Open Database</a> (ODbL).
       too_large:
         advice: 'Si falla la esportación anterior, considera utilizar una de les fontes
@@ -380,14 +381,14 @@ ast:
   geocoder:
     search:
       title:
-        latlon: Resultaos <a href="http://openstreetmap.org/">internos</a>
+        latlon: Resultaos <a href="https://openstreetmap.org/">internos</a>
         uk_postcode: Resultaos de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>
-        ca_postcode: Resultaos de <a href="http://geocoder.ca/">Geocoder.CA</a>
+        ca_postcode: Resultaos de <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Resultaos de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Resultaos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Resultaos de <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: Resultaos de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Resultaos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames_reverse: Resultaos de <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
@@ -397,12 +398,19 @@ ast:
           chair_lift: Telesilla
           drag_lift: Telesquí
           gondola: Telecabina
+          platter: Telesquí
+          pylon: Poste
           station: Estación de cable
+          t-bar: Remonte de barra en T
         aeroway:
           aerodrome: Aeródromu
+          airstrip: Campu d'aviación
           apron: Aparcaderu d'aviones
           gate: Puerta
+          hangar: Hangar
           helipad: Helipuertu
+          holding_position: Posición d'espera
+          parking_position: Posición d'aparcamientu
           runway: Pista
           taxiway: Cai de rodaxe
           terminal: Terminal
@@ -437,37 +445,32 @@ ast:
           crematorium: Crematoriu
           dentist: Dentista
           doctors: Médicos
-          dormitory: Residencia
           drinking_water: Agua potable
           driving_school: Autoescuela
           embassy: Embaxada
-          emergency_phone: Teléfonu d'emerxencia
           fast_food: Comida rápida
           ferry_terminal: Terminal de ferry
-          fire_hydrant: Boca d'incendios
           fire_station: Bomberos
           food_court: Zona de restoranes
           fountain: Fonte
           fuel: Combustible
           gambling: Xuegos d'azar
           grave_yard: Cementeriu
-          gym: Ximnasiu
+          grit_bin: Caxa d'arenón con sal
-          health_centre: Centru de salú
           hospital: Hospital
           hunting_stand: Puestu de caza
           ice_cream: Xelaos
           kindergarten: Xardín d'infancia
           library: Biblioteca
-          market: Mercáu
           marketplace: Mercáu
           monastery: Monasteriu
           motorcycle_parking: Aparcamientu pa motocicletes
           nightclub: Sala de fiestes
-          nursery: Guardería
           nursing_home: Residencia asistida
           office: Oficina
           parking: Aparcamientu
           parking_entrance: Entrada d'aparcamientu
+          parking_space: Plaza d'aparcamientu
           pharmacy: Farmacia
           place_of_worship: Llugar de cultu
           police: Policía
@@ -477,7 +480,6 @@ ast:
           prison: Cárcel
           pub: Pub
           public_building: Edificiu públicu
-          reception_area: Área de recepción
           recycling: Puntu llimpiu
           restaurant: Restorán
           retirement_home: Residencia de xubilaos
@@ -502,6 +504,7 @@ ast:
           village_hall: Sala polivalente
           waste_basket: Papelera
           waste_disposal: Contenedor pa basories
+          water_point: Toma d'agua
           youth_centre: Centru de mocedá
         boundary:
           administrative: Llende alministrativa
@@ -510,6 +513,7 @@ ast:
           protected_area: Área protexida
         bridge:
           aqueduct: Acueductu
+          boardwalk: Camín de tables
           suspension: Ponte colgante
           swing: Ponte xiratoria
           viaduct: Viaductu
@@ -529,25 +533,31 @@ ast:
           "yes": Tienda d'artesanía
         emergency:
           ambulance_station: Base d'ambulancies
+          assembly_point: Puntu de xuntanza
           defibrillator: Desfibrilador
           landing_site: Llugar de aterrizaxe d'emerxencia
           phone: Teléfonu d'emerxencia
+          water_tank: Depósitu d'agua pa emerxencies
+          "yes": Emerxencia
         highway:
           abandoned: Estrada abandonada
           bridleway: Caleya
           bus_guideway: Carril bus con guía
           bus_stop: Parada d'autobús
           construction: Estrada en construcción
+          corridor: Pasiellu
           cycleway: Pista pa bicicletes
           elevator: Ascensor
           emergency_access_point: Accesu d'emerxencia
           footway: Senderu
           ford: Vau
+          give_way: Señal de dexar pasu
           living_street: Rúa residencial
           milestone: Moyón
           motorway: Autoestrada
           motorway_junction: Encruz d'autoestrada
           motorway_link: Enllaz d'autovía
+          passing_place: Apartaderu p'adelantamientu
           path: Camín
           pedestrian: Camín peonil
           platform: Andén
@@ -564,6 +574,7 @@ ast:
           services: Área de serviciu
           speed_camera: Radar
           steps: Escaleres
+          stop: Señal de stop
           street_lamp: Farola
           tertiary: Estrada terciaria
           tertiary_link: Estrada terciaria
@@ -572,8 +583,8 @@ ast:
           trail: Senderu
           trunk: Estrada nacional
           trunk_link: Estrada nacional
+          turning_loop: Carril pa dar vuelta
           unclassified: Estrada ensin clasificar
-          unsurfaced: Estrada ensin asfaltar
           "yes": Estrada
         historic:
           archaeological_site: Xacimientu arqueolóxicu
@@ -592,6 +603,7 @@ ast:
           manor: Casona
           memorial: Memorial
           mine: Mina
+          mine_shaft: Pozu mineru
           monument: Monumentu
           roman_road: Via romana
           ruins: Ruines
@@ -601,6 +613,7 @@ ast:
           wayside_cross: Cruceru
           wayside_shrine: Santuariu de camín
           wreck: Naufraxu
+          "yes": Sitiu históricu
         junction:
           "yes": Interseición
         landuse:
@@ -638,9 +651,9 @@ ast:
         leisure:
           beach_resort: Complexu playeru
           bird_hide: Observatoriu d'aves
-          club: Club
           common: Terrén común
           dog_park: Parque pa perros
+          firepit: Pozu pa fogueres
           fishing: Área de pesca
           fitness_centre: Ximnasiu (fitness)
           fitness_station: Ximnasiu
@@ -665,15 +678,46 @@ ast:
           water_park: Parque acuáticu
           "yes": Folganza
         man_made:
+          adit: Socavón
+          beacon: Baliza
+          beehive: Colmena
+          breakwater: Rompeoles
+          bridge: Ponte
+          bunker_silo: Búnquer
+          chimney: Chimenea
+          crane: Grúa
+          dolphin: Poste d'amarre
+          dyke: Dique
+          embankment: Terremplén
+          flagpole: Asta
+          gasometer: Gasómetru
+          groyne: Espigón
+          kiln: Kiln
           lighthouse: Faru
+          mast: Mástil
+          mine: Mina
+          mineshaft: Pozu mineru
+          monitoring_station: Estación de control
+          petroleum_well: Pozu petrolíferu
+          pier: Muelle
           pipeline: Tubería
+          silo: Silu
+          storage_tank: Depósitu
+          surveillance: Vixilancia
           tower: Torre
+          wastewater_plant: Planta depuradora
+          watermill: Molín d'agua
+          water_tower: Depósitu d'agua eleváu
+          water_well: Pozu
+          water_works: Captación d'agua potable
+          windmill: Molín de vientu
           works: Fábrica
           "yes": Artificial
         military:
           airfield: Aeródromu militar
           barracks: Cuartel
           bunker: Bunker
+          "yes": Militar
         mountain_pass:
           "yes": Puertu de montaña
         natural:
@@ -719,11 +763,14 @@ ast:
           accountant: Contable
           administrative: Alministración
           architect: Arquitectu
+          association: Asociación
           company: Empresa
+          educational_institution: Institución educativa
           employment_agency: Oficina d'emplegu
           estate_agent: Axencia inmobiliaria
           government: Oficina gubernamental
           insurance: Axencia de seguros
+          it: Oficina de Teunoloxíes de la información
           lawyer: Abogáu
           ngo: Oficina d'ONG
           telecommunication: Oficina de telecomunicaciones
@@ -731,9 +778,8 @@ ast:
           "yes": Oficina
         place:
           allotments: Güertos recreativos
-          block: Bloque
-          airport: Aeropuertu
           city: Ciudá
+          city_block: Mazana de cases
           country: País
           county: Condáu
           farm: Casería
@@ -744,12 +790,13 @@ ast:
           islet: Castru de mar
           isolated_dwelling: Vivienda aisllada
           locality: Llocalidá
-          moor: Granda
           municipality: Conceyu
           neighbourhood: Barriu
           postcode: Códigu postal
+          quarter: Barriada
           region: Rexón
           sea: Mar
+          square: Plaza
           state: Estáu o provincia
           subdivision: Subdivisión
           suburb: Suburbiu
@@ -761,10 +808,8 @@ ast:
           abandoned: Ferrocarril abandonáu
           construction: Ferrocarril en construcción
           disused: Ferrocarril ensin usu
-          disused_station: Estación de ferrocarril ensin usu
           funicular: Tren funicular
           halt: Parada de tren
-          historic_station: Estación de ferrocarril históricu
           junction: Encruz ferroviariu
           level_crossing: Pasu a nivel
           light_rail: Ferrocarril llixeru
@@ -790,6 +835,7 @@ ast:
           beauty: Cuidaos corporales
           beverages: Venta de bébores
           bicycle: Tienda de bicicletes
+          bookmaker: Casa d'apuestes
           books: Llibrería
           boutique: Boutique
           butcher: Carnicería
@@ -828,12 +874,16 @@ ast:
           hairdresser: Peluquería
           hardware: Ferretería
           hifi: Hi-Fi
-          insurance: Seguros
+          houseware: Tienda de cacía
+          interior_decoration: Decoración d'interiores
           jewelry: Xoyería
           kiosk: Quioscu
+          kitchen: Venta de cocines
           laundry: Llavandería
+          lottery: Llotería
           mall: Centru comercial
           market: Mercáu
+          massage: Masaxe
           mobile_phone: Tienda de telefonía móvil
           motorcycle: Venta de motos
           music: Tienda de música
@@ -841,21 +891,27 @@ ast:
           optician: Óptica
           organic: Comida ecolóxica
           outdoor: Deportes d'aire llibre
+          paint: Tienda de pinturea
+          pawnbroker: Casa d'empeños
           pet: Tienda d'animales
           pharmacy: Farmacia
           photo: Fotografía
-          salon: Cuidaos corporales
+          seafood: Mariscos
           second_hand: Tienda d'oxetos usaos
           shoes: Zapatería
-          shopping_centre: Centru comercial
           sports: Tienda de deportes
           stationery: Papelería
           supermarket: Supermercáu
           tailor: Sastrería
+          ticket: Venta d'entraes
+          tobacco: Estancu
           toys: Xuguetería
           travel_agency: Axencia de viaxes
+          tyres: Neumáticos
+          vacant: Tienda zarrada
+          variety_store: Tienda de too a 100
           video: Videu club
-          wine: Venta de llicores
+          wine: Vinatería
           "yes": Tienda
         tourism:
           alpine_hut: Refuxu de monte
@@ -879,6 +935,7 @@ ast:
           viewpoint: Mirador
           zoo: Zoo
         tunnel:
+          building_passage: Pasu per edificiu
           culvert: Cañu
           "yes": Túnel
         waterway:
@@ -910,7 +967,7 @@ ast:
         level10: Frontera de barriu
     description:
       title:
-        osm_nominatim: Llugar según <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Llugar según <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Llugar según <a href="http://www.geonames.org/">GeoNames</a>
       types:
@@ -986,21 +1043,21 @@ ast:
       title_html: Drechos d'autor y llicencia
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> son <i>datos abiertos</i>, baxo llicencia <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data
+        href="https://opendatacommons.org/licenses/odbl/">Open Data
         Commons Open Database License</a> (ODbL) de la <a
-        href="http://osmfoundation.org/">Fundación OpenStreetMap</a> (OSMF).
+        href="https://osmfoundation.org/">Fundación OpenStreetMap</a> (OSMF).
       intro_2_html: Puedes copiar, distribuir, tresmitir y adautar los nuesos datos
         de mou llibre, mentanto deas reconocimientu a OpenStreetMap y a los sos collaboradores.
         Si camudes o crees conteníu sobre los nuesos datos, namái podrás distribuir
-        el resultáu baxo la mesma llicencia. El <a href="http://opendatacommons.org/licenses/odbl/1.0/">códigu
+        el resultáu baxo la mesma llicencia. El <a href="https://opendatacommons.org/licenses/odbl/1.0/">códigu
         llegal</a> completu t'esplica los tos drechos y obligaciones.
       intro_3_html: La cartografía de los mosaicos del mapa y la nuesa documentación,
-        tan llicenciaos baxo la llicencia <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+        tán llicenciaos baxo la llicencia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-        Commons Reconocimientu-CompartirIgual 2.0</a> (CC-BY-SA).
+        Commons Reconocimientu-CompartirIgual 2.0</a> (CC BY-SA).
       credit_title_html: Cómo dar reconocimientu a OpenStreetMap
       credit_1_html: Riquimos qu'uses el créditu &ldquo;&copy; Collaboradores d'OpenStreetMap&rdquo;.
       credit_2_html: |-
-        Tamién tienes de dexar claro que los datos tan disponibles baxo la llicencia Open Database License (ODbL), y si utilices los nuesos mosaicos de mapa, que la cartografía tien llicencia CC BY-SA. Pues facelo enllazando a <a href="http://www.openstreetmap.org/copyright">esta páxina de drechos d'autor</a>.
+        Tamién tienes de dexar claro que los datos tan disponibles baxo la llicencia Open Database License (ODbL), y si utilices los nuesos mosaicos de mapa, que la cartografía tien llicencia CC BY-SA. Puedes facelo enllazando a <a href="https://www.openstreetmap.org/copyright">esta páxina de drechos d'autor</a>.
         Alternativamente, y como requisitu si distribues OSM en forma de datos, pues nomar y enllazar direutamente a les llicencies. En medios onde los enllaces nun seyan posibles (por exemplu, obres imprentaes), suxerímoste dirixir a los llectores a openstreetmap.org (espandiendo 'OpenStreetMap' a esta dirección completa, seique), a opendatacommons.org y, si ye'l casu, a creativecommons.org.
       credit_3_html: |-
         Nun mapa electrónicu navegable, los créditos tendríen d'apaecer na esquina del mapa.
@@ -1011,7 +1068,7 @@ ast:
       more_title_html: Pa saber más
       more_1_html: |-
         Llei más tocante a cómo utilizar los nuesos datos, y cómo danos créditu, na <a
-        href="http://osmfoundation.org/Licence">páxina de Llicencia de la OSMF</a>.
+        href="https://osmfoundation.org/Licence">páxina de Llicencia de la OSMF</a>.
       more_2_html: |-
         Anque OpenStreetMap son datos abiertos, nun podemos ufrir una API de mapes de baldre pa desendolcadores d'aplicaciones pa terceros.
         Llei la nuesa <a href="https://operations.osmfoundation.org/policies/api/">Política d'usu de la API</a> (n'inglés),
@@ -1023,10 +1080,10 @@ ast:
         d''otres fontes, ente elles:'
       contributors_at_html: |-
         <strong>Austria</strong>: Contien datos de
-        <a href="http://data.wien.gv.at/">Stadt Wien</a> (baxo
+        <a href="https://data.wien.gv.at/">Stadt Wien</a> (baxo
-        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> y
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> y
-        Land Tirol (baxo <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT con enmiendes</a>).
+        Land Tirol (baxo <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT con enmiendes</a>).
       contributors_ca_html: |-
         <strong>Canadá</strong>: Contien datos de GeoBase&reg;, GeoGratis (&copy; Department of Natural
         Resources Canada), CanVec (&copy; Department of Natural
@@ -1034,12 +1091,12 @@ ast:
         Statistics Canada).
       contributors_fi_html: |-
         <strong>Finlandia</strong>: Contien datos de la base de datos topográfica de la National Land Survey de Finlandia
-        y otros conxuntos de datos, baxo la <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">Llicencia NLSFI</a>.
+        y otros conxuntos de datos, baxo la <a href="http://www.maanmittauslaitos.fi/en/opendata-licence-version1">Llicencia NLSFI</a>.
       contributors_fr_html: '<strong>Francia</strong>: Contien datos sacaos de Direction
         Générale des Impôts.'
       contributors_nl_html: |-
-        <strong>Holanda</strong>: Contien datos &copy; AND, 2007
+        <strong>Paises Baxos</strong>: Contien datos &copy; AND, 2007
-        (<a href="http://www.and.com">www.and.com</a>)
+        (<a href="https://www.and.com">www.and.com</a>)
       contributors_nz_html: '<strong>Nueva Zelanda</strong>: Contien datos sacaos
         de Land Information New Zealand. Crown Copyright reserved.'
       contributors_si_html: |-
@@ -1056,7 +1113,7 @@ ast:
       contributors_footer_1_html: |-
         Pa más detalles d'estes, y otres fontes que s'usaron p'ayudar a
         ameyorar OpenStreetMap, por favor, llei la <a
-        href="http://wiki.openstreetmap.org/wiki/Contributors">Páxina
+        href="https://wiki.openstreetmap.org/wiki/Contributors">Páxina
         de los collaboradores</a> na Wiki d'OpenStreetMap.
       contributors_footer_2_html: La inclusión de datos n'OpenStreetMap nun significa
         que'l fornidor de los datos orixinales sofite OpenStreetMap, ufra garantía
@@ -1068,14 +1125,14 @@ ast:
         d'autor.
       infringement_2_html: Si crees que s'amestó de mou inapropiáu material con drechos
         d'autor a la base de datos d'OpenStreetMap o a esti sitiu, consulta'l nuesu
-        <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimientu
+        <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimientu
         de retirada de datos</a> o pidilo direutamente nel nuesu <a href="http://dmca.openstreetmap.org/">formulariu
         en llinia</a>.
       trademarks_title_html: <span id="trademarks"></span>Marques rexistraes
-      trademarks_1_html: OpenStreetMap ,el logotipu de la lente y Estáu del Mapa son
+      trademarks_1_html: OpenStreetMap, el logotipu de la lente y «State of the Map»
-        marques rexistraes de la Fundación OpenStreetMap. Si tienes entrugues tocante
+        son marques rexistraes de la Fundación OpenStreetMap. Si tienes entrugues
-        al usu de les marques, mándales al <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">grupu
+        tocante al usu de les marques, consulta la nuesa <a href="http://wiki.osmfoundation.org/wiki/Trademark_Policy">política
-        de trabayu sobro llicencies</a>.
+        de marques rexistraes</a>.
   welcome_page:
     title: ¡Afáyate!
     introduction_html: |-
@@ -1109,8 +1166,8 @@ ast:
       paragraph_1_html: OpenStreetMap tien poques regles formales, pero esperamos
         que tolos participantes collaboren y se comuniquen cola comunidá. Si tas considerando
         cualquier actividá distinta de la edición manual, llei y sigui les instrucciones
-        sobro <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>importaciones</a>
+        sobro <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>importaciones</a>
-        y <a href='http://wiki.openstreetmap.org/wiki/Import/Automated_Edits_code_of_conduct'>ediciones
+        y <a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>ediciones
         automatizaes</a>.
     questions:
       title: ¿Tien alguna entruga?
@@ -1145,7 +1202,7 @@ ast:
       title: Otres preocupaciones
       explanation_html: |-
         Si tienes dalguna preocupación tocante a cómo tan usándose los nuesos datos o tocante al conteníu, consulta la
-        <a href='/copyright'>páxina de drechos d'autor</a> pa más información llegal, o comunícate col <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>grupu de trabayu de la OSMF</a> afayadizu.
+        <a href='/copyright'>páxina de drechos d'autor</a> pa más información llegal, o comunícate col <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>grupu de trabayu de la OSMF</a> afayadizu.
   help_page:
     title: Algamar ayuda
     introduction: OpenStreetMap tien dellos recursos p'aprender sobro'l proyeutu,
@@ -1156,7 +1213,7 @@ ast:
       title: Bienveníos a OSM
       description: Principie con esta guía rápida que cubre lo básico d'OpenStreetMap.
     beginners_guide:
-      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/Ast:Beginners%27_guide
       title: Guía del principiante
       description: Guía pa principiantes, mantenida pola comunidá.
     help:
@@ -1181,7 +1238,7 @@ ast:
       description: Ayuda pa les empreses y organizaciones que cambien a mapes y otros
         servicios, basaos n'OpenStreetMap.
     wiki:
-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/wiki/Ast:Main_Page
       title: wiki.openstreetmap.org
       description: Mirar na wiki la documentación d'OSM más a fondu.
   about_page:
@@ -1203,7 +1260,7 @@ ast:
       inxenieros que xestionen los sirvidores d'OSM, voluntarios que
       faen mapes de les zones afeutaes por desastres, y muncho más.
       Pa saber más tocante a la comunidá, ver el
-      <a href='https://blog.openstreetmap.org'>Blog d'OpenStreetMap</a>, los <a href='%{diary_path}'>diarios d'usuarios</a>, los <a href='http://blogs.openstreetmap.org/'>blogs de la comunidá</a>, y la páxina web de la <a href='http://www.osmfoundation.org/'>Fundación OSM</a>.
+      <a href='https://blog.openstreetmap.org'>Blog d'OpenStreetMap</a>, los <a href='%{diary_path}'>diarios d'usuarios</a>, los <a href='https://blogs.openstreetmap.org/'>blogs de la comunidá</a>, y la páxina web de la <a href='https://www.osmfoundation.org/'>Fundación OSM</a>.
     open_data_title: Datos abiertos
     open_data_html: |-
       OpenStreetMap son <i>datos abiertos</i>: tienes la llibertá d'usalos pa cualquier
@@ -1213,13 +1270,15 @@ ast:
       pa más detalles.
     legal_title: Llegal
     legal_html: "Esti sitiu y munchos otros servicios rellacionaos xestiónalos formalmente
-      la  \n<a href='http://osmfoundation.org/'>Fundación OpenStreetMap</a> (OSMF)
+      la  \n<a href='https://osmfoundation.org/'>Fundación OpenStreetMap</a> (OSMF)
-      \nnel nome de la comunidá. L'usu de tolos servicios remanaos pola OSMF tán suxetos
+      \nnel nome de la comunidá. L'usu de tolos servicios alministraos pola OSMF tán
-      a les nueses <a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">polítiques
+      suxetos a les nueses <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">polítiques
-      d'usu aceptable</a> y la nuesa <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">política
+      d'usu aceptable</a> y la nuesa <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">política
-      de privacidá</a>\n<br> \n<a href='http://osmfoundation.org/Contact'>Comunícate
+      de privacidá</a>\n<br>\n<a href='https://osmfoundation.org/Contact'>Comunícate
-      cola OSMF</a> \nsi tienes entrugues o problemes relativos a les llicencies,
+      cola OSMF</a> \nsi tienes entrugues relativos a les llicencies, drechos d'autor
-      drechos d'autor u otru tema llegal."
+      u otru tema llegal.\n<br>\nOpenStreetMap, el logo de la lente y «Estáu del mapa»
+      son <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">marques
+      rexistraes de la OSMF</a>."
     partners_title: Asociaos
   notifier:
     diary_comment_notification:
@@ -1421,13 +1480,13 @@ ast:
       user_page_link: páxina d'usuariu
       anon_edits_link_text: Descubri por qué ye'l casu.
       flash_player_required: Necesites un reproductor Flash pa usar Potlatch, l'editor
-        Flash d'OpenStreetMap. Puedes <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">descargar
+        Flash d'OpenStreetMap. Puedes <a href="https://get.adobe.com/flashplayer/">descargar
-        el reproductor Flash d'Adobe.com</a>. Tamién hai disponibles <a href="http://wiki.openstreetmap.org/wiki/Editing">otres
+        el reproductor Flash d'Adobe.com</a>. Tamién hai disponibles <a href="https://wiki.openstreetmap.org/wiki/Editing">otres
         opciones</a> pa editar OpenStreetMap.
       potlatch_unsaved_changes: Tienes cambios ensin guardar. (Pa guardalos en Potlatch,
         tienes de deseleicionar la vía o puntu actual si tas editando en vivo, o calcar
         nel botón guardar si apaez esi botón).
-      potlatch2_not_configured: Potlatch 2 nun ta configuráu; visita http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
+      potlatch2_not_configured: Potlatch 2 nun ta configuráu; visita https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
         pa más información
       potlatch2_unsaved_changes: Tienes cambios ensin guardar. (Pa guardar en Potlatch
         2, tienes de calcar en guardar).
@@ -1446,6 +1505,7 @@ ast:
       where_am_i: ¿Ú esto?
       where_am_i_title: Describi el to allugamientu actual usando el motor de gueta
       submit_text: Dir
+      reverse_directions_text: Invertir direiciones
     key:
       table:
         entry:
@@ -1520,7 +1580,7 @@ ast:
       edit: Editar
       preview: Vista previa
     markdown_help:
-      title_html: Analizáu con <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Analizáu con <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
       headings: Cabeceres
       heading: Cabecera
       subheading: Cabecera secundaria
@@ -1629,7 +1689,7 @@ ast:
       description: Ver les xubes más nueves de traces GPS
       tagged_with: ' etiquetaes con %{tags}'
       empty_html: Entá nun hai nada equí. <a href='%{upload_link}'>Carga una nueva
-        traza</a> o deprendi más tocante a cómo trazar col GPS na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>página
+        traza</a> o depriende más tocante a cómo trazar col GPS na <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>páxina
         de la wiki</a>.
     delete:
       scheduled_for_deletion: Traza marcada pa desaniciar
@@ -1839,11 +1899,11 @@ ast:
           <p>De mou distintu a otros mapes, OpenStreetMap ta creáu completamente por persones
           como tu, y cualquiera tien llibertá pa igualu, anovalu, descargalu y usalu.</p>
           <p>Date d'alta pa empezar a collaborar. Unviaremoste un corréu pa confirmar la cuenta.</p>
-      license_agreement: Cuando confirmes la to cuenta tendrás d'aceutar los <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">términos
+      license_agreement: Cuando confirmes la to cuenta tendrás d'aceutar los <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">términos
         de collaboración</a>.
       email address: 'Direición de corréu electrónicu:'
       confirm email address: 'Confirmar direición de corréu:'
-      not displayed publicly: La to direición nun s'amuesa en público, ver la <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy"
+      not displayed publicly: La to direición nun s'amuesa en público, ver la <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
         title="política de protección de datos de la OSMF, qu'incluye una seición
         sobro direiciones de corréu">política de protección de datos</a> pa más información
       display name: 'Nome a amosar:'
@@ -1963,23 +2023,23 @@ ast:
       email never displayed publicly: (nunca s'amuesa en público)
       external auth: 'Autenticación esterna:'
       openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: ¿qué ye esto?
       public editing:
         heading: 'Ediciones públiques:'
         enabled: Activaes. Nun yes anónimu y puedes editar los datos.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: ¿qué ye esto?
         disabled: Desactivaes y nun puedes editar los datos; toles ediciones anteriores
           son anónimes.
         disabled link text: ¿por qué nun puedo editar?
       public editing note:
         heading: Edición pública
-        text: Anguaño, les tos ediciones son anónimes y la xente nun te pue unviar
+        text: Anguaño, les tos ediciones son anónimes y la xente nun puede unviate
           mensaxes o ver la to llocalización. P'amosar lo qu'editasti y permitir que
-          la xente se ponga en contautu contigo pela páxina web, calca nel botón qu'apaez
+          la xente se ponga en contautu contigo pela páxina web, pulsia nel botón
-          abaxo. <b>Dende'l cambiu al API 0.6, sólo los usuarios públicos pueden editar
+          qu'apaez abaxo. <b>Dende'l cambiu al API 0.6, sólo los usuarios públicos
-          los datos del mapa</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">por
+          pueden editar los datos del mapa</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">por
           estes razones</a>).<ul><li>Les direiciones de corréu electrónicu nun se
           fairán públiques.</li><li>Nun ye posible volver atrás d'esta aición, y agora
           tolos usuarios nuevos son públicos de mou predetermináu.</li></ul>
@@ -2367,7 +2427,15 @@ ast:
         continue_without_exit: Siguir en %{name}
         slight_right_without_exit: Llixeramente a la drecha haza %{name}
         offramp_right_without_exit: Cueye la rampla a la drecha haza %{name}
+        offramp_right_with_directions: Toma l'enllaz a la derecha hacia %{directions}
+        offramp_right_with_name_and_directions: Toma l'enllaz a la derecha pa %{name},
+          hacia %{directions}
+        offramp_right_without_directions: Toma l'enllaz a la derecha
         onramp_right_without_exit: Xira a la drecha na rampla haza %{name}
+        onramp_right_with_directions: Xira a la derecha pal enllaz hacia %{directions}
+        onramp_right_with_name_and_directions: Xira a la derecha nel enllaz pa %{name},
+          hacia %{directions}
+        onramp_right_without_directions: Xira a la derecha pal enllaz
         endofroad_right_without_exit: Al final de la carretera xira a la drecha haza
           %{name}
         merge_right_without_exit: Xúnite a la drecha haza %{name}
@@ -2378,7 +2446,15 @@ ast:
         sharp_left_without_exit: Zarrao a la izquierda haza %{name}
         turn_left_without_exit: Xira a la izquierda haza %{name}
         offramp_left_without_exit: Cueye la rampla a la izquierda haza %{name}
+        offramp_left_with_directions: Toma l'enllaz a la izquierda hacia %{directions}
+        offramp_left_with_name_and_directions: Toma l'enllaz a la izquierda pa %{name},
+          hacia %{directions}
+        offramp_left_without_directions: Toma l'enllaz a la izquierda
         onramp_left_without_exit: Xira a la izquierda na rampla haza %{name}
+        onramp_left_with_directions: Xira a la izquierda pal enllaz hacia %{directions}
+        onramp_left_with_name_and_directions: Xira a la izquierda nel enllaz pa %{name},
+          hacia %{directions}
+        onramp_left_without_directions: Xira a la izquierda nel enllaz
         endofroad_left_without_exit: Al final de la carretera xira a la izquierda
           haza %{name}
         merge_left_without_exit: Xúnite a la izquierda haza %{name}

config/locales/az.yml

@@ -309,30 +309,23 @@ az:
           crematorium: Krematoriya
           dentist: Diş həkimi
           doctors: Həkimlər
-          dormitory: Yataqxana
           drinking_water: İçməli su
           driving_school: Sürücülük məktəbi
           embassy: Səfirlik
-          emergency_phone: Fövqəladə hallar üçün telefon
           fast_food: Fəst Fud
           ferry_terminal: Parom Terminalı
-          fire_hydrant: Yanğın Hidrantı
           fire_station: Yanğın söndürmə Stansiyası
           food_court: Açıq havada Yeməkxana
           fountain: Fontan
           fuel: Yanacaq doldurma
           grave_yard: Qəbirsanlıq
-          gym: Fitnes mərkəzi
-          health_centre: Sağlamlıq mərkəzi
           hospital: Qospital
           hunting_stand: Ov stendi
           ice_cream: Dondurma
           kindergarten: Uşaq bağçası
           library: Kitabxana
-          market: Market
           marketplace: Bazar meydanı
           nightclub: Gecə klubu
-          nursery: Pansionat
           nursing_home: Qocalar evi
           office: Ofis
           parking: Dayanacaq
@@ -345,7 +338,6 @@ az:
           prison: Həbsxana
           pub: Pivəxana
           public_building: İctimai Binalar
-          reception_area: Qəbul sahəsi
           recycling: Utilizasiya yeri
           restaurant: Restoran
           retirement_home: Qocalar Evi
@@ -418,7 +410,6 @@ az:
           trunk: Baş yol
           trunk_link: Baş yol
           unclassified: Təsnifatsız yol
-          unsurfaced: Örtüksüz yol
         historic:
           archaeological_site: Arxeoloji qazıntılar
           battlefield: Döyüş meydanı
@@ -546,7 +537,6 @@ az:
           travel_agent: Səyahət Agentliyi
           "yes": Ofislər
         place:
-          airport: Aeroport
           city: Şəhər
           country: Ölkə
           county: Ölkə
@@ -558,7 +548,6 @@ az:
           islet: Adacıq
           isolated_dwelling: Ayrıca ev-ferma
           locality: Təkr edilmiş ərazi
-          moor: Torfluq
           municipality: Bələdiyyə
           postcode: Poçt indeksi
           region: Bölgə
@@ -573,10 +562,8 @@ az:
           abandoned: Sökülmüş dəmiryol xətti
           construction: Dəmiryol xətti təmirdədir
           disused: İstifadə olunmayan (atılmış) dəmiryol xətti
-          disused_station: İstifadə olunmayan (atılmış) dəmiryol stansiyası
           funicular: Funikulyor
           halt: Qatar dayanacağı
-          historic_station: Tarixi dəmiryol stansiyası
           junction: Dəmiryol oxu
           level_crossing: Dəmiryol keçidi
           light_rail: Yüngül resli dəmiryol xətti
@@ -636,7 +623,6 @@ az:
           hairdresser: Saç ustası
           hardware: Məişət Alətləri Dükanı
           hifi: Audio və Video avadanlıqları dükanı
-          insurance: Sığorta şirkəti
           jewelry: Zərgərlik dükanı
           kiosk: Kiosk
           laundry: Camaşırxana
@@ -651,9 +637,7 @@ az:
           outdoor: Küçə satışı
           pet: Zoomaqazin
           photo: Fotomaqazin
-          salon: Salon
           shoes: Ayaqqabı dükanı
-          shopping_centre: Ticarət Mərkəzi
           sports: İdman malları dükanı
           stationery: Dəftərxana Ləvazimatı
           supermarket: Supermarket

config/locales/ba.yml

@@ -412,31 +412,24 @@ ba:
           crematorium: Крематорий
           dentist: Стоматология
           doctors: Табибтар
-          dormitory: Дөйөм ятаҡ
           drinking_water: Эсәр һыу
           driving_school: Автошкола
           embassy: Илселек
-          emergency_phone: Ашығыс хеҙмәт телефоны
           fast_food: Фаст-фуд
           ferry_terminal: Паром станцияһы
-          fire_hydrant: Янғын һүндереү гидранты
           fire_station: Янғын һүндереү һағы
           food_court: Ресторан ихатаһы
           fountain: Фонтан
           fuel: Заправка
           gambling: Уйын йорто
           grave_yard: Зыярат
-          gym: Фитнес-үҙәк/Тренажер залы
-          health_centre: Һауыҡтырыу үҙәге
           hospital: Госпиталь
           hunting_stand: Һунарсы вышкаһы
           ice_cream: Туңдырма
           kindergarten: Балалар баҡсаһы
-          market: Магазин
           marketplace: Баҙар
           motorcycle_parking: Мотоцикл парковкаһы
           nightclub: Төнгө клуб
-          nursery: Пансионат
           nursing_home: Ҡарттар йорто
           parking: Туҡталҡа
           parking_entrance: Туҡталҡаға инеү
@@ -449,7 +442,6 @@ ba:
           prison: Төрмә
           pub: Һырахана
           public_building: Йәмғиәти бина
-          reception_area: Ҡабул итеү бүлмәһе
           recycling: Киренән эшкәртеү урыны
           restaurant: Ресторан
           retirement_home: Ҡарттар йорто
@@ -543,7 +535,6 @@ ba:
           trunk: Төп юл
           trunk_link: Магистраль
           unclassified: Урындағы юл
-          unsurfaced: Шоссе юлы
         historic:
           archaeological_site: Археологик ҡаҙыныуҙар
           battlefield: Һуғыш яланы
@@ -606,7 +597,6 @@ ba:
         leisure:
           beach_resort: Үҫентеле пляж
           bird_hide: Йәшерен ултырғыс (ҡоштарҙы күҙәтеү өсөн)
-          club: Клуб
           common: Альменда
           dog_park: Эт өсөн майҙансыҡ
           fishing: Балыҡ тотоу

config/locales/be-Tarask.yml

@@ -260,7 +260,7 @@ be-Tarask:
       map_image: Выява мапы (паказвае стандартны слой)
       embeddable_html: HTML-код для ўстаўкі
       licence: Ліцэнзія
-      export_details: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
+      export_details: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open
         Data Commons Open Database License</a> (ODbL).
       too_large:
         body: 'Гэты абшар занадта вялікі для экспарту ў фармаце XML OpenStreetMap.
@@ -283,11 +283,11 @@ be-Tarask:
   geocoder:
     search:
       title:
-        latlon: Вынікі з <a href="http://openstreetmap.org/">Internal</a>
+        latlon: Вынікі з <a href="https://openstreetmap.org/">Internal</a>
         uk_postcode: Вынікі з <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>
-        ca_postcode: Вынікі з <a href="http://geocoder.ca/">Geocoder.CA</a>
+        ca_postcode: Вынікі з <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Вынікі з <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Вынікі з <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Вынікі з <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
@@ -321,29 +321,22 @@ be-Tarask:
           crematorium: Крэматорый
           dentist: Стаматалёгія
           doctors: Дактары
-          dormitory: Інтэрнат
           drinking_water: Пітная вада
           driving_school: Аўташкола
           embassy: Амбасада
-          emergency_phone: Тэлефон для экстранных выклікаў
           fast_food: Забягайлаўка
           ferry_terminal: Паромная станцыя
-          fire_hydrant: Пажарны гідрант
           fire_station: Пажарны пастарунак
           fountain: Фантан
           fuel: Запраўка
           grave_yard: Могілкі
-          gym: Фітнэс цэнтар /Трэнажорны зал
-          health_centre: Цэнтар здароўя
           hospital: Шпіталь
           hunting_stand: Паляўнічая вежа
           ice_cream: Марозіва
           kindergarten: Дзіцячы садок
           library: Бібліятэка
-          market: Рынак
           marketplace: Рынкавая плошча
           nightclub: Начны клюб
-          nursery: Дзіцячы пакой
           nursing_home: Дом састарэлых
           office: Офіс
           parking: Стаянка
@@ -356,7 +349,6 @@ be-Tarask:
           prison: Турма
           pub: Шынок
           public_building: Грамадзкі будынак
-          reception_area: Прыёмная
           recycling: Месца перапрацоўкі адыходаў
           restaurant: Рэстаран
           retirement_home: Дом састарэлых
@@ -413,7 +405,6 @@ be-Tarask:
           trunk: Шаша
           trunk_link: Шаша
           unclassified: Дарога раённага значэньня
-          unsurfaced: Дарога без пакрыцьця
         historic:
           archaeological_site: Археалягічныя раскопкі
           battlefield: Поле гістарычнай бойкі
@@ -529,7 +520,6 @@ be-Tarask:
           government: Дзяржаўная ўстанова
           insurance: Страхавое бюро
         place:
-          airport: Аэрапорт
           city: Горад
           country: Краіна
           county: Раён
@@ -541,7 +531,6 @@ be-Tarask:
           islet: Выспачка
           isolated_dwelling: Ізаляванае жытло
           locality: Населены пункт
-          moor: Тарфянік
           municipality: Муніцыпалітэт
           postcode: Паштовы індэкс
           region: Рэгіён
@@ -556,10 +545,8 @@ be-Tarask:
           abandoned: Пакінутая чыгуначная лінія
           construction: Будаўніцтва чыгункі
           disused: Пакінутая чыгунка
-          disused_station: Пакінутая чыгуначная станцыя
           funicular: Фунікулёр
           halt: Чыгуначны прыпынак
-          historic_station: Гістарычная чыгуначная станцыя
           junction: Чыгуначны вузел
           level_crossing: Чыгуначны пераезд
           light_rail: Лінія для лёгкага чыгуначнага транспарту
@@ -619,7 +606,6 @@ be-Tarask:
           hairdresser: Цырульня
           hardware: Гаспадарчыя тавары
           hifi: Крама аўдыё/відэё тэхнікі
-          insurance: Страхаваньне
           jewelry: Ювэлірная крама
           kiosk: Шапік
           laundry: Пральня
@@ -634,9 +620,7 @@ be-Tarask:
           outdoor: Выязны гандаль
           pet: Зоалягічная крама
           photo: Фотакрама
-          salon: Салён
           shoes: Крама абутку
-          shopping_centre: Гандлёвы цэнтар
           sports: Спартовая крама
           stationery: Канцтавары
           supermarket: Супэрмаркет
@@ -685,7 +669,7 @@ be-Tarask:
           weir: Плаціна
     description:
       title:
-        osm_nominatim: Месцазнаходжаньне з <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Месцазнаходжаньне з <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Месцазнаходжаньне з <a href="http://www.geonames.org/">GeoNames</a>
       types:
@@ -714,8 +698,8 @@ be-Tarask:
     edit_with: Рэдагаваць праз %{editor}
     tag_line: Вольная Wiki-мапа сьвету
     intro_2_create_account: Стварыце рахунак
-    partners_html: Гостынг падтрымліваецца %{ucl}, %{ic} і %{bytemark}, і іншымі %{partners}.
+    partners_html: Гостынг падтрымліваецца %{ucl}, %{bytemark}, %{ic} і іншымі %{partners}.
-    partners_ucl: UCL VR Centre
+    partners_ucl: UCL
     partners_ic: Лёнданскім імпэрскім каледжам
     osm_offline: База зьвестак OpenStreetMap у цяперашні момант недаступная, таму
       што праводзяцца неабходныя тэхнічныя работы.
@@ -748,42 +732,36 @@ be-Tarask:
       title_html: Аўтарскія правы і ліцэнзія
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> — <i>вольныя зьвесткі</i>, ліцэнзаваныя паводле <a
-        href="http://opendatacommons.org/licenses/odbl/">ліцэнзіі Адкрытых баз зьвестак Адкрытых агульных зьвестак</a> (ODbL) <a
+        href="https://opendatacommons.org/licenses/odbl/">ліцэнзіі Адкрытых базаў зьвестак Адкрытых агульных зьвестак</a> (ODbL) <a
-        href="http://osmfoundation.org/">Фундацыяй OpenStreetMap Foundation</a> (OSMF).
+        href="https://osmfoundation.org/">Фундацыяй OpenStreetMap Foundation</a> (OSMF).
       intro_2_html: Вы можаце капіяваць, распаўсюджваць, перадаваць і зьмяняць нашыя
-        зьвесткі да той пары, пакуль Вы спасылаецеся на OpenStreetMap і яе ўдзельнікаў.
+        зьвесткі да той пары, пакуль вы спасылаецеся на OpenStreetMap і яе ўдзельнікаў.
-        Калі Вы зьмяняеце ці выкарыстоўваеце нашыя зьвесткі, Вы можаце распаўсюджваць
+        Калі вы зьмяняеце ці выкарыстоўваеце нашыя зьвесткі, вы можаце распаўсюджваць
-        вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны <a href="http://opendatacommons.org/licenses/odbl/1.0/">тэкст
+        вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны <a href="https://opendatacommons.org/licenses/odbl/1.0/">тэкст
-        ліцэнзіі</a> растлумачыць Вам правы і адказнасьці.
+        ліцэнзіі</a> растлумачыць вам правы і адказнасьці.
       credit_title_html: Як спасылацца на OpenStreetMap
       credit_1_html: |-
         Мы патрабуем, каб
         Вы пазначалі &ldquo;&copy; удзельнікі OpenStreetMap&rdquo;.
-      credit_2_html: |-
+      credit_2_html: Мусіце таксама яўна пазначыць, што зьвесткі даступныя паводле
-        Мусіце таксама яўна пазначыць, што зьвесткі даступныя паводле ліцэнзіі Open Database, а калі карыстаецеся нашымі кавалкамі мапаў, што картаграфія ліцэнзаваная паводле CC BY-SA. Гэта можна зрабіць, спаслаўшыся на <a href="http://www.openstreetmap.org/copyright">гэтую старонку правоў</a>. Калі вы распаўсюджваеце OSM у фармаце зьвестак, вы мусіце разьмяшчаць наўпроставую спасылку на ліцэнзіі. Калі
+        ліцэнзіі 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.
+        накіроўваць вашых чытачоў на www.openstreetmap.org (магчымае выкарыстаньне
+        поўнага адрасу &lsquo;OpenStreetMap&rsquo;), на opendatacommons.org і, пры
+        неабходнасьці, на www.creativecommons.org.
       more_title_html: Даведацца болей
-      more_1_html: |-
+      more_1_html: Даведайцеся болей пра выкарыстаньне нашых зьвестак і пра спасыланьне
-        Даведайцеся болей пра выкарыстаньне нашых зьвестак і пра спасыланьне на нас на <a
+        на нас на <a href="https://osmfoundation.org/Licence">старонцы ліцэнзіі OSMF</a>.
-        href="http://osmfoundation.org/Licence">старонцы ліцэнзіі OSMF</a> і <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">старонцы адказаў
-        і пытаньняў</a>.
       more_2_html: |-
         Хоць OpenStreetMap ёсьць адкрытымі зьвесткамі, мы ня здольныя прадаставіць бяскоштны API мапаў для староньніх распрацоўнікаў. Глядзіце нашыя <a href="https://operations.osmfoundation.org/policies/api/">правілы карыстаньня API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">правілы карыстаньня частак мапаў</a>
         і <a href="https://operations.osmfoundation.org/policies/nominatim/">правілы карыстаньня Nominatim</a>.
       contributors_title_html: Нашыя ўдзельнікі
-      contributors_intro_html: |-
+      contributors_intro_html: 'Нашы аўтары — гэта тысячы асобаў. Мы таксама ўключаем
-        Нашая ліцэнзія CC BY-SA патрабуе ад Вас &ldquo;падаць арыгінальнага аўтара
+        зьвесткі з вольнай ліцэнзіяй ад нацыянальных картаграфічных службаў і зь іншых
-        у адпаведнасьці з асаблівасьцямі носьбітаў інфармацыі ці іншых выкарыстоўваемых сродкаў
+        крыніц, сярод іх:'
-        &rdquo;. Звычайныя ўдзельнікі OSM не патрабуюць пазначэньня аўтарства
-        болей чым &ldquo;удзельнікі OpenStreetMap
-        &rdquo;, але ў OpenStreetMap ёсьць зьвесткі з нацыянальных
-        картаграфічных агенцтваў ці іншых падобных крыніцаў,
-        таму, магчыма, мае сэнс спасылацца непасрэдна на іх
-        як на крыніцу, ці дадаць спасылку на гэтую старонку.
       contributors_at_html: |-
         <strong>Аўстрыя</strong>: Утрымлівае зьвесткі
         <a href="http://data.wien.gv.at/">горада Вены</a> на ўмовах

config/locales/be.yml

@@ -443,33 +443,26 @@ be:
           crematorium: Крэматорый
           dentist: Стаматолагія
           doctors: Лекары
-          dormitory: Інтэрнат
           drinking_water: Пітная вада
           driving_school: Аўташкола
           embassy: Амбасада
-          emergency_phone: Тэлефон экстранай сувязі
           fast_food: Фаст-Фуд
           ferry_terminal: Паромны тэрмінал
-          fire_hydrant: Пажарны гідрант
           fire_station: Пажарная станцыя
           food_court: Фуд-Корт
           fountain: Фантан
           fuel: АЗС
           gambling: Азартныя гульні
           grave_yard: Могілкі
-          gym: Фітнес-цэнтр ці Трэнажорная зала
-          health_centre: Медыцынскі цэнтр
           hospital: Бальніца
           hunting_stand: Паляўнічая вежа
           ice_cream: Марозіва
           kindergarten: Дзіцячы сад
           library: Бібліятэка
-          market: Рынак
           marketplace: Рыначная плошча
           monastery: Кляштар
           motorcycle_parking: Паркоўка для матацыклаў
           nightclub: Начны клуб
-          nursery: Яслі
           nursing_home: Прыватная лякарня
           office: Офіс
           parking: Паркоўка
@@ -483,7 +476,6 @@ be:
           prison: Турма
           pub: Паб
           public_building: Грамадскі будынак
-          reception_area: Зона прыёму
           recycling: Пункт перапрацоўкі
           restaurant: Рэстаран
           retirement_home: Дом састарэлых
@@ -579,7 +571,6 @@ be:
           trunk: Шаша
           trunk_link: Магістраль
           unclassified: Некласіфікаваная дарога
-          unsurfaced: Дарога без пакрыцця
           "yes": Дарога
         historic:
           archaeological_site: Археалагічныя раскопы
@@ -644,7 +635,6 @@ be:
         leisure:
           beach_resort: Пляжны курорт
           bird_hide: Засада
-          club: Клуб
           common: Агульная зямля
           dog_park: Пляцоўка для сабак
           fishing: Раён рыбалоўства
@@ -737,8 +727,6 @@ be:
           "yes": Офіс
         place:
           allotments: Сады-агароды
-          block: Блок
-          airport: Аэрапорт
           city: Горад
           country: Краіна
           county: Акруга
@@ -750,7 +738,6 @@ be:
           islet: Астравок
           isolated_dwelling: Ізаляванае жыллё
           locality: Мясцовасць
-          moor: Швартоўка
           municipality: Муніцыпалітэт
           neighbourhood: Наваколле
           postcode: Паштовы індэкс
@@ -767,10 +754,8 @@ be:
           abandoned: Закінутая чыгунка
           construction: Будаўніцтва чыгункі
           disused: Закінутая чыгунка
-          disused_station: Закінуты чыгуначны вакзал
           funicular: Фунікулер
           halt: Чыгуначны прыпынак
-          historic_station: Гістарычны чыгуначны вакзал
           junction: Чыгуначны вузел
           level_crossing: Чыгуначны пераезд
           light_rail: Хуткасны трамвай
@@ -834,7 +819,6 @@ be:
           hairdresser: Цырульнік
           hardware: Гаспадарчая крама
           hifi: Аўдыётэхніка
-          insurance: Страхаванне
           jewelry: Ювелірная крама
           kiosk: Кіёск
           laundry: Пральня
@@ -850,10 +834,8 @@ be:
           pet: Заалагічная крама
           pharmacy: Аптэка
           photo: Фота майстэрня
-          salon: Салон
           second_hand: Крама патрыманых рэчаў
           shoes: Абутковая крама
-          shopping_centre: Гандлёвы цэнтр
           sports: Спартыўная крама
           stationery: Крама канцылярскіх тавараў
           supermarket: Супермаркет

config/locales/bg.yml

@@ -341,25 +341,20 @@ bg:
           crematorium: Крематориум
           dentist: Зъболекар
           doctors: Лекари
-          dormitory: Пансион
           drinking_water: Питейна вода
           driving_school: Автошкола
           embassy: Посолство
-          emergency_phone: Телефон за спешни повиквания
           fast_food: Заведения за бързо хранене
           ferry_terminal: Фериботен терминал
-          fire_hydrant: Пожарен кран
           fire_station: Пожарна станция
           fountain: Фонтан
           fuel: Гориво
           gambling: Хазартни игри
           grave_yard: Гробище
-          gym: Фитнес зала
           hospital: Болница
           ice_cream: Сладолед
           kindergarten: Детска градина
           library: Библиотека
-          market: Пазар
           marketplace: Пазар
           monastery: Манастир
           nightclub: Нощен клуб
@@ -374,7 +369,6 @@ bg:
           prison: Затвор
           pub: Кръчма
           public_building: Обществена сграда
-          reception_area: Рецепция
           restaurant: Ресторант
           retirement_home: Старчески дом
           sauna: Сауна
@@ -455,7 +449,6 @@ bg:
           traffic_signals: Светофар
           trunk: Междуградски път
           trunk_link: Междуградски път
-          unsurfaced: Път без настилка
           "yes": Път
         historic:
           archaeological_site: Разкопки
@@ -510,7 +503,6 @@ bg:
           vineyard: Лозя
         leisure:
           beach_resort: Морски курорт
-          club: Клуб
           dog_park: Парк за кучета
           fishing: Място за риболов
           fitness_centre: Фитнес център
@@ -582,7 +574,6 @@ bg:
           "yes": Офис
         place:
           allotments: Градини
-          airport: Летище
           city: Град
           country: Страна
           county: Област
@@ -592,7 +583,6 @@ bg:
           houses: Къщи
           island: Остров
           islet: Островче
-          moor: Тресавище
           municipality: Община
           neighbourhood: Квартал
           postcode: Пощенски код
@@ -607,9 +597,7 @@ bg:
           abandoned: Изоставена железопътна линия
           construction: Железопътна линия в строеж
           disused: Изоставена ж.п. линия
-          disused_station: изоставена гара
           halt: Железопътна спирка
-          historic_station: Гара с историческо значение
           junction: Железопътен възел
           level_crossing: Прелез
           light_rail: Лека железница
@@ -650,7 +638,6 @@ bg:
           greengrocer: Плод и зеленчук
           grocery: Магазин за хранителни стоки
           hairdresser: Фризьорски салон
-          insurance: Застраховане
           jewelry: Бижутериен магазин
           laundry: Пералня
           mall: Търговски център
@@ -662,7 +649,6 @@ bg:
           pharmacy: Аптека
           photo: Фотомагазин
           shoes: Магазин за обувки
-          shopping_centre: Търговски център
           sports: Спортен магазин
           stationery: Канцеларски материали
           supermarket: Супермаркет
@@ -856,10 +842,10 @@ bg:
       unread_button: Отбелязване като непрочетено
       read_button: Отбелязване като прочетено
       reply_button: Отговор
-      delete_button: Изтрий
+      delete_button: Изтриване
     new:
-      title: Изпратете съобщение
+      title: Изпращане на съобщение
-      send_message_to: Изпратете ново съобщение на %{name}
+      send_message_to: Изпращане ново съобщение на %{name}
       subject: Тема
       body: Текст
       send_button: Изпращане
@@ -934,19 +920,19 @@ bg:
           - терминал
           admin: Административна граница
           forest: Гора
-          wood: Лес
+          wood: Дървета
           golf: Игрище за голф
           park: Парк
           resident: Жилищна зона
           common:
             1: ливада
-          retail: Зона за търговия на дребно
+          retail: Търговска зона
           industrial: Промишлена зона
           commercial: Търговска зона
           heathland: Пустош
           lake:
           - Езеро
-          farm: Земеделско стопанство
+          farm: Ферма
           brownfield: Място за строеж
           cemetery: Гробище
           allotments: Градини
@@ -1237,6 +1223,7 @@ bg:
       creator: Автор
       ago_html: преди %{when}
   javascripts:
+    close: Затваряне
     share:
       title: Споделяне
       cancel: Отказ

config/locales/bn.yml

@@ -434,33 +434,26 @@ bn:
           crematorium: শ্মশান
           dentist: দন্তচিকিৎসক
           doctors: ডাক্তার
-          dormitory: ছাত্রাবাস
           drinking_water: পানীয় জল
           driving_school: ড্রাইভিং স্কুল
           embassy: দূতাবাস
-          emergency_phone: জরুরি ফোন
           fast_food: ফাস্ট ফুড
           ferry_terminal: ফেরিঘাট
-          fire_hydrant: ফায়ার হাইড্র্যান্ট
           fire_station: অগ্নি নির্বাপন কেন্দ্র
           food_court: খাবার দোকান
           fountain: ঝরনা
           fuel: জ্বালানি
           gambling: জুয়াখেলার আড্ডা
           grave_yard: কবরস্থান
-          gym: ব্যায়াম কেন্দ্র / জিমখানা
-          health_centre: স্বাস্থকেন্দ্র
           hospital: হাসপাতাল
           hunting_stand: শিকারশালা
           ice_cream: আইসক্রিম
           kindergarten: শিশুবিদ্যালয়
           library: পাঠাগার
-          market: বাজার
           marketplace: নগরচত্বর
           monastery: আশ্রম
           motorcycle_parking: মোটরসাইকেল  পার্কিং
           nightclub: নৈশক্লাব
-          nursery: শিশুশালা
           nursing_home: নার্সিংহোম
           office: দপ্তর
           parking: পার্কিং
@@ -474,7 +467,6 @@ bn:
           prison: কারাগার
           pub: মদ্যশালা
           public_building: সরকারি ভবন
-          reception_area: অভ্যর্থন এলাকা
           restaurant: রেঁস্তোরা
           retirement_home: অবসর গৃহ
           sauna: বাষ্পস্নান
@@ -560,7 +552,6 @@ bn:
           trunk: মূল সড়ক
           trunk_link: মূল সড়ক
           unclassified: অশ্রেণীকৃত সড়ক
-          unsurfaced: কাঁচা সড়ক
           "yes": সড়ক
         historic:
           archaeological_site: প্রত্নতাত্ত্বিক স্থান
@@ -615,7 +606,6 @@ bn:
           "yes": ব্যবহার্য ভূমি
         leisure:
           beach_resort: সৈকতীয় রিসোর্ট
-          club: ক্লাব
           common: সাধারণ ভূমি
           dog_park: কুকুর উদ্যান
           fishing: মৎস শিকারের এলাকা
@@ -693,8 +683,6 @@ bn:
           travel_agent: ভ্রমণ দালাল
           "yes": দপ্তর
         place:
-          block: ব্লক
-          airport: বিমানবন্দর
           city: নগর
           country: দেশ
           county: প্রদেশ
@@ -706,7 +694,6 @@ bn:
           islet: ক্ষুদ্র দ্বীপ
           isolated_dwelling: বিচ্ছিন্ন বাসস্থান
           locality: বসতি
-          moor: প্রাস্তর
           municipality: পৌরসভা
           neighbourhood: শহরতলি
           postcode: ডাক সংখ্যা
@@ -723,8 +710,6 @@ bn:
           abandoned: পরিত্যক্ত রেলপথ
           construction: নির্মীয়মাণ রেলপথ
           disused: অব্যবহৃত রেলপথ
-          disused_station: অব্যবহৃত রেল স্টেশন
-          historic_station: ঐতিহাসিক রেল স্টেশন
           junction: রেল জংশন
           monorail: মনোরেল
           narrow_gauge: সংকীর্ণ গেজ রেল
@@ -776,7 +761,6 @@ bn:
           hairdresser: নাপিত
           hardware: যন্ত্রাংশের দোকান
           hifi: হাই-ফাই
-          insurance: বিমা
           jewelry: গহনার দোকান
           laundry: ধোপার দোকান
           mall: মল
@@ -789,10 +773,8 @@ bn:
           organic: জৈব খাদ্যের দোকান
           pharmacy: ঔষধালয়
           photo: ছবির দোকান
-          salon: সালোন
           second_hand: পুরনো-সামগ্রীর দোকান
           shoes: জুতোর দোকান
-          shopping_centre: বিপনি কেন্দ্র
           sports: ক্রীড়াসামগ্রীর দোকান
           stationery: স্টেশনারি দোকান
           supermarket: অধিবিপণী

config/locales/br.yml

@@ -134,6 +134,8 @@ br:
         title_comment: Strollad kemmoù %{id} - %{comment}
       join_discussion: Kevreañ evit kaozeal
       discussion: Kaozeadenn
+      still_open: Strollad kemmoù digor - an diviz a zigoro ur wech ma vo serret ar
+        strollad kemmoù.
     node:
       title: 'Skoulm : %{name}'
       history_title: 'Istor ar skoulm : %{name}'
@@ -347,7 +349,7 @@ br:
       map_image: Skeudenn gartenn (diskouez ur gwiskad boutin)
       embeddable_html: HTML enkorfadus
       licence: Aotre-implijout
-      export_details: Roadennoù OpenStreetMap zo dindan an aotre-implijout <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
+      export_details: Roadennoù OpenStreetMap zo dindan an aotre-implijout <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open
         Data Commons Open Database License</a> (ODbL).
       too_large:
         advice: 'Ma c''hwit an ezporzhiadur amañ a-us, implijit unan eus an elfennoù
@@ -387,11 +389,11 @@ br:
   geocoder:
     search:
       title:
-        latlon: Disoc'hoù diwar <a href="http://openstreetmap.org/">Internal</a>
+        latlon: Disoc'hoù diwar <a href="https://openstreetmap.org/">Internal</a>
         uk_postcode: Disoc'hoù diwar <a href="http://www.npemap.org.uk/">NPEMap /
           FreeThe Postcode</a>
-        ca_postcode: Disoc'hoù diwar <a href="http://geocoder.ca/">Geocoder.CA</a>
+        ca_postcode: Disoc'hoù diwar <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Disoc'hoù diwar <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Disoc'hoù diwar <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Disoc'hoù diwar <a href="http://www.geonames.org/">GeoNames</a>
         osm_nominatim_reverse: Disoc'hoù diwar <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
@@ -404,12 +406,17 @@ br:
           chair_lift: fungador
           drag_lift: Teleski
           gondola: Funlogell
+          platter: Saver pladoù
+          pylon: Peul
           station: Arsav funlogell
         aeroway:
           aerodrome: Nijva
+          airstrip: Leurenn bradañ
           apron: ↓Parklec'h nijerezioù
           gate: Dor
+          hangar: Karrdi
           helipad: biñsporzh
+          parking_position: Plas parkañ
           runway: Leurenn
           taxiway: Roudenn evit an taksioù
           terminal: Termenva
@@ -444,37 +451,32 @@ br:
           crematorium: Krematoriom
           dentist: Dentour
           doctors: Mezeien
-          dormitory: Kouskva
           drinking_water: Dour mat da evañ
           driving_school: Skol bleinañ
           embassy: Kannati
-          emergency_phone: Pellgomzer evit an trummadoù
           fast_food: Fast Food
           ferry_terminal: Porzh karrlistri
-          fire_hydrant: Dour evit an tan
           fire_station: Kazarn pomperien
           food_court: ↓Predva
           fountain: Feunteun
           fuel: Trelosk
           gambling: C'hoari
           grave_yard: Bered
-          gym: Fitness/embregerezh-korf
+          grit_bin: Bailh holen
-          health_centre: Kreizenn yec'hed
           hospital: Ospital
           hunting_stand: Stand tennañ
           ice_cream: Dienn skorn
           kindergarten: Liorzh ar vugale
           library: Levraoueg
-          market: Marc'had
           marketplace: Marc'hallac'h
           monastery: Manati
           motorcycle_parking: Parklec'h evit marc'hoù-tan
           nightclub: Klub-noz
-          nursery: Spluseg
           nursing_home: Ti yec'hed
           office: Burev
           parking: Parklec'h
           parking_entrance: Mont tre ur parklec'h
+          parking_space: Plas parkañ
           pharmacy: Apotikerezh
           place_of_worship: Lec'h azeuliñ
           police: Polis
@@ -484,7 +486,6 @@ br:
           prison: Toull-bac'h
           pub: Tavarn
           public_building: Savadur foran
-          reception_area: Takad degemer
           recycling: Lec'h adaozañ
           restaurant: Preti
           retirement_home: Ti-retredidi
@@ -509,6 +510,7 @@ br:
           village_hall: Sal ar gumun
           waste_basket: Pod-lastez
           waste_disposal: Skarzhañ al lastez
+          water_point: Lec'h dour
           youth_centre: Kreizenn evit ar re yaouank
         boundary:
           administrative: Bevennoù melestradurel
@@ -517,6 +519,7 @@ br:
           protected_area: Takad gwarezet
         bridge:
           aqueduct: Dourbont
+          boardwalk: Pourmenadenn
           suspension: Pont-skourr
           swing: Pont-tro
           viaduct: Karrbont
@@ -536,25 +539,31 @@ br:
           "yes": Stal artizanelezh
         emergency:
           ambulance_station: Sanailh ambulañsoù
+          assembly_point: Lec'h bodañ
           defibrillator: Difibrilator
           landing_site: Tachenn bradañ trumm
           phone: Pellgomzer evit an trummadoù
+          water_tank: Beol dour trumm
+          "yes": Trummadoù
         highway:
           abandoned: Hent-houarn dilezet
           bridleway: Hent evit ar varc'hegerien
           bus_guideway: Roudenn vus heñchet
           bus_stop: Arsav bus
           construction: Chanter gourhent
+          corridor: Trepad
           cycleway: Roudenn divrodegoù
           elevator: Pignerez
           emergency_access_point: Poent moned trummadoù
           footway: Gwenodenn evit an droadeien
           ford: Roudour
+          give_way: Panell "Lezit da dremen"
           living_street: Straed annez
           milestone: ↓Maen-bonn
           motorway: Gourhent
           motorway_junction: Kengej gourhent
           motorway_link: Gourhent
+          passing_place: Lec'h tremen
           path: Gwenodenn
           pedestrian: Hent evit an droadeien
           platform: Leurenn
@@ -571,6 +580,7 @@ br:
           services: Servijoù gourhent
           speed_camera: Radar tizh
           steps: Diri
+          stop: Sinal paouez
           street_lamp: Post lamp
           tertiary: Hent trede renk
           tertiary_link: Hent trede renk
@@ -579,8 +589,8 @@ br:
           trail: Roudenn
           trunk: Hent-tizh
           trunk_link: Hent-tizh
+          turning_loop: Kammdro dizehan
           unclassified: Hent dirumm
-          unsurfaced: Hent dizolo
           "yes": Hent
         historic:
           archaeological_site: Lec'hienn henoniel
@@ -599,6 +609,7 @@ br:
           manor: Maner
           memorial: Kounlec'h
           mine: Mengleuz
+          mine_shaft: Poull mengleuz
           monument: Monumant
           roman_road: Hent roman
           ruins: Dismantroù
@@ -608,6 +619,7 @@ br:
           wayside_cross: Kroaz
           wayside_shrine: Ti-pediñ
           wreck: Peñse
+          "yes": Lec'h Istorel
         junction:
           "yes": Kej
         landuse:
@@ -645,9 +657,9 @@ br:
         leisure:
           beach_resort: Kêr-gouronkañ
           bird_hide: Bod evned
-          club: Klub
           common: Tachennoù foran
           dog_park: Park chas
+          firepit: Oaled
           fishing: Takad pesketa
           fitness_centre: Kreizenn fitness
           fitness_station: ↓Atalier da embreger ar c'horf
@@ -672,15 +684,44 @@ br:
           water_park: Kreizenn dour
           "yes": Diduamantoù
         man_made:
+          beacon: Tour-tan
+          beehive: Ruskenn
+          breakwater: Diwagenner
+          bridge: Pont
+          bunker_silo: Bunker
+          chimney: Siminal
+          crane: Garv-houarn
+          dolphin: Post amariñ
+          dyke: Chaoser
+          embankment: Kleuz
+          flagpole: Gwern
+          gasometer: Gazometr
+          kiln: Forn briajoù
           lighthouse: Tour-tan
+          mast: Peul
+          mine: Mengleuz
+          mineshaft: Poull mengleuz
+          monitoring_station: Savlec'h evezhiañ
+          petroleum_well: Poull tireoul
+          pier: Sav-mein
           pipeline: Eoulsan
+          silo: Silo
+          storage_tank: Beol stokañ
+          surveillance: Evezh
           tower: Tour
+          wastewater_plant: Purlec'h tretañ an dourioù lous
+          watermill: Milin-dour
+          water_tower: Kastell-dour
+          water_well: Puñs
+          water_works: Reizhiad dre zour
+          windmill: Milin-avel
           works: Labouradeg
           "yes": Krouet gant Mab-den
         military:
           airfield: Nijva milourel
           barracks: Kazarn
           bunker: Bunker
+          "yes": Milourel
         mountain_pass:
           "yes": Ode menez
         natural:
@@ -726,11 +767,14 @@ br:
           accountant: Kontour
           administrative: Melestradur
           architect: Ti-savour
+          association: kevredigezh
           company: Embregerezh
+          educational_institution: Ensavadur desavadurel
           employment_agency: Ajañs evit al labour
           estate_agent: Kourater tiez
           government: Ajañs c'houarnamantel
           insurance: Ajañs asurañsoù
+          it: Burev urzhiataerezh
           lawyer: Alvokad
           ngo: Burev un AMG (aozadur e-maez gouarnamant)
           telecommunication: Burev pellgehentiñ
@@ -738,9 +782,8 @@ br:
           "yes": Burev
         place:
           allotments: Liorzhoù tiegezhel
-          block: Blog
-          airport: Aerborzh
           city: Meurgêr
+          city_block: Bloc'h kêrel
           country: Bro
           county: Kontelezh
           farm: Atant
@@ -751,12 +794,13 @@ br:
           islet: Enezennig
           isolated_dwelling: Ti distro
           locality: Kêr
-          moor: Lanneg
           municipality: Kumun
           neighbourhood: Ardremez
           postcode: Kod post
+          quarter: Karter
           region: Rannvro
           sea: Mor
+          square: Plasenn
           state: Stad
           subdivision: Isrann
           suburb: Karter
@@ -768,10 +812,8 @@ br:
           abandoned: Hent-houarn dilezet
           construction: Hent-houarn war sevel
           disused: Hent-houarn dilezet
-          disused_station: Porzh-houarn dilezet
           funicular: Hent-houarn fundren
           halt: Arsav tren
-          historic_station: Arsav tren istorel
           junction: Kej hent-houarn
           level_crossing: Treuzenn hent-houarn
           light_rail: Hent-houarn bihan
@@ -797,6 +839,7 @@ br:
           beauty: Stal produioù kened
           beverages: Stal evajoù
           bicycle: Stal marc'hoù-houarn
+          bookmaker: Burev klaoustreoù
           books: Levrdi
           boutique: Stal
           butcher: Kiger
@@ -835,12 +878,16 @@ br:
           hairdresser: Perukenner
           hardware: Stal urzhiataerezh
           hifi: Stal Hi-Fi
-          insurance: Asurañs
+          houseware: Stal traoù a diegezh
+          interior_decoration: Kinkladur diabarzh
           jewelry: Bravigerezh
           kiosk: Kiosk
+          kitchen: Stal-gegin
           laundry: Kanndi
+          lottery: Lotiri
           mall: Palier kenwerzh
           market: Marc'had
+          massage: Kemenadenn
           mobile_phone: Stal pellgomzerioù hezoug
           motorcycle: Stal marc'hoù-tan
           music: Stal sonerezh
@@ -848,21 +895,27 @@ br:
           optician: Luneder
           organic: Stal boued bio
           outdoor: Stal oberiantizoù diavaez
+          paint: Palier livadurioù
+          pawnbroker: Prester ouzh gouestl
           pet: Stal loened
           pharmacy: Apotikerezh
           photo: Stal luc'hskeudenniñ
-          salon: Saloñs
+          seafood: Boued-mor
           second_hand: Stal traoù eildorn
           shoes: Stal voteier
-          shopping_centre: Kreizenn-genwerzh
           sports: Stal sport
           stationery: Paperaerezh
           supermarket: Gourmarc'had
           tailor: Kemener
+          ticket: Billederezh
+          tobacco: Stal-vutun
           toys: Stal c'hoarielloù
           travel_agency: Ajañs-veaj
+          tyres: Stal vandennoù-rod
+          vacant: Stal vak
+          variety_store: Stal seurtadoù
           video: Stal videoioù
-          wine: Kavour gwin
+          wine: Kavour
           "yes": Stal
         tourism:
           alpine_hut: Bod menez
@@ -886,6 +939,7 @@ br:
           viewpoint: Gwelva
           zoo: Zoo
         tunnel:
+          building_passage: Tremen savadur
           culvert: kan-dour
           "yes": Riboul
         waterway:
@@ -991,16 +1045,15 @@ br:
     legal_babble:
       title_html: Copyright hag aotre-implijout
       intro_1_html: |-
-        OpenStreetMap <sup><a href="#trademarks">&reg;</a></sup>  zo <i>dindan un aotre-implijout digor</i>, Open Data
+        OpenStreetMap <sup><a href="#trademarks">&reg;</a></sup>  zo <i>dindan un aotre-implijout digor</i>, href "htpps : //Open Data
-        Commons Open Database License</a> (ODbL) gant <sup><a href="#trademarks">&reg;</a></sup>
+        Commons Open Database License</a> (ODbL)gant <sup><a href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-      intro_2_html: "Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù\n
+      intro_2_html: "Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù
-        \ hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e\n  genlabourerien.
+        hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e genlabourerien.
-        Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,\n
+        Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,ne
-        \ ne c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n  <a
+        c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">legal\ncode</a>
-        href=\"http://opendatacommons.org/licenses/odbl/1.0/\">legal\ncode</a> e kavot
+        e kavot munudoù ho kwirioù hag ho teverioù."
-        munudoù ho kwirioù hag ho teverioù."
       intro_3_html: "Emañ tammoù hor c'hartennoù hag hon teulioù dindan an aotre-implijout
-        <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative \nCommons
+        <a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative \nCommons
         Attribution-ShareAlike 2.0</a> license (CC-BY-SA)."
       credit_title_html: Penaos reiñ kred da OpenStreetMap
       credit_1_html: Goulenn a reomp diganeoc'h lakaat en ho kred ar meneg &ldquo;&copy;
@@ -1009,7 +1062,7 @@ br:
         Pa vez posupl e tle OpenStreetMap bezañ ur gourliamm war-du <a
           href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
           ha CC BY-SA war-du <a
-          href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>.
+          href="https://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>.
           Ma'z implijit ur skor ma ne c'haller ket krouiñ liammoù (da skouer :
           un destenn moullet), ez aliomp ac'hanoc'h da gas ho lennerien da
           www.openstreetmap.org (marteze en ur astenn
@@ -1023,7 +1076,7 @@ br:
         title: Skouer deverkadur
       more_title_html: Titouroù ouzhpenn
       more_1_html: Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor
-        roadennoù, lennit  <a href="http://osmfoundation.org/Licence"> Licence OSMF
+        roadennoù, lennit  <a href="https://osmfoundation.org/Licence"> Licence OSMF
         Licence page</a> hag ar gumuniezh <a
       more_2_html: "Daoust da OpenStreetMap bezañ un hollad roadennoù digor, n'omp
         ket evit pourchas un API digoust evit an dredeourien.\n   Sellit ouzh hor
@@ -1038,10 +1091,10 @@ br:
         zouez :'
       contributors_at_html: |-
         <strong>Aostria</strong> : Ennañ roadennoù eus
-        <a href="http://data.wien.gv.at/">Stadt Wien</a> (dindan
+        <a href="https://data.wien.gv.at/">Stadt Wien</a> (dindan
-        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.</li>
+        <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.</li>
-        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> ha
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> ha
         Land Tirol (dindan <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT gant enkemmadoù</a>).
       contributors_ca_html: |-
         <strong>Kanada</strong> : Ennañ roadennoù eus
@@ -1051,12 +1104,12 @@ br:
            Statistics Canada).
       contributors_fi_html: |-
         <strong>Finland</strong>: Ennañ ez eus roadennoù eus diaz roadennoù Ensellerezh Broadel Tiriad hag holladoù roadennoù all, dindan an
-        <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">aotre-implij NLSFI</a>.
+        <a href="https://www.maanmittauslaitos.fi/en/NLS_opendata_licence_version1_20120501">aotre-implij NLSFI</a>.
       contributors_fr_html: '<strong>Frañs</strong> : Ennañ roadennoù eus Renerezh
         Hollek an Tailhoù.'
       contributors_nl_html: |-
         <strong>Netherlands</strong> : Contains &copy; AND data, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
+          (<a href="https://www.and.com">www.and.com</a>)
       contributors_nz_html: |-
         <strong>Zeland-Nevez</strong> : Ennañ roadennoù eus
            Land Information New Zealand. Crown Copyright reserved.
@@ -1072,7 +1125,7 @@ br:
            Survey data &copy; Crown copyright and database right 2010-12.
       contributors_footer_1_html: |-
         ↓Evit muioc'h a vunudoù diwar-benn ar re-se, hag ar mammennoù all a zo bet implijet da sikour da wellaat OpenStreetMap, sellit ouzh ar <a
-        href="http://wiki.openstreetmap.org/wiki/Contributors">Bajenn Skoazellerien</a> e Wiki OpenStreetMap.
+        href="https://wiki.openstreetmap.org/wiki/Contributors">Bajenn Skoazellerien</a> e Wiki OpenStreetMap.
       contributors_footer_2_html: Enlakaat roadennoù e OpenStreetMap ne empleg ket
         ez aprou ar bourchaserien orin a endalc'had OpenStreetMap, na ne bourchasont,
         na ne waratomp pe na ne zegemeront ne vern pe atebegezh e vefe.
@@ -1083,14 +1136,14 @@ br:
         ezpleg ar re zo ar gwirioù-aozer ganto.
       infringement_2_html: ma kredit ez eus bet ouzhpennet danvez dindan aotre-implijout
         e gaou da diaz roadennoù OpenStreetMat pe d'al lec'hienn-mañ, roit an dra-se
-        da c'houzout d'hon <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">argerzh
+        da c'houzout d'hon <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">argerzh
         dizober</a>, mar plij, pe skrivit war-eeun war hor <a href="http://dmca.openstreetmap.org/">furmskrid
         enlinenn</a>.
       trademarks_title_html: <span id="merkoù"></span>Merkoù
       trademarks_1_html: Openstreet, al logo brasaer ha State of the Map zo merkoù
         marilhet gant OpenStreetMap Foundation. M'ho pez goulennoù da sevel diwar-benn
-        implij ar merkoù-se, kit e darempred gant <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
+        implij ar merkoù-se, sellit ouzh <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark
-        Working Group</a>, mar plij.
+        Policy</a>, mar plij.
   welcome_page:
     title: Deuet-mat oc'h !
     introduction_html: Degemer mat en OpenStreetMap, ar gartenn digoust eus ar bed
@@ -1123,8 +1176,8 @@ br:
       paragraph_1_html: OpenStreetMap en deus un nebeud reolennoù furmel, met gortoz
         a reomp ma vo kemeret perzh gant an holl berzhidi ha ma vo darempredoù gant
         ar gumuniezh. Ma vezit e-sell d'ober traoù all estreget ober cheñchamantoù
-        gant an dorn, lennit ha heuilhit ar sturiadoù, mar plij, e <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'></a>An
+        gant an dorn, lennit ha heuilhit ar sturiadoù, mar plij, e <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'></a>An
-        ezporzhiadurioù</> ha<a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'></a>
+        ezporzhiadurioù</> ha<a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'></a>
         Ar c'hemmoù emgefre>/a>.
     questions:
       title: Traoù da c'houlenn ?
@@ -1156,7 +1209,7 @@ br:
       title: Prederioù all
       explanation_html: Ma'z oc'h chalet gant an doare ma vez implijet hor roadennoù
         pe gant an endalc'hadoù, sellit ouzh hor <a href='/copyright'>pajenn gwir-eilañ</a>
-        evit muioc'h a ditouroù lezennel, pe kit e darempred gant ar <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>strollad-labour
+        evit muioc'h a ditouroù lezennel, pe kit e darempred gant ar <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>strollad-labour
         OSMF</a> a zere.
   help_page:
     title: Tapout sikour
@@ -1211,7 +1264,7 @@ br:
     community_driven_title: Renet gant ar gumuniezh
     community_driven_html: |-
       Liesseurt hag entanet eo kumuniezh OpenStreetMap. O kreskiñ emañ bemdez. E-mesk hor c'henlabourerien ez eus kartennourien entanet, tud a-vicher eus ar GIS, ijinourien hag a laka servijerien OSM da vont en-dro, denegourien hag a sav kartennoù eus an takadoù gwastet gant gwallreuzioù ha kalz re all.
-      Evit gouzout hiroc'h diwar-benn ar gumuniezh, sellit ouzh <a href='%{diary_path}'>deizlevrioù an implijerien</a>, <a href='http://blogs.openstreetmap.org/'>blogoù ar gumuniezh</a>, hag lec'hienn web <a href='http://www.osmfoundation.org/'>Diazezadur OSM</a>.
+      Evit gouzout hiroc'h diwar-benn ar gumuniezh, sellit ouzh <a href='http://blogs.openstreetmap.org/'>blogoù OpenStreetMap</a>, <a href='%{diary_path}'>deizlevrioù an implijerien</a>,<a href='http://blogs.openstreetmap.org/'>blogoù ar gumuniezh</a>, hag lec'hienn web <a href='http://www.osmfoundation.org
     open_data_title: Roadennoù digor
     open_data_html: 'OpenStreetMap zo <i>open data</i>: gallout a rit implijout anezhañ
       evit forzh pseeurt pal keit ha ma roit kred da OpenStreetMap ha d''ar re a labour
@@ -1220,14 +1273,16 @@ br:
       ha pajenn an aotre-implij</a> evit gouzout hiroc''h.'
     legal_title: Lezennel
     legal_html: "Al lec'hienn-mañ hag e-leizh a servijoù all kar zo korvoet ent furmel
-      gant an <a href=\"http://osmfoundation.org/\">Diazezaddur OpenStreetMap</a>
+      gant an <a href=\"https://osmfoundation.org/\">Diazezaddur OpenStreetMap</a>
       (OSMF) \nen anv ar gumuniezh.\nEvit implijout an holl servijoù kinniget gant
-      an OSMF e ranker doujañ d'hor \n<a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">
+      an OSMF e ranker doujañ d'hor \n<a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">
-      Politikerezh war an implijoù degemeret</a> ha d'hor <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">Politikerzh
+      Politikerezh war an implijoù degemeret</a> ha d'hor <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">Politikerzh
-      prevezded</a>.\n<br>\nKit <a href=\"http://osmfoundation.org/Contact\">contacter
+      prevezded</a>.\n<br>\nKit <a href=\"https://osmfoundation.org/Contact\">contacter
       l'OSMF</a> e darempred gant an OSMF</a>, mar plij, m'ho peus goulennoù da sevel
       diwar-benn an aotreoù-implijout, ar gwirioù oberour pe diwar-benn goulennoù
-      lezennel all.\n<br>"
+      lezennel all.\n<br>\nOpenStreetMap, al logo gant ar brasaer ha ''State of the
+      Map'' zo<a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">merkoù
+      marilhet OSMF</a>."
     partners_title: Kevelerien
   notifier:
     diary_comment_notification:
@@ -1450,12 +1505,12 @@ br:
       anon_edits_link_text: Kavit perak.
       flash_player_required: Ezhomm hoc'h eus eus ul lenner Flash evit implijout Potlatch,
         aozer flash OpenStreetMap. Gallout a rit <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">pellgargañ
-        Flash Player diwar Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Meur
+        Flash Player diwar Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Meur
-        a zibarzh</a> a c'haller kaout evit aozañ OpenStreetMap.
+        a zibarzh</a> a c'haller kaout evit kemmañ OpenStreetMap.
       potlatch_unsaved_changes: Kemmoù n'int ket bet enrollet zo ganeoc'h. (Evit enrollañ
         e Potlatch, e tlefec'h diziuzañ an hent pe ar poent red m'emaoc'h oc'h aozañ
         er mod bev, pe klikañ war enrollañ ma vez ur bouton enrollañ ganeoc'h.)
-      potlatch2_not_configured: Potlatch 2 n'eo ket bet kefluniet - sellit ouzh http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
+      potlatch2_not_configured: Potlatch 2 n'eo ket bet kefluniet - sellit ouzh https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
         da c'houzout hiroc'h
       potlatch2_unsaved_changes: Kemmoù n'int ket enrollet zo ganeoc'h. (Evit enrollañ
         ho kemmoù e Potlach2, klikit war enrollañ)
@@ -1471,10 +1526,11 @@ br:
       get_directions_title: Kavit an hentoù etre an daou boent
       from: Eus
       to: Da
-      where_am_i: Pelec'h emaon ?
+      where_am_i: Pelec'h emañ ?
       where_am_i_title: Deskrivañ al lec'hiadur a-vremañ en ur implijout al lusker
         enklask
       submit_text: Kas
+      reverse_directions_text: Eilpennañ an durc'hadurioù
     key:
       table:
         entry:
@@ -1549,7 +1605,7 @@ br:
       edit: Aozañ
       preview: Rakwelet
     markdown_help:
-      title_html: Dielfennet gant <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Dielfennet gant <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
       headings: Titloù
       heading: Titl
       subheading: Istitl
@@ -1657,7 +1713,7 @@ br:
       tagged_with: ' balizennet gant %{tags}'
       empty_html: N'eus netra da welet amañ. <a href='%{upload_link}'>Pellgargit ur
         roudenn nevez</a> evit gouzout hiroc'h diwar-benn an tresañ GPS, sellit ouzh
-        ar <abajenn wiki>href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2i</a>.
+        ar <abajenn wiki>href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2i</a>.
     delete:
       scheduled_for_deletion: Roudenn da vezañ dilamet
     make_public:
@@ -1864,12 +1920,12 @@ br:
         html: |-
           <p>E kemm gant kartennoù all, OpenStreetMap zo krouet penn-da-benn gant tud eveldoc'h. Forzh piv a c'hall dresañ, hizivaat, pellgargañ hag implijout anezhi.</p>
           <p>Lakait hoc'h anv evit kregiñ da genlabourat. Kas a raimp ur postel deoc'h da gadarnaat ho kont.</p>
-      license_agreement: Pa gadarnaot ho kont e tleot asantiñ da <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">ziferadennoù
+      license_agreement: Pa gadarnaot ho kont e tleot asantiñ da <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">ziferadennoù
         ar c'henlabourer</a>.
       email address: 'Chomlec''h postel :'
       confirm email address: 'Kadarnaat ar chomlec''h postel :'
       not displayed publicly: N'eo ket diskwelet ho chomlec'h d'an holl (gwelet <a
-        href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy
+        href="https://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy
         policy including section on email addresses">hor c'harta prevezded</a>) evit
         gouzout hiroc'h
       display name: 'Anv diskwelet :'
@@ -1994,12 +2050,12 @@ br:
       email never displayed publicly: (n'eo ket diskwelet d'an holl morse)
       external auth: 'Dilesadur diavaez :'
       openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: petra eo se ?
       public editing:
         heading: 'Aozañ foran :'
         enabled: Gweredekaet. N'eo ket dizanv ha gallout a ra aozañ roadennoù.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: Petra eo se ?
         disabled: Diweredekaet ha ne c'hall ket aozañ roadennoù ; diznav eo an holl
           aozadennoù kent.
@@ -2010,10 +2066,11 @@ br:
           pe gwelet ho lec'hiadur. Evit diskouez ar pezh hoc'h eus embannet ha reiñ
           an tu d'an dud da vont e darempred ganeoc'h dre al lec'hienn, klikit war
           al liamm da-heul. <b>Abaoe ar c'hemm davet ar stumm API 0.6, n'eus  nemet
-          an dud gant an doare "kemmoù foran" a c'hall embann kartennoù</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">gouzout
+          an dud gant an doare "kemmoù foran" a c'hall kemmañ roadennoù ar c'hartennoù</b>.
-          hiroc'h</a>).<ul><li>Ne vo ket roet ho chomlec'h postel d'an dud.</li><li>N'hall
+          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">gouzout hiroc'h</a>).<ul><li>Ne
-          ket an obererezh-se bezañ nullet hag emañ an holl implijerien nevez gant
+          vo ket roet ho chomlec'h postel d'an dud.</li><li>N'hall ket an obererezh-se
-          an doare "kemmoù foran" dre ziouer.</li></ul>
+          bezañ nullet hag emañ an holl implijerien nevez gant an doare "kemmoù foran"
+          dre ziouer.</li></ul>
       contributor terms:
         heading: 'Diferadennoù ar c''henlabourer :'
         agreed: Degemeret hoc'h eus diferadennoù nevez ar c'henlabourer.
@@ -2137,6 +2194,8 @@ br:
       not_a_role: An neudennad « %{role} » n'eo ket ur roll reizh.
       already_has_role: Ar roll %{role} zo gant an implijer dija.
       doesnt_have_role: N'emañ ket ar roll %{role} gant an implijer.
+      not_revoke_admin_current_user: Ne c'haller ket tennañ ar gwirioù melestrer digant
+        an implijer bremañ.
     grant:
       title: Kadarnaat roidigezh ar roll
       heading: Kadarnaat roidigezh ar roll
@@ -2363,9 +2422,10 @@ br:
       new:
         intro: Gwelet ho peus ur fazi pe un dra a vank ? Roit an dra-se da c'houzout
           d'ar gartennaouerien all evit ma vo renket. Lakait ar merker el lec'h mat
-          ha skrivet un notenn da zisplegañ ar gudenn. (Arabat skrivañ amañ titouroù
+          ha skrivit un notenn da zisplegañ ar gudenn.
-          personel pe titouroù tennet eus kartennoù dindan aotre-implijout pe rolloù
+        advice: Foran eo ho notenn ha ne c'hall ket bezañ implijet evit hizivaat ar
-          kavlec'h, mar plij.)
+          gartenn. Setu perak eo abarat ebarzhiñ titouroù personel pe titouroù o tont
+          eus kartennoù gwarezet na endalc'hioù rolloù.
         add: Ouzhpennañ un notenn
       show:
         anonymous_warning: En notenn-mañ ez eus evezhiadennoù gant implijerien dianav

config/locales/bs.yml

@@ -377,33 +377,26 @@ bs:
           crematorium: Krematorij
           dentist: Zubar
           doctors: Doktor
-          dormitory: Studentski dom
           drinking_water: Voda za piće
           driving_school: Autoškola
           embassy: Ambasada
-          emergency_phone: S.O.S. Telefon
           fast_food: Fast food
           ferry_terminal: Trajektni terminal
-          fire_hydrant: Hidrant
           fire_station: Vatrogasna stanica
           food_court: Dvorište restorana
           fountain: Fontana
           fuel: Benzinska pumpa
           gambling: Kockanje
           grave_yard: Groblje
-          gym: Fitness centar
-          health_centre: Zdravstveni centar
           hospital: Bolnica
           hunting_stand: Lovačka čeka
           ice_cream: Sladoled
           kindergarten: Dječiji vrtić
           library: Biblioteka
-          market: Tržnica
           marketplace: Tržnica
           monastery: Manastir
           motorcycle_parking: Parking za motore
           nightclub: Noćni klub
-          nursery: Čuvanje djece
           nursing_home: Starački dom
           office: Kancelarija
           parking: Parking
@@ -417,7 +410,6 @@ bs:
           prison: Zatvor
           pub: Pub
           public_building: Ustanova
-          reception_area: Recepcija
           recycling: Reciklažna stanica
           restaurant: Restoran
           retirement_home: Dom penzionera
@@ -513,7 +505,6 @@ bs:
           trunk: Brza cesta
           trunk_link: Prilaz brzoj cesti
           unclassified: Neklasificirana cesta
-          unsurfaced: Neasfaltirana cesta
           "yes": Put
         historic:
           archaeological_site: Arheološko nalazište
@@ -574,7 +565,6 @@ bs:
         leisure:
           beach_resort: Odmaralište - plaža
           bird_hide: Posmatračnica ptica
-          club: Klub
           common: Općinsko zemljište
           dog_park: Park za pse
           fishing: Ribolovno područje
@@ -653,7 +643,6 @@ bs:
           travel_agent: Putnička agencija
           "yes": Kancelarija
         place:
-          airport: Aerodrom
           city: Grad
           country: Država
           county: Kanton
@@ -665,7 +654,6 @@ bs:
           islet: Ostrvce
           isolated_dwelling: Izolirano stanovanje
           locality: Lokalitet
-          moor: Močvarno tlo
           municipality: Općina
           postcode: Poštanski broj
           region: Regija
@@ -680,10 +668,8 @@ bs:
           abandoned: Napuštena pruga
           construction: Pruga u izgradnji
           disused: Napuštena pruga
-          disused_station: Željeznička stanica (nije u upotrebi)
           funicular: Uspinjača
           halt: Željeznička stanica
-          historic_station: Historijska željeznička stanica
           junction: Željeznički čvor
           level_crossing: Pružni prelaz
           light_rail: Lahka željeznica
@@ -744,7 +730,6 @@ bs:
           hairdresser: Frizer
           hardware: Željezarija
           hifi: Hi-Fi
-          insurance: Osiguranje
           jewelry: Trgovina nakitom
           kiosk: Kiosk
           laundry: Praonica rublja
@@ -760,9 +745,7 @@ bs:
           pet: Trgovina za kućne ljubimce
           pharmacy: Apoteka
           photo: Fotograf
-          salon: Salon
           shoes: Trgovina obućom
-          shopping_centre: Trgovački centar
           sports: Trgovina sportskom opremom
           stationery: Papirnica
           supermarket: Supermarket

config/locales/ca.yml

@@ -247,7 +247,7 @@ ca:
     changeset_paging_nav:
       showing_page: Pàgina %{page}
       next: Endavant »
-      previous: « Enrere
+      previous: ← Anterior
     changeset:
       anonymous: Anònim
       no_edits: (sense edicions)
@@ -468,33 +468,26 @@ ca:
           crematorium: Crematori
           dentist: Dentista
           doctors: Metges
-          dormitory: Residència Universitària
           drinking_water: Aigua potable
           driving_school: Autoescola
           embassy: Ambaixada
-          emergency_phone: Telèfon d'emergència
           fast_food: Menjar ràpid
           ferry_terminal: Terminal de Ferry
-          fire_hydrant: Boca d'incendi
           fire_station: Parc de bombers
           food_court: Àrea de restauració
           fountain: Font
           fuel: Benzinera
           gambling: Jocs d'atzar
           grave_yard: Cementiri
-          gym: Gimnàs
-          health_centre: Centre de Salut
           hospital: Hospital
           hunting_stand: Club de caça
           ice_cream: Gelat
           kindergarten: Jardí d'infància
           library: Biblioteca
-          market: Mercat
           marketplace: Mercat
           monastery: Monestir
           motorcycle_parking: Aparcament per a motos
           nightclub: Club nocturn
-          nursery: Infantil
           nursing_home: Llar d'Avis
           office: Oficina
           parking: Pàrquing
@@ -508,7 +501,6 @@ ca:
           prison: Presó
           pub: Pub
           public_building: Edifici públic
-          reception_area: Àrea de recepció
           recycling: Punt de reciclatge
           restaurant: Restaurant
           retirement_home: Casa de Retirament
@@ -563,6 +555,7 @@ ca:
           defibrillator: Desfibril·lador
           landing_site: Lloc d'aterratges d'emergència
           phone: Telèfon per a emergències
+          "yes": Emergència
         highway:
           abandoned: Carretera abandonada
           bridleway: Ferradura
@@ -604,7 +597,6 @@ ca:
           trunk: Autovia de
           trunk_link: Autovia de
           unclassified: Sense classificar Road
-          unsurfaced: Pista sense asfaltar
           "yes": Carretera
         historic:
           archaeological_site: Lloc arqueològic
@@ -632,6 +624,7 @@ ca:
           wayside_cross: Camí de la creu
           wayside_shrine: Santuari de carreteres
           wreck: Wreck
+          "yes": Lloc històric
         junction:
           "yes": Intersecció
         landuse:
@@ -669,7 +662,6 @@ ca:
         leisure:
           beach_resort: Beach Resort
           bird_hide: Aguait
-          club: Club
           common: Terra comú
           dog_park: Parc caní
           fishing: Àrea de pesca
@@ -696,8 +688,11 @@ ca:
           water_park: Parc aquàtic
           "yes": Esbarjo
         man_made:
+          breakwater: Escullera
+          bridge: Pont
           lighthouse: Far
           pipeline: Canonada
+          silo: Sitja
           tower: Torre
           works: Fàbrica
           "yes": Fet per l'home
@@ -750,7 +745,9 @@ ca:
           accountant: Comptable
           administrative: Administració
           architect: Arquitecte
+          association: Associació
           company: Empresa
+          educational_institution: Institució educativa
           employment_agency: Agència d'ocupació
           estate_agent: Immobiliària
           government: Oficina governamental
@@ -762,9 +759,8 @@ ca:
           "yes": Oficina
         place:
           allotments: Horts
-          block: Bloc
-          airport: Aeroport
           city: Ciutat
+          city_block: Illa de cases
           country: País
           county: Comtat
           farm: Granja
@@ -775,7 +771,6 @@ ca:
           islet: Illot
           isolated_dwelling: Habitatge aïllat
           locality: Localitat
-          moor: Amarrador
           municipality: Municipi
           neighbourhood: Barri
           postcode: Codi postal
@@ -792,10 +787,8 @@ ca:
           abandoned: Ferrocarril fora de Servei
           construction: Ferrocarril en Construcció
           disused: Ferrocarril en desús
-          disused_station: Estació de tren tancada
           funicular: Funicular Railway
           halt: Parada de tren
-          historic_station: Estació de tren antiga
           junction: Cruïlla de tren
           level_crossing: Pas a nivell
           light_rail: Tren lleuger
@@ -859,7 +852,6 @@ ca:
           hairdresser: Perruqueria o barberia
           hardware: Botiga de maquinari
           hifi: Hi-Fi
-          insurance: Homes For Sale
           jewelry: Joieria
           kiosk: Quiosc botiga
           laundry: Bugaderia
@@ -875,10 +867,8 @@ ca:
           pet: Botiga d'animals
           pharmacy: Farmàcia
           photo: Botiga de foto
-          salon: Sala d'estar
           second_hand: Botiga de segona mà
           shoes: Sabateria
-          shopping_centre: Centre comercial
           sports: Botiga d'esports
           stationery: Botiga de papereria
           supermarket: Supermercat
@@ -1118,10 +1108,10 @@ ca:
         per eliminar dades protegides pels drets d'autor</a> o empleneu aquest <a
         href="http://dmca.openstreetmap.org/">formulari en línia.</a>.
       trademarks_title_html: <span id="trademarks"></span>Marques registrades
-      trademarks_1_html: OpenStreetMap i el logotip de la lupa són marques registrades
+      trademarks_1_html: OpenStreetMap, el logotip de la lupa i «State of the Map»
-        de la Fundació OpenStreetMap. Si teniu preguntes sobre l'ús de les marques,
+        són marques registrades de la Fundació OpenStreetMap. Si teniu preguntes sobre
-        si us plau envieu les vostres al <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Grup
+        l’ús de les marques, consulteu la <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">política
-        de Treball de Llicències</a>.
+        de marques registrades</a>.
   welcome_page:
     title: Benvingut!
     introduction_html: Us donem la benvinguda a l'OpenStreetMap, el mapa lliure i

config/locales/cs.yml

@@ -7,6 +7,7 @@
 # Author: DemonioCZ
 # Author: Dvorapa
 # Author: H4nek
+# Author: Ilimanaq29
 # Author: JAn Dudík
 # Author: Jezevec
 # Author: Jkjk
@@ -17,6 +18,7 @@
 # Author: Martin Urbanec
 # Author: Masox
 # Author: Matěj Grabovský
+# Author: Matěj Suchánek
 # Author: Michaelbrabec
 # Author: Mkyral
 # Author: Mormegil
@@ -428,12 +430,19 @@ cs:
           chair_lift: Sedačková lanovka
           drag_lift: Vlek
           gondola: Kabinková lanovka
+          platter: Talířový výtah
+          pylon: Pylon
           station: Stanice lanovky
+          t-bar: Výtah T-Bar
         aeroway:
           aerodrome: Letiště
+          airstrip: Startovací a přistávací dráha
           apron: Odbavovací plocha
           gate: Letištní brána
+          hangar: Hangár
           helipad: Heliport
+          holding_position: Držení pozice
+          parking_position: Parkovací slot
           runway: Dráha
           taxiway: Pojezdová dráha
           terminal: Terminál
@@ -468,37 +477,32 @@ cs:
           crematorium: Krematorium
           dentist: Zubař
           doctors: Lékař
-          dormitory: Kolej
           drinking_water: Pitná voda
           driving_school: Autoškola
           embassy: Velvyslanectví
-          emergency_phone: Nouzový telefon
           fast_food: Rychlé občerstvení
           ferry_terminal: Přístaviště přívozu
-          fire_hydrant: Požární hydrant
           fire_station: Hasičská stanice
           food_court: Občerstvení
           fountain: Fontána
           fuel: Čerpací stanice
           gambling: Hazardní hry
           grave_yard: Hřbitov
-          gym: Fitness centrum / tělocvična
+          grit_bin: Zrnitý koš
-          health_centre: Zdravotní středisko
           hospital: Nemocnice
           hunting_stand: Posed
           ice_cream: Zmrzlinárna
           kindergarten: Mateřská škola
           library: Knihovna
-          market: Tržiště
           marketplace: Tržnice
           monastery: Klášter
           motorcycle_parking: Parkoviště pro motocykly
           nightclub: Noční klub
-          nursery: Jesle
           nursing_home: Pečovatelský dům
           office: Úřad
           parking: Parkoviště
           parking_entrance: Vjezd na parkoviště
+          parking_space: Parkoviště
           pharmacy: Lékárna
           place_of_worship: Náboženský objekt
           police: Policie
@@ -508,7 +512,6 @@ cs:
           prison: Věznice
           pub: Hospoda
           public_building: Veřejná budova
-          reception_area: Recepce
           recycling: Tříděný odpad
           restaurant: Restaurace
           retirement_home: Domov důchodců
@@ -533,6 +536,7 @@ cs:
           village_hall: Společenský sál
           waste_basket: Odpadkový koš
           waste_disposal: Popelnice
+          water_point: Bod vody
           youth_centre: Centrum pro mládež
         boundary:
           administrative: Administrativní hranice
@@ -541,6 +545,7 @@ cs:
           protected_area: Chráněná oblast
         bridge:
           aqueduct: Akvadukt
+          boardwalk: Tabulová chůze
           suspension: Visutý most
           swing: Otočný most
           viaduct: Viadukt
@@ -560,25 +565,31 @@ cs:
           "yes": Řemeslná dílna
         emergency:
           ambulance_station: Stanoviště záchranné služby
+          assembly_point: Shromažďovací místo
           defibrillator: Defibrilátor
           landing_site: Přistávací plocha záchranky
           phone: Nouzový telefon
+          water_tank: Nouzová vodní nádrž
+          "yes": Nouze
         highway:
           abandoned: Zrušená silnice
           bridleway: Koňská stezka
           bus_guideway: Autobusová dráha
           bus_stop: Autobusová zastávka
           construction: Silnice ve výstavbě
+          corridor: Koridor
           cycleway: Cyklostezka
           elevator: Výtah
           emergency_access_point: Nouzový lokalizační bod
           footway: Chodník
           ford: Brod
+          give_way: Značka cesty
           living_street: Obytná zóna
           milestone: Kilometrovník
           motorway: Dálnice
           motorway_junction: Dálniční křižovatka
           motorway_link: Dálnice
+          passing_place: Přechod
           path: Stezka
           pedestrian: Pěší zóna
           platform: Nástupiště
@@ -595,6 +606,7 @@ cs:
           services: Dálniční odpočívadlo
           speed_camera: Radar
           steps: Schody
+          stop: Značka Stop
           street_lamp: Pouliční lampa
           tertiary: Silnice třetí třídy
           tertiary_link: Silnice třetí třídy
@@ -603,8 +615,8 @@ cs:
           trail: Stezka
           trunk: Významná silnice
           trunk_link: Významná silnice
+          turning_loop: Otočná smyčka
           unclassified: Silnice
-          unsurfaced: Nezpevněná cesta
           "yes": Cesta
         historic:
           archaeological_site: Archeologické naleziště
@@ -623,6 +635,7 @@ cs:
           manor: Panství
           memorial: Památník
           mine: Důl
+          mine_shaft: Důlní šachta
           monument: Pomník
           roman_road: Římská cesta
           ruins: Zřícenina
@@ -632,6 +645,7 @@ cs:
           wayside_cross: Boží muka
           wayside_shrine: Boží muka
           wreck: Vrak
+          "yes": Historická stránka
         junction:
           "yes": Křižovatka
         landuse:
@@ -669,9 +683,9 @@ cs:
         leisure:
           beach_resort: Pobřežní letovisko
           bird_hide: Ptačí pozorovatelna
-          club: Klub
           common: Obecní půda
           dog_park: Park pro psy
+          firepit: Ohniště
           fishing: Rybářská oblast
           fitness_centre: Fitness centrum
           fitness_station: Fitness
@@ -696,15 +710,46 @@ cs:
           water_park: Aquapark
           "yes": Volný čas
         man_made:
+          adit: Adit
+          beacon: Maják
+          beehive: Včelí úl
+          breakwater: Vlnolam
+          bridge: Most
+          bunker_silo: Bunkr
+          chimney: Komín
+          crane: Jeřáb
+          dolphin: Kotvící pošta
+          dyke: Hráz
+          embankment: Nábřeží
+          flagpole: Vlajková tyč
+          gasometer: Plynoměr
+          groyne: Vlnolam
+          kiln: Pec
           lighthouse: Maják
+          mast: Stožár
+          mine: Mina
+          mineshaft: Důlní šachta
+          monitoring_station: Stanice monitoringu
+          petroleum_well: Ropný důl
+          pier: Molo
           pipeline: Potrubí
+          silo: Silo
+          storage_tank: Skladovací nádrž
+          surveillance: Dohled
           tower: Věž
+          wastewater_plant: Rostlina na plýtvání vodou
+          watermill: Vodní mlýn
+          water_tower: Vodní věž
+          water_well: Studna
+          water_works: Vodárna
+          windmill: Větrný mlýn
           works: Továrna
           "yes": Lidský výtvor
         military:
           airfield: Vojenské letiště
           barracks: Kasárna
           bunker: Bunkr
+          "yes": Armáda
         mountain_pass:
           "yes": Průsmyk
         natural:
@@ -750,11 +795,14 @@ cs:
           accountant: Účetní
           administrative: Správa
           architect: Architekt
+          association: Asociace
           company: Firma
+          educational_institution: Vzdělávací instituce
           employment_agency: Pracovní agentura
           estate_agent: Realitní kancelář
           government: Vládní úřad
           insurance: Pojišťovna
+          it: Počítačová kancelář
           lawyer: Právnická kancelář
           ngo: Úřad nevládní organizace
           telecommunication: Telekomunikační úřad
@@ -762,9 +810,8 @@ cs:
           "yes": Kancelář
         place:
           allotments: Zahrádkářská kolonie
-          block: Blok
-          airport: Letiště
           city: Velkoměsto
+          city_block: Městský blok
           country: Stát
           county: Hrabství
           farm: Farma
@@ -775,12 +822,13 @@ cs:
           islet: Ostrůvek
           isolated_dwelling: Samota
           locality: Oblast
-          moor: Bažina
           municipality: Obecní úřad
           neighbourhood: Čtvrť
           postcode: PSČ
+          quarter: Čtvrt
           region: Region
           sea: Moře
+          square: Náměstí
           state: Stát
           subdivision: Parcely
           suburb: Městská část
@@ -792,10 +840,8 @@ cs:
           abandoned: Zrušená železniční trať
           construction: Železnice ve výstavbě
           disused: Nepoužívaná železniční trať
-          disused_station: Zrušená železniční stanice
           funicular: Lanová dráha
           halt: Železniční zastávka
-          historic_station: Nádraží historické železnice
           junction: Kolejové rozvětvení
           level_crossing: Železniční přejezd
           light_rail: Rychlodráha
@@ -821,6 +867,7 @@ cs:
           beauty: Salón krásy
           beverages: Prodej nápojů
           bicycle: Cykloobchod
+          bookmaker: Bookmaker
           books: Knihkupectví
           boutique: Butik
           butcher: Řeznictví
@@ -859,12 +906,16 @@ cs:
           hairdresser: Kadeřnictví
           hardware: Železářství
           hifi: Prodej Hi-Fi elektroniky
-          insurance: Pojišťovna
+          houseware: Obchod s domácími potřebami
+          interior_decoration: Vnitřní dekorace
           jewelry: Klenotnictví
           kiosk: Kiosek
+          kitchen: Kuchyňský obchod
           laundry: Prádelna
+          lottery: Loterie
           mall: Nákupní centrum
           market: Trh
+          massage: Masáž
           mobile_phone: Prodej mobilních telefonů
           motorcycle: Prodej motocyklů
           music: Prodej hudby
@@ -872,19 +923,25 @@ cs:
           optician: Oční optika
           organic: Prodej biopotravin
           outdoor: Outdoorový obchod
+          paint: Obchod s barvami
+          pawnbroker: Zastavárník
           pet: Prodejna pro chovatele
           pharmacy: Lékárna
           photo: Prodejna foto
-          salon: Salón
+          seafood: Mořské plody
           second_hand: Bazar
           shoes: Obuvnictví
-          shopping_centre: Nákupní centrum
           sports: Prodejna pro sportovce
           stationery: Papírnictví
           supermarket: Supermarket
           tailor: Krejčí
+          ticket: Obchod s lístky
+          tobacco: Trafika
           toys: Hračkářství
           travel_agency: Cestovní kancelář
+          tyres: Pneuservis
+          vacant: Volný obchod
+          variety_store: Jednotkový obchod
           video: Videopůjčovna, prodej DVD
           wine: Vinárna
           "yes": Obchod
@@ -910,6 +967,7 @@ cs:
           viewpoint: Vyhlídka
           zoo: Zoo
         tunnel:
+          building_passage: Stavební průchod
           culvert: Propustek
           "yes": Tunel
         waterway:
@@ -1091,9 +1149,9 @@ cs:
         pro odstranění</a> nebo přímo podejte výzvu pomocí <a href="http://dmca.openstreetmap.org/">on-line
         formuláře</a>.
       trademarks_title_html: <span id="trademarks"></span>Ochranné známky
-      trademarks_1_html: OpenStreetMap, logo s lupou a State of the Map jsou zapsané
+      trademarks_1_html: OpenStreetMap, jeho logo s lupou a State of the Map jsou
-        ochranné známky OpenStreetMap Foundation. Pokud máte dotazy ohledně vašeho
+        zapsané ochranné známky OpenStreetMap Foundation. Pokud máte dotazy ohledně
-        používání těchto známek, zašlete své dotazy <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">pracovní
+        vašeho používání těchto známek, zašlete své dotazy <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">pracovní
         skupině pro licencování</a>.
   welcome_page:
     title: Vítejte!
@@ -1246,7 +1304,7 @@ cs:
       see_their_profile: Jeho/její profil si můžete prohlédnout na %{userurl}.
       befriend_them: Můžete si ho/ji také přidat jako přítele na %{befriendurl}.
     gpx_notification:
-      greeting: Ahoj,
+      greeting: Dobrý den,
       your_gpx_file: Vypadá to, že váš GPX soubor
       with_description: s popisem
       and_the_tags: 'a následujícími štítky:'
@@ -1273,13 +1331,13 @@ cs:
     email_confirm:
       subject: '[OpenStreetMap] Potvrzení vaší e-mailové adresy'
     email_confirm_plain:
-      greeting: Ahoj,
+      greeting: Dobrý den,
       hopefully_you: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru %{server_url}
         na %{new_address}.
       click_the_link: Pokud jste to byli vy, potvrďte změnu kliknutím na následující
         odkaz.
     email_confirm_html:
-      greeting: Ahoj,
+      greeting: Dobrý den,
       hopefully_you: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru %{server_url}
         na %{new_address}.
       click_the_link: Pokud jste to byli vy, potvrďte změnu kliknutím na následující
@@ -1287,7 +1345,7 @@ cs:
     lost_password:
       subject: '[OpenStreetMap] Žádost o nové heslo'
     lost_password_plain:
-      greeting: Ahoj,
+      greeting: Dobrý den,
       hopefully_you: Někdo (patrně vy) požádal o vygenerování nového hesla pro uživatele
         serveru openstreetmap.org s touto e-mailovou adresou.
       click_the_link: Pokud tedy chcete, kliknutím na níže uvedený odkaz získáte nové
@@ -1327,7 +1385,7 @@ cs:
       details: Podrobnosti k poznámce můžete najít na %{url}.
     changeset_comment_notification:
       hi: Dobrý den, uživateli %{to_user},
-      greeting: Ahoj,
+      greeting: Dobrý den,
       commented:
         subject_own: '[OpenStreetMap] %{commenter} okomentoval jednu z vašich sad
           změn'
@@ -1463,6 +1521,7 @@ cs:
       where_am_i: Kde je toto?
       where_am_i_title: Popsat právě zobrazované místo pomocí vyhledávače
       submit_text: Hledat
+      reverse_directions_text: Opačné směry
     key:
       table:
         entry:
@@ -2380,8 +2439,16 @@ cs:
       instructions:
         continue_without_exit: Pokračujte na %{name}
         slight_right_without_exit: Mírně vpravo na %{name}
-        offramp_right_without_exit: Použijte nájezd vpravo na %{name}
+        offramp_right_without_exit: Použijte sjezd vpravo na %{name}
+        offramp_right_with_directions: Použijte sjezd vpravo směrem na %{directions}
+        offramp_right_with_name_and_directions: Použijte sjezd vpravo na %{name},
+          směrem na %{directions}
+        offramp_right_without_directions: Použijte sjezd vpravo
         onramp_right_without_exit: Odbočte vpravo na nájezd na %{name}
+        onramp_right_with_directions: Odbočte vpravo na nájezd směrem na %{directions}
+        onramp_right_with_name_and_directions: Odbočte vpravo na nájezd na %{name},
+          směrem na %{directions}
+        onramp_right_without_directions: Odbočte vpravo na nájezd
         endofroad_right_without_exit: Na konci silnice odbočte vpravo na %{name}
         merge_right_without_exit: Připojte se vpravo na %{name}
         fork_right_without_exit: Na rozcestí odbočte vpravo na %{name}
@@ -2390,18 +2457,26 @@ cs:
         uturn_without_exit: Otočte se na %{name}
         sharp_left_without_exit: Ostře vlevo na %{name}
         turn_left_without_exit: Odbočte vlevo na %{name}
-        offramp_left_without_exit: Použijte nájezd vlevo na %{name}
+        offramp_left_without_exit: Použijte sjezd vlevo na %{name}
+        offramp_left_with_directions: Použijte sjezd vlevo směrem na %{directions}
+        offramp_left_with_name_and_directions: Použijte sjezd vlevo na %{name}, směrem
+          na %{directions}
+        offramp_left_without_directions: Použijte sjezd vlevo
         onramp_left_without_exit: Odbočte vlevo na nájezd na %{name}
+        onramp_left_with_directions: Odbočte vlevo na nájezd směrem na %{directions}
+        onramp_left_with_name_and_directions: Odbočte vlevo na nájezd na %{name},
+          směrem na %{directions}
+        onramp_left_without_directions: Odbočte vlevo na nájezd
         endofroad_left_without_exit: Na konci silnice odbočte vlevo na %{name}
         merge_left_without_exit: Připojte se vlevo na %{name}
         fork_left_without_exit: Na rozcestí odbočte vlevo na %{name}
         slight_left_without_exit: Mírně vlevo na %{name}
         via_point_without_exit: (zastávka)
         follow_without_exit: Jeďte po %{name}
-        roundabout_without_exit: Na kruhovém objezdu použijte %{name}
+        roundabout_without_exit: Z kruhového objezdu vyjeďte na %{name}
         leave_roundabout_without_exit: Vyjeďte z kruhového objezdu – %{name}
         stay_roundabout_without_exit: Zůstaňte na kruhovém objezdu – %{name}
-        start_without_exit: Začněte na konci %{name}
+        start_without_exit: Začněte na %{name}
         destination_without_exit: Jste v cíli
         against_oneway_without_exit: Jeďte protisměrem na %{name}
         end_oneway_without_exit: Konec jednosměrky na %{name}

config/locales/cy.yml

@@ -417,33 +417,26 @@ cy:
           crematorium: Amlosgfa
           dentist: Deintydd
           doctors: Meddygfa
-          dormitory: Noswylfa
           drinking_water: Dŵr Yfed
           driving_school: Ysgol Yrru
           embassy: Llysgenhadaeth
-          emergency_phone: Ffôn Argyfwng
           fast_food: Bwyd Parod
           ferry_terminal: Terfynell Fferi
-          fire_hydrant: Hydrant tân
           fire_station: Gorsaf Dân
           food_court: Cwrt Fwydydd
           fountain: Ffynnon
           fuel: Tanwydd
           gambling: Gamblo
           grave_yard: Mynwent
-          gym: Canolfan Ffitrwydd / Campfa
-          health_centre: Canolfan Iechyd
           hospital: Ysbyty
           hunting_stand: Llwyfan Hela
           ice_cream: Hufen Iâ
           kindergarten: Meithrinfa
           library: Llyfrgell
-          market: Marchnad
           marketplace: Marchnad
           monastery: Mynachdy
           motorcycle_parking: Man Parcio Beiciau Modur
           nightclub: Clwb Nôs
-          nursery: Meithrinfa
           nursing_home: Cartref Nyrsio
           office: Swyddfa
           parking: Parcio
@@ -457,7 +450,6 @@ cy:
           prison: Carchar
           pub: Tafarn
           public_building: Adeilad Cyhoeddus
-          reception_area: Derbyniad
           recycling: Pwynt Ailgylchu
           restaurant: Bwyty
           retirement_home: Cartref Ymddeol
@@ -553,7 +545,6 @@ cy:
           trunk: Cefnffordd
           trunk_link: Cefnffordd
           unclassified: Ffordd Diddosbarth
-          unsurfaced: Ffordd Heb Wyneb
           "yes": Ffordd
         historic:
           archaeological_site: Safle Archaeolegol
@@ -618,7 +609,6 @@ cy:
         leisure:
           beach_resort: Ardal Wyliau
           bird_hide: Cuddle Adar
-          club: Clwb
           common: Tir Comin
           dog_park: Parc Cwn
           fishing: Man Pysgota
@@ -711,8 +701,6 @@ cy:
           "yes": Swyddfa
         place:
           allotments: Rhandiroedd
-          block: Bloc
-          airport: Maes Awyr
           city: Dinas
           country: Gwlad
           county: Sir
@@ -724,7 +712,6 @@ cy:
           islet: Ynysig
           isolated_dwelling: Annedd Unig
           locality: Ardal
-          moor: Gwaun
           municipality: Bwrdeistref
           neighbourhood: Cymdogaeth
           postcode: Cod Post
@@ -741,10 +728,8 @@ cy:
           abandoned: Hen Reilffordd
           construction: Rheilffordd yn cael ei Osod
           disused: Rheilffordd Segur
-          disused_station: Gorsaf Drenau Segur
           funicular: Rheilffordd fynydd
           halt: Stop Trenau
-          historic_station: Hen Orsaf Trenau
           junction: Cyffordd Rheilffyrdd
           level_crossing: Croesfan Wastad
           light_rail: Rheilffordd Ysgafn
@@ -808,7 +793,6 @@ cy:
           hairdresser: Siop Drin Gwallt
           hardware: Siop Nwyddau Metel
           hifi: Sain
-          insurance: Yswiriant
           jewelry: Siop Gemwaith
           kiosk: Siop Fechan
           laundry: Golchdy
@@ -824,10 +808,8 @@ cy:
           pet: Siop Anifeiliaid Anwes
           pharmacy: Fferyllfa
           photo: Siop Luniau
-          salon: Salon Trin Gwallt
           second_hand: Siol Ail-law
           shoes: Siop Esgidiau
-          shopping_centre: Canolfan Siopa
           sports: Siop Chwaraeon
           stationery: Siop Offer Swyddfa
           supermarket: Archfarchnad

config/locales/da.yml

@@ -11,6 +11,7 @@
 # Author: Hede2000
 # Author: Hein0170
 # Author: Hylle
+# Author: IBDJ
 # Author: Jens Jensen
 # Author: Jhertel
 # Author: Joedalton
@@ -364,7 +365,7 @@ da:
       map_image: Kort billede (viser standard lag)
       embeddable_html: HTML der kan indlejres
       licence: Licens
-      export_details: OpenStreetMaps data er licenseret under <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
+      export_details: OpenStreetMaps data er licenseret under <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open
         Data Commons Open Database License</a> (ODbL).
       too_large:
         advice: 'Hvis ovenstående eksport mislykkes, kan du overveje at bruge en af
@@ -405,14 +406,14 @@ da:
   geocoder:
     search:
       title:
-        latlon: Resultater fra <a href="http://openstreetmap.org/">interne</a>
+        latlon: Resultater fra <a href="https://openstreetmap.org/">interne</a>
         uk_postcode: Resultater fra <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>
-        ca_postcode: Resultater fra <a href="http://geocoder.ca/">Geocoder.CA</a>
+        ca_postcode: Resultater fra <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Resultater fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Resultater fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Resultater fra <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: Resultater fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Resultater fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames_reverse: Resultater fra <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
@@ -422,12 +423,19 @@ da:
           chair_lift: Stolelift
           drag_lift: Træklift
           gondola: Gondolbane
+          platter: Tallerkenlift
+          pylon: Pylon
           station: Svævebanestation
+          t-bar: Ankerlift
         aeroway:
           aerodrome: Flyveplads
+          airstrip: Landingsbane
           apron: Forstykke
           gate: Gate
+          hangar: Hangar
           helipad: Helikopterplads
+          holding_position: Venteposition
+          parking_position: Parkeringsposition
           runway: Landingsbane
           taxiway: Rullevej
           terminal: Terminal
@@ -462,37 +470,32 @@ da:
           crematorium: Krematorium
           dentist: Tandlæge
           doctors: Læger
-          dormitory: Kollegium
           drinking_water: Drikkevand
           driving_school: Køreskole
           embassy: Ambassade
-          emergency_phone: Nødtelefon
           fast_food: Fastfood
           ferry_terminal: Færgeterminal
-          fire_hydrant: Brandhane
           fire_station: Brandstation
           food_court: Food Court
           fountain: Springvand
           fuel: Benzinstation
           gambling: Spil
           grave_yard: Kirkegård
-          gym: Træningscenter
+          grit_bin: Saltkasse
-          health_centre: Sundhedscenter
           hospital: Sygehus
           hunting_stand: Jagtplatform
           ice_cream: Is
           kindergarten: Børnehave
           library: Bibliotek
-          market: Marked
           marketplace: Markedsplads
           monastery: Kloster
           motorcycle_parking: Motorcykelparkering
           nightclub: Natklub
-          nursery: Førskole
           nursing_home: Plejehjem
           office: Kontor
           parking: Parkering
           parking_entrance: Parkeringsindkørsel
+          parking_space: Parkeringsplads
           pharmacy: Apotek
           place_of_worship: Sted for gudstjenester
           police: Politi
@@ -502,7 +505,6 @@ da:
           prison: Fængsel
           pub: Pub
           public_building: Offentlig bygning
-          reception_area: Modtagelsesområde
           recycling: Genbrugsstation
           restaurant: Restaurant
           retirement_home: Plejehjem
@@ -527,6 +529,7 @@ da:
           village_hall: Forsamlingshus
           waste_basket: Skraldespand
           waste_disposal: Skraldecontainer
+          water_point: Vandpunkt
           youth_centre: Ungdomscenter
         boundary:
           administrative: Administrativ grænse
@@ -535,6 +538,7 @@ da:
           protected_area: Beskyttet område
         bridge:
           aqueduct: Akvædukt
+          boardwalk: Strandbro
           suspension: Hængebro
           swing: Drejebro
           viaduct: Viadukt
@@ -554,25 +558,31 @@ da:
           "yes": Håndsværksbutik
         emergency:
           ambulance_station: Ambulancestation
+          assembly_point: Mødested
           defibrillator: Hjertestarter
           landing_site: Nødlandingsplads
           phone: Nødtelefon
+          water_tank: Nødvandtank
+          "yes": Nødsituation
         highway:
           abandoned: Forladt motorvej
           bridleway: Ridesti
           bus_guideway: Styret busspor
           bus_stop: Busstoppested
           construction: Vej under konstruktion
+          corridor: Korridor
           cycleway: Cykelsti
           elevator: Elevator
           emergency_access_point: Nødudgangspunkt
           footway: Gangsti
           ford: Vadested
+          give_way: Giv plads-skilt
           living_street: Vej med legende børn
           milestone: Milepæl
           motorway: Motorvej
           motorway_junction: Motorvejsafkørsel
           motorway_link: Af-/tilkørsel til motorvej
+          passing_place: Overgang
           path: Sti
           pedestrian: Gågade
           platform: Perron
@@ -589,6 +599,7 @@ da:
           services: Motorvejsserviceområde
           speed_camera: Fartkamera
           steps: Trappe
+          stop: Stopskilt
           street_lamp: Gadelygte
           tertiary: Hovedvej
           tertiary_link: Hovedvej
@@ -597,8 +608,8 @@ da:
           trail: Spor
           trunk: Motortrafikvej
           trunk_link: Motortrafikvej
+          turning_loop: Vendesløjfe
           unclassified: Anden vej
-          unsurfaced: Uasfalteret vej
           "yes": Vej
         historic:
           archaeological_site: Arkæologisk sted
@@ -617,6 +628,7 @@ da:
           manor: Herregård
           memorial: Mindesmærke
           mine: Mine
+          mine_shaft: Mineskakt
           monument: Monument
           roman_road: Romersk vej
           ruins: Ruin
@@ -626,6 +638,7 @@ da:
           wayside_cross: Vejkors
           wayside_shrine: Vejside helligdom
           wreck: Vrag
+          "yes": Historisk plads
         junction:
           "yes": Kryds
         landuse:
@@ -663,9 +676,9 @@ da:
         leisure:
           beach_resort: Badestrand
           bird_hide: Fugleskjul
-          club: Klub
           common: Fælles arealer
           dog_park: Hundepark
+          firepit: Kogegrube
           fishing: Fiskeområde
           fitness_centre: Motionscenter
           fitness_station: Udendørs fitness udstyr
@@ -690,15 +703,46 @@ da:
           water_park: Vandland
           "yes": Fritid
         man_made:
+          adit: Stoll
+          beacon: Fyr
+          beehive: Bikube
+          breakwater: Mole
+          bridge: Bro
+          bunker_silo: Bunker
+          chimney: Skorsten
+          crane: Kran
+          dolphin: Fortøjningspæl
+          dyke: Grøft
+          embankment: Dige
+          flagpole: Flagstang
+          gasometer: Gasometer
+          groyne: Høfde
+          kiln: Kalkovn
           lighthouse: Fyr
+          mast: Mast
+          mine: Mine
+          mineshaft: Mineskakt
+          monitoring_station: Overvågningsstation
+          petroleum_well: Oliebrønd
+          pier: Mole
           pipeline: Rørledning
+          silo: Silo
+          storage_tank: Lagertank
+          surveillance: Overvågning
           tower: Tårn
+          wastewater_plant: Affaldsfabrik
+          watermill: Vandmølle
+          water_tower: Vandtårn
+          water_well: Brønd
+          water_works: Vandanlæg
+          windmill: Vindmølle
           works: Fabrik
           "yes": Menneskeskabt
         military:
           airfield: Militær flyveplads
           barracks: Kaserne
           bunker: Bunker
+          "yes": Militær
         mountain_pass:
           "yes": Bjergpas
         natural:
@@ -744,11 +788,14 @@ da:
           accountant: Revisor
           administrative: Administration
           architect: Arkitekt
+          association: Forening
           company: Firma
+          educational_institution: Uddannelsesanstalt
           employment_agency: Arbejdsløshedskontor
           estate_agent: Ejendomsmægler
           government: Statligt kontor
           insurance: Forsikringskontor
+          it: IT-kontor
           lawyer: Advokat
           ngo: ikkestatsligt kontor (NGO)
           telecommunication: Telekommunikationskontor
@@ -756,9 +803,8 @@ da:
           "yes": Kontor
         place:
           allotments: Kolonihaver
-          block: Blok
-          airport: Lufthavn
           city: Storby
+          city_block: Bykvarter
           country: Land
           county: Amt
           farm: Gård
@@ -769,12 +815,13 @@ da:
           islet: Holm
           isolated_dwelling: Enlig bolig
           locality: Sted
-          moor: Hede
           municipality: Kommune
           neighbourhood: Kvarter
           postcode: Postnummer
+          quarter: Kvarter
           region: Region
           sea: Hav
+          square: Plads
           state: Stat
           subdivision: Bydel
           suburb: Forstad
@@ -786,10 +833,8 @@ da:
           abandoned: Nedlagt jernbane
           construction: Jernbane under konstruktion
           disused: Nedlagt jernbane
-          disused_station: Nedlagt jernbanestation
           funicular: Kabelbane
           halt: Togstoppested
-          historic_station: Historisk jernbanestation
           junction: Jernbaneovergang
           level_crossing: Jernbaneoverskæring
           light_rail: Bybane
@@ -815,6 +860,7 @@ da:
           beauty: Skønhedssalon
           beverages: Drikkevareforretning
           bicycle: Cykelhandel
+          bookmaker: Boghandler
           books: Boghandel
           boutique: Boutique
           butcher: Slagter
@@ -853,12 +899,16 @@ da:
           hairdresser: Frisør
           hardware: Byggemarked
           hifi: Hi-Fi
-          insurance: Forsikring
+          houseware: Køkkenudstyr
+          interior_decoration: Indretning
           jewelry: Guldsmed
           kiosk: Kiosk
+          kitchen: Køkkenbutik
           laundry: Vaskeri
+          lottery: Lotteri
           mall: Indkøbscenter
           market: Marked
+          massage: Massage
           mobile_phone: Mobiltelefonforretning
           motorcycle: Motorcykelbutik
           music: Musikforretning
@@ -866,19 +916,25 @@ da:
           optician: Optiker
           organic: Økologisk fødevarebutik
           outdoor: Udendørs butik
+          paint: Malerbutik
+          pawnbroker: Pantelåner
           pet: Dyrehandel
           pharmacy: Apotek
           photo: Fotobutik
-          salon: Salon
+          seafood: Fisk og skaldyr
           second_hand: Genbrugsbutik
           shoes: Skobutik
-          shopping_centre: Indkøbscenter
           sports: Sportsforretning
           stationery: Papirvarehandel
           supermarket: Supermarked
           tailor: Skrædder
+          ticket: Billetbutik
+          tobacco: Tobaksbutik
           toys: Legetøjsbutik
           travel_agency: Rejsebureau
+          tyres: Dækbutik
+          vacant: Ledig butik
+          variety_store: Stormagasin
           video: Videoforretning
           wine: Vinforretning
           "yes": Forretning
@@ -904,6 +960,7 @@ da:
           viewpoint: Udsigtspunkt
           zoo: Zoologisk have
         tunnel:
+          building_passage: Byggepassage
           culvert: Stenkiste
           "yes": Tunnel
         waterway:
@@ -935,7 +992,7 @@ da:
         level10: Sognegrænse
     description:
       title:
-        osm_nominatim: Position fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Position fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Position fra <a href="http://www.geonames.org/">GeoNames</a>
       types:
@@ -1010,23 +1067,23 @@ da:
       title_html: Ophavsret og licens
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> er <i>åbne data</i>, licenseret under <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data
+        href="https://opendatacommons.org/licenses/odbl/">Open Data
         Commons Open Database License</a> (ODbL) af <a
-        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
+        href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
       intro_2_html: "Du kan frit kopiere, distribuere, overføre og tilpasse vores
         data, \nså længe du angiver OpenStreetMap og dets\nbidragsydere som kilde.
         Hvis du ændrer eller bygger på vores\ndata, må du kun distribuere resultatet
-        under den samme licens. Den\nfulde <a\nhref=\"http://opendatacommons.org/licenses/odbl/1.0/\">juridiske
+        under den samme licens. Den\nfulde <a\nhref=\"https://opendatacommons.org/licenses/odbl/1.0/\">juridiske
         tekst</a>\nforklarer dine rettigheder og pligter."
       intro_3_html: Kartografien i vores kort-fliser, samt vores dokumentation er
-        licenseret under <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.da">Creative
+        licenseret under <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.da">Creative
         Commons Navngivelse-DelPåSammeVilkår 2.0</a> (CC BY-SA).
       credit_title_html: Kildeangivelse og OpenStreetMap
       credit_1_html: Vi kræver at din kildeangivelse mindst består af &ldquo;&copy;
         OpenStreetMap-bidragsydere&rdquo;..
       credit_2_html: "Du skal også gøre det klart, at dataene er tilgængelige under
         Open \nDatabase License, og hvis du bruger vores kort-fliser, at kartografien
-        er\n licenseret som CC BY-SA. Du kan gøre dette ved at linke til\n<a href=\"http://www.openstreetmap.org/copyright\">denne
+        er\n licenseret som CC BY-SA. Du kan gøre dette ved at linke til\n<a href=\"https://www.openstreetmap.org/copyright\">denne
         side om ophavsret</a>. \nAlternativt, og som et krav, hvis du distribuerer
         OSM som\n data, kan du navngive og oprette et hyperlink direkte til licenserne.
         I medier\n hvor hyperlinks ikke er mulige (f.eks. trykte værker), foreslår
@@ -1042,9 +1099,7 @@ da:
       more_title_html: Læs mere
       more_1_html: |-
         Læs mere om brug af vores data, og hvordan du krediterer os, på <a
-        href="http://osmfoundation.org/Licence">OSMF Licens-siden</a> og i fællesskabets <a
+        href="https://osmfoundation.org/Licence">OSMF Licens-siden</a>.
-        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Juridiske
-        FAQ</a>.
       more_2_html: |-
         Selvom OpenStreetMap er åbne data, kan vi ikke levere et
         gratis kort-API til tredjeparter.
@@ -1059,10 +1114,10 @@ da:
         og andre kilder, blandt dem:
       contributors_at_html: |-
         <strong>Østrig</strong>: Indeholder data fra
-        <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
+        <a href="https://data.wien.gv.at/">Stadt Wien</a> (under
-        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Delstaten Vorarlberg</a> og
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Delstaten Vorarlberg</a> og
-        Delstaten Tyrol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT med tilføjelser</a>).
+        Delstaten Tyrol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT med tilføjelser</a>).
       contributors_ca_html: |-
         <strong>Canada</strong>: Indeholder data fra
         GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -1070,14 +1125,13 @@ da:
         Resources Canada) og StatCan (Geography Division,
         Statistics Canada).
       contributors_fi_html: '<strong>Finland</strong>: Indeholder data fra National
-        Land Survey af Finlands topografiske database og andre datasæt under <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI
+        Land Survey af Finlands topografiske database og andre datasæt under <a href="https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1">NLSFI-licensen</a>.'
-        licensen</a>.'
       contributors_fr_html: |-
         <strong>Frankrig</strong>: Indeholder data fra
         Direction Générale des Impôts.
       contributors_nl_html: |-
         <strong>Holland</strong>: Indeholder &copy; AND data, 2007
-        (<a href="http://www.and.com">www.and.com</a>)
+        (<a href="https://www.and.com">www.and.com</a>)
       contributors_nz_html: "<strong>New Zealand</strong>: Indeholder data fra \nLand
         Information New Zealand. Crown Copyright reserveret."
       contributors_si_html: |-
@@ -1095,7 +1149,7 @@ da:
         2010-12.
       contributors_footer_1_html: |-
         For yderligere oplysninger om disse og andre kilder, der er blevet brugt for at hjælpe med at forbedre OpenStreetMap, se venligst <a
-        href="http://wiki.openstreetmap.org/wiki/Contributors">siden med bidragsydere</a> på OpenStreetMap Wiki.
+        href="https://wiki.openstreetmap.org/wiki/Contributors">siden med bidragsydere</a> på OpenStreetMap Wiki.
       contributors_footer_2_html: |-
         Optagelse af data i OpenStreetMap indebærer ikke at den oprindelige
         dataudbyder siger god for OpenStreetMap, giver nogen garanti eller
@@ -1108,12 +1162,12 @@ da:
       infringement_2_html: |-
         Hvis du mener, at ophavsretligt beskyttet materiale uberettiget er
          føjet til OpenStreetMap databasen eller dette websted, bedes du følge
-         vores <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedure til fjernelse a materiale</a> eller udfyld formular direkte på vores
+         vores <a hrefs="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedure til fjernelse a materiale</a> eller udfyld formular direkte på vores
         <a href="http://dmca.openstreetmap.org/">on-line side</a>.
       trademarks_title_html: <span id="trademarks"></span>Varemærker
       trademarks_1_html: OpenStreetMap, forstørrelsesglas-logoet og "State of the
         Map" er registrerede varemærker til OpenStreetMap Foundation. Hvis du har
-        spørgsmål om din brug af mærkerne, bedes du sende dine spørgsmål til <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licens-arbejdsgruppen</a>.
+        spørgsmål om din brug af mærkerne, så se <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Varemærkepolitikken</a>.
   welcome_page:
     title: Velkommen!
     introduction_html: Velkommen til OpenStreetMap, det frie brugerredigerede verdenskort.
@@ -1148,8 +1202,8 @@ da:
       paragraph_1_html: "OpenStreetMap har få formelle regler, men vi forventer, at
         alle deltagere vil samarbejde\nmed, og kommunikere med fællesskabet. Hvis
         du overvejer\nandre aktiviteter end manuel redigering af en side, skal du
-        læse og følge retningslinjerne på \n<a href=\"http://wiki.openstreetmap.org/wiki/Import/Guidelines\">Import</a>
+        læse og følge retningslinjerne på \n<a href=\"https://wiki.openstreetmap.org/wiki/Import/Guidelines\">Import</a>
-        og \n<a href=\"http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct\">Automatiserede
+        og \n<a href=\"https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct\">Automatiserede
         Redigeringer</a>."
     questions:
       title: Spørgsmål?
@@ -1184,7 +1238,7 @@ da:
       explanation_html: |-
         Hvis du har bekymringer om, hvordan vores data bruges, eller om indholdet, kan du se vores
         <a href='/copyright'>side om ophavsret</a> for flere juridiske oplysninger, eller kontakte den relevante
-        <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF arbejdsgruppe</a>.
+        <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF arbejdsgruppe</a>.
   help_page:
     title: Få hjælp
     introduction: OpenStreetMap har flere ressourcer til at lære om projektet, stille
@@ -1195,7 +1249,7 @@ da:
       title: Velkommen til OSM
       description: Start med denne hurtige guide der dækker det grundlæggende i OpenStreetMap.
     beginners_guide:
-      url: http://wiki.openstreetmap.org/wiki/Da:Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/Da:Beginners%27_guide
       title: Hjælp for nybegyndere
       description: Hjælp for nybegyndere, som vedligeholdes af fællesskabet.
     help:
@@ -1219,7 +1273,7 @@ da:
       description: Hjælp til virksomheder og organisationer, der skifter til OpenStreetMap
         baserede kort og andre tjenester.
     wiki:
-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
       description: Gennemse wikien for dybdegående OSM dokumentation.
   about_page:
@@ -1239,8 +1293,8 @@ da:
       vokser hver dag.\nVores bidragsydere omfatter entusiastiske kortlæggere, GIS-fagfolk,
       ingeniører der\nkører OSM-servere, humanitære arbejdere der kortlægger katastroferamte
       områder,\nog mange flere.\nFor at læs mere om fællesskabet, se\n<a href='https://blog.openstreetmap.org'>OpenStreetMap-bloggen</a>,
-      \n<a href='%{diary_path}'>brugerdagbøger</a>,\n<a href='http://blogs.openstreetmap.org/'>fællesskabsblogs</a>,
+      \n<a href='%{diary_path}'>brugerdagbøger</a>,\n<a href='https://blogs.openstreetmap.org/'>fællesskabsblogs</a>,
-      og\n <a href='http://www.osmfoundation.org/'>OSM Foundations</a> hjemmeside."
+      og\n <a href='https://www.osmfoundation.org/'>OSM Foundations</a> hjemmeside."
     open_data_title: Åbne Data
     open_data_html: |-
       OpenStreetMap er <i>åbne data</i>: du må bruge dem til ethvert formål,
@@ -1249,12 +1303,14 @@ da:
       den samme licens. Se siden om <a href='%{copyright_path}'>ophavsret og licens</a> for detaljer.
     legal_title: Juridisk
     legal_html: "Dette websted og mange andre relaterede tjenester er formelt drevet
-      af \n<a href=\"http://osmfoundation.org/\">OpenStreetMap Foundation</a> (OSMF)
+      af \n<a href=\"https://osmfoundation.org/\">OpenStreetMap Foundation</a> (OSMF)
       på vegne af fællesskabet. Brug af alle OSMF-drevne tjenester er underlagt vores
-      <a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">Politikker
+      <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">Politikker
-      for acceptabel brug</a> og vores <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privatlivs-poltik</a>.\n<br>
+      for acceptabel brug</a> og vores <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privatlivs-poltik</a>.\n<br>
-      \nDu bedes <a href=\"http://osmfoundation.org/Contact\">kontakte OSMF</a> \nhvis
+      \nDu bedes <a href=\"https://osmfoundation.org/Contact\">kontakte OSMF</a> \nhvis
-      du har spørgsmål om licenser, ophavsret eller andre juridiske spørgsmål og problemstillinger."
+      du har spørgsmål om licenser, ophavsret eller andre juridiske spørgsmål og problemstillinger.\n<br>\nOpenStreetMap,
+      forstørrelsesglas-logoet og \"State of the Map\" er <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">varemærker
+      registreret af OSMF</a>."
     partners_title: Partnere
   notifier:
     diary_comment_notification:
@@ -1464,15 +1520,16 @@ da:
         dette. Du kan gøre dine ændringer offentlige fra din %{user_page}.
       user_page_link: brugerside
       anon_edits_link_text: Find ud af hvorfor.
-      flash_player_required: Du har brug for en Flash afspiller for at bruge Potlatch,
+      flash_player_required: Du har brug for en Flashafspiller for at bruge Potlatch,
-        OpenStreetMap Flash editoren. Du kan <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">hente
+        OpenStreetMap Flash-redigeringsprogrammet. Du kan <a href="https://get.adobe.com/flashplayer/">hent
-        Flash Player fra Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Flere
+        Flash Player fra Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Flere
         andre indstillinger</a> er også tilgængelige til redigering af OpenStreetMap.
       potlatch_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch skal
         du afmarkere den nuværende vej eller nuværende punkt hvis du retter i live-tilstand,
         eller klikke på gem-knappen hvis du har en).
       potlatch2_not_configured: Potlatch 2 er ikke blevet konfigureret - se venligst
-        http://wiki.openstreetmap.org/wiki/The_Rails_Port
+        https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for yderligere
+        information
       potlatch2_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch
         2 skal du trykke på gem-knappen).
       id_not_configured: iD er ikke blevet konfigureret
@@ -1490,6 +1547,7 @@ da:
       where_am_i: Hvor er dette?
       where_am_i_title: Beskriv den nuværende position ved hjælp af søgemaskinen
       submit_text: Søg
+      reverse_directions_text: Vend retningen om
     key:
       table:
         entry:
@@ -1564,7 +1622,7 @@ da:
       edit: Redigér
       preview: Forhåndsvisning
     markdown_help:
-      title_html: Parset med <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Fortolket med <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
       headings: Overskrifter
       heading: Overskrift
       subheading: Underoverskrift
@@ -1671,9 +1729,8 @@ da:
       public_traces_from: Offentlige GPS-spor fra %{user}
       description: Gennemse de seneste GPS track uploads
       tagged_with: ' med egenskaberne %{tags}'
-      empty_html: Der er ingenting her endnu. <a href='%{upload_link}'>Upload et nyt
+      empty_html: Der er ingenting her endnu. <a href='%{upload_link}'>Overfør et
-        spor</a> eller lær mere om GPS sporing på <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
+        nyt spor</a> eller lær mere om GPS-sporing på <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikisiden</a>.
-        siden</a>.
     delete:
       scheduled_for_deletion: Spor planlagt til at blive slettet
     make_public:
@@ -1882,13 +1939,13 @@ da:
         html: |-
           <p>I modsætning til andre kort, er OpenStreetMap helt lavet af folk som dig, og det er frit for alle at rette, opdatere, downloade og bruge.</p>
           <p>Tilmeld dig for at komme i gang med at bidrage. Vi vil sende en e-mail for at bekræfte din konto.</p>
-      license_agreement: Når du bekræfter din konto, skal du acceptere <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">vilkårene
+      license_agreement: Når du bekræfter din konto, skal du acceptere <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">vilkårene
-        for bidragsydere</a>.
+        for bidragydere</a>.
       email address: 'E-mailadresse:'
       confirm email address: 'Bekræft e-mailadresse:'
-      not displayed publicly: Din adresse vises ikke offentligt; se vores <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy"
+      not displayed publicly: Din adresse vises ikke offentligt; se vores href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
-        title="OSMF-privatlivspolitik inklusive afsnittet om e-mailadresser">privatlivspolitik</a>
+        title="OSMF privacy policy including section on email addresses">privatlivspolitik</a>
-        for mere information
+        for yderligere information
       display name: 'Vist navn:'
       display name description: Dit offentligt synlige brugernavn. Du kan ændre dette
         senere i indstillingerne.
@@ -2008,12 +2065,12 @@ da:
       email never displayed publicly: (vises aldrig offentligt)
       external auth: 'Ekstern godkendelse:'
       openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: hvad er dette?
       public editing:
         heading: 'Offentlig redigering:'
         enabled: Aktiveret. Ikke anonym og kan ændre data.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: hvad er dette?
         disabled: Deaktiveret og kan ikke ændre data, alle tidligere ændringer er
           anonyme.
@@ -2023,10 +2080,10 @@ da:
         text: I øjeblikket er dine ændringer anonyme og andre kan ikke sende dig beskeder
           eller se hvor du er. Klik på knappen nedenfor for at vise hvad du har ændret
           og lade folk kontakte dig gennem siden. <b>Siden 0.6 API blev sat i drift
-          kan kun offentlige brugere rette i kortdata</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">se
+          kan kun offentlige brugere rette i kortdata</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">se
-          hvorfor</a>).<ul><li>Din e-mailadresse bliver ikke afsløret ved at skifte
+          hvorfor</a>).<ul><li>Din e-postadresse bliver ikke afsløret ved at skrive
-          til offentlig.</li><li>Den handling kan ikke omgøres, og alle nye brugere
+          offentligt.</li><li>Den handling kan ikke omgøres, og alle nye brugere er
-          er nu offentlige som standard.</li></ul>
+          nu offentlige som standard.</li></ul>
       contributor terms:
         heading: 'Vilkår for bidragsydere:'
         agreed: Du har accepteret de nye vilkår for bidragsydere.
@@ -2406,7 +2463,15 @@ da:
         continue_without_exit: Fortsæt ad %{name}
         slight_right_without_exit: Svagt til højre ind på %{name}
         offramp_right_without_exit: Tag afkørslen til højre ud på %{name}
+        offramp_right_with_directions: Tag rampen til højre retning imod %{directions}
+        offramp_right_with_name_and_directions: Tag rampen til højre på %{name}, retning
+          imod %{directions}
+        offramp_right_without_directions: Tag rampen til højre
         onramp_right_without_exit: Hold til højre ud på %{name}
+        onramp_right_with_directions: Drej mod højre ind på rampen, retning imod %{directions}
+        onramp_right_with_name_and_directions: Drej mod højre ind på rampen på %{name},
+          retning imod %{directions}
+        onramp_right_without_directions: Drej mod højre ind på rampen
         endofroad_right_without_exit: Ved slutningen af vejen drej til højre ud på
           %{name}
         merge_right_without_exit: Flet til højre ind på %{name}
@@ -2417,7 +2482,16 @@ da:
         sharp_left_without_exit: Skarpt til venstre ind på %{name}
         turn_left_without_exit: Drej til venstre ind på %{name}
         offramp_left_without_exit: Tag afkørslen til venstre ud på %{name}
+        offramp_left_with_directions: Tag rampen til venstre, retning imod %{directions}
+        offramp_left_with_name_and_directions: Tag rampen til venstre på %{name},
+          retning imod %{directions}
+        offramp_left_without_directions: Tag rampen til venstre
         onramp_left_without_exit: Hold til venstre ud på %{name}
+        onramp_left_with_directions: Drej mod venstre ind på rampen, retning imod
+          %{directions}
+        onramp_left_with_name_and_directions: Drej mod venstre ind på rampen på %{name},
+          retning imod %{directions}
+        onramp_left_without_directions: Drej mod venstre ind på rampen
         endofroad_left_without_exit: Ved slutningen af vejen drej til venstre ud på
           %{name}
         merge_left_without_exit: Flet til venstre ind på %{name}
@@ -2425,10 +2499,10 @@ da:
         slight_left_without_exit: Svagt til venstre ind på %{name}
         via_point_without_exit: (via punkt)
         follow_without_exit: Følg %{name}
-        roundabout_without_exit: Ved rundkørslen, tag %{name}
+        roundabout_without_exit: Ved rundkørslen, tag afkørsel mod %{name}
         leave_roundabout_without_exit: Forlad rundkørslen - %{name}
         stay_roundabout_without_exit: Bliv i rundkørslen - %{name}
-        start_without_exit: Start ved slutningen af %{name}
+        start_without_exit: Start på %{name}
         destination_without_exit: Nå målet
         against_oneway_without_exit: Kør mod ensretningen på %{name}
         end_oneway_without_exit: Slutningen af ensretningen på %{name}

config/locales/de.yml

@@ -19,8 +19,10 @@
 # Author: Geitost
 # Author: GerdP
 # Author: Grille chompa
+# Author: Hikemaniac
 # Author: Holger
 # Author: HolgerJeromin
+# Author: Hufkratzer
 # Author: Inkowik
 # Author: Jacobbraeutigam
 # Author: John07
@@ -449,12 +451,19 @@ de:
           chair_lift: Sessellift
           drag_lift: Schlepplift
           gondola: Gondelbahn
+          platter: Skilift
+          pylon: Mast
           station: Gondelstation
+          t-bar: Schlepplift
         aeroway:
           aerodrome: Flugplatz
+          airstrip: Startbahn
           apron: Flugvorfeld
           gate: Flugsteig
+          hangar: Flugzeughalle
           helipad: Hubschrauberlandeplatz
+          holding_position: Haltestelle
+          parking_position: Parkplatz
           runway: Start- und Landebahn
           taxiway: Rollbahn
           terminal: Terminal
@@ -489,37 +498,32 @@ de:
           crematorium: Krematorium
           dentist: Zahnarzt
           doctors: Arzt
-          dormitory: Studentenwohnheim
           drinking_water: Trinkwasser
           driving_school: Fahrschule
           embassy: Botschaft
-          emergency_phone: Notrufsäule
           fast_food: Schnellimbiss
           ferry_terminal: Fähren-Anlaufstelle
-          fire_hydrant: Hydrant
           fire_station: Feuerwehr
           food_court: Food-Court
           fountain: Springbrunnen
           fuel: Tankstelle
           gambling: Glücksspiel
           grave_yard: Friedhof
-          gym: Fitnessstudio
+          grit_bin: Streugutbehälter
-          health_centre: Gesundheitszentrum
           hospital: Krankenhaus
           hunting_stand: Hochstand
           ice_cream: Eisdiele
           kindergarten: Kindergarten
           library: Bücherei
-          market: Markt
           marketplace: Marktplatz
           monastery: Kloster
           motorcycle_parking: Motorradparkplatz
           nightclub: Nachtklub
-          nursery: Kindertagesstätte
           nursing_home: Altersheim
           office: Büro
           parking: Parkplatz
           parking_entrance: Parkeinfahrt
+          parking_space: Stellplatz
           pharmacy: Apotheke
           place_of_worship: Andachtsstätte
           police: Polizei
@@ -529,7 +533,6 @@ de:
           prison: Gefängnis
           pub: Kneipe
           public_building: Öffentliches Gebäude
-          reception_area: Empfangsbereich
           recycling: Recycling-Center
           restaurant: Restaurant
           retirement_home: Altersheim
@@ -554,6 +557,7 @@ de:
           village_hall: Gemeindezentrum
           waste_basket: Mülleimer
           waste_disposal: Abfallentsorgung
+          water_point: Wasseranschluss
           youth_centre: Jugendzentrum
         boundary:
           administrative: Verwaltungsgrenze
@@ -562,6 +566,7 @@ de:
           protected_area: Schutzgebiet
         bridge:
           aqueduct: Aquädukt
+          boardwalk: Strandpromenade
           suspension: Hängebrücke
           swing: Drehbrücke
           viaduct: Viadukt
@@ -581,25 +586,31 @@ de:
           "yes": Handwerksgeschäft
         emergency:
           ambulance_station: Rettungswache
+          assembly_point: Sammelplatz
           defibrillator: Defibrillator
           landing_site: Notlandeplatz
           phone: Notrufsäule
+          water_tank: Notwasserbehälter
+          "yes": Notfall
         highway:
           abandoned: Aufgegebene Straße
           bridleway: Reitweg
           bus_guideway: Busspur
           bus_stop: Bushaltestelle
           construction: Straße im Bau
+          corridor: Flur
           cycleway: Radweg
           elevator: Lift
           emergency_access_point: Notrufpunkt
           footway: Fußweg
           ford: Furt
+          give_way: Vorfahrt-beachten-Schild
           living_street: Spiel-/Wohnstraße
           milestone: Kilometerstein
           motorway: Autobahn
           motorway_junction: Autobahnausfahrt/-kreuz
           motorway_link: Autobahnauffahrt
+          passing_place: Ausweichstelle
           path: Pfad (Wanderweg)
           pedestrian: Fußgängerzone
           platform: Bahnsteig
@@ -616,6 +627,7 @@ de:
           services: Autobahnraststätte
           speed_camera: Blitzer
           steps: Treppe
+          stop: Stoppschild
           street_lamp: Straßenlaterne
           tertiary: Hauptstraße
           tertiary_link: Hauptstraße-Auffahrt
@@ -624,12 +636,12 @@ de:
           trail: Pfad
           trunk: Schnellstraße
           trunk_link: Schnellstraßenauffahrt
+          turning_loop: Wendeschleife
           unclassified: Straße
-          unsurfaced: Nichtasphaltierte Straße
           "yes": Straße
         historic:
           archaeological_site: Ausgrabungsstätte
-          battlefield: Kampfgebiet
+          battlefield: Schlachtfeld
           boundary_stone: Grenzstein
           building: Historisches Gebäude
           bunker: Bunker
@@ -644,6 +656,7 @@ de:
           manor: Gutshaus
           memorial: Denkmal
           mine: Mine
+          mine_shaft: Grubenschacht
           monument: Monument
           roman_road: Römerstraße
           ruins: Ruine
@@ -653,6 +666,7 @@ de:
           wayside_cross: Wegkreuz
           wayside_shrine: Bildstock
           wreck: Schiffswrack
+          "yes": Historischer Ort
         junction:
           "yes": Kreuzung
         landuse:
@@ -690,9 +704,9 @@ de:
         leisure:
           beach_resort: Strandbad
           bird_hide: Vogelbeobachtungshütte
-          club: Verein
           common: öffentliche Grünfläche (brit.)
           dog_park: Hundepark
+          firepit: Feuerstelle
           fishing: Fischereigrund
           fitness_centre: Fitnessstudio
           fitness_station: Freiluft-Fitnesseinrichtung
@@ -704,7 +718,7 @@ de:
           miniature_golf: Minigolf
           nature_reserve: Naturschutzgebiet
           park: Park
-          pitch: Sportplatz
+          pitch: Spielfeld
           playground: Spielplatz
           recreation_ground: Erholungsgebiet
           resort: Ferienort
@@ -717,15 +731,46 @@ de:
           water_park: Wasserpark
           "yes": Freizeit
         man_made:
+          adit: Stollen
+          beacon: Leuchtturm
+          beehive: Bienenstock
+          breakwater: Hafendamm
+          bridge: Brücke
+          bunker_silo: Bunker
+          chimney: Schornstein
+          crane: Kran
+          dolphin: Dalben
+          dyke: Deich
+          embankment: Böschung
+          flagpole: Fahnenmast
+          gasometer: Gasometer
+          groyne: Buhne
+          kiln: Brennofen
           lighthouse: Leuchtturm
+          mast: Mast
+          mine: Bergwerk
+          mineshaft: Grubenschacht
+          monitoring_station: Beobachtungsstation
+          petroleum_well: Erdölquelle
+          pier: Pfeiler
           pipeline: Rohrleitung
+          silo: Speicher
+          storage_tank: Lagertank
+          surveillance: Überwachung
           tower: Turm
+          wastewater_plant: Kläranlage
+          watermill: Wassermühle
+          water_tower: Wasserturm
+          water_well: Brunnen
+          water_works: Wasserwerk
+          windmill: Windmühle
           works: Fabrik
           "yes": menschgemacht
         military:
           airfield: Militärflugplatz
           barracks: Kaserne
           bunker: Bunker
+          "yes": Militär
         mountain_pass:
           "yes": Gebirgspass
         natural:
@@ -771,11 +816,14 @@ de:
           accountant: Buchhaltungsbüro
           administrative: Verwaltung
           architect: Architekt
+          association: Gesellschaft
           company: Unternehmen
+          educational_institution: Bildungseinrichtung
           employment_agency: Arbeitsamt
           estate_agent: Immobilienhändler
           government: Amt
           insurance: Versicherungsbüro
+          it: IT-Büro
           lawyer: Rechtsanwalt
           ngo: NGO
           telecommunication: Telekommunikationsbüro
@@ -783,9 +831,8 @@ de:
           "yes": Büro
         place:
           allotments: Schrebergärten
-          block: Block
-          airport: Flughafen
           city: Stadt
+          city_block: Häuserblock
           country: Staat
           county: Bezirk
           farm: Bauernhof
@@ -796,12 +843,13 @@ de:
           islet: Eiland
           isolated_dwelling: Einzelgehöft
           locality: Flur
-          moor: Moor
           municipality: Gemeinde
           neighbourhood: Wohngegend
           postcode: Postleitzahl
+          quarter: Stadtviertel
           region: Region
           sea: Meer
+          square: Platz
           state: Bundesland/-staat
           subdivision: Vorort
           suburb: Stadtteil
@@ -813,10 +861,8 @@ de:
           abandoned: Aufgegebene Bahnstrecke
           construction: Bahnstrecke im Bau
           disused: Aufgelassene Bahnstrecke
-          disused_station: Aufgelassener Bahnhof
           funicular: Standseilbahn
           halt: Haltestelle
-          historic_station: Historischer Bahnhof
           junction: Bahnknoten
           level_crossing: Eisenbahnkreuzung
           light_rail: Stadtbahn
@@ -842,6 +888,7 @@ de:
           beauty: Schönheitssalon
           beverages: Getränkemarkt
           bicycle: Fahrradgeschäft
+          bookmaker: Buchmacher
           books: Buchgeschäft
           boutique: Boutique
           butcher: Metzgerei
@@ -880,12 +927,16 @@ de:
           hairdresser: Frisör
           hardware: Eisenwarenhändler
           hifi: Elektroshop
-          insurance: Versicherungsbüro
+          houseware: Hauswarenladen
+          interior_decoration: Innenausstattung
           jewelry: Juwelier
           kiosk: Kiosk
+          kitchen: Küchengeschäft
           laundry: Wäscherei
+          lottery: Lottoannahmestelle
           mall: Einkaufszentrum
           market: Markt
+          massage: Masseur
           mobile_phone: Handygeschäft
           motorcycle: Motorradgeschäft
           music: Musikladen
@@ -893,19 +944,25 @@ de:
           optician: Optiker
           organic: Bio-Laden
           outdoor: Outdoor-Ausrüster
+          paint: Lackiererei
+          pawnbroker: Pfandleiher
           pet: Tierhandlung
           pharmacy: Apotheke
           photo: Fotoladen
-          salon: Salon
+          seafood: Meeresfrüchte
           second_hand: Second-Hand-Geschäft
           shoes: Schuhgeschäft
-          shopping_centre: Einkaufszentrum
           sports: Sportgeschäft
           stationery: Schreibwarenladen
           supermarket: Supermarkt
           tailor: Schneiderei
+          ticket: Ticketladen
+          tobacco: Tabakladen
           toys: Spielwarengeschäft
           travel_agency: Reisebüro
+          tyres: Reifenhändler
+          vacant: Leerstehendes Geschäft
+          variety_store: Billigladen
           video: Videothek
           wine: Vinothek
           "yes": Geschäft
@@ -931,6 +988,7 @@ de:
           viewpoint: Aussichtspunkt
           zoo: Zoo
         tunnel:
+          building_passage: Gebäudedurchgang
           culvert: Durchlass
           "yes": Tunnel
         waterway:
@@ -1141,7 +1199,7 @@ de:
       trademarks_title_html: <span id="trademarks"></span>Markenzeichen
       trademarks_1_html: OpenStreetMap, das Lupenlogo und „State of the Map“ sind
         eingetragene Warenzeichen der OpenStreetMap Foundation. Falls du Fragen über
-        deine Verwendung der Marken hast, sende deine Fragen bitte an die <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Lizenz-Arbeitsgruppe</a>.
+        deine Verwendung der Marken hast, lies bitte unsere <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Markenrichtlinie</a>.
   welcome_page:
     title: Willkommen!
     introduction_html: |-
@@ -1265,7 +1323,7 @@ de:
       OpenStreetMap legt Wert auf lokales Wissen. Autoren benutzen
       Luftbilder, GPS-Geräte und Feldkarten zur Verifizierung, sodass OSM
       korrekt und aktuell ist.
-    community_driven_title: Community Driven
+    community_driven_title: Gemeinschaftsbetrieben
     community_driven_html: |-
       Die OpenStreetMap-Gemeinschaft ist vielfältig, leidenschaftlich und wächst täglich.
       Unsere Mitwirkenden sind begeisterte Mapper, GIS-Profis, Ingenieure, die die OSM-Server
@@ -1284,7 +1342,7 @@ de:
       <a href='%{copyright_path}'>Urheberrechts- und Lizenzseite</a> für Einzelheiten.
     legal_title: Rechtliche Hinweise
     legal_html: |-
-      Diese Website und viele damit in Zusammenhang stehende Dienste werden
+      Diese Website und viele damit in Zusammenhang stehenden Dienste werden
       von der <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
       für die OSM-Gemeinschaft betrieben. Die Verwendung aller OSMF-betriebenen Dienste
       ist Thema unserer
@@ -1292,7 +1350,9 @@ de:
       und unserer <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Datenschutzrichtlinie</a>.
       <br>
       Bitte <a href='https://osmfoundation.org/Contact'>kontaktiere die OSMF</a>,
-      falls du Lizenz-, Urheberrechts- oder andere rechtliche Fragen und Probleme hast.
+      falls du Lizenz-, Urheberrechts- oder andere rechtliche Fragen hast.
+      <br>
+      OpenStreetMap, das Lupenlogo und „State of the Map“ sind <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">eingetragene Warenzeichen der OSMF</a>.
     partners_title: Partner
   notifier:
     diary_comment_notification:
@@ -1538,6 +1598,7 @@ de:
       where_am_i: Wo ist das?
       where_am_i_title: Die momentane Position mit der Suchmaschine anzeigen
       submit_text: Los
+      reverse_directions_text: Richtungen umkehren
     key:
       table:
         entry:
@@ -2481,7 +2542,17 @@ de:
         continue_without_exit: Weiter auf %{name}
         slight_right_without_exit: Leicht rechts auf %{name}
         offramp_right_without_exit: Die rechte Auffahrt auf %{name} nehmen
+        offramp_right_with_directions: Die rechte Auffahrt Richtung %{directions}
+          nehmen
+        offramp_right_with_name_and_directions: Die rechte Auffahrt auf %{name} Richtung
+          %{directions} nehmen
+        offramp_right_without_directions: Die rechte Auffahrt nehmen
         onramp_right_without_exit: Bei der Auffahrt rechts abbiegen auf %{name}
+        onramp_right_with_directions: Rechts auf die Auffahrt Richtung %{directions}
+          abbiegen
+        onramp_right_with_name_and_directions: Rechts auf die Auffahrt auf %{name}
+          Richtung %{directions} abbiegen
+        onramp_right_without_directions: Rechts auf die Auffahrt abbiegen
         endofroad_right_without_exit: Am Straßenende rechts abbiegen auf %{name}
         merge_right_without_exit: Rechts einfädeln in %{name}
         fork_right_without_exit: Bei der Gabelung rechts abbiegen auf %{name}
@@ -2491,17 +2562,26 @@ de:
         sharp_left_without_exit: Scharf links auf %{name}
         turn_left_without_exit: Links abbiegen auf %{name}
         offramp_left_without_exit: Die linke Auffahrt auf %{name} nehmen
+        offramp_left_with_directions: Die linke Auffahrt Richtung %{directions} nehmen
+        offramp_left_with_name_and_directions: Die linke Auffahrt auf %{name} Richtung
+          %{directions} nehmen
+        offramp_left_without_directions: Die linke Auffahrt nehmen
         onramp_left_without_exit: Bei der Auffahrt links abbiegen auf %{name}
+        onramp_left_with_directions: Links auf die Auffahrt Richtung %{directions}
+          abbiegen
+        onramp_left_with_name_and_directions: Links auf die Auffahrt auf %{name} Richtung
+          %{directions} abbiegen
+        onramp_left_without_directions: Links auf die Auffahrt abbiegen
         endofroad_left_without_exit: Am Straßenende links abbiegen auf %{name}
         merge_left_without_exit: Links einfädeln in %{name}
         fork_left_without_exit: Bei der Gabelung links abbiegen auf %{name}
         slight_left_without_exit: Leicht links auf %{name}
         via_point_without_exit: (über Punkt)
         follow_without_exit: '%{name} folgen'
-        roundabout_without_exit: Im Kreisverkehr nimm %{name}
+        roundabout_without_exit: Im Kreisverkehr Ausfahrt auf %{name} nehmen
         leave_roundabout_without_exit: Kreisverkehr verlassen – %{name}
         stay_roundabout_without_exit: Auf Kreisverkehr bleiben – %{name}
-        start_without_exit: Starten beim Ende von %{name}
+        start_without_exit: Starten bei %{name}
         destination_without_exit: Ziel erreicht
         against_oneway_without_exit: Gegen die Einbahnstraße gehen auf %{name}
         end_oneway_without_exit: Ende der Einbahnstraße auf %{name}

config/locales/diq.yml

@@ -207,7 +207,7 @@ diq:
       title_nearby: Nezdıra vurriyayışê setê karberi
       load_more: Dehana vêşi
     rss:
-      full: Vaten pêro
+      full: Heme werênayış
   diary_entry:
     new:
       publish_button: Vıla ke
@@ -242,7 +242,7 @@ diq:
       newer_comments: Tewr Vatışê Newey
       older_comments: Vatışo Tewr Kehan
   export:
-    title: Teber de
+    title: Teberdayış
     start:
       area_to_export: Cayo ke cıra bıvciyo
       manually_select: Be desti ra yew cayo bin weçıne
@@ -269,7 +269,7 @@ diq:
       latitude: 'Verıniye:'
       longitude: 'Derganiye:'
       output: Vıcyaen
-      export_button: Teber de
+      export_button: Teberdayış
   geocoder:
     search:
       title:
@@ -324,33 +324,26 @@ diq:
           crematorium: Krematoryum
           dentist: Dındandar
           doctors: Dıxtori
-          dormitory: Ware
           drinking_water: Awa Şımıtışi
           driving_school: Kursa Ramenan
           embassy: Sefirey
-          emergency_phone: Vistren Telefon
           fast_food: Fast Food
           ferry_terminal: Terminala Feriboter
-          fire_hydrant: Mıslıxa Şewati
           fire_station: Itfaiye
           food_court: Kerwanseray
           fountain: Fıskiye
           fuel: Petrol
           gambling: Kumarxane
           grave_yard: Mezla ser
-          gym: Merkeza Fitnessi / Salona Spori
-          health_centre: Merkeza Weşiney
           hospital: Nêweşxane
           hunting_stand: Standê Seydwanan
           ice_cream: Dondırme
           kindergarten: Kreş
           library: Kıtıbxane
-          market: Market
           marketplace: Heruna bazari
           monastery: Manastır
           motorcycle_parking: Motorpiskilet park kerdış
           nightclub: Kluba Şewer
-          nursery: Kreş
           nursing_home: Rehatxane
           office: Ofis
           parking: Otopark
@@ -364,7 +357,6 @@ diq:
           prison: Hepısxane
           pub: Biraxane
           public_building: Binaya Şaran
-          reception_area: Heruna Resepsiyoni
           recycling: Heruna peyd amayışi
           restaurant: Restaurant
           retirement_home: Weynexane
@@ -460,7 +452,6 @@ diq:
           trunk: Letebıyayi ser ray
           trunk_link: Lwtebıyayi ser ray
           unclassified: Nêrêzbıyayi ray
-          unsurfaced: Raya xam
           "yes": Ray
         historic:
           archaeological_site: Arkeolojik Ca
@@ -523,7 +514,6 @@ diq:
         leisure:
           beach_resort: Dewa plajın
           bird_hide: Cay mıriçık weynayışi
-          club: Klüb
           common: Umumi erd
           dog_park: Parka kutıkan
           fishing: Heruna masan
@@ -616,8 +606,6 @@ diq:
           "yes": Ofis
         place:
           allotments: Bostan
-          block: Blok
-          airport: Meydanê hewayi
           city: Suk
           country: Dewlete
           county: Welat
@@ -628,7 +616,6 @@ diq:
           island: Ada
           islet: Adeqeq
           locality: Wereyin
-          moor: Lıncane
           municipality: Belediya
           neighbourhood: Mehla
           postcode: Kodê posteyi
@@ -675,7 +662,7 @@ diq:
           gallery: Galeri
           garden_centre: Merkeza Hêgay
           gift: Çiyo Hediye
-          salon: Kuafor
+          "yes": Dukan
         tourism:
           gallery: Galeriye
           hostel: Hostel
@@ -688,6 +675,7 @@ diq:
           canal: Kenal
           dam: Berac
           lock: İskele
+          river: Ro
     description:
       types:
         cities: Suki
@@ -699,7 +687,7 @@ diq:
     sign_up: qeyd be
     edit: Bıvırne
     history: Tarix
-    export: Tebergroten
+    export: Teberdayış
     data: Melumati
     help: Peşti
     copyright: Heqa telıfi
@@ -1111,6 +1099,8 @@ diq:
     notes:
       show:
         comment: Mışewre
+    directions:
+      time: Zeman
   redaction:
     edit:
       description: Şınasnayış

config/locales/dsb.yml

@@ -413,30 +413,23 @@ dsb:
           crematorium: Krematorium
           dentist: Zubny gójc
           doctors: Gójce
-          dormitory: Internat
           drinking_water: Pitna wóda
           driving_school: Jězdna šula
           embassy: Wjelikopósłaństwo
-          emergency_phone: Telefon za nuzowe zawołanje
           fast_food: Pójědankarnja
           ferry_terminal: Pśewózny pśistaw
-          fire_hydrant: Hydrant
           fire_station: Wognjarnja
           food_court: Food Court
           fountain: Studnja
           fuel: Tankownja
           grave_yard: Kjarchob
-          gym: Fitnesowy centrum
-          health_centre: Strowotniski centrum
           hospital: Chórownja
           hunting_stand: Góntwarske sedło
           ice_cream: Lod
           kindergarten: Źiśownja
           library: Knigłownja
-          market: Wiki
           marketplace: Wikowanišćo
           nightclub: Nocny klub
-          nursery: Źiśownja
           nursing_home: Wótwardowarnja
           office: Běrow
           parking: Parkowanišćo
@@ -449,7 +442,6 @@ dsb:
           prison: Popajźeństwo
           pub: Kjarcma
           public_building: Zjawne twarjenje
-          reception_area: Wobcerk pśidostaśa
           recycling: Zběranišćo starowinow
           restaurant: Gósćeńc
           retirement_home: Starcownja
@@ -527,7 +519,6 @@ dsb:
           trunk: Dalokowobchadowa droga
           trunk_link: Dalokowobchadowa droga
           unclassified: Njezarědowana droga
-          unsurfaced: Njewobtwarźona droga
         historic:
           archaeological_site: Archeologiske wukopowanišćo
           battlefield: Bitwišćo
@@ -659,7 +650,6 @@ dsb:
           travel_agent: Drogowański běrow
           "yes": Běrow
         place:
-          airport: Lětanišćo
           city: Wjelike město
           country: Kraj
           county: Wokrejs
@@ -671,7 +661,6 @@ dsb:
           islet: Mała kupa
           isolated_dwelling: Jadnotliwe bydło
           locality: Sedlišćo
-          moor: Bagno
           municipality: Gmejna
           neighbourhood: Bydleński wobcerk
           postcode: Postowa licba
@@ -687,10 +676,8 @@ dsb:
           abandoned: Spušćona zeleznicowa cera
           construction: Zeleznicowa cera se twari
           disused: Njewužywana zeleznicowa cera
-          disused_station: Njewužywane dwórnišćo
           funicular: Powrjozowa zeleznica
           halt: Zeleznicowe zastanišćo
-          historic_station: Historiske dwórnišćo
           junction: Zeleznicowe kśicnišćo
           level_crossing: Zeleznicowy pśechod
           light_rail: Měsćańska zeleznica
@@ -754,7 +741,6 @@ dsb:
           hairdresser: Frizerski salon
           hardware: Twarski mark
           hifi: Technika hi-fi
-          insurance: Zawěsćarnja
           jewelry: Pyšnotkowy wobchod
           kiosk: Kiosk
           laundry: Pałkarnja
@@ -770,10 +756,8 @@ dsb:
           pet: Coologiska pśedawarnja
           pharmacy: Aptejka
           photo: Fotograf
-          salon: Salon
           second_hand: Nakupowarnja
           shoes: Wobchod za crjeje
-          shopping_centre: Kupowański centrum
           sports: Sportowy wobchod
           stationery: Pśedawarnja za pisańskich wórow
           supermarket: Supermark

config/locales/el.yml

@@ -22,6 +22,7 @@
 # Author: SkarmoutsosV
 # Author: Stam.nikos
 # Author: SucreRouge
+# Author: Tgkarounos
 # Author: Zserdx
 # Author: Ανώνυμος Βικιπαιδιστής
 # Author: 아라
@@ -159,6 +160,8 @@ el:
         title_comment: Ομάδα αλλαγών %{id} - %{comment}
       join_discussion: Συνδεθείτε για να μπείτε στη συζήτηση
       discussion: Συζήτηση
+      still_open: Η ομάδα αλλαγών παραμένει σε εκκρεμότητα - η συζήτηση θα ανοίξει
+        μόλις ολοκληρωθεί η ομάδα αλλαγών.
     node:
       title: 'Κόμβος: %{name}'
       history_title: 'Ιστορικό κόμβου: %{name}'
@@ -377,7 +380,7 @@ el:
       embeddable_html: Ενσωματούμενη HTML
       licence: Άδεια
       export_details: Τα δεδομένα του OpenStreetMap είναι αδειοδοτημένα υπό την <a
-        href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open
+        href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open
         Database License</a> (ODbL).
       too_large:
         advice: 'Αν η εξαγωγή αποτυγχάνει, παρακαλώ δοκιμάστε μία από τις πηγές που
@@ -418,15 +421,15 @@ el:
   geocoder:
     search:
       title:
-        latlon: Αποτελέσματα από την <a href="http://openstreetmap.org/">εσωτερική</a>
+        latlon: Αποτελέσματα από την <a href="https://openstreetmap.org/">εσωτερική</a>
           βάση δεδομένων
         uk_postcode: Αποτελέσματα από <a href="http://www.npemap.org.uk/">NPEMap /
           FreeThe Postcode</a>
-        ca_postcode: Αποτελέσματα από <a href="http://geocoder.ca/">Geocoder.CA</a>
+        ca_postcode: Αποτελέσματα από <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Αποτελέσματα από το <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Αποτελέσματα από το <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Αποτελέσματα από το <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: Αποτελέσματα από το <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Αποτελέσματα από το <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames_reverse: Αποτελέσματα από το <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
@@ -437,12 +440,19 @@ el:
           chair_lift: Αναβατήρας με κάθισμα
           drag_lift: Συρόμενος αναβατήρας
           gondola: Τελεφερίκ-Γόνδολα
+          platter: Πιατέλα ανύψωσης
+          pylon: Πυλώνας
           station: Σταθμός εναέριου δρόμου
+          t-bar: T-Bar Ασανσέρ
         aeroway:
           aerodrome: Αεροδρόμιο
+          airstrip: Διάδρομος προσγειώσεως
           apron: Χώρος ελιγμών
           gate: Πύλη
+          hangar: Υπόστεγο για αεροπλάνα
           helipad: Ελικοδρόμιο
+          holding_position: κράτηση θέσης
+          parking_position: Θέση στάθμευσης
           runway: Διάδρομος
           taxiway: Τροχιόδρομος
           terminal: Τερματικός σταθμός
@@ -477,37 +487,32 @@ el:
           crematorium: Κρεματόριο
           dentist: Οδοντίατρος
           doctors: Ιατροί
-          dormitory: Κοιτώνας
           drinking_water: Πόσιμο νερό
           driving_school: Σχολή οδηγών
           embassy: Πρεσβεία
-          emergency_phone: Τηλέφωνο έκτακτης ανάγκης
           fast_food: Ταχυφαγείο
           ferry_terminal: Σταθμός πορθμείων
-          fire_hydrant: Κρουνός πυροσβεστικής
           fire_station: Πυροσβεστικός σταθμός
           food_court: Προαύλιο φαγητού
           fountain: Συντριβάνι
           fuel: Καύσιμα
           gambling: Τυχερά παιχνίδια
           grave_yard: Νεκροταφείο
-          gym: Γυμναστήριο
+          grit_bin: Κάδος Χαλικιού
-          health_centre: Κέντρο υγείας
           hospital: Νοσοκομείο
           hunting_stand: Κυνηγητικό κιόσκι
           ice_cream: Παγωτό
           kindergarten: Νηπιαγωγείο
           library: Βιβλιοθήκη
-          market: Αγορά
           marketplace: Αγορά
           monastery: Μοναστήρι
           motorcycle_parking: Χώρος στάθμευσης μοτοσικλετών
           nightclub: Νυχτερινό κέντρο
-          nursery: Παιδικός σταθμός
           nursing_home: Οίκος ευγηρίας
           office: Γραφείο
           parking: Χώρος στάθμευσης
           parking_entrance: Είσοδος χώρου στάθμευσης
+          parking_space: Χώρος στάθμευσης
           pharmacy: Φαρμακείο
           place_of_worship: Τόπος λατρείας
           police: Αστυνομία
@@ -517,7 +522,6 @@ el:
           prison: Φυλακή
           pub: Παμπ
           public_building: Δημόσιο κτίριο
-          reception_area: Χώρος υποδοχής
           recycling: Σημείο ανακύκλωσης
           restaurant: Εστιατόριο
           retirement_home: Γηροκομείο
@@ -542,6 +546,7 @@ el:
           village_hall: Αίθουσα χωριού
           waste_basket: Καλάθι απορριμμάτων
           waste_disposal: Διάθεση αποβλήτων
+          water_point: Σημείο ανεφοδιασμού νερού
           youth_centre: Κέντρο νεολαίας
         boundary:
           administrative: Διοικητικό όριο
@@ -550,6 +555,7 @@ el:
           protected_area: Προστατευόμενη περιοχή
         bridge:
           aqueduct: Υδραγωγείο
+          boardwalk: πεζοδρόμιο
           suspension: Κρεμαστή Γέφυρα
           swing: Αιωρούμενη Γέφυρα
           viaduct: Κοιλαδογέφυρα
@@ -569,25 +575,31 @@ el:
           "yes": Κατάστημα τεχνών
         emergency:
           ambulance_station: Σταθμός ασθενοφόρων
+          assembly_point: σημείο συγκέντρωσης
           defibrillator: Απινιδωτής
           landing_site: Τοποθεσία έκτακτης προσγείωσης
           phone: Τηλέφωνο έκτακτης ανάγκης
+          water_tank: Δεξαμενή νερού έκτακτης ανάγκης
+          "yes": επείγον περιστατικό
         highway:
           abandoned: Εγκαταλελειμμένος αυτοκινητόδρομος
           bridleway: Μονοπάτι για άλογα
           bus_guideway: Καθορισμένη λωρίδα λεωφορείου
           bus_stop: Στάση λεωφορείου
           construction: Δρόμος υπό κατασκευή
+          corridor: Διάδρομος
           cycleway: Ποδηλατόδρομος
           elevator: Ανελκυστήρας
           emergency_access_point: Σημείο πρόσβασης έκτακτης ανάγκης
           footway: Μονοπάτι
           ford: Κοιτόστρωση
+          give_way: Δώστε το σήμα
           living_street: Μεικτός δρόμος
           milestone: Ορόσημο
           motorway: Αυτοκινητόδρομος
           motorway_junction: Διασταύρωση αυτοκινητόδρομου
           motorway_link: Αυτοκινητόδρομος
+          passing_place: Πέρασμα
           path: Διαδρομή
           pedestrian: Πεζόδρομος
           platform: Πλατφόρμα
@@ -604,6 +616,7 @@ el:
           services: Υπηρεσίες αυτοκινητοδρόμου
           speed_camera: Κάμερα ταχύτητας
           steps: Σκαλοπάτια
+          stop: Σήμα στάσης
           street_lamp: Λάμπα δρόμου
           tertiary: Τριτεύων δρόμος
           tertiary_link: Τριτεύων δρόμος
@@ -612,8 +625,8 @@ el:
           trail: Μονοπάτι
           trunk: Εθνική οδός
           trunk_link: Εθνική οδός
+          turning_loop: Κυκλικός Κόμβος
           unclassified: Αταξινόμητη οδός
-          unsurfaced: Δρόμος χωρίς επίστρωση
           "yes": Δρόμος
         historic:
           archaeological_site: Αρχαιολογικός χώρος
@@ -632,6 +645,7 @@ el:
           manor: Έπαυλη
           memorial: Μνημείο
           mine: Ορυχείο
+          mine_shaft: Φρεάτιο ορυχείου
           monument: Μνημείο
           roman_road: Ρωμαϊκός δρόμος
           ruins: Ερείπιο
@@ -641,6 +655,7 @@ el:
           wayside_cross: Σταυρός στην άκρη του δρόμου
           wayside_shrine: Εικονοστάσιο στην άκρη του δρόμου
           wreck: Ναυάγιο
+          "yes": Ιστορικός Χώρος
         junction:
           "yes": Διασταύρωση
         landuse:
@@ -678,9 +693,9 @@ el:
         leisure:
           beach_resort: Παραθαλάσσιο θέρετρο
           bird_hide: Καταφύγιο πουλιών
-          club: Κλαμπ
           common: Κοινόχρηστη γη
           dog_park: Πάρκο σκύλων
+          firepit: Λάκκος Φωτιάς
           fishing: Αλιευτική περιοχή
           fitness_centre: Κέντρο αδυνατίσματος
           fitness_station: Γυμναστήριο
@@ -705,15 +720,46 @@ el:
           water_park: Υδάτινο πάρκο
           "yes": Ψυχαγωγία
         man_made:
+          adit: Οριζόντια είσοδος σε ορυχείο
+          beacon: φάρος
+          beehive: Κυψέλη
+          breakwater: Κυματοθραύστης
+          bridge: Γέφυρα
+          bunker_silo: Οχυρό
+          chimney: Καμινάδα
+          crane: Γερανός
+          dolphin: Δέστρα
+          dyke: Ανάχωμα
+          embankment: Ανάχωμα
+          flagpole: Ιστός σημαίας
+          gasometer: Αεριόμετρο
+          groyne: Φράγμα
+          kiln: Καμίνι
           lighthouse: Φάρος
+          mast: Κατάρτι
+          mine: Ορυχείο
+          mineshaft: Φρεάτιο ορυχείου
+          monitoring_station: Σταθμός παρακολούθησης
+          petroleum_well: Γεώτρηση Πετρελαίου
+          pier: Αποβάθρα
           pipeline: Αγωγός
+          silo: Σιλό
+          storage_tank: Δεξαμενή αποθήκευσης
+          surveillance: Επιτήρηση
           tower: Πύργος
+          wastewater_plant: Μονάδα επεξεργασίας λυμάτων
+          watermill: Νερόμυλος
+          water_tower: Πύργος νερού
+          water_well: Πηγάδι
+          water_works: Έργα Υδάτων
+          windmill: Αερόμυλος
           works: Εργοστάσιο
           "yes": Τεχνητό
         military:
           airfield: Στρατιωτικό αεροδρόμιο
           barracks: Στρατώνας
           bunker: Οχυρό
+          "yes": Στρατός
         mountain_pass:
           "yes": Ορεινό πέρασμα
         natural:
@@ -759,11 +805,14 @@ el:
           accountant: Λογιστής
           administrative: Διαχείριση
           architect: Αρχιτέκτονας
+          association: Σύλλογος
           company: Εταιρεία
+          educational_institution: Εκπαιδευτικό ίδρυμα
           employment_agency: Οργανισμός απασχόλησης
           estate_agent: Κτηματομεσιτικό γραφείο
           government: Κυβερνητικό γραφείο
           insurance: Ασφαλιστικό γραφείο
+          it: Γραφείο πληροφορικής
           lawyer: Δικηγόρος
           ngo: Γραφείο ΜΚΟ
           telecommunication: Γραφείο τηλεπικοινωνιών
@@ -771,9 +820,8 @@ el:
           "yes": Γραφείο
         place:
           allotments: Λαχανόκηποι
-          block: Φραγή
-          airport: Αεροδρόμιο
           city: Πόλη
+          city_block: Οικοδομικό τετράγωνο πόλης
           country: Χώρα
           county: Κομητεία
           farm: Αγρόκτημα
@@ -784,12 +832,13 @@ el:
           islet: Νησίδα
           isolated_dwelling: Απομονωμένη κατοικία
           locality: Τοποθεσία
-          moor: Δέστρα
           municipality: Δήμος
           neighbourhood: Γειτονιά
           postcode: Ταχυδρομικός κώδικας
+          quarter: Συνοικία
           region: Περιοχή
           sea: Θάλασσα
+          square: Πλατεία
           state: Πολιτεία
           subdivision: Υποδιαίρεση
           suburb: Προάστιο
@@ -801,10 +850,8 @@ el:
           abandoned: Εγκαταλελειμμένος σιδηρόδρομος
           construction: Σιδηρόδρομος υπό κατασκευή
           disused: Σιδηρόδρομος εκτός χρήσης
-          disused_station: Σιδηροδρομικός σταθμός εκτός χρήσης
           funicular: Τελεφερίκ σε ράγες
           halt: Σταθμός τραίνου
-          historic_station: Ιστορικός σιδηροδρομικός σταθμός
           junction: Σιδηροδρομικός κόμβος
           level_crossing: Ισόπεδη διάβαση
           light_rail: Ελαφρύ τρένο
@@ -830,6 +877,7 @@ el:
           beauty: Σαλόνι ομορφιάς
           beverages: Κατάστημα ποτών
           bicycle: Κατάστημα ποδηλάτων
+          bookmaker: Σελιδοδείκτης
           books: Βιβλιοπωλείο
           boutique: Μπουτίκ
           butcher: Κρεοπωλείο
@@ -868,12 +916,16 @@ el:
           hairdresser: Κομμωτήριο
           hardware: Κατάστημα με χρώματα-σιδηρικά
           hifi: Hi-Fi
-          insurance: Ασφαλιστική
+          houseware: Μαγαζί με οικιακά είδη
+          interior_decoration: Διακόσμηση εσωτερικού χώρου
           jewelry: Κοσμηματοπωλείο
           kiosk: Περίπτερο
+          kitchen: Μαγαζί κουζινών
           laundry: Πλυντήριο
+          lottery: Λοταρία
           mall: Εμπορικό κέντρο
           market: Αγορά
+          massage: Μασάζ
           mobile_phone: Κατάστημα κινητής τηλεφωνίας
           motorcycle: Κατάστημα μοτοσικλετών
           music: Κατάστημα μουσικής
@@ -881,19 +933,25 @@ el:
           optician: Οπτικός
           organic: Κατάστημα οργανικών τροφίμων
           outdoor: Υπαίθριο κατάστημα
+          paint: Μαγαζί ειδών βαφής
+          pawnbroker: Ενεχυροδανειστής
           pet: Κατάστημα κατοικίδιων
           pharmacy: Φαρμακείο
           photo: Φωτογραφείο
-          salon: Σαλόνι
+          seafood: Θαλασσινό φαγητό
           second_hand: Κατάστημα μεταχειρισμένων
           shoes: Κατάστημα υποδημάτων
-          shopping_centre: Εμπορικό κέντρο
           sports: Κατάστημα αθλητικών
           stationery: Κατάστημα χαρτικών/ειδών γραφείου
           supermarket: Σουπερμάρκετ
           tailor: Ράφτης
+          ticket: Μαγαζί εισιτηρίων
+          tobacco: Μαγαζί προϊόντων καπνού
           toys: Κατάστημα παιχνιδιών
           travel_agency: Ταξιδιωτικό πρακτορείο
+          tyres: Κατάστημα ελαστικών
+          vacant: Κενό κατάστημα
+          variety_store: Κατάστημα ποικιλιών
           video: Κατάστημα βίντεο
           wine: Ψιλικατζίδικο
           "yes": Κατάστημα
@@ -950,7 +1008,7 @@ el:
         level10: Σύνορο προαστίου
     description:
       title:
-        osm_nominatim: Τοποθεσία από το <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Τοποθεσία από το <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Τοποθεσία από το <a href="http://www.geonames.org/">GeoNames</a>
       types:
@@ -1028,23 +1086,23 @@ el:
     legal_babble:
       title_html: Πνευματικά δικαιώματα και άδεια χρήσης
       intro_1_html: |-
-        Το OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> είναι βάση <i>ανοικτών δεδομένων</i> αδειοδοτημένα υπό την <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) από το <a
+        Το OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> είναι βάση <i>ανοικτών δεδομένων</i> αδειοδοτημένα υπό την <a href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) από το <a
-        href="http://osmfoundation.org/">Ίδρυμα OpenStreetMap</a> (OSMF).
+        href="https://osmfoundation.org/">Ίδρυμα OpenStreetMap</a> (OSMF).
       intro_2_html: Είστε ελεύθεροι να αντιγράψετε, να διανείμετε, μεταδώσετε και
         προσαρμόσετε τα δεδομένα μας εφόσον κάνετε αναφορά στο OpenStreetMap και στους
         συνεισφέροντές του. Εάν τροποποιήσετε ή αξιοποιήσετε τα δεδομένα μας, μπορείτε
-        να διανείμετε το αποτέλεσμα μόνο σύμφωνα με την ίδια άδεια. Ο πλήρης <a href="http://opendatacommons.org/licenses/odbl/1.0/">νομικός
+        να διανείμετε το αποτέλεσμα μόνο σύμφωνα με την ίδια άδεια. Ο πλήρης <a href="https://opendatacommons.org/licenses/odbl/1.0/">νομικός
         κώδικας</a> εξηγεί τα δικαιώματα και τις υποχρεώσεις.
       intro_3_html: |-
-        Η χαρτογράφηση στα πλακίδια χάρτη, και η τεκμηρίωση μας, είναι αδειοδοτημένες υπο την άδεια <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+        Η χαρτογράφηση στα πλακίδια χάρτη, και η τεκμηρίωση μας, είναι αδειοδοτημένες υπο την άδεια <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-        Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).
+        Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
       credit_title_html: Πως να κάνετε αναφορά στο OpenStreetMap
       credit_1_html: |-
         Απαιτείται να χρησιμοποιείτε την αναφορά στο &ldquo;&copy; Συνεισφέροντες του
         OpenStreetMap&rdquo;.
       credit_2_html: |-
         Επίσης πρέπει να κάνετε σαφές ότι τα δεδομένα διατίθενται υπό την άδεια Open
-        Database License, και αν χρησιμοποιείτε τα πλακίδια χάρτη, ότι η χαρτογραφία είναι υπό την άδεια CC-BY-SA. Μπορείτε να το κάνετε αυτό με σύνδεσμο σε <a href="http://www.openstreetmap.org/copyright">αυτήν τη σελίδα δικαιωμάτων</a>.
+        Database License, και αν χρησιμοποιείτε τα πλακίδια χάρτη, ότι η χαρτογραφία είναι υπό την άδεια CC-BY-SA. Μπορείτε να το κάνετε αυτό με σύνδεσμο σε <a href="https://www.openstreetmap.org/copyright">αυτήν τη σελίδα δικαιωμάτων</a>.
         Εναλλακτικά, και σαν προαπαιτούμενο εάν διαμοιράζετε δεδομένα OSM, μπορείτε να δώσετε απευθείας σύνδεσμο προς τις άδειες. Σε μέσα στα οποία οι σύνδεσμοι δεν είναι εφικτοί (π.χ. εκτυπώσεις), προτείνουμε να κατευθύνετε τους αναγνώστες σας στο openstreetmap.org (ίσως επεκτείνοντας το «OpenStreetMap» σε αυτήν τη πλήρη διεύθυνση), προς opendatacommons.org, και αναλόγως στο creativecommons.org.
       credit_3_html: |-
         Για έναν ηλεκτρονικά εμφανιζόμενο χάρτη, η αναφορά θα πρέπει να εμφανίζεται στη γωνία του χάρτη.
@@ -1055,7 +1113,7 @@ el:
       more_title_html: Μαθαίνοντας περισσότερα
       more_1_html: |-
         Διαβάστε περισσότερα σχετικά με τη χρήση των δεδομένων μας, και πώς να μας μνημονεύσετε στην
-        <a href="http://osmfoundation.org/Licence">σελίδα Άδειας OSMF</a>.
+        <a href="https://osmfoundation.org/Licence">σελίδα Άδειας OSMF</a>.
       more_2_html: |-
         Παρόλο που το OpenStreetMap αποτελείται από ανοικτά δεδομένα, δεν μπορούμε να προσφέρουμε ένα
         δωρεάν API χαρτών για τρίτους προγραμματιστές.
@@ -1068,9 +1126,9 @@ el:
         και άλλες πηγές, μεταξύ αυτών:'
       contributors_at_html: |-
         <strong>Αυστρία</strong>: Περιέχει δεδομένα από τα
-        <a href="http://data.wien.gv.at/">Stadt Wien</a> (υπό  <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="https://data.wien.gv.at/">Stadt Wien</a> (υπό  <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> και
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> και
-        Land Tirol (υπό <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT με τροποποιήσεις</a>).
+        Land Tirol (υπό <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT με τροποποιήσεις</a>).
       contributors_ca_html: |-
         <strong>Καναδάς</strong>: Περιέχει δεδομένα από τα
         GeoBase®, GeoGratis (© Τμήμα Φυσικών
@@ -1079,12 +1137,12 @@ el:
         Στατιστική Υπηρεσία Καναδά).
       contributors_fi_html: "<strong>Φινλανδία</strong>: Περιέχει δεδομένα από το
         National Land Survey of Finland's Topographic Database\nκαι άλλα datasets,
-        υπό την \n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">NLSFI
+        υπό την \n<a href=\"https://www.maanmittauslaitos.fi/en/opendata-licence-version1\">NLSFI
         Άδεια</a>."
       contributors_fr_html: '<strong>Γαλλία</strong>: Περιέχει δεδομένα που προέρχονται
         από το Direction Générale des Impôts.'
       contributors_nl_html: '<strong>Ολλανδία</strong>: Περιέχει δεδομένα που προέρχονται
-        από το AND &copy; 2007 (<a href="http://www.and.com">www.and.com</a>)'
+        από το AND &copy; 2007 (<a href="https://www.and.com">www.and.com</a>)'
       contributors_nz_html: '<strong>Νέα Ζηλανδία</strong>: Περιέχει δεδομένα που
         πηγάζουν από την Υπηρεσία Πληροφοριών Γης Νέας Ζηλανδίας. Τα Πνευματικά Δικαιώματα
         Crown είναι κατωχυρωμένα.'
@@ -1102,7 +1160,7 @@ el:
         2010-12.
       contributors_footer_1_html: |-
         Για περισσότερες λεπτομέρειες σχετικά με αυτές, και άλλες πηγές που χρησιμοποιήθηκαν
-        για να βελτιώσουν το OpenStreetMap, παρακαλούμε δείτε τη σελίδα <a href="http://wiki.openstreetmap.org/wiki/Contributors">Συνεισφέροντες</a> στο OpenStreetMap Wiki.
+        για να βελτιώσουν το OpenStreetMap, παρακαλούμε δείτε τη σελίδα <a href="https://wiki.openstreetmap.org/wiki/Contributors">Συνεισφέροντες</a> στο OpenStreetMap Wiki.
       contributors_footer_2_html: Η συμπερίληψη δεδομένων στο OpenStreetMap δεν συνεπάγεται
         ότι ο αρχικός πάροχος δεδομένων εγκρίνει το OpenStreetMap, παρέχει οποιαδήποτε
         εγγύηση ή αποδέχεται καμία ευθύνη.
@@ -1112,14 +1170,14 @@ el:
         χωρίς την προηγούμενη άδεια από τους ιδιοκτήτες των δικαιωμάτων.
       infringement_2_html: Εάν πιστεύετε ότι προστέθηκε παράνομα υλικό που προστατεύεται
         από πνευματικά δικαιώματα στη βάση δεδομένων του OpenStreetMap ή σε αυτόν
-        τον ιστότοπο, παρακαλούμε απευθυνθείτε στη <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">
+        τον ιστότοπο, παρακαλούμε απευθυνθείτε στη <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">
         διαδικασία απομάκρυνσης </a> ή καταθέστε άμεσα μια αίτηση στην <a href="http://dmca.openstreetmap.org/">on-line
         σελίδα αιτήσεων</a>.
       trademarks_title_html: <span id="trademarks"></span>Εμπορικά σήματα
       trademarks_1_html: Το OpenStreetMap, το λογότυπο με το μεγεθυντικό φακό και
         το «State of the Map» είναι σήματα κατατεθέντα του Ιδρύματος OpenStreetMap.
         Αν έχετε ερωτήσεις σχετικά με τη χρήση των σημάτων, στείλτε τις ερωτήσεις
-        σας στην <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Ομάδα
+        σας στην <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Ομάδα
         Εργασίας Αδειών Χρήσης</a>.
   welcome_page:
     title: Καλώς ήρθατε!
@@ -1154,8 +1212,8 @@ el:
       paragraph_1_html: Το OpenStreetMap έχει λίγους επίσημους κανόνες, αλλά αναμένουμε
         από όλους τους συμμετέχοντες να συνεργαστούν και να επικοινωνούν με την κοινότητα.
         Αν σκέφτεστε άλλες δραστηριότητες εκτός από την επεξεργασία με το χέρι, παρακαλούμε
-        διαβάστε και ακολουθήστε τις οδηγίες στις <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Εισαγωγές</a>
+        διαβάστε και ακολουθήστε τις οδηγίες στις <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Εισαγωγές</a>
-        και στις <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Αυτόματες
+        και στις <a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Αυτόματες
         Επεξεργασίες</a>.
     questions:
       title: Ερωτήσεις;
@@ -1192,7 +1250,7 @@ el:
       explanation_html: Αν ανησυχείτε για το πώς χρησιμοποιούνται τα δεδομένα μας
         ή σχετικά με τα περιεχόμενα, παρακαλούμε συμβουλευτείτε τη <a href='/copyright'>σελίδα
         πνευματικών δικαιωμάτων</a> μας για περισσότερες νομικές πληροφορίες ή επικοινωνήστε
-        με την κατάλληλη <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>ομάδα
+        με την κατάλληλη <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>ομάδα
         εργασίας του OSMF</a>.
   help_page:
     title: Βοήθεια
@@ -1205,7 +1263,7 @@ el:
       description: Ξεκινήστε με αυτές τις σύντομες οδηγίες που καλύπτουν τα βασικά
         του OpenStreetMap.
     beginners_guide:
-      url: http://wiki.openstreetmap.org/wiki/El:Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/El:Beginners%27_guide
       title: Οδηγός Αρχαρίων
       description: Οδηγός αρχαρίων διατηρούμενος από την κοινότητα.
     help:
@@ -1230,7 +1288,7 @@ el:
       description: Βοήθεια για εταιρείες και οργανισμούς για μετάβαση σε χάρτες που
         βασίζονται στο OpenStreetMap και άλλες υπηρεσίες.
     wiki:
-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
       description: Περιηγηθείτε το wiki για επιμελής τεκμηρίωση του OSM.
   about_page:
@@ -1252,8 +1310,8 @@ el:
       που τρέχουν τους εξυπηρετητές OSM, ανθρωπιστές που χαρτογραφούν κατεστραμμένες-πληγείσες περιοχές,
       και πολλούς περισσότερους.
       Για να μάθετε περισσότερα για την κοινότητα, ανατρέξτε στα <a href="%{diary_path}">ημερολόγια χρηστών</a>, τα
-      <a href="http://blogs.openstreetmap.org/">ιστολόγια της κοινότητας</a>και
+      <a href="https://blogs.openstreetmap.org/">ιστολόγια της κοινότητας</a>και
-      την ιστοσελίδα του <a href="http://www.osmfoundation.org/">Ιδρύματος OSM</a>.
+      την ιστοσελίδα του <a href="https://www.osmfoundation.org/">Ιδρύματος OSM</a>.
     open_data_title: Ανοικτά Δεδομένα
     open_data_html: 'Το OpenStreetMap είναι βάση <i>ανοικτών δεδομένων</i>: είστε
       ελεύθεροι να την χρησιμοποιήστε για οποιονδήποτε σκοπό, εφόσον μνημονεύετε το
@@ -1263,9 +1321,9 @@ el:
       Δικαιώματα και Άδεια Χρήσης</a> για λεπτομέρειες.'
     legal_title: Νομικό
     legal_html: |-
-      Αυτός ο ιστότοπος και πολλές άλλες σχετικές υπηρεσίες λειτουργούν επίσημα από το <a href='http://osmfoundation.org/'>Ίδρυμα OpenStreetMap</a> (OSMF) εκ μέρους της κοινότητας. Η χρήση όλων των υπηρεσιών του OSMF  υπόκειται στην <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Πολιτική Αποδεκτής Χρήσης</a> μας και στην <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Πολιτική Απορρήτου</a> μας.
+      Αυτός ο ιστότοπος και πολλές άλλες σχετικές υπηρεσίες λειτουργούν επίσημα από το <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/Privacy_Policy">Πολιτική Απορρήτου</a> μας.
       <br>
-      Παρακαλούμε <a href='http://osmfoundation.org/Contact'>επικοινωνήστε με το OSMF</a> αν έχετε ερωτήματα για άδειες χρήσης, πνευματικά δικαιώματα ή άλλα νομικά θέματα.
+      Παρακαλούμε <a href='https://osmfoundation.org/Contact'>επικοινωνήστε με το OSMF</a> αν έχετε ερωτήματα για άδειες χρήσης, πνευματικά δικαιώματα ή άλλα νομικά θέματα.
     partners_title: Συνεργάτες
   notifier:
     diary_comment_notification:
@@ -1487,14 +1545,14 @@ el:
       user_page_link: σελίδα σας χρήστη
       anon_edits_link_text: Μάθετε γιατί συμβαίνει αυτό.
       flash_player_required: Χρειάζεστε Flash player για να χρησιμοποιήσετε το Potlatch,
-        το Flash πρόγραμμα επεξεργασίας του OpenStreetMap. Μπορείτε να <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">κάνετε
+        το Flash πρόγραμμα επεξεργασίας του OpenStreetMap. Μπορείτε να <a href=https://get.adobe.com/flashplayer/">κάνετε
-        λήψη του Flash Player από την τοποθεσία Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Πολλές
+        λήψη του Flash Player από την τοποθεσία Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Πολλές
         άλλες επιλογές</a> είναι επίσης διαθέσιμες για επεξεργασία στο OpenStreetMap.
       potlatch_unsaved_changes: Έχετε μη αποθηκευμένες αλλαγές. (Για να αποθηκεύσετε
         στο Potlatch, πρέπει να αποεπιλέξτε οποιαδήποτε διαδρομή ή κόμβο, αν επεξεργάζεστε
         σε ζωντανή λειτουργία, ή απλά πατήστε «Αποθήκευση» εάν έχετε κουμπί αποθήκευσης.)
       potlatch2_not_configured: Το Potlatch 2 δεν έχει ρυθμιστεί - παρακαλούμε δείτε
-        http://wiki.openstreetmap.org/wiki/The_Rails_Port
+        https://wiki.openstreetmap.org/wiki/The_Rails_Port
       potlatch2_unsaved_changes: Έχετε μη αποθηκευμένες αλλαγές. (Για να αποθηκεύσετε
         στο Potlatch 2, πρέπει να κάνετε κλικ στο «Αποθήκευση».)
       id_not_configured: Ο iD δεν έχει ρυθμιστεί
@@ -1586,7 +1644,7 @@ el:
       edit: Επεξεργασία
       preview: Προεπισκόπηση
     markdown_help:
-      title_html: Αναλύεται με το <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Αναλύεται με το <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
       headings: Επικεφαλίδες
       heading: Επικεφαλίδα
       subheading: Υποκεφαλίδα
@@ -1698,7 +1756,7 @@ el:
       description: Προβολή πρόσφατων μεταφορτώσεων ιχνών GPS
       tagged_with: χαρακτηρίστηκαν με %{tags}
       empty_html: Τίποτα ακόμα εδώ. <a href='%{upload_link}'>Ανεβάστε ένα νέο ίχνος</a>
-        ή μάθετε περισσότερα για την καταγραφή ιχνών με GPS στη <a href='http://wiki.openstreetmap.org/wiki/El:Beginners_Guide_1.2'>σελίδα
+        ή μάθετε περισσότερα για την καταγραφή ιχνών με GPS στη <a href='https://wiki.openstreetmap.org/wiki/El:Beginners_Guide_1.2'>σελίδα
         wiki</a>.
     delete:
       scheduled_for_deletion: Το ίχνος προγραμματίστηκε για διαγραφή
@@ -1916,12 +1974,12 @@ el:
           και είναι ανοικτός στον καθένα να τον διορθώσει, αναβαθμίσει, κατεβάσει και χρησιμοποιήσει.</p>
           <p>Εγγραφείτε για να αρχίσετε να συνεισφέρετε. Θα σας στείλουμε ένα email για να επιβεβαιώσουμε τον λογαριασμό σας.</p>
       license_agreement: Όταν επιβεβαιώσετε το λογαριασμό σας, θα πρέπει να συμφωνήσετε
-        με τους <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">όρους
+        με τους <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">όρους
         συνεισφοράς</a>.
       email address: 'Διεύθυνση Ηλ. Ταχυδρομείου:'
       confirm email address: 'Επιβεβαίωση Διεύθυνσης Ηλ. Ταχυδρομείου:'
       not displayed publicly: Η διεύθυνση σου δεν εμφανίζεται δημόσια (βλέπετε την
-        <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy
+        <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy
         policy including section on email addresses">πολιτική απορρήτου</a> για περισσότερες
         πληροφορίες)
       display name: 'Εμφανιζόμενο όνομα:'
@@ -2045,13 +2103,13 @@ el:
       email never displayed publicly: (όχι δημόσια εμφάνιση)
       external auth: 'Εξωτερικός Έλεγχος Ταυτότητας:'
       openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: τι είναι αυτό;
       public editing:
         heading: 'Δημόσια επεξεργασία:'
         enabled: Ενεργοποιήθηκε. Δεν είστε πια ανώνυμοι και μπορείτε να επεξεργαστείτε
           δεδομένα.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: τι είναι αυτό;
         disabled: Απενεργοποιήθηκε και δεν μπορείτε να επεξεργαστείτε δεδομένα, όλες
           οι προηγούμενες επεξεργασίες είναι ανώνυμες.
@@ -2063,7 +2121,7 @@ el:
           επεξεργαστεί και να επιτρέψετε στους άλλους έρθουν σε επαφή μαζί σας μέσω
           του ιστοχώρου, πατήστε το κουμπί από κάτω. <b>Μετά την αλλαγή σε API 0.6,
           μόνο οι επώνυμοι χρήστες μπορούν να επεξεργαστούν δεδομένα του χάρτη.</b>.
-          (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">μάθετε γιατί</a>).
+          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">μάθετε γιατί</a>).
           <ul><li>Η διεύθυνσή σας ηλεκτρονικού ταχυδρομείου δεν θα αποκαλυφθεί δημόσια.
           </li><li> Αυτή η ενέργεια δεν μπορεί να αναιρεθεί και όλοι οι νέοι χρήστες
           είναι επώνυμοι εξ' αρχής.</li></ul>
@@ -2203,7 +2261,7 @@ el:
         χρήστη `%{name}'?
       confirm: Επιβεβαίωση
       fail: Δεν μπόρεσε να εξουσιοδοτήσει τον χρήστη % {όνομα}. Παρακαλώ ελέγξετε
-        ότι ο χρήστης και ο ρόλος είναι και οι δύο έγκυροι.
+        ότι ο χρήστης και ο ρόλος είναι και οι δύο έγκυροι
     revoke:
       title: Επιβεβαίωση ανάκλησης ρόλου
       heading: Επιβεβαίωση ανάκλησης ρόλου
@@ -2475,7 +2533,7 @@ el:
         slight_left_without_exit: Ελαφριά αριστερά στην %{name}
         via_point_without_exit: (μέσω σημείου)
         follow_without_exit: Ακολουθήστε την %{name}
-        roundabout_without_exit: Στον κυκλικό κόμβο πάρτε την %{name}
+        roundabout_without_exit: Στον κυκλικό κόμβο βγείτε στο %{name}
         leave_roundabout_without_exit: Βγείτε από τον κυκλικό κόμβο - %{name}
         stay_roundabout_without_exit: Μείνετε στον κυκλικό κόμβο - %{name}
         start_without_exit: Ξεκινήστε στο τέλος του %{name}

config/locales/en-GB.yml

@@ -12,6 +12,7 @@
 # Author: Eduard Popov
 # Author: IknowJoseph
 # Author: Jagwar
+# Author: Jguthrie100
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25
@@ -456,33 +457,26 @@ en-GB:
           crematorium: Crematorium
           dentist: Dentist
           doctors: Doctors
-          dormitory: Dormitory
           drinking_water: Drinking Water
           driving_school: Driving School
           embassy: Embassy
-          emergency_phone: Emergency Phone
           fast_food: Fast Food
           ferry_terminal: Ferry Terminal
-          fire_hydrant: Fire Hydrant
           fire_station: Fire Station
           food_court: Food Court
           fountain: Fountain
           fuel: Fuel
           gambling: Gambling
           grave_yard: Graveyard
-          gym: Fitness Centre/Gym
-          health_centre: Health Centre
           hospital: Hospital
           hunting_stand: Hunting Stand
           ice_cream: Ice Cream
           kindergarten: Nursery School
           library: Library
-          market: Market
           marketplace: Marketplace
           monastery: Monastery
           motorcycle_parking: Motorcycle Parking
           nightclub: Night Club
-          nursery: Nursery School
           nursing_home: Nursing Home
           office: Office
           parking: Parking
@@ -496,7 +490,6 @@ en-GB:
           prison: Prison
           pub: Pub
           public_building: Public Building
-          reception_area: Reception Area
           recycling: Recycling Point
           restaurant: Restaurant
           retirement_home: Retirement Home
@@ -529,6 +522,7 @@ en-GB:
           protected_area: Protected Area
         bridge:
           aqueduct: Aqueduct
+          boardwalk: Promenade
           suspension: Suspension Bridge
           swing: Swing Bridge
           viaduct: Viaduct
@@ -592,7 +586,6 @@ en-GB:
           trunk: Trunk Road
           trunk_link: Trunk Road
           unclassified: Unclassified Road
-          unsurfaced: Unsurfaced Road
           "yes": Road
         historic:
           archaeological_site: Archaeological Site
@@ -657,7 +650,6 @@ en-GB:
         leisure:
           beach_resort: Beach Resort
           bird_hide: Bird Hide
-          club: Club
           common: Common Land
           dog_park: Dog Park
           fishing: Fishing Area
@@ -685,6 +677,7 @@ en-GB:
           "yes": Leisure
         man_made:
           lighthouse: Lighthouse
+          petroleum_well: Oil Well
           pipeline: Pipeline
           tower: Tower
           works: Factory
@@ -750,8 +743,6 @@ en-GB:
           "yes": Office
         place:
           allotments: Allotments
-          block: Block
-          airport: Airport
           city: City
           country: Country
           county: County
@@ -763,7 +754,6 @@ en-GB:
           islet: Islet
           isolated_dwelling: Isolated Dwelling
           locality: Locality
-          moor: Moor
           municipality: Municipality
           neighbourhood: Neighbourhood
           postcode: Postcode
@@ -780,10 +770,8 @@ en-GB:
           abandoned: Abandoned Railway
           construction: Railway under construction
           disused: Disused Railway
-          disused_station: Disused Railway Station
           funicular: Funicular Railway
           halt: Train Stop
-          historic_station: Historic Railway Station
           junction: Railway Junction
           level_crossing: Level Crossing
           light_rail: Light Rail
@@ -847,7 +835,6 @@ en-GB:
           hairdresser: Hairdresser
           hardware: Hardware Store
           hifi: Hi-Fi
-          insurance: Insurance
           jewelry: Jewellers
           kiosk: Kiosk Shop
           laundry: Laundry
@@ -863,10 +850,8 @@ en-GB:
           pet: Pet Shop
           pharmacy: Pharmacy
           photo: Photo Shop
-          salon: Salon
           second_hand: Second-hand Shop
           shoes: Shoe Shop
-          shopping_centre: Shopping Centre
           sports: Sports Shop
           stationery: Stationers
           supermarket: Supermarket
@@ -1480,6 +1465,7 @@ en-GB:
       where_am_i: Where am I?
       where_am_i_title: Describe the current location using the search engine
       submit_text: Go
+      reverse_directions_text: Reverse Directions
     key:
       table:
         entry:
@@ -2368,6 +2354,8 @@ en-GB:
           can fix it. Move the marker to the correct position and type a note to explain
           the problem. (Please don't enter personal information or information from
           copyrighted maps or directory listings.)
+        advice: Your note is public and may be used to update the map, so don't enter
+          personal information or information from copyrighted maps or directory listings.
         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which
@@ -2399,7 +2387,15 @@ en-GB:
         continue_without_exit: Continue on %{name}
         slight_right_without_exit: Slight right onto %{name}
         offramp_right_without_exit: Take the sliproad on the right onto %{name}
+        offramp_right_with_directions: Take the sliproad on the right towards %{directions}
+        offramp_right_with_name_and_directions: Take the sliproad on the right onto
+          %{name}, towards %{directions}
+        offramp_right_without_directions: Take the sliproad on the right
         onramp_right_without_exit: Turn right on the sliproad onto %{name}
+        onramp_right_with_directions: Turn right onto the sliproad towards %{directions}
+        onramp_right_with_name_and_directions: Turn right on the sliproad onto %{name},
+          towards %{directions}
+        onramp_right_without_directions: Turn right onto the sliproad
         endofroad_right_without_exit: At the end of the road turn right onto %{name}
         merge_right_without_exit: Merge right onto %{name}
         fork_right_without_exit: At the fork turn right onto %{name}
@@ -2409,7 +2405,15 @@ en-GB:
         sharp_left_without_exit: Sharp left onto %{name}
         turn_left_without_exit: Turn left onto %{name}
         offramp_left_without_exit: Take the sliproad on the left onto %{name}
+        offramp_left_with_directions: Take the sliproad on the left towards %{directions}
+        offramp_left_with_name_and_directions: Take the sliproad on the left onto
+          %{name}, towards %{directions}
+        offramp_left_without_directions: Take the sliproad on the left
         onramp_left_without_exit: Turn left on the sliproad onto %{name}
+        onramp_left_with_directions: Turn left onto the sliproad towards %{directions}
+        onramp_left_with_name_and_directions: Turn left on the sliproad onto %{name},
+          towards %{directions}
+        onramp_left_without_directions: Turn left onto the sliproad
         endofroad_left_without_exit: At the end of the road turn left onto %{name}
         merge_left_without_exit: Merge left onto %{name}
         fork_left_without_exit: At the fork turn left onto %{name}
@@ -2419,7 +2423,7 @@ en-GB:
         roundabout_without_exit: At roundabout take %{name}
         leave_roundabout_without_exit: Leave roundabout - %{name}
         stay_roundabout_without_exit: Stay on roundabout - %{name}
-        start_without_exit: Start at end of %{name}
+        start_without_exit: Start on %{name}
         destination_without_exit: Reach destination
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}

config/locales/en.yml

@@ -385,12 +385,19 @@ en:
           chair_lift: "Chair Lift"
           drag_lift: "Drag Lift"
           gondola: "Gondola Lift"
+          platter: "Platter Lift"
+          pylon: "Pylon"
           station: "Aerialway Station"
+          t-bar: "T-Bar Lift"
         aeroway:
           aerodrome: "Aerodrome"
+          airstrip: "Airstrip"
           apron: "Apron"
           gate: "Gate"
+          hangar: "Hangar"
           helipad: "Helipad"
+          holding_position: "Holding Position"
+          parking_position: "Parking Position"
           runway: "Runway"
           taxiway: "Taxiway"
           terminal: "Terminal"
@@ -425,37 +432,32 @@ en:
           crematorium: "Crematorium"
           dentist: "Dentist"
           doctors: "Doctors"
-          dormitory: "Dormitory"
           drinking_water: "Drinking Water"
           driving_school: "Driving School"
           embassy: "Embassy"
-          emergency_phone: "Emergency Phone"
           fast_food: "Fast Food"
           ferry_terminal: "Ferry Terminal"
-          fire_hydrant: "Fire Hydrant"
           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"
           gambling: "Gambling"
           grave_yard: "Grave Yard"
-          gym: "Fitness Centre / Gym"
+          grit_bin: "Grit Bin"
-          health_centre: "Health Centre"
           hospital: "Hospital"
           hunting_stand: "Hunting Stand"
           ice_cream: "Ice Cream"
           kindergarten: "Kindergarten"
           library: "Library"
-          market: "Market"
           marketplace: "Marketplace"
           monastery: "Monastery"
           motorcycle_parking: "Motorcycle Parking"
           nightclub: "Night Club"
-          nursery: "Nursery"
           nursing_home: "Nursing Home"
           office: "Office"
           parking: "Parking"
           parking_entrance: "Parking Entrance"
+          parking_space: "Parking Space"
           pharmacy: "Pharmacy"
           place_of_worship: "Place of Worship"
           police: "Police"
@@ -465,7 +467,6 @@ en:
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"
-          reception_area: "Reception Area"
           recycling: "Recycling Point"
           restaurant: "Restaurant"
           retirement_home: "Retirement Home"
@@ -490,6 +491,7 @@ en:
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           waste_disposal: "Waste Disposal"
+          water_point: "Water Point"
           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
@@ -498,6 +500,7 @@ en:
           protected_area : "Protected Area"
         bridge:
           aqueduct: "Aqueduct"
+          boardwalk: "Boardwalk"
           suspension: "Suspension Bridge"
           swing: "Swing Bridge"
           viaduct: "Viaduct"
@@ -517,25 +520,31 @@ en:
           "yes": "Craft Shop"
         emergency:
           ambulance_station: "Ambulance Station"
+          assembly_point: "Assembly Point"
           defibrillator: "Defibrillator"
           landing_site: "Emergency Landing Site"
           phone: "Emergency Phone"
+          water_tank: "Emergency Water Tank"
+          "yes": "Emergency"
         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"
+          corridor: "Corridor"
           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"
+          give_way: "Give Way Sign"
           living_street: "Living Street"
           milestone: "Milestone"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           motorway_link: "Motorway Road"
+          passing_place: "Passing Place"
           path: "Path"
           pedestrian: "Pedestrian Way"
           platform: "Platform"
@@ -552,6 +561,7 @@ en:
           services: "Motorway Services"
           speed_camera: "Speed Camera"
           steps: "Steps"
+          stop: "Stop Sign"
           street_lamp: "Street Lamp"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"
@@ -560,8 +570,8 @@ en:
           trail: "Trail"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"
+          turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
-          unsurfaced: "Unsurfaced Road"
           "yes" : "Road"
         historic:
           archaeological_site: "Archaeological Site"
@@ -580,6 +590,7 @@ en:
           manor: "Manor"
           memorial: "Memorial"
           mine: "Mine"
+          mine_shaft: "Mine Shaft"
           monument: "Monument"
           roman_road: "Roman Road"
           ruins: "Ruins"
@@ -589,6 +600,7 @@ en:
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
+          "yes": "Historic Site"
         junction:
           "yes": "Junction"
         landuse:
@@ -626,9 +638,9 @@ en:
         leisure:
           beach_resort: "Beach Resort"
           bird_hide: "Bird Hide"
-          club: "Club"
           common: "Common Land"
           dog_park: "Dog Park"
+          firepit: "Fire Pit"
           fishing: "Fishing Area"
           fitness_centre: "Fitness Centre"
           fitness_station: "Fitness Station"
@@ -653,15 +665,46 @@ en:
           water_park: "Water Park"
           "yes": "Leisure"
         man_made:
+          adit: "Adit"
+          beacon: "Beacon"
+          beehive: "Bee Hive"
+          breakwater: "Breakwater"
+          bridge: "Bridge"
+          bunker_silo: "Bunker"
+          chimney: "Chimney"
+          crane: "Crane"
+          dolphin: "Mooring Post"
+          dyke: "Dyke"
+          embankment: "Embankment"
+          flagpole: "Flagpole"
+          gasometer: "Gasometer"
+          groyne: "Groyne"
+          kiln: "Kiln"
           lighthouse: "Lighthouse"
+          mast: "Mast"
+          mine: "Mine"
+          mineshaft: "Mine Shaft"
+          monitoring_station: "Monitoring Station"
+          petroleum_well: "Petroleum Well"
+          pier: "Pier"
           pipeline: "Pipeline"
+          silo: "Silo"
+          storage_tank: "Storage Tank"
+          surveillance: "Surveillance"
           tower: "Tower"
+          wastewater_plant: "Wastewater Plant"
+          watermill: "Water Mill"
+          water_tower: "Water Tower"
+          water_well: "Well"
+          water_works: "Water Works"
+          windmill: "Wind Mill"
           works: "Factory"
           "yes": "Man-made"
         military:
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"
+          "yes": "Military"
         mountain_pass:
           "yes" : "Mountain Pass"
         natural:
@@ -707,11 +750,14 @@ en:
           accountant: "Accountant"
           administrative: "Administration"
           architect: "Architect"
+          association: "Association"
           company: "Company"
+          educational_institution: "Educational Institution"
           employment_agency: "Employment Agency"
           estate_agent: "Estate Agent"
           government: "Governmental Office"
           insurance: "Insurance Office"
+          it: "IT Office"
           lawyer: "Lawyer"
           ngo: "NGO Office"
           telecommunication: "Telecommunication Office"
@@ -719,9 +765,8 @@ en:
           "yes": "Office"
         place:
           allotments: "Allotments"
-          block: "Block"
-          airport: "Airport"
           city: "City"
+          city_block: "City Block"
           country: "Country"
           county: "County"
           farm: "Farm"
@@ -732,12 +777,13 @@ en:
           islet: "Islet"
           isolated_dwelling: "Isolated Dwelling"
           locality: "Locality"
-          moor: "Moor"
           municipality: "Municipality"
           neighbourhood: "Neighbourhood"
           postcode: "Postcode"
+          quarter: "Quarter"
           region: "Region"
           sea: "Sea"
+          square: "Square"
           state: "State"
           subdivision: "Subdivision"
           suburb: "Suburb"
@@ -749,10 +795,8 @@ en:
           abandoned: "Abandoned Railway"
           construction: "Railway under Construction"
           disused: "Disused Railway"
-          disused_station: "Disused Railway Station"
           funicular: "Funicular Railway"
           halt: "Train Stop"
-          historic_station: "Historic Railway Station"
           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"
@@ -778,6 +822,7 @@ en:
           beauty: "Beauty Shop"
           beverages: "Beverages Shop"
           bicycle: "Bicycle Shop"
+          bookmaker: "Bookmaker"
           books: "Book Shop"
           boutique: "Boutique"
           butcher: "Butcher"
@@ -816,12 +861,16 @@ en:
           hairdresser: "Hairdresser"
           hardware: "Hardware Store"
           hifi: "Hi-Fi"
-          insurance: "Insurance"
+          houseware: "Houseware Shop"
+          interior_decoration: "Interior Decoration"
           jewelry: "Jewelry Shop"
           kiosk: "Kiosk Shop"
+          kitchen: "Kitchen Shop"
           laundry: "Laundry"
+          lottery: "Lottery"
           mall: "Mall"
           market: "Market"
+          massage: "Massage"
           mobile_phone: "Mobile Phone Shop"
           motorcycle: "Motorcycle Shop"
           music: "Music Shop"
@@ -829,21 +878,27 @@ en:
           optician: "Optician"
           organic: "Organic Food Shop"
           outdoor: "Outdoor Shop"
+          paint: "Paint Shop"
+          pawnbroker: "Pawnbroker"
           pet: "Pet Shop"
           pharmacy: "Pharmacy"
           photo: "Photo Shop"
-          salon: "Salon"
+          seafood: "Sea Food"
           second_hand: "Second-hand Shop"
           shoes: "Shoe Shop"
-          shopping_centre: "Shopping Centre"
           sports: "Sports Shop"
           stationery: "Stationery Shop"
           supermarket: "Supermarket"
           tailor: "Tailor"
+          ticket: "Ticket Shop"
+          tobacco: "Tobacco Shop"
           toys: "Toy Shop"
           travel_agency: "Travel Agency"
+          tyres: "Tyre Shop"
+          vacant: "Vacant Shop"
+          variety_store: "Variety Store"
           video: "Video Shop"
-          wine: "Off License"
+          wine: "Wine Store"
           "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"
@@ -867,6 +922,7 @@ en:
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:
+          building_passage: "Building Passage"
           culvert: "Culvert"
           "yes": "Tunnel"
         waterway:
@@ -1183,7 +1239,7 @@ en:
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
       trademarks_title_html: <span id="trademarks"></span>Trademarks
       trademarks_1_html: |
-        OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
+        OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.
   welcome_page:
     title: Welcome!
     introduction_html: |
@@ -1334,6 +1390,8 @@ en:
       <br>
       Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
       if you have licensing, copyright or other legal questions and issues.
+      <br>
+      OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
     partners_title: Partners
   notifier:
     diary_comment_notification:
@@ -1529,6 +1587,7 @@ en:
       where_am_i: "Where is this?"
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
+      reverse_directions_text: "Reverse Directions"
     key:
       table:
         entry:
@@ -2379,7 +2438,13 @@ en:
         continue_without_exit: Continue on %{name}
         slight_right_without_exit: Slight right onto %{name}
         offramp_right_without_exit: Take the ramp on the right onto %{name}
+        offramp_right_with_directions: Take the ramp on the right towards %{directions}
+        offramp_right_with_name_and_directions: Take the ramp on the right onto %{name}, towards %{directions}
+        offramp_right_without_directions: Take the ramp on the right
         onramp_right_without_exit: Turn right on the ramp onto %{name}
+        onramp_right_with_directions: Turn right onto the ramp towards %{directions}
+        onramp_right_with_name_and_directions: Turn right on the ramp onto %{name}, towards %{directions}
+        onramp_right_without_directions: Turn right onto the ramp
         endofroad_right_without_exit: At the end of the road turn right onto %{name}
         merge_right_without_exit: Merge right onto %{name}
         fork_right_without_exit: At the fork turn right onto %{name}
@@ -2389,17 +2454,23 @@ en:
         sharp_left_without_exit: Sharp left onto %{name}
         turn_left_without_exit: Turn left onto %{name}
         offramp_left_without_exit: Take the ramp on the left onto %{name}
+        offramp_left_with_directions: Take the ramp on the left towards %{directions}
+        offramp_left_with_name_and_directions: Take the ramp on the left onto %{name}, towards %{directions}
+        offramp_left_without_directions: Take the ramp on the left
         onramp_left_without_exit: Turn left on the ramp onto %{name}
+        onramp_left_with_directions: Turn left onto the ramp towards %{directions}
+        onramp_left_with_name_and_directions: Turn left on the ramp onto %{name}, towards %{directions}
+        onramp_left_without_directions: Turn left onto the ramp
         endofroad_left_without_exit: At the end of the road turn left onto %{name}
         merge_left_without_exit: Merge left onto %{name}
         fork_left_without_exit: At the fork turn left onto %{name}
         slight_left_without_exit: Slight left onto %{name}
         via_point_without_exit: (via point)
         follow_without_exit: Follow %{name}
-        roundabout_without_exit: At roundabout take %{name}
+        roundabout_without_exit: At roundabout take exit onto %{name}
         leave_roundabout_without_exit: Leave roundabout - %{name}
         stay_roundabout_without_exit: Stay on roundabout - %{name}
-        start_without_exit: Start at end of %{name}
+        start_without_exit: Start on %{name}
         destination_without_exit: Reach destination
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}

config/locales/eo.yml

@@ -353,7 +353,7 @@ eo:
       embeddable_html: Enkorpigebla HTML
       licence: Permesilo
       export_details: OpenStreetMap-datumoj estas disponeblaj laŭ la permesilo <a
-        href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open
+        href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open
         Database License</a> (ODbL).
       too_large:
         advice: 'Se la elportado malsukcesis, bonvolu uzi unu el jenaj fontoj:'
@@ -391,14 +391,14 @@ eo:
   geocoder:
     search:
       title:
-        latlon: Rezultoj el <a href="http://openstreetmap.org/">Internal</a>
+        latlon: Rezultoj el <a href="https://openstreetmap.org/">nia retejo</a>
         uk_postcode: Rezultoj el <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>
-        ca_postcode: Rezultoj el <a href="http://geocoder.ca/">Geocoder.CA</a>
+        ca_postcode: Rezultoj el <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Rezultoj el <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Rezultoj el <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Rezultoj el <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: Rezultoj el <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Rezultoj el <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames_reverse: Rezultoj el <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
@@ -408,12 +408,19 @@ eo:
           chair_lift: Telfero seĝa
           drag_lift: Skitelfero
           gondola: Telfero plur-vagoneta
+          platter: Skitelfero unupersona
+          pylon: Fosto
           station: Kablovoja stacio
+          t-bar: Skitelfero dupersona
         aeroway:
           aerodrome: Aerodromo
+          airstrip: Provizora aerodromo
           apron: Aviadil-parkumejo
           gate: Pordego
+          hangar: Hangaro
           helipad: Surteriĝejo helikoptera
+          holding_position: Haltejo antaŭ aŭtokur-strato
+          parking_position: Aviadil-parkumejo (pozicio)
           runway: Avia dromo
           taxiway: Aŭtokur-strato
           terminal: Flugstacio
@@ -448,37 +455,32 @@ eo:
           crematorium: Kadavro-bruligejo
           dentist: Dentistejo
           doctors: Kabineto de kuracisto
-          dormitory: Studenthejmo
           drinking_water: Trinkakvejo
           driving_school: Stirlernejo
           embassy: Ambasadejo
-          emergency_phone: Alarma telefono
           fast_food: Rapidmanĝejo
           ferry_terminal: Pramstacio
-          fire_hydrant: Hidranto
           fire_station: Fajrobribadejo
           food_court: Manĝobazaro
           fountain: Fontano
           fuel: Benzinejo
           gambling: Hazardludejo
           grave_yard: Tombejo ĉirkaŭpreĝeja
-          gym: Ripoz-gimnastika centro
+          grit_bin: Ujo kun sablo kaj salo
-          health_centre: Medicina centro
           hospital: Malsanulejo
           hunting_stand: Altembusko ĉasada
           ice_cream: Glaciaĵejo
           kindergarten: Infanĝardeno
           library: Biblioteko
-          market: Bazaro
           marketplace: Bazaro
           monastery: Monaĥejo
           motorcycle_parking: Parkumejo motorcikla
           nightclub: Noktoklubejo
-          nursery: Infanejo
           nursing_home: Domo de permanenta zorgado
           office: Oficejo
           parking: Parkumejo
           parking_entrance: Enveturejo al parkumejo
+          parking_space: Parkumeja pozicio
           pharmacy: Apoteko
           place_of_worship: Preĝejo
           police: Policejo
@@ -488,7 +490,6 @@ eo:
           prison: Malliberejo
           pub: Taverno
           public_building: Konstruaĵo publika
-          reception_area: Atendejo
           recycling: Recikligejo
           restaurant: Restoracio
           retirement_home: Maljunulejo
@@ -513,6 +514,7 @@ eo:
           village_hall: Komunuma centro (vilaĝo)
           waste_basket: Rubujo
           waste_disposal: Rubujego
+          water_point: Trinkejo
           youth_centre: Junulara centro
         boundary:
           administrative: Administra limo
@@ -521,6 +523,7 @@ eo:
           protected_area: Naturprotektejo
         bridge:
           aqueduct: Akvedukto
+          boardwalk: Ligna trotuaro
           suspension: Pendoponto
           swing: Ponto turnebla
           viaduct: Viadukto
@@ -540,25 +543,31 @@ eo:
           "yes": Metiejo
         emergency:
           ambulance_station: Ambulanca stacio
+          assembly_point: Vivsava renkontiĝejo
           defibrillator: Defibrililo
           landing_site: Surteriĝejo en urĝo
           phone: Alarma telefono
+          water_tank: Kontraŭbrulega akvujo
+          "yes": Je danĝero
         highway:
           abandoned: Forlasita vojo
           bridleway: Ĉevalvojo
           bus_guideway: Aŭtobus-trako
           bus_stop: Haltejo aŭtobusa
           construction: Vojo konstruata
+          corridor: Koridoro
           cycleway: Bicikovojo
           elevator: Lifto
           emergency_access_point: Vivsava rekonebla signo
           footway: Piedvojeto
           ford: Travadejo
+          give_way: Trafiksigno ‘cedi traveturon’
           living_street: Ĉedoma strato
           milestone: Mejloŝtono
           motorway: Aŭtovojo
           motorway_junction: Elveturejo el aŭtovojo
           motorway_link: Ligilo al aŭtovojo
+          passing_place: Preterpasejo
           path: Vojeto
           pedestrian: Piedirada strato
           platform: Haltejo
@@ -575,6 +584,7 @@ eo:
           services: Servejo de vojaĝantoj
           speed_camera: Rapid-kontrolilo
           steps: Ŝtuparo
+          stop: Trafiksigno STOP
           street_lamp: Stratlampo
           tertiary: Vojo tria-ranga
           tertiary_link: Ligilo al vojo tria-ranga
@@ -583,8 +593,8 @@ eo:
           trail: Kurso
           trunk: Vojo ekspresa
           trunk_link: Ligilo al vojo ekspresa
+          turning_loop: Ejo por ĝirado U-forma
           unclassified: Vojo kvara-ranga
-          unsurfaced: Ligilo al vojo kvara-ranga
           "yes": Vojo
         historic:
           archaeological_site: Arĥeologia ejo
@@ -603,6 +613,7 @@ eo:
           manor: Palaceto historia
           memorial: Memorigaĵo
           mine: Minejo
+          mine_shaft: Ŝakto
           monument: Monumento
           roman_road: Romia ŝoseo
           ruins: Ruinoj historiaj
@@ -612,6 +623,7 @@ eo:
           wayside_cross: Krucifikso apudvoja
           wayside_shrine: Adorejo apudvoja
           wreck: Ruinoj de ŝipo
+          "yes": Historia ejo
         junction:
           "yes": Vojkruciĝo
         landuse:
@@ -649,9 +661,9 @@ eo:
         leisure:
           beach_resort: Apudmara ripoz-centro
           bird_hide: Bird-observejo
-          club: Klubejo
           common: Publika ripoza tereno
           dog_park: Hund-parko
+          firepit: Lignofajrejo
           fishing: Fiŝkaptadejo
           fitness_centre: Ripoz-gimnastika centro
           fitness_station: Ekzerco-parko
@@ -676,15 +688,46 @@ eo:
           water_park: Akvoparko
           "yes": Ripozejo
         man_made:
+          adit: Minejo horizontala
+          beacon: Buo fiksa
+          beehive: Abulejo
+          breakwater: Ond-rompilo
+          bridge: Ponto
+          bunker_silo: Bunkro armea
+          chimney: Fumtubo
+          crane: Gruo
+          dolphin: Dukdalbo
+          dyke: Digo
+          embankment: Surŝutaĵo
+          flagpole: Flago
+          gasometer: Gasujo
+          groyne: Ond-rompileto
+          kiln: Forno industria
           lighthouse: Lumturo
+          mast: Masto
+          mine: Minejo
+          mineshaft: Ŝakto
+          monitoring_station: Observada stacio
+          petroleum_well: Naftoŝakto
+          pier: Marponto
           pipeline: Tubolinio
+          silo: Tur-stokejo
+          storage_tank: Rezervujo
+          surveillance: Supergardo
           tower: Turo
+          wastewater_plant: Akvopurigejo
+          watermill: Muelejo akva
+          water_tower: Akvoturo
+          water_well: Puto
+          water_works: Akvotrinkebligejo
+          windmill: Muelejo venta
           works: Fabriko
           "yes": Artefarita objekto
         military:
           airfield: Aerbazo armea
           barracks: Soldatejo
           bunker: Bunkro armea
+          "yes": Armeo
         mountain_pass:
           "yes": Montpasejo
         natural:
@@ -730,11 +773,14 @@ eo:
           accountant: Oficejo de kontisto
           administrative: Administra oficejo
           architect: Oficejo de arĥitekturisto
+          association: Oficejo de asocio
           company: Oficejo de firmao
+          educational_institution: Oficejo de edukada institucio
           employment_agency: Dungoficejo
           estate_agent: Oficejo de nemoveblaĵisto
           government: Registara oficejo
           insurance: Asekurkompaniejo
+          it: Oficejo de informteĥnika firmao
           lawyer: Oficejo de leĝisto
           ngo: Oficejo de ne-registara organizaĵo
           telecommunication: Telekomunikada oficejo
@@ -742,9 +788,8 @@ eo:
           "yes": Oficejo
         place:
           allotments: Familiaj ĝardenoj
-          block: Bloko
-          airport: Flughaveno
           city: Urbego
+          city_block: Dombloko
           country: Lando
           county: Distrikto
           farm: Farmobieno
@@ -755,12 +800,13 @@ eo:
           islet: Insuleto
           isolated_dwelling: Solstaranta domo
           locality: Ejo
-          moor: Arbustetaro
           municipality: Municipo
           neighbourhood: Najbaraĵo
           postcode: Poŝtkodo
+          quarter: Kvartalo
           region: Regiono
           sea: Maro
+          square: Placo
           state: Provinco
           subdivision: Kvartalo
           suburb: Suburbo
@@ -772,10 +818,8 @@ eo:
           abandoned: Eksa fervojlinio
           construction: Fervojlinio konstruata
           disused: Forlasita fervojlinio
-          disused_station: Forlasita stacio fervoja
           funicular: Funikularo
           halt: Haltejo fervoja
-          historic_station: Fervoja stacidomo historia
           junction: Fervojnodo
           level_crossing: Traknivela pasejo (vojo)
           light_rail: Fervojo malpeza
@@ -801,6 +845,7 @@ eo:
           beauty: Beligejo
           beverages: Trinkaĵ-vendejo
           bicycle: Bicikl-vendejo
+          bookmaker: Vetperisto
           books: Libro-vendejo
           boutique: Mod-butiko
           butcher: Viand-vendejo
@@ -839,12 +884,16 @@ eo:
           hairdresser: Frizejo
           hardware: Laboril-vendejo
           hifi: Altfidel-son-vendejo
-          insurance: Asekurkompaniejo
+          houseware: Mastrum-aparata vendejo
+          interior_decoration: Ensembl-vendejo
           jewelry: Juvel-vendejo
           kiosk: Gazetbudo
+          kitchen: Kuirej-mebla vendejo
           laundry: Vestaĵ-lavejo (akvo)
+          lottery: Loteri-vendejo
           mall: Vendejaro
           market: Bazaro
+          massage: Kabineto de masaĝo
           mobile_phone: Poŝtelefon-vendejo
           motorcycle: Motorcikl-vendejo
           music: Muzik-vendejo
@@ -852,21 +901,27 @@ eo:
           optician: Optikbutiko
           organic: Ekologi-manĝaĵa vendejo
           outdoor: Vojaĝil-vendejo
+          paint: Farb-vendejo
+          pawnbroker: Lombardejo
           pet: Dombest-vendejo
           pharmacy: Apoteko
           photo: Fotovendejo
-          salon: Beligejo
+          seafood: Marfrukt-vendejo
           second_hand: Brokantejo
           shoes: Ŝuo-vendejo
-          shopping_centre: Vendejaro
           sports: Sportovendejo
           stationery: Papervaro-vendejo
           supermarket: Superbazaro
           tailor: Tajlorejo
+          ticket: Bilet-vendejo
+          tobacco: Tabak-vendejo
           toys: Ludil-vendejo
           travel_agency: Vojaĝ-oficejo
+          tyres: Pneŭ-vendejo
+          vacant: Forlasita vendejo
+          variety_store: Diversaĵ-vendejo
           video: Filmovendejo
-          wine: Alkohol-vendejo
+          wine: Vin-vendejo
           "yes": Vendejo
         tourism:
           alpine_hut: Montara kabano
@@ -890,6 +945,7 @@ eo:
           viewpoint: Belvidejo
           zoo: Bestoĝardeno
         tunnel:
+          building_passage: Trakonstruaĵa tunelo
           culvert: Subvoja konduktilo
           "yes": Tunelo
         waterway:
@@ -921,7 +977,7 @@ eo:
         level10: Limo de subkvartalo (niv.10)
     description:
       title:
-        osm_nominatim: Loko el <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Loko el <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Loko el <a href="http://www.geonames.org/">GeoNames</a>
       types:
@@ -995,14 +1051,14 @@ eo:
     legal_babble:
       title_html: Kopirajto kaj permesilo
       intro_1_html: |-
-        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> estas projekto de <i>malfermaj datumoj</i> eldonita sub la permesilo <a
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> estas projekto de <i>malfermaj datumoj</i> eldonita laŭ la permesilo <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data
+        href="https://opendatacommons.org/licenses/odbl/">Open Data
         Commons Open Database License</a> (ODbL) de la  <a
-        href="http://osmfoundation.org/">OpenStreetMap Fondaĵo</a> (OSMF).
+        href="http://osmfoundation.org/">Fondaĵo OpenStreetMap</a> (OSMF).
       intro_2_html: Vi rajtas kopii, disdoni, transdoni kaj modifi niajn datumojn,
         nur se vi atribuos aŭtorecon al OpenStreetMap kaj ĝiaj kontribuintoj. Se vi
         modifos aŭ uzos niajn datumojn, vi povos distribui la verkon laŭ la sama permesilo.
-        La plena <a href="http://opendatacommons.org/licenses/odbl/1.0/">interkonsento
+        La plena <a href="https://opendatacommons.org/licenses/odbl/1.0/">interkonsento
         de uzado</a> klarigas viajn rajtojn kaj devojn.
       intro_3_html: La kartografio de niaj map-kaheloj kaj nia dokumentaro estas disponeblaj
         laŭ la permesilo <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.eo">Krea
@@ -1011,8 +1067,8 @@ eo:
       credit_1_html: 'Ni postulas, ke vi markos: &ldquo;&copy; Kontribuintoj de OpenStreetMap&rdquo;.'
       credit_2_html: Vi ankaŭ devas klarigi, ke datumoj estas disponeblaj laŭ la permesilo
         Open Database License, kaj kartografio de map-kaheloj laŭ la permesilo CC
-        BY-SA. Vi povas indiki tion per fari ligilon al <a href="http://www.openstreetmap.org/copyright">ĉi
+        BY-SA. Vi povas indiki tion per fari ligilon al <a href="https://www.openstreetmap.org/copyright">tiu
-        tiu paĝo pri permesilo</a>. Alimaniere, se vi distribuas OSM en datuma formo,
+        ĉi paĝo pri permesilo</a>. Alimaniere, se vi distribuas OSM en datuma formo,
         vi povas mencii nomo(j)n kaj ligilo(j)n al la permesilo(j). Se ne estas eble
         meti ligilojn (ekz. en paperaj mapoj), ni sugestas direkti viajn legantojn
         al openstreetmap.org (eble meti plenan retadreson), al opendatacommons.org
@@ -1026,7 +1082,7 @@ eo:
       more_title_html: Sciiĝi pli
       more_1_html: |-
         Sciigu pli pri uzado de niaj datumoj kaj kiel atribui aŭtorecon ĉe la <a
-        href="http://osmfoundation.org/Licence">retpaĝo pri permesilo OSMF</a>.
+        href="https://osmfoundation.org/Licence">retpaĝo pri permesilo OSMF</a>.
       more_2_html: Kvankam la datumoj de OpenStreetMap estas liberaj, ni ne povas
         liveri senpagan API-on por eksteraj programistoj. Legu nian <a href="https://operations.osmfoundation.org/policies/api/">politikon
         pri uzado de API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">politikon
@@ -1037,9 +1093,9 @@ eo:
         inkludas datumoj laŭ malferma permesilo el landaj kartografiaj organizaĵoj
         kaj el aliaj fontoj, inter ili:'
       contributors_at_html: |-
-        <strong>Aŭstrujo</strong>: enhavas datumojn el <a href="http://data.wien.gv.at/">Stadt Wien</a> (laŭ <a href="http://creativecommons.org/licenses/by/3.0/at/deed.eo">CC BY</a>),
+        <strong>Aŭstrujo</strong>: enhavas datumojn el <a href="https://data.wien.gv.at/">Stadt Wien</a> (laŭ <a href="https://creativecommons.org/licenses/by/3.0/at/deed.eo">CC BY</a>),
-        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> kaj
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> kaj
-        Land Tirol (sub <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT kun postaj ŝanĝoj</a>).
+        Land Tirol (laŭ <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT kun postaj ŝanĝoj</a>).
       contributors_ca_html: |-
         <strong>Kanado</strong>: enhavas datumojn el
         GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -1048,12 +1104,12 @@ eo:
         Statistics Canada).
       contributors_fi_html: |-
         <strong>Suomujo</strong>: enhavas datumojn el
-        National Land Survey of Finland's Topographic Database kaj aliaj fontoj, laŭ la <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI permesilo</a>.
+        National Land Survey of Finland's Topographic Database kaj aliaj fontoj, laŭ la <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">permesilo NLSFI</a>.
       contributors_fr_html: '<strong>Francujo</strong>: enhavas datumojn ricevitajn
         el ''Direction Générale des Impôts''.'
       contributors_nl_html: |-
         <strong>Nederlando</strong>: enhavas datumojn el &copy; AND, 2007
-        (<a href="http://www.and.com">www.and.com</a>).
+        (<a href="https://www.and.com">www.and.com</a>).
       contributors_nz_html: '<strong>Nov-Zelando</strong>: enhavas datumojn ricevitajn
         el ''Land Information New Zealand''. Crown Copyright reserved.'
       contributors_si_html: |-
@@ -1068,8 +1124,8 @@ eo:
         Survey' &copy; Crown copyright and database right
         2010-12.
       contributors_footer_1_html: |-
-        Por pli da detaloj pri ĉi tiuj kaj aliaj fontoj uzitaj por plibonigi OpenStreetMap, bonvolu viziti la <a
+        Por pli da detaloj pri tiuj ĉi kaj aliaj fontoj uzitaj por plibonigi OpenStreetMap, bonvolu viziti la <a
-        href="http://wiki.openstreetmap.org/wiki/Contributors">paĝon pri kontribuintoj</a> en la OpenStreetMap-vikio.
+        href="https://wiki.openstreetmap.org/wiki/Contributors">paĝon pri kontribuintoj</a> en la OpenStreetMap-vikio.
       contributors_footer_2_html: Inkludo de datumoj en OpenStreetMap ne indikas,
         ke la provizanto de datumoj apogas OpenStreetMap, garantias por iu aŭ respondumas
         por iu.
@@ -1078,16 +1134,15 @@ eo:
         el iuj ajn fontoj protektataj de kopirajto (ekz. Google Maps aŭ paperaj mapoj)
         sen klara permeso de posedanto de kopirajtoj.
       infringement_2_html: Se ve pensas, ke datumoj protektataj per kopirajto estas
-        misaldonitaj al OpenStreetMap-datumbazo aŭ al ĉi tiu retejo, bonvolu legi
+        misaldonitaj al OpenStreetMap-datumbazo aŭ al tiu ĉi retejo, bonvolu legi
-        pri <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">proceduro
+        pri <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">proceduro
         de forigado de datumoj</a> aŭ plenigi la <a href="http://dmca.openstreetmap.org/">enretan
         formularon</a>.
       trademarks_title_html: <span id="trademarks"></span>Registritaj markoj
-      trademarks_1_html: OpenStreetMap, la piktogramo de grandiga lenso kaj 'State
+      trademarks_1_html: OpenStreetMap, la piktogramo de grandiga lenso kaj “State
-        of the Map' estas registritaj markoj de OpenStreetMap Fondaĵo. Se vi havas
+        of the Map” estas registritaj markoj de la Fondaĵo OpenStreetMap. Se vi havas
-        iujn demandojn pri uzado de niaj markoj, bonvolu sendi viajn demandojn al
+        iujn demandojn pri uzado de niaj markoj, bonvolu sciigi kun nia <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">politiko
-        la <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">grupo
+        pri varmarkoj</a>.
-        de laboro pri permesilo</a>.
   welcome_page:
     title: Bonvenon!
     introduction_html: Bonvenon al OpenStreetMap, la libera kaj redaktebla mapo de
@@ -1119,8 +1174,8 @@ eo:
       paragraph_1_html: "OpenStreetMap havas malmultajn formalajn regulojn, tamen
         ni esperas, ke ĉiuj kunlaboros kaj interparolos en la komunumo. Se vi planas
         iujn agadojn aliajn ol permanajn redaktojn, bonvolu legi la sekvajn rekomendojn
-        pri <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>enportadoj</a>
+        pri <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>enportoj</a>
-        kaj \n<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>aŭtomataj
+        kaj \n<a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>aŭtomataj
         redaktoj</a>."
     questions:
       title: Iaj demandoj?
@@ -1129,7 +1184,7 @@ eo:
         por ricevi helpon</a>.
     start_mapping: Ekigi mapigadon
     add_a_note:
-      title: Ĉu mankas al vi tempo por ridaktado? Aldonu rimarkon!
+      title: Ĉu mankas al vi tempo por redakti? Aldonu rimarkon!
       paragraph_1_html: Se vi volas nur korekti iun etan kaj vi ne havas tempon por
         registriĝi kaj lerni redaktadon, vi povas facile aldoni rimarkon.
       paragraph_2_html: Simple iru al <a href='%{map_url}'>la mapo</a> kaj alklaku
@@ -1153,7 +1208,7 @@ eo:
       title: Aliaj aferoj
       explanation_html: Se vi havas demandojn pri kial niaj datumoj aŭ enhavo estas
         uzataj, bonvolu ekkoni <a href='/copyright'>paĝon pri kopirajto</a> por pliaj
-        leĝaj informoj, aŭ kontaktu la <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF-laborgrupon</a>.
+        leĝaj informoj, aŭ kontaktu la <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF-laborgrupon</a>.
   help_page:
     title: Akiri helpon
     introduction: OpenStreetMap havas kelkajn ejojn por lerni pri la projekto, por
@@ -1163,7 +1218,7 @@ eo:
       title: Bonvenon al OSM
       description: Komencu ekde ĉi tiu manlibreto ampleksanta fundamentojn de OpenStreetMap.
     beginners_guide:
-      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
       title: Manlibro por komencantoj
       description: Manlibro por komencantoj kreata de la komunumo (en la angla).
     help:
@@ -1203,8 +1258,8 @@ eo:
       kaj ĝisdatigaj.
     community_driven_title: Kondukata de komunumo
     community_driven_html: |-
-      La komunumo de OpenStreetMap estas diversa, pasia kaj kreskas tagon post tago. Inter niaj kontribuantoj estas ŝatantoj de mapoj, profesiuloj de GIS, inĝenieroj prizorgantaj OSM-servilojn, helpistoj kiuj mapas areojn tuŝitajn de katastrofoj kaj multaj aliaj. Por sciigi pli pri la komunumo, vidu <a href='https://blog.openstreetmap.org'>taglibron OpenStreetMap</a>, <a href='%{diary_path}'>taglibrojn de uzantoj</a>,
+      La komunumo de OpenStreetMap estas diversa, pasia kaj kreskas tagon post tago. Inter niaj kontribuantoj estas ŝatantoj de mapoj, profesiuloj de GIS, inĝenieroj prizorgantaj OSM-servilojn, helpistoj kiuj mapigas areojn tuŝitajn de katastrofoj kaj multaj aliaj. Por sciigi pli pri la komunumo, vidu <a href='https://blog.openstreetmap.org'>taglibron OpenStreetMap</a>, <a href='%{diary_path}'>taglibrojn de uzantoj</a>,
-      <a href='http://blogs.openstreetmap.org/'>komunumajn taglibrojn</a> kaj la retpaĝon de <a href='http://www.osmfoundation.org/'>OSM Fondaĵo</a>.
+      <a href='https://blogs.openstreetmap.org/'>komunumajn taglibrojn</a> kaj la retpaĝon de la <a href='https://www.osmfoundation.org/'>Fondaĵo OSM</a>.
     open_data_title: Malfermaj datumoj
     open_data_html: 'OpenStreetMap estas <i>malfermaj datumoj</i>: vi povas uzi ĝin
       kiamaniere vi volas sub la kondiĉo de vi atribuos aŭtorecon al OpenStreetMap
@@ -1212,12 +1267,10 @@ eo:
       la verkon nur laŭ la sama permesilo. Vidu la <a href=''%{copyright_path}''>paĝon
       pri kopirajto kaj permesilo</a> por pli da detaloj.'
     legal_title: Leĝaj demandoj
-    legal_html: Ĉi tiu retejo kaj aliaj servoj estas formale administrataj de la <a
+    legal_html: |-
-      href='http://osmfoundation.org/'>OpenStreetMap Fondaĵo</a> (OSMF) komisie de
+      Tiu ĉi retejo kaj aliaj servoj estas formale administrataj de la <a href='https://osmfoundation.org/'>Fondaĵo OpenStreetMap</a> (OSMF) komisie de la komunumo. Uzado de ĉiuj OSMF-servoj estas regulata per nia <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">politiko de uzado</a> kaj nia <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">politiko de privateco</a>. Bonvolu <a href='https://osmfoundation.org/Contact'>kontakti kun OSMF</a>, se vi havas iun demandon pri permesilo, kopirajto aŭ leĝo.
-      la komunumo. Uzado de ĉiuj OSMF-servoj estas regulata per <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Politiko
+      <br>
-      de uzado</a> kaj nia <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Politiko
+      OpenStreetMap, la piktogramo de lupeo kaj “State of the Map” estas <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registritaj varmarkoj de OSMF</a>.
-      de privateco</a>. Bonvolu <a href='http://osmfoundation.org/Contact'>kontakti
-      kun OSMF</a>, se vi havas iun demandon pri permesilo, kopirajto aŭ leĝo.
     partners_title: Kunlaborantoj
   notifier:
     diary_comment_notification:
@@ -1418,14 +1471,14 @@ eo:
         kiel publikan ĉe via %{user_page}.
       user_page_link: uzantpaĝo
       anon_edits_link_text: Tie ĉi vi sciiĝis kiel.
-      flash_player_required: Por uzi laOpenStreetMap-redaktilon 'Potlatch', vi bezonas
+      flash_player_required: Por uzi la OpenStreetMap-redaktilon 'Potlatch', vi bezonas
-        la kromprogramon Flash. Vi povas <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">elŝuti
+        la kromprogramon Flash. Vi povas <a href="https://get.adobe.com/flashplayer/">elŝuti
-        Flash Player el Adobe.com retpaĝo</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Kelkaj
+        Flash Player el retpaĝo de Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Kelkaj
         aliaj redaktiloj</a> estas disponeblaj por redakti OpenStreetMap.
       potlatch_unsaved_changes: Vi havas nekonservitajn ŝanĝojn. (Por konservi ŝanĝojn
         en Potlatch, malelektu nune elektitan linion aŭ punkton se vi redaktas en
         'rekta reĝimo', aŭ alklaku butonon 'konservi', se ĝi videblas.)
-      potlatch2_not_configured: Potlatch 2 ne estas agordita - vidu http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
+      potlatch2_not_configured: Potlatch 2 ne estas agordita - legu https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
         por pli da informoj
       potlatch2_unsaved_changes: Vi havas nekonservitajn ŝanĝojn. (Por konservi ilin
         en Potlatch 2, alklaku 'konservi'.)
@@ -1444,6 +1497,7 @@ eo:
       where_am_i: Kie estas tio ĉi?
       where_am_i_title: Trovas la nunan pozicion per la foliumilo
       submit_text: Ek
+      reverse_directions_text: Inversigi direkton
     key:
       table:
         entry:
@@ -1518,7 +1572,7 @@ eo:
       edit: Redakti
       preview: Antaŭvidi
     markdown_help:
-      title_html: Sintakse analizita per <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Sintakse analizita per <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
       headings: Titoloj
       heading: Titolo
       subheading: Subtitolo
@@ -1625,8 +1679,8 @@ eo:
       public_traces_from: Publikaj GPS-spuroj de %{user}
       description: Montri lastajn GPS-spurojn
       tagged_with: etikedita kun %{tags}
-      empty_html: Ankoraŭ neniu estas tie ĉi.. <a href='%{upload_link}'>Alŝutu novan
+      empty_html: Ankoraŭ nenio estas tie ĉi. <a href='%{upload_link}'>Alŝutu novan
-        spuron</a> aŭ lernu pli pri GPS-spurado ĉe la <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>viki-paĝo</a>.
+        spuron</a> aŭ sciigu pli pri GPS-spurado ĉe la <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>viki-paĝo</a>.
     delete:
       scheduled_for_deletion: Spuro forviŝota
     make_public:
@@ -1833,11 +1887,11 @@ eo:
         html: <p>Kontraste kun aliaj mapoj, OpenStreetMap estas tute kreata de homoj
           kiel vi, kaj iu ajn povas korekti, ĝisdatigi, elŝuti kaj uzi ĝin.</p> <p>Registriĝu
           por komenci kontribuadon. Ni sendos al vi retleteron por konfirmi vian konton.</p>
-      license_agreement: Kiam vi konfirmos vian konton, vi devos akcepti la <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">interkonsenton
+      license_agreement: Kiam vi konfirmos vian konton, vi devos akcepti la <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">interkonsenton
         pri kontribuado</a>.
       email address: 'Retpoŝtadreso:'
       confirm email address: 'Konfirmi retpoŝtadreson:'
-      not displayed publicly: Via adreso ne estos montrata publike, vidu nian <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy"
+      not displayed publicly: Via adreso ne estos montrata publike, vidu nian <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
         title="OSMF-a politiko pri privateco enhavanta sekcio pri retpoŝta adreso">politikon
         pri privateco</a> por pli da informoj.
       display name: 'Montrata nomo:'
@@ -1958,12 +2012,12 @@ eo:
       email never displayed publicly: (neniam publike montrita)
       external auth: 'Ekstera aŭtentigo:'
       openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: kio estas tio?
       public editing:
         heading: 'Publika redaktado:'
         enabled: Ebligita. Ne anonima kaj rajtas redakti.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: Kio estas tio ?
         disabled: Malebligita kaj ne rajtas redakti, ĉiuj antaŭaj redaktoj naŭ estas
           publikaj.
@@ -1973,9 +2027,9 @@ eo:
         text: Nuntempe viaj redaktoj estas anonimaj kaj aliuloj ne povas sendi mesaĝojn
           al vi kaj vidi vian lokon. Por montri kion vi redaktis kaj ebligi al aliuloj
           kontakti vin per la retejo, alklaku la butonon sube. <b>Ekde la versio 0.6
-          de API, nur publikaj uzantoj povas redakti map-datumojn.</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">sciiĝi
+          de API, nur publikaj uzantoj povas redakti map-datumojn.</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">sciiĝi
-          kial</a>).<ul><li>Via retpoŝta adreso ne estos publikigita.</li><li>Ĉi tio
+          kial</a>).<ul><li>Via retpoŝta adreso ne estos publikigita.</li><li>Tiu
-          ago ne povos esti malfarita kaj ĉiuj novaj uzantoj estas publikaj implicite.</li></ul>
+          ĉi ago ne povos esti malfarita kaj ĉiuj novaj uzantoj estas publikaj implicite.</li></ul>
       contributor terms:
         heading: 'Interkonsento pri kontribuado:'
         agreed: Vi konsentis la novan interkonsenton pri kontribuado.
@@ -2302,7 +2356,7 @@ eo:
       createnote_disabled_tooltip: Pligrandigu por aldoni rimarkon al la mapo
       map_notes_zoom_in_tooltip: Pligrandigu por vidi map-rimarkoj
       map_data_zoom_in_tooltip: Pligrandigu por vidi map-datumoj
-      queryfeature_tooltip: Montri informoj pri objekto
+      queryfeature_tooltip: Montri informojn pri objekto
       queryfeature_disabled_tooltip: Pligrandigu por montri informojn pri objektoj
     changesets:
       show:
@@ -2334,7 +2388,7 @@ eo:
       ascend: Supreniro
       engines:
         graphhopper_bicycle: Bicikle (GraphHopper)
-        graphhopper_car: Aŭto (GraphHopper)
+        graphhopper_car: Aŭte (GraphHopper)
         graphhopper_foot: Piede (GraphHopper)
         mapquest_bicycle: Bicikle (MapQuest)
         mapquest_car: Aŭte (MapQuest)
@@ -2350,7 +2404,16 @@ eo:
         continue_without_exit: Antaŭen al %{name}
         slight_right_without_exit: Ete dekstren al %{name}
         offramp_right_without_exit: Veturu la elveturejon dekstre al %{name}
+        offramp_right_with_directions: Direktiĝu al enveturejo dekstre direkte al
+          %{directions}
+        offramp_right_with_name_and_directions: Direktiĝu al enveturejo %{name}ĉe
+          dekstre direkte al %{directions}
+        offramp_right_without_directions: Direktiĝu al enveturejo ĉe dekstre
         onramp_right_without_exit: Turniĝu dekstren al la elveturejo al %{name}
+        onramp_right_with_directions: Dekstren al enveturejo direkte al %{directions}
+        onramp_right_with_name_and_directions: Dekstren al enveturejo %{name} direkte
+          al %{directions}
+        onramp_right_without_directions: Dekstren al enveturejo
         endofroad_right_without_exit: Ĉe la fino de la vojo turniĝu dekstren al %{name}
         merge_right_without_exit: Turniĝu dekstren al %{name}
         fork_right_without_exit: Ĉe la vojforko turniĝu dekstren al %{name}
@@ -2360,7 +2423,16 @@ eo:
         sharp_left_without_exit: Ege maldekstren al %{name}
         turn_left_without_exit: Turniĝu maldekstren al %{name}
         offramp_left_without_exit: Veturu la elveturejon maldekstre al %{name}
+        offramp_left_with_directions: Direktiĝu al enveturejo maldekstre direkte al
+          %{directions}
+        offramp_left_with_name_and_directions: Direktiĝu al enveturejo %{name}ĉe maldekstre
+          direkte al %{directions}
+        offramp_left_without_directions: Direktiĝu al enveturejo ĉe maldekstre
         onramp_left_without_exit: Turniĝu maldekstren al la elveturejo al %{name}
+        onramp_left_with_directions: Maldekstren al enveturejo direkte al %{directions}
+        onramp_left_with_name_and_directions: Maldekstren al enveturejo %{name} direkte
+          al %{directions}
+        onramp_left_without_directions: Maldekstren al enveturejo
         endofroad_left_without_exit: Ĉe la fino de la vojo turniĝu maldekstren al
           %{name}
         merge_left_without_exit: Turniĝu maldekstren al %{name}
@@ -2368,10 +2440,10 @@ eo:
         slight_left_without_exit: Ete maldekstren al %{name}
         via_point_without_exit: (tra punkto)
         follow_without_exit: Sekvu %{name}
-        roundabout_without_exit: Ĉe trafikcirklo al %{name}
+        roundabout_without_exit: Ĉe trafikcirklo al elveturejo %{name}
         leave_roundabout_without_exit: Elveturu el trafikcirklo - %{name}
         stay_roundabout_without_exit: Sekvu la trafikcirklon - %{name}
-        start_without_exit: Komencu ĉe la fino de %{name}
+        start_without_exit: Komencu ĉe %{name}
         destination_without_exit: Celo atingita
         against_oneway_without_exit: Iru kontraŭ-direkte al %{name}
         end_oneway_without_exit: Fino de unuflanka vojo ĉe %{name}

config/locales/es.yml

@@ -26,6 +26,7 @@
 # Author: Locos epraix
 # Author: Luzcaru
 # Author: Macofe
+# Author: MarcoAurelio
 # Author: McDutchie
 # Author: Mor
 # Author: Nemo bis
@@ -441,11 +442,14 @@ es:
           chair_lift: Telesilla
           drag_lift: Telearrastre
           gondola: Telecabina
+          platter: Telesquí
           station: Estación de remonte
         aeroway:
           aerodrome: Aeródromo
+          airstrip: Aeródromo
           apron: Pista
           gate: Puerta
+          hangar: Hangar
           helipad: Helipuerto
           runway: Pista
           taxiway: Calle de rodaje
@@ -481,37 +485,31 @@ es:
           crematorium: Crematorio
           dentist: Dentista
           doctors: Consultorio médico
-          dormitory: Residencia de estudiantes
           drinking_water: Agua potable
           driving_school: Autoescuela
           embassy: Embajada
-          emergency_phone: Teléfono de emergencia
           fast_food: Comida rápida
           ferry_terminal: Terminal de ferrys
-          fire_hydrant: Hidrante
           fire_station: Parque de bomberos
           food_court: Zona de restaurantes
           fountain: Fuente
           fuel: Gasolinera
           gambling: Juegos de azar
           grave_yard: Cementerio
-          gym: Gimnasio
-          health_centre: Centro de salud
           hospital: Hospital
           hunting_stand: Apostadero de caza
           ice_cream: Heladería
           kindergarten: Escuela infantil/guardería
           library: Biblioteca
-          market: Mercado
           marketplace: Mercado
           monastery: Monasterio
           motorcycle_parking: Estacionamiento para motocicletas
           nightclub: Club nocturno
-          nursery: Enfermería
           nursing_home: Residencia para la tercera edad
           office: Oficina
           parking: Aparcamiento
           parking_entrance: Entrada de estacionamiento
+          parking_space: Estacionamiento
           pharmacy: Farmacia
           place_of_worship: Templo
           police: Policía
@@ -521,7 +519,6 @@ es:
           prison: Prisión
           pub: Pub
           public_building: Edificio público
-          reception_area: Área de recepción
           recycling: Punto de reciclaje
           restaurant: Restaurante
           retirement_home: Residencia de jubilados
@@ -573,20 +570,25 @@ es:
           "yes": Tienda de artesanía
         emergency:
           ambulance_station: Base de ambulancias
+          assembly_point: Punto de reunión
           defibrillator: Desfibrilador
           landing_site: Lugar de aterrizaje de emergencia
           phone: Teléfono de emergencia
+          water_tank: Tanque de agua de emergencia
+          "yes": Emergencia
         highway:
           abandoned: Calle o carretera abandonada
           bridleway: Camino prioritario para peatones y caballos
           bus_guideway: Canal guiado de autobuses
           bus_stop: Parada de autobuses
           construction: Calle o carretera en construcción
+          corridor: Corredor
           cycleway: Bicisenda
           elevator: Ascensor
           emergency_access_point: Acceso de emergencia
           footway: Sendero
           ford: Vado
+          give_way: Señal de ceda el paso
           living_street: Calle residencial
           milestone: Hito
           motorway: Autovía
@@ -608,6 +610,7 @@ es:
           services: Vía de servicio
           speed_camera: Radar
           steps: Escaleras
+          stop: Señal de alto
           street_lamp: Farola
           tertiary: Carretera terciaria
           tertiary_link: Carretera terciaria
@@ -617,7 +620,6 @@ es:
           trunk: Vía rápida
           trunk_link: Enlace de vía rápida
           unclassified: Carretera sin clasificar
-          unsurfaced: Vía no pavimentada
           "yes": Camino
         historic:
           archaeological_site: Yacimiento arqueológico
@@ -636,6 +638,7 @@ es:
           manor: Casa señorial
           memorial: Memorial
           mine: Mina
+          mine_shaft: Pozo minero
           monument: Monumento
           roman_road: Calzada romana
           ruins: Ruinas
@@ -645,6 +648,7 @@ es:
           wayside_cross: Crucero
           wayside_shrine: Sepulcro
           wreck: Pecio
+          "yes": Sitio histórico
         junction:
           "yes": Intersección
         landuse:
@@ -682,7 +686,6 @@ es:
         leisure:
           beach_resort: Complejo en la playa
           bird_hide: Observatorio de aves
-          club: Club
           common: Terreno común
           dog_park: Parque canino
           fishing: Área de pesca
@@ -709,15 +712,35 @@ es:
           water_park: Parque acuático
           "yes": Ocio
         man_made:
+          beehive: Colmena
+          breakwater: Rompeolas
+          bridge: Puente
+          bunker_silo: Búnker
+          chimney: Chimenea
+          dyke: Dique
+          embankment: Terraplén
+          gasometer: Depósito de gas
+          groyne: Espigón
           lighthouse: Faro
+          mine: Mina
+          mineshaft: Pozo minero
+          petroleum_well: Pozo petrolífero
+          pier: Muelle
           pipeline: Tubería
+          silo: Silo
+          surveillance: Vigilancia
           tower: Torre
+          wastewater_plant: Planta de tratamiento de aguas
+          watermill: Molino hidráulico
+          water_well: Pozo
+          windmill: Molino de viento
           works: Fábrica
           "yes": Artificial
         military:
           airfield: Aeródromo militar
           barracks: Barracas
           bunker: Búnker
+          "yes": Ejército
         mountain_pass:
           "yes": Paso de montaña
         natural:
@@ -763,7 +786,9 @@ es:
           accountant: Contable
           administrative: Administración
           architect: Arquitecto
+          association: Asociación
           company: Empresa
+          educational_institution: Institución educativa
           employment_agency: Agencia de empleo
           estate_agent: Inmobiliaria
           government: Oficina gubernamental
@@ -775,9 +800,8 @@ es:
           "yes": Oficina
         place:
           allotments: Parcelas
-          block: Bloque
-          airport: Aeropuerto
           city: Ciudad
+          city_block: Manzana
           country: País
           county: Condado
           farm: Granja
@@ -788,12 +812,12 @@ es:
           islet: Islote
           isolated_dwelling: Vivienda aislada
           locality: Paraje
-          moor: Páramo
           municipality: Municipio
           neighbourhood: Barrio
           postcode: Código postal
           region: Región
           sea: Mar
+          square: Plaza
           state: Estado o provincia
           subdivision: Subdivisión
           suburb: Suburbio
@@ -805,10 +829,8 @@ es:
           abandoned: Ferrocarril abandonado
           construction: Vía ferroviaria en construcción
           disused: Ferrocarril en desuso
-          disused_station: Estación de tren en desuso
           funicular: Vía de funicular
           halt: Apeadero
-          historic_station: Estación de tren histórica
           junction: Encrucijada de vías ferroviarias
           level_crossing: Paso a nivel
           light_rail: Metro ligero
@@ -834,6 +856,7 @@ es:
           beauty: Salón de belleza
           beverages: Tienda de bebidas
           bicycle: Tienda de bicicletas
+          bookmaker: Casa de apuestas
           books: Librería
           boutique: Boutique
           butcher: Carnicería
@@ -872,12 +895,14 @@ es:
           hairdresser: Peluquería
           hardware: Ferretería
           hifi: Hi-Fi
-          insurance: Aseguradora
+          interior_decoration: Decoración de interiores
           jewelry: Joyería
           kiosk: Quiosco
           laundry: Lavandería
+          lottery: Lotería
           mall: Centro comercial
           market: Mercado
+          massage: Masaje
           mobile_phone: Tienda de telefonía
           motorcycle: Tienda de motocicletas
           music: Tienda de música
@@ -885,21 +910,22 @@ es:
           optician: Óptica
           organic: Tienda de alimentos orgánicos
           outdoor: Tienda de deportes de aventura
+          pawnbroker: Casa de empeños
           pet: Tienda de mascotas
           pharmacy: Farmacia
           photo: Tienda de fotografía
-          salon: Salón de belleza
+          seafood: Mariscos
           second_hand: Tienda de segunda mano
           shoes: Zapatería
-          shopping_centre: Centro comercial
           sports: Tienda de deportes
           stationery: Papelería
           supermarket: Supermercado
           tailor: Sastre
+          tobacco: Tabaquería
           toys: Juguetería
           travel_agency: Agencia de viajes
           video: Videoclub
-          wine: Vinoteca
+          wine: Vinatería
           "yes": Tienda
         tourism:
           alpine_hut: Refugio de montaña
@@ -1113,10 +1139,10 @@ es:
         de descolgado</a> o preséntelo directamente en nuestra <a href="http://dmca.openstreetmap.org/">página
         de presentación en línea</a>.
       trademarks_title_html: <span id="trademarks"></span>Marcas registradas
-      trademarks_1_html: OpenStreetMap, el logotipo de la lupa y el estado del mapa
+      trademarks_1_html: OpenStreetMap, el logotipo de la lupa y «State of the Map»
         son marcas registradas de la Fundación OpenStreetMap. Si tienes preguntas
-        sobre su uso, envíalas al <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">grupo
+        sobre su uso, consulta nuestra <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">normativa
-        de trabajo sobre licencias</a>.
+        de marcas registradas</a>.
   welcome_page:
     title: ¡Bienvenido!
     introduction_html: Bienvenido a OpenStreetMap, el mapa libre y editable del mundo.
@@ -1254,13 +1280,15 @@ es:
       página sobre Derechos de autor y Licencia</a> para obtener más detalles.'
     legal_title: Legal
     legal_html: "Este sitio y muchos otros servicios relacionados son gestionados
-      por la  \n<a href='http://osmfoundation.org/'>Fundación OpenStreetMap</a> (OSMF)
+      formalmente por la  \n<a href='https://osmfoundation.org/'>Fundación OpenStreetMap</a>
-      \nen nombre de la comunidad. El uso de todos los servicios gestionados por la
+      (OSMF) \nen nombre de la comunidad. El uso de todos los servicios gestionados
-      OSMF está sujeto \na nuestra <a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nnormativa
+      por la OSMF está sujeto \na nuestra <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nnormativa
-      de uso aceptable</a> y nuestra <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">normativa
+      de uso aceptable</a> y nuestra <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">normativa
-      de privacidad</a>\n<br> \n<a href='http://osmfoundation.org/Contact'>Contacta
+      de privacidad</a>\n<br> \n<a href='http://osmfoundation.org/Contact'>Ponte en
-      con la OSMF</a> \nsi tienes preguntas o problemas sobre licencias, derechos
+      contacto con la OSMF</a> \nsi tienes preguntas sobre licencias, derechos de
-      de autor u otro tema legal."
+      autor u otra cuestión legal.\n<br>\nOpenStreetMap, el logotipo de la lupa y
+      «State of the Map» son <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">marcas
+      registradas de la OSMF</a>."
     partners_title: Socios
   notifier:
     diary_comment_notification:
@@ -2453,10 +2481,10 @@ es:
         slight_left_without_exit: Gire un poco a la izquierda hacia %{name}
         via_point_without_exit: (punto intermedio)
         follow_without_exit: Siga %{name}
-        roundabout_without_exit: En la rotonda, tomar %{name}
+        roundabout_without_exit: En la rotonda, tomar salida hacia %{name}
         leave_roundabout_without_exit: Salir de la rotonda - %{name}
         stay_roundabout_without_exit: Permanecer en la rotonda - %{name}
-        start_without_exit: Iniciar al final de %{name}
+        start_without_exit: Comenzar en %{name}
         destination_without_exit: Llegue a su destino
         against_oneway_without_exit: Ir en contra de una vía de un solo sentido en
           %{name}

config/locales/et.yml

@@ -428,25 +428,20 @@ et:
           crematorium: Krematoorium
           dentist: Hambaarst
           doctors: Arstid
-          dormitory: Ühiselamu
           drinking_water: Joogivesi
           driving_school: Autokool
           embassy: Saatkond
-          emergency_phone: Hädaabi telefon
           fast_food: Kiirtoit
           ferry_terminal: Praamiterminal
-          fire_hydrant: Tuletõrjehüdrant
           fire_station: Tuletõrjedepoo
           fountain: Purskkaev
           fuel: Kütus
           grave_yard: Surnuaed
-          health_centre: Tervisekeskus
           hospital: Haigla
           hunting_stand: Jahikantsel
           ice_cream: Jäätis
           kindergarten: Lasteaed
           library: Raamatukogu
-          market: Turg
           marketplace: Turg
           monastery: Klooster
           nightclub: Ööklubi
@@ -462,7 +457,6 @@ et:
           prison: Vangla
           pub: Pubi
           public_building: Ühiskondlik hoone
-          reception_area: Vastuvõtt
           recycling: Jäätmekäitluspunkt
           restaurant: Restoran
           retirement_home: Vanadekodu
@@ -530,7 +524,6 @@ et:
           street_lamp: Tänavavalgusti
           tertiary: Kohalik maantee
           traffic_signals: Valgusfoor
-          unsurfaced: Katteta tee
           "yes": Tee
         historic:
           battlefield: Lahinguväli
@@ -574,7 +567,6 @@ et:
           vineyard: Viinamarjaistandus
           "yes": Maakasutus
         leisure:
-          club: Klubi
           dog_park: Koerapark
           fishing: Kalapüügipiirkond
           garden: Aed
@@ -646,7 +638,6 @@ et:
           travel_agent: Reisibüroo
         place:
           allotments: Suvilad
-          airport: Lennujaam
           city: Linn
           country: Riik
           county: Maakond
@@ -655,7 +646,6 @@ et:
           houses: Majad
           island: Saar
           islet: Saareke
-          moor: Raba
           municipality: Vald
           postcode: Sihtnumber
           sea: meri
@@ -667,10 +657,8 @@ et:
           abandoned: Ülesvõetud raudtee
           construction: Ehitusjärgus raudtee
           disused: Mahajäetud raudtee
-          disused_station: Mahajäetud raudteejaam
           funicular: Köisraudtee
           halt: Rongipeatus
-          historic_station: Ajalooline raudteejaam
           junction: Raudtee ülekäigukoht
           level_crossing: Raudtee ülesõidukoht
           light_rail: Kergraudtee
@@ -725,7 +713,6 @@ et:
           grocery: Toidupood
           hairdresser: Juuksur
           hardware: Rauakauplus
-          insurance: Kindlustus
           jewelry: Juveelipood
           kiosk: Kiosk
           laundry: Pesumaja
@@ -740,9 +727,7 @@ et:
           pet: Lemmikloomapood
           pharmacy: Apteek
           photo: Fotopood
-          salon: Ilusalong
           shoes: Kingapood
-          shopping_centre: Kaubanduskeskus
           sports: Spordipood
           stationery: Kirjatarvete kauplus
           supermarket: Supermarket

config/locales/eu.yml

@@ -453,33 +453,26 @@ eu:
           crematorium: Erraustegia
           dentist: Dentista
           doctors: Medikuak
-          dormitory: Ikasle egoitza
           drinking_water: Edateko ura
           driving_school: Autoeskola
           embassy: Enbaxada
-          emergency_phone: Larrialdi Telefonoa
           fast_food: Janari Azkarra
           ferry_terminal: Ferry Terminala
-          fire_hydrant: Suteetako ur-hartunea
           fire_station: Suhiltzaile Egoitza
           food_court: Jatetxe-eremua
           fountain: Iturria
           fuel: Gasolindegia
           gambling: Jokoak
           grave_yard: Hilerria
-          gym: Fitness Zentroa / Gimnasioa
-          health_centre: Osasun Zentroa
           hospital: Ospitalea
           hunting_stand: Ehiza postua
           ice_cream: Izozkiak
           kindergarten: Haurtzaindegia
           library: Liburutegia
-          market: Merkatu
           marketplace: Merkatua
           monastery: Monastegia
           motorcycle_parking: Motorrentzako aparkalekua
           nightclub: Gau-kluba
-          nursery: Haurtzaindegia
           nursing_home: Zaharren egoitza
           office: Bulegoa
           parking: Aparkalekua
@@ -493,7 +486,6 @@ eu:
           prison: Espetxea
           pub: Pub-a
           public_building: Eraikin publiko
-          reception_area: Harrera lekua
           recycling: Birziklatze gune
           restaurant: Jatetxea
           retirement_home: Nagusien etxea
@@ -589,7 +581,6 @@ eu:
           trunk: Errepide nagusia
           trunk_link: Errepide nagusia
           unclassified: Sailkatu gabeko errepidea
-          unsurfaced: Asfaltatu gabeko errepidea
           "yes": Errepidea
         historic:
           archaeological_site: Aztarnategi arkeologikoa
@@ -654,7 +645,6 @@ eu:
         leisure:
           beach_resort: Hondartza Konplexua
           bird_hide: Hegazti Aterpea
-          club: Kluba
           common: Lur Komunak
           dog_park: Txakurrentzako Parkea
           fishing: Arrantza Lekua
@@ -747,8 +737,6 @@ eu:
           "yes": Bulegoa
         place:
           allotments: Alokatutako baratzeak
-          block: Blokea
-          airport: Aireportua
           city: Hiria
           country: Herrialdea
           county: Konderria
@@ -760,7 +748,6 @@ eu:
           islet: Uhartea
           isolated_dwelling: Etxebizitza isolatua
           locality: Lokalitatea
-          moor: Mortua
           municipality: Udalerria
           neighbourhood: Auzoa
           postcode: Posta-kodea
@@ -777,10 +764,8 @@ eu:
           abandoned: Abandonatutako Trenbidea
           construction: Eraikitze-lanetan dagoen trenbidea
           disused: Erabili gabeko trenbidea
-          disused_station: Erabili gabeko tren geltokia
           funicular: Funikularra
           halt: Tren Geralekua
-          historic_station: Tren Geltoki Historikoa
           junction: Trenbide lotunea
           level_crossing: Trenbide-pasagunea
           light_rail: Tren arina
@@ -844,7 +829,6 @@ eu:
           hairdresser: Ileapaindegia
           hardware: Hardware-denda
           hifi: Hi-Fi
-          insurance: Aseguruak
           jewelry: Bitxi-denda
           kiosk: Kioskoa
           laundry: Garbitegia
@@ -860,10 +844,8 @@ eu:
           pet: Animalia-denda
           pharmacy: Farmazia
           photo: Argazki-denda
-          salon: Apaindegia
           second_hand: Bigarren eskuko denda
           shoes: Zapatadenda
-          shopping_centre: Merkataritza-gunea
           sports: Kirol denda
           stationery: Paper-denda
           supermarket: Supermerkatua

config/locales/fa.yml

@@ -460,33 +460,26 @@ fa:
           crematorium: کوره
           dentist: دندانپزشکی
           doctors: پزشکان
-          dormitory: خوابگاه
           drinking_water: آب آشامیدنی
           driving_school: آموزشگاه رانندگی
           embassy: سفارت
-          emergency_phone: تلفن اضطراری
           fast_food: غذای آماده
           ferry_terminal: پایانه کشتی
-          fire_hydrant: شیر آتش‌نشانی
           fire_station: آتش‌نشانی
           food_court: پذيرايي
           fountain: چشمه
           fuel: پمپ بنزین
           gambling: قمار
           grave_yard: محوطهٔ گورستان
-          gym: مرکز تناسب اندام / ورزشگاه
-          health_centre: مركز بهداشت
           hospital: بیمارستان
           hunting_stand: شکارگاه
           ice_cream: بستنی فروشی
           kindergarten: کودکستان
           library: کتابخانه
-          market: بازار
           marketplace: بازار
           monastery: صومعه
           motorcycle_parking: پارکینگ موتور سیکلت
           nightclub: باشگاه شبانه
-          nursery: شیر خوارگاه
           nursing_home: خانه سالمندان
           office: دفتر
           parking: پارکینگ
@@ -500,7 +493,6 @@ fa:
           prison: زندان
           pub: میخانه
           public_building: ساختمان عمومی
-          reception_area: محوطه پذیرش
           recycling: نقطه بازیافت
           restaurant: رستوران
           retirement_home: خانه ی بازنشستگی
@@ -596,7 +588,6 @@ fa:
           trunk: بزرگراه
           trunk_link: بزرگراه
           unclassified: جادهٔ طبقه‌بندی‌نشده
-          unsurfaced: جاده ظاهر نشده
           "yes": جاده
         historic:
           archaeological_site: پایگاه باستان‌شناسی
@@ -661,7 +652,6 @@ fa:
         leisure:
           beach_resort: تفریحگاه ساحلی
           bird_hide: محل مشاهده ی پرندگان
-          club: کلوپ
           common: سرزمین مشترک
           dog_park: پارک سگ
           fishing: منطقهٔ ماهی‌گیری
@@ -754,8 +744,6 @@ fa:
           "yes": دفتر
         place:
           allotments: سهم
-          block: بستن
-          airport: فرودگاه
           city: شهر بزرگ
           country: کشور
           county: شهرستان
@@ -767,7 +755,6 @@ fa:
           islet: جزیره کوچک
           isolated_dwelling: خانه پیش ساخته
           locality: محل
-          moor: دشت
           municipality: شهرداری
           neighbourhood: محله
           postcode: کدپستی
@@ -784,10 +771,8 @@ fa:
           abandoned: راه‌آهن رهاشده
           construction: راه‌آهن در دست ساخت
           disused: راه‌آهن منسوخ
-          disused_station: ایستگاه منسوخ راه‌آهن
           funicular: راه‌آهن کابلی
           halt: ایستگاه قطار
-          historic_station: ایستگاه تاریخی راه‌آهن
           junction: اتصال راه‌آهن
           level_crossing: محل تقاطع دو خط راه‌آهن
           light_rail: ریل سبک
@@ -851,7 +836,6 @@ fa:
           hairdresser: سلمانی
           hardware: فروشگاه سخت افزار
           hifi: Hi-Fi
-          insurance: بیمه
           jewelry: فروشگاه طلا و جواهر
           kiosk: فروشگاه کیوسک
           laundry: خشکشویی
@@ -867,10 +851,8 @@ fa:
           pet: فروشگاه حیوانات خانگی
           pharmacy: داروخانه
           photo: فروشگاه عکس
-          salon: سالن زیبایی
           second_hand: سمساری
           shoes: فروشگاه کفش
-          shopping_centre: مرکز خرید
           sports: فروشگاه ورزشی
           stationery: فروشگاه لوازم التحریر
           supermarket: سوپرمارکت

config/locales/fi.yml

@@ -19,6 +19,7 @@
 # Author: Nemo bis
 # Author: Nike
 # Author: Olli
+# Author: Pahkiqaz
 # Author: Pyscowicz
 # Author: Ramilehti
 # Author: Ruila
@@ -431,12 +432,17 @@ fi:
           chair_lift: Tuolihissi
           drag_lift: Vetohissi
           gondola: Gondolihissi
+          platter: Hiihtohissi
           station: Ilmarata-asema
+          t-bar: Ankkurihissi
         aeroway:
           aerodrome: Lentokenttä
+          airstrip: Kiitorata
           apron: Asemataso
           gate: Portti
+          hangar: Hangaari
           helipad: Helikopterikenttä
+          parking_position: Parkkialue
           runway: Kiitorata
           taxiway: Rullaustie
           terminal: Terminaali
@@ -471,37 +477,31 @@ fi:
           crematorium: Krematorio
           dentist: Hammaslääkäri
           doctors: Lääkäreitä
-          dormitory: Asuntola
           drinking_water: Juomavesi
           driving_school: Autokoulu
           embassy: Lähetystö
-          emergency_phone: Hätäpuhelin
           fast_food: Pikaruokaravintola
           ferry_terminal: Lauttaterminaali
-          fire_hydrant: Paloposti
           fire_station: Paloasema
           food_court: Elintarviketori
           fountain: Lähde
           fuel: Polttoaine
           gambling: Uhkapelaus
           grave_yard: Hautausmaa
-          gym: Liikuntakeskus / kuntosali
-          health_centre: Terveyskeskus
           hospital: Sairaala
           hunting_stand: Metsästyslava
           ice_cream: Jäätelö
           kindergarten: Päiväkoti
           library: Kirjasto
-          market: Tori
           marketplace: Tori
           monastery: Luostari
           motorcycle_parking: Moottoripyöräpysäköinti
           nightclub: Yökerho
-          nursery: Päiväkoti
           nursing_home: Hoitokoti
           office: Toimisto
           parking: Parkkipaikka
           parking_entrance: Pysäköintialueen sisäänkäynti
+          parking_space: Parkkipaikka
           pharmacy: Apteekki
           place_of_worship: Kirkko, temppeli, pyhä paikka
           police: Poliisi
@@ -511,7 +511,6 @@ fi:
           prison: Vankila
           pub: Pubi
           public_building: Julkinen rakennus
-          reception_area: Vastaanottoalue
           recycling: Kierrätyspaikka
           restaurant: Ravintola
           retirement_home: Vanhainkoti
@@ -536,6 +535,7 @@ fi:
           village_hall: Kyläkoti
           waste_basket: Roskakori
           waste_disposal: Jätehuolto
+          water_point: vesipiste
           youth_centre: Nuorisokeskus
         boundary:
           administrative: Hallinnollinen raja
@@ -563,25 +563,31 @@ fi:
           "yes": Käsityömyymälä
         emergency:
           ambulance_station: Ensihoitoasema
+          assembly_point: kohtaamispaikka
           defibrillator: Defibrillaattori
           landing_site: Hätälaskualue
           phone: Hätäpuhelin
+          water_tank: hätävesitankki
+          "yes": Hätä
         highway:
           abandoned: Hylätty valtatie
           bridleway: Ratsastustie
           bus_guideway: Ohjattu linja-autokaista
           bus_stop: Bussipysäkki
           construction: Rakenteilla oleva tie
+          corridor: käytävä
           cycleway: Pyörätie
           elevator: Hissi
           emergency_access_point: Hätätilapaikka
           footway: Polku
           ford: Kahluupaikka
+          give_way: kärkikolmio
           living_street: Asuinkatu
           milestone: Virstanpylväs
           motorway: Moottoritie
           motorway_junction: Moottoritien liittymä
           motorway_link: Moottoritie
+          passing_place: ohituspaikka
           path: Polku
           pedestrian: Jalkakäytävä
           platform: Asemalaituri
@@ -598,6 +604,7 @@ fi:
           services: Moottoritiepalvelut
           speed_camera: Nopeuskamera
           steps: Portaat
+          stop: Stopmerkki
           street_lamp: Katuvalaisin
           tertiary: Yhdystie
           tertiary_link: Yhdystie
@@ -607,7 +614,6 @@ fi:
           trunk: Valtatie
           trunk_link: Valtatie
           unclassified: Luokittelematon tie
-          unsurfaced: Päällystämätön tie
           "yes": Tie
         historic:
           archaeological_site: Arkeologinen kohde
@@ -626,6 +632,7 @@ fi:
           manor: Kartano
           memorial: Muistomerkki
           mine: Kaivos
+          mine_shaft: kaivostunneli
           monument: Muistomerkki
           roman_road: Roomalainen tie
           ruins: Rauniot
@@ -635,6 +642,7 @@ fi:
           wayside_cross: Tieristi
           wayside_shrine: Tienvarsialttari
           wreck: Hylky
+          "yes": historiallinen paikka
         junction:
           "yes": Risteys
         landuse:
@@ -672,7 +680,6 @@ fi:
         leisure:
           beach_resort: Rantakohde
           bird_hide: Linnunpesä
-          club: Klubi
           common: Yhteinen maa
           dog_park: Koirapuisto
           fishing: Kalastusalue
@@ -699,15 +706,32 @@ fi:
           water_park: Vesipuisto
           "yes": Vapaa-aika
         man_made:
+          beehive: ampiaispesä
+          bridge: Silta
+          bunker_silo: Bunkkeri
+          chimney: piippu
+          crane: Nosturi
+          dyke: Pato
+          flagpole: Lipputanko
+          gasometer: Kaasusäiliö
           lighthouse: Majakka
+          mast: Masto
+          mine: Kaivos
+          mineshaft: kaivostunneli
+          pier: Laituri
           pipeline: Putkisto
+          silo: Siilo
+          surveillance: vartiointi
           tower: Torni
+          water_tower: Vesitorni
+          water_well: Kaivo
           works: Tehdas
           "yes": ihmisen tekemä
         military:
           airfield: Sotilaskenttä
           barracks: Kasarmi
           bunker: Bunkkeri
+          "yes": armeija
         mountain_pass:
           "yes": Vuoristosola
         natural:
@@ -758,6 +782,7 @@ fi:
           estate_agent: Kiinteistönvälittäjä
           government: Virasto
           insurance: Vakuutusyhtiö
+          it: IT toimisto
           lawyer: Asianajotoimisto
           ngo: Kansalaisjärjestö
           telecommunication: Tietoliikenneyritys
@@ -765,9 +790,8 @@ fi:
           "yes": Toimisto
         place:
           allotments: Siirtolapuutarha
-          block: Este
-          airport: Lentokenttä
           city: Kaupunki
+          city_block: kortteli
           country: Maa
           county: Piirikunta
           farm: Maatila
@@ -778,12 +802,12 @@ fi:
           islet: Saareke
           isolated_dwelling: Erakkomaja
           locality: Paikkakunta
-          moor: Nummi
           municipality: Kunta
           neighbourhood: Naapurusto
           postcode: Postinumero
           region: Alue
           sea: Meri
+          square: Neliö
           state: Osavaltio
           subdivision: Naapurusto
           suburb: Lähiö
@@ -795,10 +819,8 @@ fi:
           abandoned: Hylätty rautatie
           construction: Rakenteilla oleva rautatie
           disused: Käyttämätön rautatie
-          disused_station: Käytöstä poistunut rautatieasema
           funicular: Funikulaari
           halt: Seisake
-          historic_station: Historiallinen juna-asema
           junction: Rautatien risteys
           level_crossing: Tasoristeys
           light_rail: Pikaraitiotie
@@ -824,6 +846,7 @@ fi:
           beauty: Kosmetiikkakauppa
           beverages: Juomakauppa
           bicycle: Polkupyöräkauppa
+          bookmaker: kirjanmerkki
           books: Kirjakauppa
           boutique: Puoti
           butcher: Lihakauppa
@@ -862,12 +885,12 @@ fi:
           hairdresser: Kampaamo
           hardware: Rautakauppa
           hifi: Elektroniikkakauppa
-          insurance: Vakuutus
           jewelry: Korukauppa
           kiosk: Kioski
           laundry: Pesula
           mall: Ostoskeskus
           market: Tori
+          massage: hieronta
           mobile_phone: Matkapuhelinkauppa
           motorcycle: Moottoripyöräkauppa
           music: Musiikkikauppa
@@ -875,21 +898,22 @@ fi:
           optician: Optikko
           organic: Luomukauppa
           outdoor: Ulkoiluvälinekauppa
+          paint: Maalikauppa
           pet: Eläinkauppa
           pharmacy: Apteekki
           photo: Valokuvausliike
-          salon: Salonki
           second_hand: Osto- ja myyntiliike
           shoes: Kenkäkauppa
-          shopping_centre: Ostoskeskus
           sports: Urheilukauppa
           stationery: Paperikauppa
           supermarket: Supermarketti
           tailor: Räätäli
+          tobacco: Tupakkakauppa
           toys: Lelukauppa
           travel_agency: Matkatoimisto
+          tyres: Rengaskauppa
           video: Videokauppa
-          wine: Alkoholikauppa
+          wine: Viinikauppa
           "yes": Kauppa
         tourism:
           alpine_hut: Alppimaja
@@ -959,9 +983,9 @@ fi:
       alt_text: OpenStreetMap-logo
     home: Siirry kotipaikkaan
     logout: Kirjaudu ulos
-    log_in: kirjaudu sisään
+    log_in: Kirjaudu sisään
     log_in_tooltip: Kirjaudu sisään tunnuksellasi
-    sign_up: rekisteröidy
+    sign_up: Rekisteröidy
     start_mapping: Liity mukaan
     sign_up_tooltip: Muokkaaminen edellyttää käyttäjätunnusta
     edit: Muokkaa
@@ -1106,8 +1130,7 @@ fi:
         tai <a href="https://dmca.openstreetmap.org/">ilmoittaa suoraan</a>.
       trademarks_title_html: <span id="trademarks"></span>Tavaramerkit
       trademarks_1_html: OpenStreetMap, suurennuslasilogo ja maailmankartta ovat OpenStreetMap-säätiön
-        rekisteröityjä tavaramerkkejä. <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Lisensointiryhmämme
+        rekisteröityjä tavaramerkkejä. Jos sinulla on kysyttävää tutustu <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">tavaramerkkisivuun.</a>
-        (englanniksi)</a> vastaa mielellään kysymyksiin tavaramerkkien käytöstä.
   welcome_page:
     title: Tervetuloa!
     introduction_html: 'Tervetuloa OpenStreetMapiin: ilmaiseen ja vapaasti muokattavaan
@@ -1238,10 +1261,12 @@ fi:
     legal_title: Lakitekninen jako
     legal_html: "Tämä ja monet muut OSM-sivustot ovat muodollisesti <a href='https://osmfoundation.org/'>OpenStreetMap-säätiön</a>
       (OSMF) hallinnoimia OSM-yhteisön puolesta. Kaikkien näiden sivustojen käyttöön
-      sovelletaan <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nhyväksytyn
+      sovelletaan <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nsallitun
       käytön käytäntöjä</a> ja <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">tietosuojakäytäntöä</a>
       (molemmat sisällöt saatavilla vain englanniksi).\n<br> \n<a href='https://osmfoundation.org/Contact'>Ota
-      yhteys OSMF:ään</a> lisensointi-, tekijänoikeus- ja muissa lakiteknisissä kysymyksissä."
+      yhteys OSMF:ään</a> lisensointi-, tekijänoikeus- ja muissa lakiteknisissä kysymyksissä.\n<br>\nNimi
+      OpenStreetMap, suurennuslasilogo ja slogan State of the Map ovat <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">säätiön
+      rekisteröimiä tavaramerkkejä</a>."
     partners_title: Kumppanit
   notifier:
     diary_comment_notification:
@@ -1468,9 +1493,10 @@ fi:
       get_directions_title: Hae reittiohjeet kahden paikan välille
       from: Lähtöpaikka
       to: Määränpää
-      where_am_i: Missä tämä on?
+      where_am_i: Mikä tämä paikka on?
       where_am_i_title: Määrittää nykyisen sijainnin hakukoneella
       submit_text: Hae
+      reverse_directions_text: Vastakkainen suunta
     key:
       table:
         entry:
@@ -1785,7 +1811,7 @@ fi:
       email or username: 'Sähköpostiosoite tai käyttäjätunnus:'
       password: 'Salasana:'
       openid: '%{logo} OpenID:'
-      remember: Muista minut
+      remember: Pidä minut sisäänkirjautuneena
       lost password link: Unohditko salasanasi?
       login_button: Kirjaudu sisään
       register now: Rekisteröidy
@@ -1875,7 +1901,7 @@ fi:
       external auth: 'Kolmannen osapuolen todennus:'
       password: 'Salasana:'
       confirm password: 'Salasana uudelleen:'
-      use external auth: 'Voit myös kirjautua jonkun muun palvelun tunnuksilla:'
+      use external auth: Voit myös kirjautua jonkun muun palvelun tunnuksilla
       auth no password: Mikäli kirjaudut sisään kolmannen osapuolen palveluiden avulla,
         sinun ei tarvitse luoda itsellesi salasanaa, mutta jotkin ylimääräiset työkalut
         tai palvelimet voivat silti vaatia sitä.
@@ -1927,7 +1953,7 @@ fi:
       notes: Karttailmoitukset
       remove as friend: Poista kavereista
       add as friend: Lisää kaveriksi
-      mapper since: 'Liittyi palveluun:'
+      mapper since: 'Rekisteröitymispäivämäärä:'
       ago: (%{time_in_words_ago} sitten)
       ct status: 'Osallistumisehdot:'
       ct undecided: Ei valittu
@@ -2345,9 +2371,9 @@ fi:
         intro: Huomasitko virheen tai puuttuvan kohteen? Ilmoita siitä muille kartoittajille,
           jolloin virhe voidaan korjata. Siirrä merkkipiste oikeaan kohtaan ja kirjoita
           selite ongelmasta.
-        advice: Merkintäsi on julkinen ja sitä voidaan käyttää kartan päivittämiseen,
+        advice: Merkintä näkyy julkisesti kaikille, älä kirjoita henkilökohtaisia
-          joten älä kirjoita henkilökohtaisia tietoja tai tietoja tekijänoikeuksin
+          tietoja. Aineistoa kehitetään palautteen perusteella, minkä takia älä käytä
-          suojatuista karttoista tai hakemistotiedoista.
+          lähteenä muita karttoja tai hakemistoja.
         add: Lähetä ilmoitus
       show:
         anonymous_warning: Tässä karttailmoituksessa on kommentteja tunnistautumattomilta
@@ -2389,6 +2415,7 @@ fi:
         turn_left_without_exit: Käänny vasemmalle tielle %{name}
         offramp_left_without_exit: Poistu vasemmalle liittymään tielle %{name}
         onramp_left_without_exit: Käänny vasemmalle liittymään tielle %{name}
+        onramp_left_without_directions: Käänny vasemmalle rampille
         endofroad_left_without_exit: Tienpäässä käänny vasemmalle tielle %{name}
         merge_left_without_exit: Liity vasemmalle tielle %{name}
         fork_left_without_exit: Liittymässä ryhmity vasemmalle suuntaan %{name}

config/locales/fr.yml

@@ -461,12 +461,19 @@ fr:
           chair_lift: Télésiège
           drag_lift: Téléski
           gondola: Télécabine
+          platter: Monte-plat
+          pylon: Pylône
           station: Gare de télécabine
+          t-bar: Monte-barre en T
         aeroway:
           aerodrome: Aérodrome
+          airstrip: Piste d’atterrissage
           apron: Aire de stationnement
           gate: Porte
+          hangar: Hangar
           helipad: Héliport
+          holding_position: Position d’attente
+          parking_position: Place de parking
           runway: Piste
           taxiway: Piste de circulation d’un aéroport
           terminal: Terminal
@@ -501,37 +508,32 @@ fr:
           crematorium: Crématorium
           dentist: Dentiste
           doctors: Docteurs
-          dormitory: Dortoir
           drinking_water: Eau potable
           driving_school: École de conduite
           embassy: Ambassade
-          emergency_phone: Borne d’appel d’urgence
           fast_food: Restauration rapide
           ferry_terminal: Terminal de ferry
-          fire_hydrant: Bouche d’incendie
           fire_station: Caserne des pompiers
           food_court: Aire de restauration
           fountain: Fontaine
           fuel: Carburant
           gambling: Jeu d’argent
           grave_yard: Cimetière
-          gym: Fitness / gymnastique
+          grit_bin: Bac à sel
-          health_centre: Centre de santé / dispensaire
           hospital: Hôpital
           hunting_stand: Stand de tir
           ice_cream: Glacier
           kindergarten: Jardin d’enfant
           library: Bibliothèque
-          market: Marché
           marketplace: Place de marché
           monastery: Monastère
           motorcycle_parking: Parking à motos
           nightclub: Boîte de nuit
-          nursery: Nurserie
           nursing_home: Maison de retraite médicalisée
           office: Bureau
           parking: Parking
           parking_entrance: Entrée d’un parking
+          parking_space: Place de parking
           pharmacy: Pharmacie
           place_of_worship: Lieu de culte
           police: Police
@@ -541,7 +543,6 @@ fr:
           prison: Prison
           pub: Pub
           public_building: Bâtiment public
-          reception_area: Zone de livraison
           recycling: Point de recyclage
           restaurant: Restaurant
           retirement_home: Maison de retraite
@@ -566,6 +567,7 @@ fr:
           village_hall: Salle municipale
           waste_basket: Poubelle
           waste_disposal: Élimination des déchets
+          water_point: Point d’eau
           youth_centre: Centre pour la jeunesse
         boundary:
           administrative: Limite administrative
@@ -574,6 +576,7 @@ fr:
           protected_area: Zone protégée
         bridge:
           aqueduct: Aqueduc
+          boardwalk: Promenade
           suspension: Pont suspendu
           swing: Pont tournant
           viaduct: Viaduc
@@ -593,25 +596,31 @@ fr:
           "yes": Boutique d’artisanat
         emergency:
           ambulance_station: Dépôt d’ambulances
+          assembly_point: Point de rassemblement
           defibrillator: Défibrillateur
           landing_site: Terrain d’atterrissage d’urgence
           phone: Borne d’appel d’urgence
+          water_tank: Citerne d’eau d’urgence
+          "yes": Urgence
         highway:
           abandoned: Autoroute abandonnée
           bridleway: Chemin pour cavaliers
           bus_guideway: Voie de bus guidé / trolley
           bus_stop: Arrêt de bus
           construction: Route en construction
+          corridor: Couloir
           cycleway: Piste cyclable
           elevator: Ascenseur
           emergency_access_point: Point d’accès d’urgence
           footway: Chemin piéton
           ford: Gué
+          give_way: Panneau cédez le passage
           living_street: Rue en zone de rencontre
           milestone: Borne kilométrique
           motorway: Autoroute
           motorway_junction: Sortie / Échangeur
           motorway_link: Bretelle d’autoroute
+          passing_place: Endroit de passage
           path: Chemin
           pedestrian: Rue piétonne
           platform: Plateforme
@@ -628,6 +637,7 @@ fr:
           services: Services autoroutiers
           speed_camera: Radar de vitesse
           steps: Escalier
+          stop: Signe d'arrêt
           street_lamp: Lampadaire
           tertiary: Route tertiaire
           tertiary_link: Route tertiaire
@@ -636,8 +646,8 @@ fr:
           trail: Sentier
           trunk: Voie express
           trunk_link: Voie express
+          turning_loop: Virage en boucle
           unclassified: Route mineure
-          unsurfaced: Route non revêtue
           "yes": Route
         historic:
           archaeological_site: Site archéologique
@@ -656,6 +666,7 @@ fr:
           manor: Manoir
           memorial: Mémorial
           mine: Mine
+          mine_shaft: Puits de mine
           monument: Monument
           roman_road: Voie romaine
           ruins: Ruines
@@ -665,6 +676,7 @@ fr:
           wayside_cross: Calvaire
           wayside_shrine: Oratoire
           wreck: Épave
+          "yes": Site historique
         junction:
           "yes": Intersection / carrefour
         landuse:
@@ -702,9 +714,9 @@ fr:
         leisure:
           beach_resort: Station balnéaire
           bird_hide: Observatoire ornithologique
-          club: Club
           common: Terrains communaux
           dog_park: Parc à chiens
+          firepit: Foyer
           fishing: Zone de pêche
           fitness_centre: Centre de fitness
           fitness_station: Atelier de parcours de santé
@@ -729,15 +741,46 @@ fr:
           water_park: Parc aquatique
           "yes": Loisirs
         man_made:
+          adit: Galerie d’accès
+          beacon: Phare
+          beehive: Ruche
+          breakwater: Brise-lames
+          bridge: Pont
+          bunker_silo: Bunker
+          chimney: Cheminée
+          crane: Grue
+          dolphin: Poste d’amarrage
+          dyke: Digue
+          embankment: Talus
+          flagpole: Mât
+          gasometer: Gazomètre
+          groyne: Épi de plage
+          kiln: Four à poterie
           lighthouse: Phare
+          mast: Pylône
+          mine: Mine
+          mineshaft: Puits de mine
+          monitoring_station: Station de surveillance
+          petroleum_well: Puits de pétrole
+          pier: Jetée
           pipeline: Pipeline
+          silo: Silo
+          storage_tank: Citerne de stockage
+          surveillance: Surveillance
           tower: Tour
+          wastewater_plant: Station de traitement des eaux usées
+          watermill: Moulin à eau
+          water_tower: Château d’eau
+          water_well: Puits
+          water_works: Système hydraulique
+          windmill: Moulin à vent
           works: Usine
           "yes": Créé par l’homme
         military:
           airfield: Terrain d’aviation militaire
           barracks: Caserne
           bunker: Bunker
+          "yes": Militaire
         mountain_pass:
           "yes": Col de montagne
         natural:
@@ -783,11 +826,14 @@ fr:
           accountant: Comptable
           administrative: Administration
           architect: Architecte
+          association: Association
           company: Entreprise
+          educational_institution: Institution éducative
           employment_agency: Agence pour l’emploi
           estate_agent: Agent immobilier
           government: Administration publique
           insurance: Agence d’assurance
+          it: Bureau informatique
           lawyer: Avocat
           ngo: Agence d’une ONG
           telecommunication: Agence de télécommunication
@@ -795,9 +841,8 @@ fr:
           "yes": Bureau
         place:
           allotments: Jardins familiaux
-          block: Bloc
-          airport: Aéroport
           city: Ville
+          city_block: Bloc urbain
           country: Pays
           county: Comté
           farm: Ferme
@@ -808,12 +853,13 @@ fr:
           islet: Îlot
           isolated_dwelling: Lieu-dit habité
           locality: Lieu-dit
-          moor: Maure
           municipality: Municipalité
           neighbourhood: Quartier
           postcode: Code postal
+          quarter: Trimestre
           region: Région
           sea: Mer
+          square: Square
           state: État / province
           subdivision: Subdivision
           suburb: Quartier
@@ -825,10 +871,8 @@ fr:
           abandoned: Voie ferrée abandonnée
           construction: Voie ferrée en construction
           disused: Voie ferrée désaffectée
-          disused_station: Gare ferroviaire désaffectée
           funicular: Funiculaire
           halt: Arrêt de train
-          historic_station: Gare ferroviaire historique
           junction: Jonction ferroviaire
           level_crossing: Passage à niveau
           light_rail: Voie ferrée légère
@@ -854,6 +898,7 @@ fr:
           beauty: Magasin de produits de beauté
           beverages: Magasin de boissons
           bicycle: Magasin de vélos
+          bookmaker: Bureau de paris
           books: Librairie
           boutique: Boutique de mode
           butcher: Boucherie
@@ -892,12 +937,16 @@ fr:
           hairdresser: Coiffeur
           hardware: Quincaillerie
           hifi: Magasin Hi-Fi
-          insurance: Assurance
+          houseware: Magasin d’articles ménagers
+          interior_decoration: Décoration intérieure
           jewelry: Bijouterie
           kiosk: Kiosque
+          kitchen: Magasin de cuisine
           laundry: Blanchisserie
+          lottery: Loto
           mall: Centre commercial
           market: Marché
+          massage: Massage
           mobile_phone: Boutique de téléphones mobiles
           motorcycle: Magasin de motos
           music: Boutique de musique / disquaire
@@ -905,21 +954,27 @@ fr:
           optician: Opticien
           organic: Magasin d’alimentation bio
           outdoor: Magasin d’articles pour activité en plein air
+          paint: Galerie de peinture
+          pawnbroker: Prêteur sur gages
           pet: Animalerie
           pharmacy: Pharmacie
           photo: Boutique de photographie
-          salon: Salon de beauté
+          seafood: Fruits de mer
           second_hand: Boutique de produits d’occasion
           shoes: Magasin de chaussures
-          shopping_centre: Centre commercial
           sports: Magasin de d’articles de sport
           stationery: Papeterie
           supermarket: Supermarché
           tailor: Tailleur
+          ticket: Billetterie
+          tobacco: Bureau de tabac
           toys: Magasin de jouets
           travel_agency: Agence de voyage
+          tyres: Magasin de pneus
+          vacant: Commerce vaquant
+          variety_store: Magasin de variétés
           video: Magasin de vidéos
-          wine: Vendeur d’alcool à emporter / caviste
+          wine: Caviste
           "yes": Boutique
         tourism:
           alpine_hut: Refuge
@@ -943,6 +998,7 @@ fr:
           viewpoint: Point de vue
           zoo: Zoo
         tunnel:
+          building_passage: Passage de bâtiment
           culvert: Buse
           "yes": Tunnel
         waterway:
@@ -1140,9 +1196,8 @@ fr:
       trademarks_title_html: <span id="marques"></span>Marques
       trademarks_1_html: OpenStreetMap, le logo loupe et State of the Map sont des
         marques déposées de l'OpenStreetMap Foundation. Si vous avez des questions
-        à propos de l’utilisation de ces marques, merci de prendre contact avec le
+        à propos de l’utilisation de ces marques, merci de consulter notre <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">règlement
-        <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
+        concernant les marques déposées</a>.
-        Working Group</a>.
   welcome_page:
     title: Bienvenue !
     introduction_html: Bienvenue à OpenStreetMap, la carte du monde libre et éditable.
@@ -1292,7 +1347,9 @@ fr:
       des usages acceptés</a> et à notre <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">Politique
       de confidentialité</a>.\n<br> \nVeuillez <a href=\"https://osmfoundation.org/Contact\">contacter
       l’OSMF</a> \nsi vous avez des questions ou problèmes concernant les licences,
-      les droits d’auteur ou d’autres aspects juridiques."
+      les droits d’auteur ou d’autres aspects juridiques.\n<br>\nOpenStreetMap, le
+      logo avec la loupe et ''State of the Map'' sont <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">des
+      marques déposées de OSMF</a>."
     partners_title: Partenaires
   notifier:
     diary_comment_notification:
@@ -1535,6 +1592,7 @@ fr:
       where_am_i: Où est-ce ?
       where_am_i_title: Décrit la position actuelle en utilisant le moteur de recherche
       submit_text: Aller
+      reverse_directions_text: Inverser les directions
     key:
       table:
         entry:
@@ -1633,8 +1691,8 @@ fr:
     create:
       upload_trace: Envoyer la trace GPS
       trace_uploaded: Votre fichier GPX a été envoyé et est en attente de son intégration
-        dans la base de données. Ceci prend en général moins d’une demie heure et
+        dans la base de données. Ceci prend en général moins d’une demi-heure et un
-        un courriel vous sera envoyé lorsque cela sera terminé.
+        courriel vous sera envoyé lorsque ce sera terminé.
     edit:
       title: Modifier la trace %{name}
       heading: Modifier la trace %{name}
@@ -2480,7 +2538,15 @@ fr:
         continue_without_exit: Continuez sur %{name}
         slight_right_without_exit: Tournez légèrement à droite sur %{name}
         offramp_right_without_exit: Prendre la bretelle à droite sur %{name}
+        offramp_right_with_directions: Prendre la bretelle à droite vers %{directions}
+        offramp_right_with_name_and_directions: Prendre la bretelle à droite sur %{name},
+          vers %{directions}
+        offramp_right_without_directions: Prendre la bretelle à droite
         onramp_right_without_exit: Tourner à droite sur la bretelle sur %{name}
+        onramp_right_with_directions: Tourner à droite sur la bretelle vers %{directions}
+        onramp_right_with_name_and_directions: Tourner à droite sur la bretelle sur
+          %{name}, vers %{directions}
+        onramp_right_without_directions: Tourner à droite sur la bretelle
         endofroad_right_without_exit: À la fin de la route, tourner à droite sur %{name}
         merge_right_without_exit: Rejoindre à droite sur %{name}
         fork_right_without_exit: À la bifurcation, tourner à droite sur %{name}
@@ -2490,7 +2556,15 @@ fr:
         sharp_left_without_exit: Tournez vivement à gauche sur %{name}
         turn_left_without_exit: Tournez à gauche sur %{name}
         offramp_left_without_exit: Prendre la bretelle de gauche jusque %{name}
+        offramp_left_with_directions: Prendre la bretelle à gauche vers %{directions}
+        offramp_left_with_name_and_directions: Prendre la bretelle à gauche sur %{name},
+          vers %{directions}
+        offramp_left_without_directions: Prendre la bretelle à gauche
         onramp_left_without_exit: Tourner à gauche sur la bretelle sur %{name}
+        onramp_left_with_directions: Tourner à gauche sur la bretelle vers %{directions}
+        onramp_left_with_name_and_directions: Tourner à gauche sur la bretelle sur
+          %{name}, vers %{directions}
+        onramp_left_without_directions: Tourner à gauche sur la bretelle
         endofroad_left_without_exit: À la fin de la route, tourner à gauche sur %{name}
         merge_left_without_exit: Rejoindre à gauche sur %{name}
         fork_left_without_exit: À la bifurcation, tourner à gauche sur %{name}

config/locales/fur.yml

@@ -388,22 +388,17 @@ fur:
           crematorium: Crematori
           dentist: Dentist
           doctors: Dotôrs
-          dormitory: Dormitori
           drinking_water: Aghe potabil
           driving_school: Scuele guide
           embassy: Ambassade
-          emergency_phone: Telefon di emergjence
           ferry_terminal: Terminâl traghets
-          fire_hydrant: Idrant
           fire_station: Stazion dai pompîrs
           fountain: Fontane
           fuel: Stazion di riforniment
-          health_centre: Centri pe salût
           hospital: Ospedâl
           ice_cream: Gjelato
           kindergarten: Scuelute
           library: Biblioteche
-          market: Marcjât
           nightclub: Club noturni
           office: Ufizi
           parking: Parcament
@@ -470,7 +465,6 @@ fur:
           tertiary: Strade terziarie
           tertiary_link: Strade terziarie
           track: Piste
-          unsurfaced: Strade no asfaltade
         historic:
           archaeological_site: Sît archeologic
           battlefield: Cjamp di bataie
@@ -551,7 +545,6 @@ fur:
           travel_agent: Agjenzie di viaçs
           "yes": Ufizi
         place:
-          airport: Aeropuart
           city: Citât
           country: Paîs
           county: Contee
@@ -575,7 +568,6 @@ fur:
           abandoned: Ferade bandonade
           construction: Ferade in costruzion
           disused: Ferade bandonade
-          disused_station: Stazion de ferade bandonade
           halt: Fermade de ferade
           level_crossing: Passaç a nivel
           light_rail: Ferade lizere
@@ -598,7 +590,6 @@ fur:
           electronics: Buteghe di eletroniche
           gallery: Galarie di art
           hairdresser: Piruchîr o barbîr
-          insurance: Assicurazion
           jewelry: Buteghe dal oresin
           laundry: Lavandarie
           market: Marcjât

config/locales/fy.yml

@@ -175,28 +175,22 @@ fy:
           crematorium: Krematoariurn
           dentist: Toskedokter
           doctors: Dokter
-          dormitory: Studintehûs
           drinking_water: Drinkwetter
           driving_school: Rydskoalle
           embassy: Ambassade
           fast_food: Fast food
-          fire_hydrant: Brânkraan
           fire_station: Brânwar
           food_court: Foodcourt
           fountain: Fontein
           fuel: Brânstof
           grave_yard: Begraafplak
-          gym: Fitnesssintrum
-          health_centre: Sûnenssintrum
           hospital: Sikehûs
           hunting_stand: Jachttoer
           ice_cream: Iis
           kindergarten: Beukerskoalle
           library: Bibleteek
-          market: Merk
           marketplace: Merkplein
           nightclub: Nachtklub
-          nursery: Pjutteboartersplak
           nursing_home: Ferpleechhûs
           office: Kantoar
           parking: Parkeare
@@ -207,7 +201,6 @@ fy:
           preschool: Pjutteboartersplak of beukerskoalle
           prison: Finzenis
           pub: Kafee
-          reception_area: Resepsje
           restaurant: Restaurant
           retirement_home: Bejaardetehûs
           sauna: Sauna
@@ -334,7 +327,6 @@ fy:
           travel_agent: Reisburo
           "yes": Kantoar
         place:
-          airport: Lofthaven
           city: Stêd
           country: Lân
           county: Distrikt
@@ -344,7 +336,6 @@ fy:
           houses: Huzen
           island: Eilân
           locality: Plak
-          moor: Fean
           municipality: Gemeente
           neighbourhood: Wyk
           postcode: Postkoade
@@ -367,7 +358,6 @@ fy:
           greengrocer: Grienteboer
           hairdresser: Kapper
           hifi: Hi-fi
-          insurance: Fersekering
           jewelry: Juwelier
           laundry: Waskerij
           market: Merk
@@ -375,9 +365,7 @@ fy:
           pet: Bistewinkel
           pharmacy: Apoteek
           photo: Fotowinkel
-          salon: Skientmesalon
           second_hand: Kringloopwinkel
-          shopping_centre: Winkelsintrum
           supermarket: Supermerk
           tailor: Kleanmakker
           travel_agency: Reisburo

config/locales/ga.yml

@@ -438,33 +438,26 @@ ga:
           crematorium: Créamatóiriam
           dentist: Fiaclóir
           doctors: Dochtúirí
-          dormitory: Áras cónaithe
           drinking_water: Uisce Inólta
           driving_school: Scoil Tiomána
           embassy: Ambasáid
-          emergency_phone: Fón Éigeandála
           fast_food: Mearbhia
           ferry_terminal: Críochfort Farantóireachta
-          fire_hydrant: Béal Tuile
           fire_station: Stáisiún Dóiteáin
           food_court: Cúirt Bhia
           fountain: Scairdeán/fuarán
           fuel: Breosla
           gambling: Cearrbhachas
           grave_yard: Reilg
-          gym: Spórtlann / Giom
-          health_centre: Ionad Sláinte
           hospital: Ospidéal
           hunting_stand: Árdán seilge
           ice_cream: Uachtar reoite
           kindergarten: Naíonra
           library: Leabharlann
-          market: Margadh
           marketplace: Áit mhargaidh
           monastery: Mainistir
           motorcycle_parking: Páirceáil do Ghluaisrothair
           nightclub: Club Oíche
-          nursery: Naíonra
           nursing_home: Teach Altranais
           office: Oifig
           parking: Páirceáil
@@ -478,7 +471,6 @@ ga:
           prison: Príosún
           pub: Teach tábhairne
           public_building: Foirgneamh Poiblí
-          reception_area: Limistéar Fáilte
           recycling: Ionad Athchúrsála
           restaurant: Bialann
           retirement_home: Áras Seanóirí
@@ -574,7 +566,6 @@ ga:
           trunk: Mórbhóthar
           trunk_link: Mórbhóthar
           unclassified: Bóthar Neamhaicmithe
-          unsurfaced: Bóthar Gan Dromhchla
           "yes": Bóthar
         historic:
           archaeological_site: Láithreán Seandálaíochta
@@ -639,7 +630,6 @@ ga:
         leisure:
           beach_resort: Ionad Saoire Cois Trá
           bird_hide: Folachán Éanbhreathnóireachta
-          club: Club
           common: Coimín
           dog_park: Páirc do Mhadraí
           fishing: Áit Iascaireachta
@@ -732,8 +722,6 @@ ga:
           "yes": Oifig
         place:
           allotments: Cuibhrinn
-          block: Bloc
-          airport: Aerfort
           city: Cathair
           country: Tír
           county: Contae
@@ -745,7 +733,6 @@ ga:
           islet: Oileáinín
           isolated_dwelling: Áit Chónaithe Iargúlta
           locality: Dúiche
-          moor: Móinteán
           municipality: Cathair bhardais/baile bardais
           neighbourhood: Comharsanacht
           postcode: Cód poist
@@ -762,10 +749,8 @@ ga:
           abandoned: Iarnród Tréigthe
           construction: Iarnród á Thógáil
           disused: Iarnróid atá As Úsáid
-          disused_station: Stáisiún Iarnróid As Úsáid
           funicular: Iarnród Cáblach
           halt: Stad Traenach
-          historic_station: Stáisiún Iarnróid Stairiúil
           junction: Acomhal Iarnróid
           level_crossing: Crosaire Comhréidh
           light_rail: Iarnród Éadrom
@@ -829,7 +814,6 @@ ga:
           hairdresser: Gruaigeadóir
           hardware: Siopa Crua-earraí
           hifi: Hi-Fi
-          insurance: Árachas
           jewelry: Siopa Seodóireachta
           kiosk: Both
           laundry: Neachtlann
@@ -845,10 +829,8 @@ ga:
           pet: Siopa Peataí
           pharmacy: Cógaslann
           photo: Siopa Grianghrafadóireachta
-          salon: Ionad áilleachta/sciamhlann
           second_hand: Siopa Earraí Athláimhe
           shoes: Siopa Bróg
-          shopping_centre: Ionad Siopadóireachta
           sports: Siopa Spóirt
           stationery: Siopa Stáiseanóireachta
           supermarket: Ollmhargadh

config/locales/gd.yml

@@ -459,33 +459,26 @@ gd:
           crematorium: Luaithreachan
           dentist: Fiaclaire
           doctors: Lighichean
-          dormitory: Suain-lann
           drinking_water: Uisge-òil
           driving_school: Sgoil draibhidh
           embassy: Ambasaid
-          emergency_phone: Fòn-èiginn
           fast_food: Biadh luath
           ferry_terminal: Port-aiseig
-          fire_hydrant: Tobar-sràide
           fire_station: Stèisean-smàlaidh
           food_court: Talla bìdh
           fountain: Fuaran
           fuel: Connadh
           gambling: Cearrachas
           grave_yard: Cladh
-          gym: Taigh-sunntais
-          health_centre: Ionad-slàinte
           hospital: Ospadal
           hunting_stand: Stannd seilge
           ice_cream: Reòiteagan
           kindergarten: Sgoil-àraich
           library: Leabhar-lann
-          market: Margadh
           marketplace: Ionad-margaidh
           monastery: Manachainn
           motorcycle_parking: Ionad-pàircidh motar-baidhseagal
           nightclub: Club-oidhche
-          nursery: Sgoil-àraich
           nursing_home: Taigh-altraim
           office: Oifis
           parking: Ionad-pàircidh
@@ -499,7 +492,6 @@ gd:
           prison: Prìosan
           pub: Taigh-seinnse
           public_building: Togalach poblach
-          reception_area: Ionad-fàilte
           recycling: Ionad ath-chuairteachaidh
           restaurant: Taigh-bìdh
           retirement_home: Taigh-cluaineis
@@ -595,7 +587,6 @@ gd:
           trunk: Prìomh-rathad
           trunk_link: Prìomh-rathad
           unclassified: Rathad neo-sheòrsaichte
-          unsurfaced: Rathad gun uachdar
           "yes": Rathad
         historic:
           archaeological_site: Làrach àrc-eòlach
@@ -660,7 +651,6 @@ gd:
         leisure:
           beach_resort: Tràigh-turasachd
           bird_hide: Crò-eun
-          club: Club
           common: Fearann coitcheann
           dog_park: Pàirc-chon
           fishing: Raon iasgaich
@@ -753,8 +743,6 @@ gd:
           "yes": Oifis
         place:
           allotments: Cuibhreann talmhainn
-          block: Bloca
-          airport: Port-adhair
           city: Baile
           country: Dùthaich
           county: Siorrachd/Còigeamh
@@ -766,7 +754,6 @@ gd:
           islet: Eilean beag
           isolated_dwelling: Àite-còmhnaidh iomallach
           locality: Àite
-          moor: Mòine
           municipality: Baile
           neighbourhood: Coimhearsnachd
           postcode: Còd-puist
@@ -783,10 +770,8 @@ gd:
           abandoned: Rèile thrèigte
           construction: Rèile 'ga togail
           disused: Rèile gun chleachdadh
-          disused_station: Stèisean-rèile gun chleachdadh
           funicular: Rèile-bhruthaich
           halt: Stad trèana
-          historic_station: Stèisean-rèile eachdraidheil
           junction: Snaidhm-rèile
           level_crossing: Crois-rèile fhosgailte
           light_rail: Rèile aotrom
@@ -850,7 +835,6 @@ gd:
           hairdresser: Gruagaire
           hardware: Bùth leasachadh dachaigh
           hifi: HiFi
-          insurance: Àrachas
           jewelry: Bùth usgaran
           kiosk: Cìtheasg
           laundry: Taigh-nigheachain
@@ -866,10 +850,8 @@ gd:
           pet: Bùth pheatachan
           pharmacy: Bùth-chungaidhean
           photo: Bùth dhealbhan
-          salon: Salon maise
           second_hand: Bùth rudan ath-làimhe
           shoes: Bùth bhrògan
-          shopping_centre: Ionad-seopadaireachd
           sports: Bùth spòrs
           stationery: Bùth pàipearachd
           supermarket: Oll-mhargadh

config/locales/gl.yml

@@ -346,7 +346,7 @@ gl:
       map_image: Imaxe de mapa (mostra unha capa normal)
       embeddable_html: HTML incorporable
       licence: Licenza
-      export_details: Os datos do OpenStreetMap están licenciados baixo a <a href="http://opendatacommons.org/licenses/odbl/1.0/">licenza
+      export_details: Os datos do OpenStreetMap están licenciados baixo a <a href="https://opendatacommons.org/licenses/odbl/1.0/">licenza
         Open Data Commons Open Database License</a> (ODbL).
       too_large:
         advice: 'Se a exportación anterior falla, considere utilizar unha das fontes
@@ -386,14 +386,14 @@ gl:
   geocoder:
     search:
       title:
-        latlon: Resultados <a href="http://openstreetmap.org/">internos</a>
+        latlon: Resultados <a href="https://openstreetmap.org/">internos</a>
         uk_postcode: Resultados desde <a href="http://www.npemap.org.uk/">NPEMap /
           FreeThe Postcode</a>
-        ca_postcode: Resultados desde <a href="http://geocoder.ca/">Geocoder.CA</a>
+        ca_postcode: Resultados desde <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Resultados desde <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Resultados desde <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Resultados desde <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: Resultados desde <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Resultados desde <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames_reverse: Resultados desde <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
@@ -403,12 +403,18 @@ gl:
           chair_lift: Teleférico
           drag_lift: Telesquí
           gondola: Telecabina
+          platter: Telesquí
+          pylon: Torre de alta tensión
           station: Estación de telesquí
+          t-bar: Telesquí de barra de metal en T
         aeroway:
           aerodrome: Aeródromo
+          airstrip: Aeródromo
           apron: Plataforma
           gate: Porta
+          hangar: Hangar
           helipad: Heliporto
+          parking_position: Posición de estacionamento
           runway: Pista
           taxiway: Vía de circulación do aeroporto
           terminal: Terminal
@@ -443,37 +449,31 @@ gl:
           crematorium: Crematorio
           dentist: Dentista
           doctors: Médicos
-          dormitory: Residencia universitaria
           drinking_water: Auga potable
           driving_school: Escola de condución
           embassy: Embaixada
-          emergency_phone: Teléfono de emerxencia
           fast_food: Comida rápida
           ferry_terminal: Terminal de transbordadores
-          fire_hydrant: Boca de incendios
           fire_station: Parque de bombeiros
           food_court: Área de restauración
           fountain: Fonte
           fuel: Combustible
           gambling: Xogos de azar
           grave_yard: Cemiterio
-          gym: Ximnasio
-          health_centre: Centro de saúde
           hospital: Hospital
           hunting_stand: Lugar de caza
           ice_cream: Xeadaría
           kindergarten: Xardín de infancia
           library: Biblioteca
-          market: Mercado
           marketplace: Praza de mercado
           monastery: Mosteiro
           motorcycle_parking: Estacionamento para motocicletas
           nightclub: Club nocturno
-          nursery: Parvulario
           nursing_home: Residencia para a terceira idade
           office: Oficina
           parking: Aparcadoiro
           parking_entrance: Entrada de estacionamento
+          parking_space: Aparcadoiro
           pharmacy: Farmacia
           place_of_worship: Lugar de culto
           police: Policía
@@ -483,7 +483,6 @@ gl:
           prison: Prisión
           pub: Pub
           public_building: Edificio público
-          reception_area: Zona de recepción
           recycling: Punto de reciclaxe
           restaurant: Restaurante
           retirement_home: Residencia de xubilados
@@ -508,6 +507,7 @@ gl:
           village_hall: Concello
           waste_basket: Cesto do lixo
           waste_disposal: Contedor de lixo
+          water_point: Punto de auga
           youth_centre: Casa da xuventude
         boundary:
           administrative: Límite administrativo
@@ -535,20 +535,25 @@ gl:
           "yes": Tenda de artesanía
         emergency:
           ambulance_station: Base de ambulancias
+          assembly_point: Punto de reunión
           defibrillator: Desfibrilador
           landing_site: Lugar de aterrizaxe de emerxencia
           phone: Teléfono de emerxencia
+          water_tank: Tanque de auga de emerxencia
+          "yes": Emerxencia
         highway:
           abandoned: Estrada abandonada
           bridleway: Pista de cabalos
           bus_guideway: Liña de autobuses guiados
           bus_stop: Parada de autobús
           construction: Autoestrada en construción
+          corridor: Corredor
           cycleway: Pista de bicicletas
           elevator: Ascensor
           emergency_access_point: Punto de acceso de emerxencia
           footway: Carreiro
           ford: Vao
+          give_way: Sinal de ceda o paso
           living_street: Rúa residencial
           milestone: Miliario
           motorway: Autoestrada
@@ -570,6 +575,7 @@ gl:
           services: Área de servizo
           speed_camera: Radar
           steps: Chanzos
+          stop: Sinal de alto
           street_lamp: Luminaria
           tertiary: Estrada terciaria
           tertiary_link: Estrada terciaria
@@ -579,7 +585,6 @@ gl:
           trunk: Estrada nacional
           trunk_link: Estrada nacional
           unclassified: Estrada sen clasificar
-          unsurfaced: Estrada non pavimentada
           "yes": Estrada
         historic:
           archaeological_site: Xacemento arqueolóxico
@@ -598,6 +603,7 @@ gl:
           manor: Casa señorial
           memorial: Memorial
           mine: Mina
+          mine_shaft: Pozo mineiro
           monument: Monumento
           roman_road: Estrada romana
           ruins: Ruínas
@@ -607,6 +613,7 @@ gl:
           wayside_cross: Cruce de camiños
           wayside_shrine: Santuario no camiño
           wreck: Pecio
+          "yes": Sitio histórico
         junction:
           "yes": Intersección
         landuse:
@@ -644,7 +651,6 @@ gl:
         leisure:
           beach_resort: Balneario
           bird_hide: Observatorio de aves
-          club: Club
           common: Terreo común
           dog_park: Parque canino
           fishing: Área de pesca
@@ -671,15 +677,32 @@ gl:
           water_park: Parque acuático
           "yes": Ocio
         man_made:
+          beehive: Colmea
+          bridge: Ponte
+          bunker_silo: Búnker
+          chimney: Cheminea
+          crane: Guindastre
+          dyke: Dique
           lighthouse: Faro
+          mine: Mina
+          mineshaft: Pozo mineiro
+          petroleum_well: Pozo petrolífero
           pipeline: Tubaxe
+          silo: Silo
+          surveillance: Vixilancia
           tower: Torre
+          wastewater_plant: Planta de tratamento de augas
+          watermill: Muíño hidráulico
+          water_tower: Torre de auga
+          water_well: Pozo
+          windmill: Muíño de vento
           works: Fábrica
           "yes": Artificial
         military:
           airfield: Aeródromo militar
           barracks: Barracas
           bunker: Búnker
+          "yes": Militar
         mountain_pass:
           "yes": Porto de montaña
         natural:
@@ -725,7 +748,9 @@ gl:
           accountant: Contable
           administrative: Administración
           architect: Arquitecto
+          association: Asociación
           company: Empresa
+          educational_institution: Institución educativa
           employment_agency: Axencia de emprego
           estate_agent: Axencia inmobiliaria
           government: Oficina gobernamental
@@ -737,8 +762,6 @@ gl:
           "yes": Oficina
         place:
           allotments: Hortas
-          block: Bloque
-          airport: Aeroporto
           city: Cidade
           country: País
           county: Condado
@@ -750,12 +773,12 @@ gl:
           islet: Illote
           isolated_dwelling: Vivenda illada
           locality: Localidade
-          moor: Páramo
           municipality: Municipio
           neighbourhood: Veciñanza
           postcode: Código postal
           region: Rexión
           sea: Mar
+          square: Praza
           state: Estado/Provincia
           subdivision: Subdivisión
           suburb: Barrio
@@ -767,10 +790,8 @@ gl:
           abandoned: Vía de tren abandonada
           construction: Vía ferroviaria en construción
           disused: Vía ferroviaria en desuso
-          disused_station: Estación de trens en desuso
           funicular: Vía de funicular
           halt: Parada de trens
-          historic_station: Estación de trens histórica
           junction: Unión de vías ferroviarias
           level_crossing: Paso a nivel
           light_rail: Metro lixeiro
@@ -834,12 +855,13 @@ gl:
           hairdresser: Perrucaría
           hardware: Ferraxaría
           hifi: Hi-Fi
-          insurance: Aseguradora
           jewelry: Xoiaría
           kiosk: Quiosco
           laundry: Lavandaría
+          lottery: Lotaría
           mall: Centro comercial
           market: Mercado
+          massage: Masaxe
           mobile_phone: Tenda de telefonía móbil
           motorcycle: Tenda de motocicletas
           music: Tenda de música
@@ -850,18 +872,17 @@ gl:
           pet: Tenda de mascotas
           pharmacy: Farmacia
           photo: Tenda de fotografía
-          salon: Salón de beleza
           second_hand: Tenda de segunda man
           shoes: Zapataría
-          shopping_centre: Centro comercial
           sports: Tenda de deportes
           stationery: Papelaría
           supermarket: Supermercado
           tailor: Xastraría
+          tobacco: Estanco
           toys: Xoguetaría
           travel_agency: Axencia de viaxes
           video: Tenda de vídeos
-          wine: Tenda de licores
+          wine: Tenda de viño
           "yes": Tenda
         tourism:
           alpine_hut: Cabana alpina
@@ -916,7 +937,7 @@ gl:
         level10: Fronteira do barrio
     description:
       title:
-        osm_nominatim: Localización desde <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Localización desde <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Localización desde <a href="http://www.geonames.org/">GeoNames</a>
       types:
@@ -991,19 +1012,19 @@ gl:
     legal_babble:
       title_html: Dereitos de autoría e licenza
       intro_1_html: "O OpenStreetMap <sup><a href=\"#trademarks\">&reg;</a></sup>
-        está dispoñible baixo <i>datos abertos</i> e atópase baixo a <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open
+        está dispoñible baixo <i>datos abertos</i> e atópase baixo a <a\nhref=\"https://opendatacommons.org/licenses/odbl/\">Open
-        Data\nCommons Open Database License</a> (ODbL) da  <a\t\nhref=\"http://osmfoundation.org/\">Fundación
+        Data\nCommons Open Database License</a> (ODbL) da  <a\t\nhref=\"https://osmfoundation.org/\">Fundación
         OpenStreetMap</a> (OSMF)."
       intro_2_html: |-
         Vostede é libre de copiar, distribuír, transmitir e adaptar os nosos datos,
         na medida en que acredite o OpenStreetMap e mais os seus
         colaboradores. Se altera ou constrúe a partir dos nosos datos, terá
         que distribuír o resultado baixo a mesma licenza. O
-        <a href="http://opendatacommons.org/licenses/odbl/1.0/">texto
+        <a href="https://opendatacommons.org/licenses/odbl/1.0/">texto
         legal</a> ao completo explica os seus dereitos e responsabilidades.
       intro_3_html: |-
         Os datos cartográficos dos cuadrantes dos nosos mapas e a nosa documentación
-        atópanse baixo a licenza <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+        atópanse baixo a licenza <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
         Commons recoñecemento compartir igual 2.0</a> (CC BY-SA).
       credit_title_html: Como acreditar o OpenStreetMap
       credit_1_html: |-
@@ -1012,7 +1033,7 @@ gl:
       credit_2_html: "Cómpre tamén deixar claro que os datos están dispoñibles baixo
         a Open \nDatabase License e, se utiliza os cuadrantes dos nosos mapas, que
         os datos cartográficos\nestán baixo a licenza CC-BY-SA. Pode facelo ligando
-        con\n<a href=\"http://www.openstreetmap.org/copyright/gl\">esta páxina</a>.\nComo
+        con\n<a href=\"https://www.openstreetmap.org/copyright/gl\">esta páxina</a>.\nComo
         alternativa, e obrigatoriamente se está distribuíndo o OSM nun\nformulario
         de datos, pode nomear e ligar directamente cara á(s) licenza(s). Naqueles
         medios\nnos que non sexa posible incluír as ligazóns (por exemplo, nas obras
@@ -1028,7 +1049,7 @@ gl:
       more_title_html: Máis información
       more_1_html: |-
         Descubra máis sobre como empregar os nosos datos e como acreditarnos na <a
-        href="http://osmfoundation.org/Licence">páxina de licenza de OSMF</a>.
+        href="https://osmfoundation.org/Licence">páxina de licenza de OSMF</a>.
       more_2_html: |-
         Malia que o OpenStreetMap é de datos abertos, non podemos proporcionar un
         mapa API gratuíto aos desenvolvedores.
@@ -1042,10 +1063,10 @@ gl:
         e outras fontes, entre elas:
       contributors_at_html: |-
         <strong>Austria:</strong> Contén datos de
-        <a href="http://data.wien.gv.at/">Stadt Wien</a> (baixo a licenza
+        <a href="https://data.wien.gv.at/">Stadt Wien</a> (baixo a licenza
-        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> e
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> e
-        Land Tirol (baixo a licenza <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT con emendas</a>).
+        Land Tirol (baixo a licenza <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT con emendas</a>).
       contributors_ca_html: |-
         <strong>Canadá:</strong> Contén datos de
         GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -1056,13 +1077,13 @@ gl:
         <strong>Finlandia</strong>: Contén datos da
         National Land Survey of Finland's Topographic Database
         e outros conxuntos de datos, baixo a
-        <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">licenza NLSFI</a>.
+        <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">licenza NLSFI</a>.
       contributors_fr_html: |-
         <strong>Francia:</strong> Contén datos con orixe na
         Direction Générale des Impôts.
       contributors_nl_html: |-
         <strong>Países Baixos:</strong> Contén datos de &copy; AND, 2007
-        (<a href="http://www.and.com">www.and.com</a>)
+        (<a href="https://www.and.com">www.and.com</a>)
       contributors_nz_html: |-
         <strong>Nova Zelandia:</strong> Contén datos con orixe no
         Land Information New Zealand. Dereitos de autor da coroa.
@@ -1082,7 +1103,7 @@ gl:
       contributors_footer_1_html: |-
         Para obter máis información sobre estas e outras fontes usadas
         para axudar na mellora do OpenStreetMap, bote unha ollada á <a
-        href="http://wiki.openstreetmap.org/wiki/Contributors">páxina dos
+        href="https://wiki.openstreetmap.org/wiki/Contributors">páxina dos
         colaboradores</a> no wiki do OpenStreetMap.
       contributors_footer_2_html: |-
         A inclusión de datos no OpenStreetMap non implica que o que
@@ -1096,14 +1117,14 @@ gl:
       infringement_2_html: |-
         Se pensa que se engadiu material protexido de xeito inapropiado
         á base de datos do OpenStreetMap ou a este sitio, consulte
-        o noso <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedemento
+        o noso <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedemento
         para retirar datos</a> ou deixe unha notificación no noso
         <a href="http://dmca.openstreetmap.org/">formulario en liña</a>.
       trademarks_title_html: <span id="trademarks"></span>Marcas rexistadas
       trademarks_1_html: OpenStreetMap, o logotipo coa lupa e ''State of the Map''
         son marcas rexistadas da Fundación OpenStreetMap. Se ten algunha pregunta
-        sobre a utilización das marcas, por favor envée as súas cuestión ó <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Grupo
+        sobre a utilización das marcas, por favor consulte a nosa <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Política
-        de Traballo de Licenzas</a>.
+        de Licenzas</a>.
   welcome_page:
     title: Reciba a nosa benvida!
     introduction_html: Dámoslle a benvida ao OpenStreetMap, o mapa do mundo libre
@@ -1137,8 +1158,8 @@ gl:
       paragraph_1_html: OpenStreetMap ten poucas regras formais, pero esperamos que
         todos os participantes colaboraren e se comuniquen coa comunidade. Se está
         considerando algunha actividade que non sexa a edición manual, lea e siga
-        as instrucións sobre <a href='http://wiki.openstreetmap.<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'></a>org/wiki/Import/Guidelines'>importacións</a>
+        as instrucións sobre <a href='https://wiki.openstreetmap.<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'></a>org/wiki/Import/Guidelines'>importacións</a>
-        e <a href='http://wiki.openstreetmap.org/wiki/Import/Automated_Edits_code_of_conduct'>edicións
+        e <a href='https://wiki.openstreetmap.org/wiki/Import/Automated_Edits_code_of_conduct'>edicións
         automatizadas</a>.
     questions:
       title: Ten algunha pregunta?
@@ -1174,7 +1195,7 @@ gl:
       explanation_html: |-
         Se lle preocupa como se usan os nosos datos ou lle preocupan os contidos, consulte a
         <a href='/copyright'>páxina de dereitos de autoría</a> para obter máis información legal ou póñase en contacto cun dos
-        <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>grupos de traballo da Fundación OSM</a>.
+        <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>grupos de traballo da Fundación OSM</a>.
   help_page:
     title: Obter axuda
     introduction: |-
@@ -1185,7 +1206,7 @@ gl:
       title: Dámoslle a benvida ao OSM
       description: Comece con esta guía rápida cos principios básicos do OpenStreetMap.
     beginners_guide:
-      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
       title: Guía do principiante
       description: Guía para principiantes, mantida pola comunidade.
     help:
@@ -1209,7 +1230,7 @@ gl:
       description: Axuda para as empresas e organizacións que migran a mapas e a outros
         servizos baseados en OpenStreetMap.
     wiki:
-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
       description: No wiki atopará documentación detallada do OSM.
   about_page:
@@ -1234,8 +1255,8 @@ gl:
       Para obter máis información sobre a comunidade, consulte o
       <a href='https://blog.openstreetmap.org'>blogue do OpenStreetMap</a>,
       <a href='%{diary_path}'>diarios de usuarios</a>,
-      <a href='http://blogs.openstreetmap.org/'>blogues da comunidade</a>, e
+      <a href='https://blogs.openstreetmap.org/'>blogues da comunidade</a>, e
-      o <a href='http://www.osmfoundation.org/'>sitio web da Fundación OSM</a>.
+      o <a href='https://www.osmfoundation.org/'>sitio web da Fundación OSM</a>.
     open_data_title: Datos libres
     open_data_html: |-
       Os datos do OpenStreetMap son <i>datos libres</i>; pode usalos libremente e para calquera finalidade
@@ -1463,7 +1484,7 @@ gl:
       potlatch_unsaved_changes: Ten cambios sen gardar. (Para gardar no Potlatch,
         ten que desmarcar o camiño actual ou o punto, se está a editar no modo en
         vivo, ou premer sobre o botón "Gardar".)
-      potlatch2_not_configured: O Potlatch 2 non está configurado; consulte http://wiki.openstreetmap.org/wiki/The_Rails_Port
+      potlatch2_not_configured: O Potlatch 2 non está configurado; consulte https://wiki.openstreetmap.org/wiki/The_Rails_Port
         para obter máis información
       potlatch2_unsaved_changes: Ten cambios sen gardar. (Para gardar no Potlatch
         2, prema en "Gardar".)
@@ -1556,7 +1577,7 @@ gl:
       edit: Editar
       preview: Vista previa
     markdown_help:
-      title_html: Analizado con <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Analizado con <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
       headings: Cabeceiras
       heading: Cabeceira
       subheading: Subcabeceira
@@ -1665,7 +1686,7 @@ gl:
       description: Examinar as cargas recentes de pistas GPS
       tagged_with: ' etiquetadas con %{tags}'
       empty_html: Aínda non hai nada por aquí. <a href='%{upload_link}'>Cargue unha
-        nova pista</a> ou obteña máis información sobre as pistas GPS na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>páxina
+        nova pista</a> ou obteña máis información sobre as pistas GPS na <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>páxina
         do wiki</a>.
     delete:
       scheduled_for_deletion: Pista á espera da súa eliminación
@@ -1875,12 +1896,12 @@ gl:
         html: |-
           <p>A diferenza doutros mapas, o OpenStreetMap está completamente creado por xente coma vostede, e calquera persoa é libre de corrixilo, actualizalo, descargalo e utilizalo.</p>
           <p>Rexístrese para comezar a contribuír. Enviarémoslle un correo electrónico para confirmar a súa conta.</p>
-      license_agreement: Cando confirme a súa conta necesitará aceptar os <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">termos
+      license_agreement: Cando confirme a súa conta necesitará aceptar os <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">termos
         do colaborador</a>.
       email address: 'Enderezo de correo electrónico:'
       confirm email address: Confirmar o enderezo de correo electrónico
       not displayed publicly: A súa dirección IP non se mostra publicamente, vexa
-        a nosa <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="política
+        a nosa <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="política
         de protección de datos OSMF, incluíndo a sección sobre enderezos de correo">política
         de protección de datos</a> para máis información
       display name: 'Nome mostrado:'
@@ -2000,12 +2021,12 @@ gl:
       email never displayed publicly: (nunca mostrado publicamente)
       external auth: 'Autenticación externa:'
       openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: que é isto?
       public editing:
         heading: 'Edición pública:'
         enabled: Activado. Non é anónimo e pode editar os datos.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: que é isto?
         disabled: Desactivado e non pode editar os datos. Todas as anteriores edicións
           son anónimas.
@@ -2016,7 +2037,7 @@ gl:
           mensaxes ou ollar a súa localización. Para mostrar o que editou e permitir
           que a xente se poña en contacto con vostede mediante a páxina web, prema
           no botón que aparece a continuación. <b>Desde a migración da API á versión
-          0.6, tan só os usuarios públicos poden editar os datos do mapa</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">máis
+          0.6, tan só os usuarios públicos poden editar os datos do mapa</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">máis
           información</a>).<ul><li>Os enderezos de correo electrónico non se farán
           públicos.</li><li>Non é posible reverter esta acción e agora os novos usuarios
           xa son públicos por defecto.</li></ul>

config/locales/he.yml

@@ -449,33 +449,26 @@ he:
           crematorium: משרפה
           dentist: רופא שיניים
           doctors: רופאים
-          dormitory: מעונות
           drinking_water: מי שתייה
           driving_school: בית ספר לנהיגה
           embassy: שגרירות
-          emergency_phone: טלפון חירום
           fast_food: מזון מהיר
           ferry_terminal: מסוף מעבורת
-          fire_hydrant: ברז כיבוי אש
           fire_station: תחנת כיבוי אש
           food_court: אזור מזון מהיר
           fountain: מזרקה
           fuel: דלק
           gambling: הימורים
           grave_yard: בית קברות
-          gym: מכון כושר/חדר כושר
-          health_centre: מרכז בריאות
           hospital: בית חולים
           hunting_stand: תצפית ציידים
           ice_cream: גלידה
           kindergarten: גן ילדים
           library: ספרייה
-          market: שוק
           marketplace: שוק
           monastery: מנזר
           motorcycle_parking: חניית אופנועים
           nightclub: מועדון לילה
-          nursery: פעוטון
           nursing_home: בית אבות
           office: משרד
           parking: חניה
@@ -489,7 +482,6 @@ he:
           prison: כלא
           pub: פאב
           public_building: מבנה ציבור
-          reception_area: אזור קליטה
           recycling: נקודת מיחזור
           restaurant: מסעדה
           retirement_home: בית אבות
@@ -585,7 +577,6 @@ he:
           trunk: דרך ראשית
           trunk_link: דרך ראשית
           unclassified: דרך לא מסווגת
-          unsurfaced: דרך בלתי־סלולה
           "yes": דרך
         historic:
           archaeological_site: אתר ארכאולוגי
@@ -650,7 +641,6 @@ he:
         leisure:
           beach_resort: אתר נופש לחוף ים
           bird_hide: מצפור
-          club: מועדון
           common: שטח משותף
           dog_park: פארק כלבים
           fishing: אזור דיג
@@ -677,9 +667,20 @@ he:
           water_park: פארק מים
           "yes": נופש
         man_made:
+          beehive: כוורת דבורים
+          bridge: גשר
+          bunker_silo: בונקר
+          chimney: ארובה
+          crane: עגורן
           lighthouse: מגדלור
+          mine: מכרה
+          mineshaft: פיר מכרה
+          monitoring_station: תחנת מעקב
           pipeline: קו צינורות
+          surveillance: מעקב
           tower: מגדל
+          water_tower: מגדל מים
+          water_well: באר
           works: מפעל
           "yes": מעשה־אדם
         military:
@@ -743,8 +744,6 @@ he:
           "yes": משרד
         place:
           allotments: שטחים חקלאיים
-          block: רובע
-          airport: נמל תעופה
           city: עיר
           country: ארץ
           county: מחוז
@@ -756,7 +755,6 @@ he:
           islet: איוֹן
           isolated_dwelling: מגורים מבודדים
           locality: יישוב
-          moor: אדמת כבול
           municipality: עירייה
           neighbourhood: שכונה
           postcode: מיקוד
@@ -773,10 +771,8 @@ he:
           abandoned: מסילת ברזל נטושה
           construction: מסילת ברזל בבנייה
           disused: מסילת ברזל שאינה בשימוש
-          disused_station: תחנת רכבת שאינה בשימוש
           funicular: פוניקולר
           halt: תחנת רכבת
-          historic_station: תחנת רכבת היסטורית
           junction: מפגש מסילות ברזל
           level_crossing: מפגש מסילת ברזל וכביש
           light_rail: רכבת קלה
@@ -840,12 +836,12 @@ he:
           hairdresser: מעצב שער
           hardware: חנות חומרי בניין
           hifi: ציוד מוזיקה
-          insurance: ביטוח
           jewelry: חנות תכשיטים
           kiosk: קיוסק
           laundry: מכבסה
           mall: מרכז קניות
           market: שוק
+          massage: עיסוי
           mobile_phone: חנות טלפונים ניידים
           motorcycle: חנות אופנועים
           music: חנות כלי נגינה
@@ -853,21 +849,23 @@ he:
           optician: אופטיקאי
           organic: חנות מזון אורגני
           outdoor: חנות ציוד מחנאות
+          paint: חנות צבע
           pet: חנות חיות מחמד
           pharmacy: בית מרקחת
           photo: חנות צילום
-          salon: סלון
+          seafood: מאכלי ים
           second_hand: חנות יד שנייה
           shoes: חנות נעליים
-          shopping_centre: מרכז קניות
           sports: חנות ספורט
           stationery: חנות כלי כתיבה
           supermarket: סופרמרקט
           tailor: חייט
+          tobacco: חנות טבק
           toys: חנות צעצועים
           travel_agency: סוכנות נסיעות
+          tyres: חנות צמיגים
           video: ספריית וידאו
-          wine: חנות אלכוהול
+          wine: חנות יין
           "yes": חנות
         tourism:
           alpine_hut: בקתה אלפינית

config/locales/hr.yml

@@ -444,33 +444,26 @@ hr:
           crematorium: Krematorij
           dentist: Zubar
           doctors: Doktor
-          dormitory: Studentski dom
           drinking_water: Pitka voda
           driving_school: Autoškola
           embassy: Veleposlanstvo
-          emergency_phone: Telefon (S.O.S)
           fast_food: Fast food
           ferry_terminal: Trajektni terminal
-          fire_hydrant: Hidrant
           fire_station: Vatrogasna postaja
           food_court: Blagovaonski kutak
           fountain: Fontana
           fuel: Benzinska
           gambling: Kockarnica
           grave_yard: Groblje
-          gym: Fitness centar
-          health_centre: Zdravstveni centar
           hospital: Bolnica
           hunting_stand: Čeka
           ice_cream: Slastičarna
           kindergarten: Dječji vrtić
           library: Knjižnica
-          market: Tržnica
           marketplace: Tržnica
           monastery: Samostan
           motorcycle_parking: Parking za motocikle
           nightclub: Noćni klub
-          nursery: Čuvanje djece
           nursing_home: Starački dom
           office: Kancelarija
           parking: Parking
@@ -484,7 +477,6 @@ hr:
           prison: Zatvor
           pub: Pub
           public_building: Ustanova
-          reception_area: Recepcija
           recycling: Reciklažna točka
           restaurant: Restoran
           retirement_home: Dom za starije osobe
@@ -580,7 +572,6 @@ hr:
           trunk: Cesta rezervirana za motorna vozila
           trunk_link: Cesta rezrevirana za mot. voz. - prilazna cesta
           unclassified: Nerazvrstana cesta
-          unsurfaced: Neasfaltirana cesta
           "yes": Cesta
         historic:
           archaeological_site: Arheološko nalazište
@@ -640,7 +631,6 @@ hr:
           vineyard: Vinograd
         leisure:
           beach_resort: Plaža
-          club: Klub
           common: Općinsko zemljište
           dog_park: Park za pse
           fishing: Ribičko područje
@@ -721,7 +711,6 @@ hr:
           ngo: Ured nedržavne organizacije
           "yes": Ured
         place:
-          airport: Zračna luka
           city: Grad
           country: Država
           county: Županija/grofovija
@@ -732,7 +721,6 @@ hr:
           island: Otok
           islet: Otočić
           locality: Lokalitet
-          moor: Močvara
           municipality: Općina
           postcode: Poštanski broj
           region: Područje
@@ -748,10 +736,8 @@ hr:
           abandoned: Napuštena pruga
           construction: Pruga u izgradnji
           disused: Napuštena pruga
-          disused_station: Željeznička stanica (nije u upotrebi)
           funicular: Uspinjača
           halt: Željeznička stanica
-          historic_station: Povijesna željeznička stanica
           junction: Željeznički čvor
           level_crossing: Pružni prijelaz
           light_rail: Laka željeznica
@@ -815,7 +801,6 @@ hr:
           hairdresser: Frizer
           hardware: Željezar
           hifi: Hi-Fi
-          insurance: Osiguranje
           jewelry: Zlatarna
           kiosk: Kiosk
           laundry: Praonica rublja
@@ -831,9 +816,7 @@ hr:
           pet: Trgovina za kućne ljubimce
           pharmacy: Ljekarna
           photo: Fotograf
-          salon: Salon
           shoes: Trgovina obućom
-          shopping_centre: Trgovački centar
           sports: Trgovina sportskom opremom
           stationery: Papirnica
           supermarket: Supermarket

config/locales/hsb.yml

@@ -439,33 +439,26 @@ hsb:
           crematorium: Krematorij
           dentist: Zubny lěkar
           doctors: Lěkarjo
-          dormitory: Internat
           drinking_water: Pitna woda
           driving_school: Jězbna šula
           embassy: Wulkopósłanstwo
-          emergency_phone: Nuzowy telefon
           fast_food: Přikuski
           ferry_terminal: Přewozny přistaw
-          fire_hydrant: Wohnjowy hydrant
           fire_station: Wohnjostraža
           food_court: Food Court
           fountain: Studnja
           fuel: Tankownja
           gambling: Hra wo zbožo
           grave_yard: Kěrchow
-          gym: Fitnesowy center/Fitnesowe studijo
-          health_centre: Strowotny centrum
           hospital: Chorownja
           hunting_stand: Łakańca
           ice_cream: Jědźny lód
           kindergarten: Pěstowarnja
           library: Knihownja
-          market: Wiki
           marketplace: Torhošćo
           monastery: klóšter
           motorcycle_parking: parkowanišćo za motorske
           nightclub: Nócny klub
-          nursery: Pěstowarnja
           nursing_home: Hladarnja
           office: Běrow
           parking: Parkowanišćo
@@ -479,7 +472,6 @@ hsb:
           prison: Jastwo
           pub: Korčma
           public_building: Zjawne twarjenje
-          reception_area: Přijimanski wobłuk
           recycling: Přijimarnja starowiznow
           restaurant: Hosćenc
           retirement_home: Starownja
@@ -575,7 +567,6 @@ hsb:
           trunk: Dalokodróha
           trunk_link: Dalokodróha
           unclassified: Njezarjadowana dróha
-          unsurfaced: Njewobtwjerdźena dróha
           "yes": dróha
         historic:
           archaeological_site: Archeologiske wurywanišćo
@@ -640,7 +631,6 @@ hsb:
         leisure:
           beach_resort: Mórske kupjele
           bird_hide: Ptači schow
-          club: towarstwo
           common: Gmejnski kraj
           dog_park: psyči park
           fishing: Rybnišćo
@@ -733,8 +723,6 @@ hsb:
           "yes": Běrow
         place:
           allotments: małozahrodki
-          block: blok
-          airport: Lětanišćo
           city: Wulkoměsto
           country: Kraj
           county: Wokrjes
@@ -746,7 +734,6 @@ hsb:
           islet: Kupka
           isolated_dwelling: Jednotliwe bydło
           locality: Sydlišćo
-          moor: Bahno
           municipality: Gmejna
           neighbourhood: Bydlenski wobwod
           postcode: Postowe wodźenske čisło
@@ -763,10 +750,8 @@ hsb:
           abandoned: Rozpušćena železnica
           construction: Železnica so twari
           disused: Zastajena železnica
-          disused_station: Zawrjene dwórnišćo
           funicular: Powjaznica
           halt: Železniske zastanišćo
-          historic_station: Historiske dwórnišćo
           junction: Železniske křižnišćo
           level_crossing: Železniski přechod
           light_rail: Měšćanska železnica
@@ -830,7 +815,6 @@ hsb:
           hairdresser: Frizerski salon
           hardware: Twarske wiki
           hifi: Hi-fi
-          insurance: Zawěsćernja
           jewelry: Debjenkowy wobchod
           kiosk: Kiosk
           laundry: Myjernja
@@ -846,10 +830,8 @@ hsb:
           pet: Coowobchod
           pharmacy: Lěkarnja
           photo: Fotograf
-          salon: Salon
           second_hand: Nakupowanišćo
           shoes: Wobchod črijow
-          shopping_centre: Nakupowanišćo
           sports: Sportowy wobchod
           stationery: Papjernistwo
           supermarket: Superwiki

config/locales/hu.yml

@@ -457,33 +457,26 @@ hu:
           crematorium: Krematórium
           dentist: Fogorvos
           doctors: Orvosi rendelő
-          dormitory: Kollégium
           drinking_water: Ivóvíz
           driving_school: Autósiskola
           embassy: Nagykövetség
-          emergency_phone: Segélyhívó
           fast_food: Gyorsétterem
           ferry_terminal: Kompkikötő
-          fire_hydrant: Tűzcsap
           fire_station: Tűzoltóság
           food_court: Ételudvar
           fountain: Szökőkút
           fuel: Benzinkút
           gambling: Szerencsejáték
           grave_yard: Kis temető
-          gym: Fitnesz- / Tornaterem
-          health_centre: Egészségügyi központ
           hospital: Kórház
           hunting_stand: Magasles
           ice_cream: Jégkrém
           kindergarten: Óvoda
           library: Könyvtár
-          market: Piac
           marketplace: Vásártér
           monastery: Kolostor
           motorcycle_parking: Motoros parkoló
           nightclub: Éjszakai bár
-          nursery: Óvoda
           nursing_home: Idősek otthona
           office: Iroda
           parking: Parkoló
@@ -497,7 +490,6 @@ hu:
           prison: Börtön
           pub: Kocsma
           public_building: Középület
-          reception_area: Recepció
           recycling: Szelektív hulladékgyűjtő
           restaurant: Étterem
           retirement_home: Nyugdíjasotthon
@@ -593,7 +585,6 @@ hu:
           trunk: Autóút
           trunk_link: Autóút
           unclassified: Egyéb út
-          unsurfaced: Burkolatlan út
           "yes": Út
         historic:
           archaeological_site: Régészeti lelőhely
@@ -658,7 +649,6 @@ hu:
         leisure:
           beach_resort: Tengerparti üdülőhely
           bird_hide: Madárles
-          club: Klub
           common: Közös terület
           dog_park: Kutyapark
           fishing: Horgászterület
@@ -751,8 +741,6 @@ hu:
           "yes": Iroda
         place:
           allotments: Veteményeskertek
-          block: Blokk
-          airport: Repülőtér
           city: Nagyváros
           country: Ország
           county: Megye
@@ -764,7 +752,6 @@ hu:
           islet: Kis sziget
           isolated_dwelling: Elszigetelt épület
           locality: Hely
-          moor: Mocsár
           municipality: Település
           neighbourhood: Szomszédság
           postcode: Irányítószám
@@ -781,10 +768,8 @@ hu:
           abandoned: Felhagyott vasút
           construction: Építés alatt álló vasút
           disused: Használaton kívüli vasút
-          disused_station: Használaton kívüli vasútállomás
           funicular: Siklóvasút
           halt: Vasúti megállóhely
-          historic_station: Történelmi vasútállomás
           junction: Vasúti csomópont
           level_crossing: Vasúti átjáró
           light_rail: HÉV
@@ -848,7 +833,6 @@ hu:
           hairdresser: Fodrászat
           hardware: Szerelési bolt
           hifi: Hi-Fi bolt
-          insurance: Biztosító
           jewelry: Ékszerbolt
           kiosk: Trafik
           laundry: Mosoda
@@ -864,10 +848,8 @@ hu:
           pet: Állatkereskedés
           pharmacy: Gyógyszertár
           photo: Fotóbolt
-          salon: Szalon
           second_hand: Használtcikk kereskedés
           shoes: Cipőbolt
-          shopping_centre: Bevásárlóközpont
           sports: Sportbolt
           stationery: Írószerbolt
           supermarket: Szupermarket

config/locales/ia.yml

@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Carlosedepaula
+# Author: Fanjiayi
 # Author: Julian Mendez
 # Author: Macofe
 # Author: McDutchie
@@ -343,7 +344,7 @@ ia:
       map_image: Imagine de carta (monstra le strato standard)
       embeddable_html: HTML incorporabile
       licence: Licentia
-      export_details: Le datos de OpenStreetMap es licentiate sub le <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
+      export_details: Le datos de OpenStreetMap es licentiate sub le <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open
         Data Commons Open Database License</a> (ODbL).
       too_large:
         advice: 'Si iste exportation falle, considera usar un del fontes listate hic
@@ -384,14 +385,14 @@ ia:
   geocoder:
     search:
       title:
-        latlon: Resultatos <a href="http://openstreetmap.org/">interne</a>
+        latlon: Resultatos <a href="https://openstreetmap.org/">interne</a>
         uk_postcode: Resultatos de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>
-        ca_postcode: Resultatos de <a href="http://geocoder.ca/">Geocoder.CA</a>
+        ca_postcode: Resultatos de <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Resultatos de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Resultatos de <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: Resultatos ab <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Resultatos ab <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames_reverse: Resultatos ab <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
@@ -441,33 +442,26 @@ ia:
           crematorium: Crematorio
           dentist: Dentista
           doctors: Medicos
-          dormitory: Dormitorio
           drinking_water: Aqua potabile
           driving_school: Autoschola
           embassy: Ambassada
-          emergency_phone: Telephono de emergentia
           fast_food: Fast food
           ferry_terminal: Terminal de ferry
-          fire_hydrant: Hydrante de incendio
           fire_station: Caserna de pumperos
           food_court: Zona de restaurantes
           fountain: Fontana
           fuel: Carburante
           gambling: Joco de hasardo
           grave_yard: Cemeterio
-          gym: Centro de fitness / Gymnasio
-          health_centre: Centro de sanitate
           hospital: Hospital
           hunting_stand: Posto de chassa
           ice_cream: Gelato
           kindergarten: Schola pro juvene infantes
           library: Bibliotheca
-          market: Mercato
           marketplace: Mercato
           monastery: Monasterio
           motorcycle_parking: Parking a motocyclo
           nightclub: Club nocturne
-          nursery: Sala recreative pro parve infantes
           nursing_home: Casa de convalescentia
           office: Officio
           parking: Parking
@@ -481,7 +475,6 @@ ia:
           prison: Prision
           pub: Taverna
           public_building: Edificio public
-          reception_area: Area de reception
           recycling: Puncto de recyclage
           restaurant: Restaurante
           retirement_home: Residentia pro vetere personas
@@ -577,7 +570,6 @@ ia:
           trunk: Via national
           trunk_link: Via national
           unclassified: Via non classificate
-          unsurfaced: Cammino de terra
           "yes": Cammino
         historic:
           archaeological_site: Sito archeologic
@@ -642,7 +634,6 @@ ia:
         leisure:
           beach_resort: Loco de vacantias al plagia
           bird_hide: Observatorio de aves
-          club: Club
           common: Terreno commun
           dog_park: Parco pro canes
           fishing: Area de pisca
@@ -670,6 +661,7 @@ ia:
           "yes": Tempore libere
         man_made:
           lighthouse: Pharo
+          mine: Mina
           pipeline: Tubulatura
           tower: Turre
           works: Fabrica
@@ -678,6 +670,7 @@ ia:
           airfield: Aerodromo militar
           barracks: Barracas
           bunker: Bunker
+          "yes": Militar
         mountain_pass:
           "yes": Passo de montania
         natural:
@@ -723,6 +716,7 @@ ia:
           accountant: Contabile
           administrative: Administration
           architect: Architecto
+          association: Associatione
           company: Compania
           employment_agency: Agentia de empleo
           estate_agent: Agentia immobiliari
@@ -735,8 +729,6 @@ ia:
           "yes": Officio
         place:
           allotments: Jardines familial
-          block: Bloco
-          airport: Aeroporto
           city: Citate
           country: Pais
           county: Contato
@@ -748,12 +740,12 @@ ia:
           islet: Insuletta
           isolated_dwelling: Habitation isolate
           locality: Localitate
-          moor: Landa
           municipality: Municipalitate
           neighbourhood: Quartiero
           postcode: Codice postal
           region: Region
           sea: Mar
+          square: Quadrate
           state: Stato
           subdivision: Subdivision
           suburb: Suburbio
@@ -765,10 +757,8 @@ ia:
           abandoned: Ferrovia abandonate
           construction: Ferrovia in construction
           disused: Ferrovia in disuso
-          disused_station: Station ferroviari in disuso
           funicular: Ferrovia funicular
           halt: Halto de traino
-          historic_station: Station ferroviari historic
           junction: Junction ferroviari
           level_crossing: Passage a nivello
           light_rail: Metro legier
@@ -832,7 +822,6 @@ ia:
           hairdresser: Perruccheria
           hardware: Quincalieria
           hifi: Hi-fi
-          insurance: Assecurantia
           jewelry: Joieleria
           kiosk: Kiosque
           laundry: Lavanderia
@@ -848,10 +837,8 @@ ia:
           pet: Boteca de animales
           pharmacy: Pharmacia
           photo: Magazin de photographia
-          salon: Salon
           second_hand: Magazin de secunde mano
           shoes: Scarperia
-          shopping_centre: Centro commercial
           sports: Magazin de sport
           stationery: Papireria
           supermarket: Supermercato
@@ -914,7 +901,7 @@ ia:
         level10: Limite de suburbio
     description:
       title:
-        osm_nominatim: Loco de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Loco de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Position de <a href="http://www.geonames.org/">GeoNames</a>
       types:
@@ -990,26 +977,26 @@ ia:
       title_html: Copyright e Licentia
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> es <i>datos aperte</i>, licentiate sub le <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data
+        href="https://opendatacommons.org/licenses/odbl/">Open Data
         Commons Open Database License</a> (ODbL) per le <a
-        href="http://osmfoundation.org/">Fundation OpenStreetMap</a> (OSMF).
+        href="https://osmfoundation.org/">Fundation OpenStreetMap</a> (OSMF).
       intro_2_html: |2-
           Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas
           e datos, a condition que vos da recognoscentia a OpenStreetMap e su
           contributores. Si vos altera o extende nostre cartas e datos, vos
           pote distribuer le resultato solmente sub le mesme licentia. Le
-          complete <a href="http://opendatacommons.org/licenses/odbl/1.0/">codice
+          complete <a href="https://opendatacommons.org/licenses/odbl/1.0/">codice
           legal</a> explica vostre derectos e responsabilitates.
       intro_3_html: |-
         Le cartographia in nostre tegulas de carta, e nostre documentation, son
-        publicate sub licentia <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+        publicate sub licentia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
         Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).
       credit_title_html: Como dar recognoscentia a OpenStreetMap
       credit_1_html: |-
         Nos require que vos usa le recognoscentia &ldquo;&copy; OpenStreetMap
         contributors&rdquo;.
       credit_2_html: |-
-        Vos debe anque clarificar que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a <a href="http://www.openstreetmap.org/copyright">iste pagina de copyright</a>.
+        Vos debe anque clarificar que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a <a href="https://www.openstreetmap.org/copyright">iste pagina de copyright</a>.
         Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote mentionar le licentia(s) e ligar directemente a illo(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a openstreetmap.org (forsan per inserer iste adresse complete in loco del parola &lsquo;OpenStreetMap&rsquo;), a opendatacommons.org, e (si relevante) a creativecommons.org.
       credit_3_html: 'Pro un carta electronic navigabile, le recognoscentia debe apparer
         in le angulo del carta. Per exemplo:'
@@ -1019,7 +1006,7 @@ ia:
       more_title_html: Pro saper plus
       more_1_html: |-
         Lege plus sur le uso de nostre datos, e como recognoscer nos, in le <a
-        href="http://osmfoundation.org/Licence">pagina de licentia OSMF</a>.
+        href="https://osmfoundation.org/Licence">pagina de licentia OSMF</a>.
       more_2_html: |-
         Ben que OpenStreetMap es datos aperte, nos non pote fornir un API cartographic gratuite pro tertios. Vide nostre <a href="https://operations.osmfoundation.org/policies/api/">politica pro le uso del API</a>,
         <a href="https://operations.osmfoundation.org/policies/tiles">politica pro le uso de tegulas</a>
@@ -1030,8 +1017,8 @@ ia:
         altere fontes, inter le quales:'
       contributors_at_html: |-
         <strong>Austria</strong>: Contine datos ab le
-           <a href="http://data.wien.gv.at/">Citate de Vienna</a> licentiate sub
+           <a href="https://data.wien.gv.at/">Citate de Vienna</a> licentiate sub
-           <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.
+           <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.
       contributors_ca_html: |-
         <strong>Canada</strong>: Contine datos ab
            GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -1040,14 +1027,14 @@ ia:
            Statistics Canada).
       contributors_fi_html: "<strong>Finlandia</strong>: Contine datos ab le base
         de datos topographic del Inspection \nNational del Territorio de Finlandia
-        e de altere insimules de datos, sub le\n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">licentia
+        e de altere insimules de datos, sub le\n<a href=\"https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">licentia
         NLSFI</a>."
       contributors_fr_html: |-
         <strong>Francia</strong>: Contine datos fornite per le
            Direction Générale des Impôts.
       contributors_nl_html: |-
         <strong>Nederlandia</strong>: Contine datos &copy; AND, 2007
-        (<a href="http://www.and.com">www.and.com</a>)
+        (<a href="https://www.and.com">www.and.com</a>)
       contributors_nz_html: |-
         <strong>Nove Zelandia</strong>: Contine datos proveniente de
            Land Information New Zealand. Crown Copyright reservate.
@@ -1067,7 +1054,7 @@ ia:
       contributors_footer_1_html: |-
         Pro ulterior detalios de iste e altere fontes que ha essite usate
         pro adjutar a meliorar OpenStreetMap, vide le <a
-        href=""http://wiki.openstreetmap.org/wiki/Contributors">pagina
+        href=""https://wiki.openstreetmap.org/wiki/Contributors">pagina
         de contributores</a> in le wiki de OpenStreetMap.
       contributors_footer_2_html: |2-
           Le inclusion de datos in OpenStreetMap non implica que le fornitor
@@ -1080,13 +1067,13 @@ ia:
           sin explicite permission del titulares del derecto de autor.
       infringement_2_html: Si vos crede que material sub copyright ha essite inserite
         inappropriatemente in le base de datos de OpenStreetMap o in iste sito, per
-        favor consulta nostre <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura
+        favor consulta nostre <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura
-        de remotion</a> o submitte un plancto immediate usante nostre <a href="http://dmca.openstreetmap.org/">formulario
+        de remotion</a> o submitte un plancto immediate usante nostre <a href="https://dmca.openstreetmap.org/">formulario
         in linea</a>.
       trademarks_title_html: <span id="trademarks"></span>Marcas commercial
       trademarks_1_html: OpenStreetMap, le logotypo con le lupa e "State of the Map"
         es marcas registrate del Fundation OpenStreetMap. Si vos ha questiones sur
-        le uso de iste marcas, invia los al <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">gruppo
+        le uso de iste marcas, invia los al <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">gruppo
         de labor sur licentias</a>.
   welcome_page:
     title: Benvenite!
@@ -1119,8 +1106,8 @@ ia:
       paragraph_1_html: OpenStreetMap ha poc regulas formal, ma nos expecta que tote
         le participantes collabora e communica con le communitate. Si vos considera
         un activitate altere que modification per mano, lege e seque le directivas
-        sur le <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>importation</a>
+        sur le <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>importation</a>
-        e sur le <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>modification
+        e sur le <a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>modification
         automatisate</a>.
     questions:
       title: Questiones?

config/locales/id.yml

@@ -461,33 +461,26 @@ id:
           crematorium: Tempat Kremasi (Pembakaran Mayat)
           dentist: Dokter Gigi
           doctors: Dokter
-          dormitory: Asrama
           drinking_water: Air Minum
           driving_school: Sekolah Mengemudi
           embassy: Kedutaan Besar
-          emergency_phone: Telepon Darurat
           fast_food: Makanan Cepat Saji
           ferry_terminal: Terminal Kapal Feri
-          fire_hydrant: Hidran/Keran Kebakaran
           fire_station: Stasiun Pemadam Kebakaran
           food_court: Tempat Makan
           fountain: Air Mancur
           fuel: Stasiun Pengisian Bahan Bakar
           gambling: Perjudian
           grave_yard: Kuburan
-          gym: Pusat Kebugaran / Gym
-          health_centre: Pusat Kesehatan
           hospital: Rumah Sakit
           hunting_stand: Pos Berburu
           ice_cream: Es Krim
           kindergarten: Taman Kanak-kanak
           library: Perpustakaan
-          market: Pasar
           marketplace: Pasar
           monastery: Biara
           motorcycle_parking: Parkir Motor
           nightclub: Klub Malam
-          nursery: Pendidikan Anak Usia Dini (PAUD)
           nursing_home: Panti Jompo
           office: Kantor
           parking: Parkir
@@ -501,7 +494,6 @@ id:
           prison: Penjara
           pub: Pub
           public_building: Bangunan Publik
-          reception_area: Area Bagian Penerima Tamu
           recycling: Titik Daur Ulang
           restaurant: Restoran
           retirement_home: Rumah Jompo
@@ -597,7 +589,6 @@ id:
           trunk: Jalan Nasional
           trunk_link: Jalan Nasional
           unclassified: Jalan Tidak Terklasifikasi
-          unsurfaced: Jalan Tanpa Permukaan
           "yes": Jalan
         historic:
           archaeological_site: Situs arkeologi
@@ -662,7 +653,6 @@ id:
         leisure:
           beach_resort: Resort Pantai
           bird_hide: Tempat Observasi Burung
-          club: Klub
           common: Lahan Publik
           dog_park: Taman Anjing
           fishing: Tempat Pemancingan
@@ -755,8 +745,6 @@ id:
           "yes": Kantor
         place:
           allotments: Tanah Garapan
-          block: Blok
-          airport: Bandara
           city: Kota
           country: Negara
           county: Provinsi
@@ -768,7 +756,6 @@ id:
           islet: Pulau Kecil
           isolated_dwelling: Daerah Terisolasi
           locality: Lokal
-          moor: Tegalan
           municipality: Kotamadya/Kabupaten
           neighbourhood: Lingkungan
           postcode: Kode Pos
@@ -785,10 +772,8 @@ id:
           abandoned: Rel Kereta Api Terbengkalai
           construction: Rel kereta yang diperbaiki
           disused: Rel Kereta Api Tak Terpakai
-          disused_station: Bekas Stasiun Kereta
           funicular: Trem yang digerakan dengan kabel
           halt: Pemberhentian kereta
-          historic_station: Stasiun Kereta Bersejarah
           junction: Persimpangan Rel
           level_crossing: Perlintasan Bertingkat
           light_rail: Kereta api cepat
@@ -852,7 +837,6 @@ id:
           hairdresser: Penata Rambut
           hardware: Toko Perangkat Keras
           hifi: Hi-Fi
-          insurance: Asuransi
           jewelry: Toko Perhiasan
           kiosk: Kios/Warung
           laundry: Penatu
@@ -868,10 +852,8 @@ id:
           pet: Toko Hewan
           pharmacy: Apotek
           photo: Studio Foto
-          salon: Salon
           second_hand: Toko loak
           shoes: Toko Sepatu
-          shopping_centre: Pusat Perbelanjaan
           sports: Toko Olahraga
           stationery: Toko Alat Tulis
           supermarket: Supermarket

config/locales/is.yml

@@ -411,12 +411,19 @@ is:
           chair_lift: Stólalyfta
           drag_lift: Toglyfta
           gondola: Eggjalyfta
+          platter: Diskalyfta
+          pylon: Lyftumastur
           station: Lyftustöð
+          t-bar: T-lyfta
         aeroway:
           aerodrome: Flugsvæði
+          airstrip: Flugbraut
           apron: Flughlað
           gate: Hlið
+          hangar: Flugskýli
           helipad: Þyrlupallur
+          holding_position: Biðstæði
+          parking_position: Loftfarastæði
           runway: Flugbraut
           taxiway: Akbraut flugvéla
           terminal: Flugstöð
@@ -451,37 +458,32 @@ is:
           crematorium: Bálstofa
           dentist: Tannlæknir
           doctors: Læknar
-          dormitory: Heimavist
           drinking_water: Drykkjarvatn
           driving_school: Ökuskóli
           embassy: Sendiráð
-          emergency_phone: Neyðarsími
           fast_food: Skyndibitastaður
           ferry_terminal: Ferjustöð
-          fire_hydrant: Brunahani
           fire_station: Slökkvistöð
           food_court: Veitingasvæði
           fountain: Gosbrunnur
           fuel: Eldsneyti
           gambling: Fjárhættuspil
           grave_yard: Kirkjugarður
-          gym: Líkamsræktarstöð
+          grit_bin: Sandkista
-          health_centre: Heilsumiðstöð
           hospital: Sjúkrahús
           hunting_stand: Skotvöllur
           ice_cream: Ísbúð
           kindergarten: Leikskóli
           library: Bókasafn
-          market: Markaður
           marketplace: Markaður
           monastery: Klaustur
           motorcycle_parking: Mótorhjólastæði
           nightclub: Næturklúbbur
-          nursery: Skiptiborð
           nursing_home: Hjúkrunarheimili
           office: Skrifstofa
           parking: Bílastæði
           parking_entrance: Aðgangur að bílastæði
+          parking_space: Bílastæði
           pharmacy: Lyfjabúð
           place_of_worship: Tilbeiðslustaður
           police: Lögreglustöð
@@ -491,7 +493,6 @@ is:
           prison: Fangelsi
           pub: Krá
           public_building: Opinber bygging
-          reception_area: Móttökusvæði
           recycling: Endurvinnsla
           restaurant: Veitingastaður
           retirement_home: Elliheimili
@@ -499,7 +500,7 @@ is:
           school: Skóli
           shelter: Skýli
           shop: Verslun
-          shower: Steypibað
+          shower: Sturta
           social_centre: Félagsmiðstöð
           social_club: Samfélagsklúbbur
           social_facility: Félagsþjónusta
@@ -516,6 +517,7 @@ is:
           village_hall: Hreppsskrifstofa
           waste_basket: Ruslafata
           waste_disposal: Ruslsöfnun
+          water_point: Vatnspóstur
           youth_centre: Ungmennamiðstöð
         boundary:
           administrative: Stjórnsýslumörk
@@ -524,6 +526,7 @@ is:
           protected_area: Verndarsvæði
         bridge:
           aqueduct: Vatnsveitubrú
+          boardwalk: Plankabrú
           suspension: Hengibrú
           swing: Snúningsbrú
           viaduct: Dalbrú
@@ -543,25 +546,31 @@ is:
           "yes": Handverkshús
         emergency:
           ambulance_station: Sjúkrabílastöð
+          assembly_point: Safnsvæði
           defibrillator: Hjartastuðtæki
           landing_site: Neyðarlending
           phone: Neyðarsími
+          water_tank: Vatnstankur fyrir neyðartilfelli
+          "yes": Neyðartilfelli
         highway:
           abandoned: Ónotuð hraðbraut
           bridleway: Reiðstígur
           bus_guideway: Strætisvagnaakrein með stýringu
           bus_stop: Strætisvagnabiðstöð
           construction: Hraðbraut í byggingu
+          corridor: Gangur
           cycleway: Hjólastígur
           elevator: Lyfta
           emergency_access_point: Neyðaraðgangur
           footway: Göngustígur
           ford: Vað
+          give_way: Víkja-skilti
           living_street: Vistgata
           milestone: Vegalengdarsteinn
           motorway: Hraðbraut
           motorway_junction: Þjóðvegatenging
           motorway_link: Hraðbraut
+          passing_place: Víkingakantur
           path: Slóð
           pedestrian: Gönguleið
           platform: Pallur
@@ -578,6 +587,7 @@ is:
           services: Hraðbrautaþjónusta
           speed_camera: Hraðamyndavél
           steps: Tröppur
+          stop: Stöðvunarskilti
           street_lamp: Ljósastaur
           tertiary: Annar vegur
           tertiary_link: Annar vegur
@@ -586,8 +596,8 @@ is:
           trail: Stígur
           trunk: Stofnbraut (Hringvegurinn)
           trunk_link: Stofnbraut (Hringvegurinn)
+          turning_loop: Snúningsslaufa
           unclassified: Óflokkaður vegur
-          unsurfaced: Vegur án slitlags
           "yes": Vegur
         historic:
           archaeological_site: Fornminjar
@@ -606,6 +616,7 @@ is:
           manor: Herragarður
           memorial: Minnismerki
           mine: Náma
+          mine_shaft: Námugöng
           monument: Minnisvarði
           roman_road: Rómverskur vegur
           ruins: Rústir
@@ -615,6 +626,7 @@ is:
           wayside_cross: Vegakross
           wayside_shrine: Vegaskrín
           wreck: Flak
+          "yes": Sögustaður
         junction:
           "yes": Tenging
         landuse:
@@ -652,9 +664,9 @@ is:
         leisure:
           beach_resort: Strandbær
           bird_hide: Fuglaskoðunarhús
-          club: Klúbbur
           common: Almenningur
           dog_park: Hundagarður
+          firepit: Eldhola
           fishing: Fiskveiði
           fitness_centre: Líkamsræktarstöð
           fitness_station: Líkamsræktarstöð
@@ -679,15 +691,46 @@ is:
           water_park: Vatnsleikjagarður
           "yes": Afþreying
         man_made:
+          adit: Námuinngangur
+          beacon: Miðunarmerki
+          beehive: Býflugnabú
+          breakwater: Brimvarnargarður
+          bridge: Brú
+          bunker_silo: Sprengjubyrgi
+          chimney: Skorsteinn
+          crane: Krani
+          dolphin: Bryggjustólpi
+          dyke: Flóðgarður
+          embankment: Stallur
+          flagpole: Fánastöng
+          gasometer: Gasmælir
+          groyne: Öldubrjótur
+          kiln: Brennsluofn
           lighthouse: Viti
+          mast: Mastur
+          mine: Náma
+          mineshaft: Námugöng
+          monitoring_station: Vöktunarstöð
+          petroleum_well: Olíulind
+          pier: Bryggja
           pipeline: Leiðsla
+          silo: Síló
+          storage_tank: Geymslutankur
+          surveillance: Eftirlit
           tower: Turn
+          wastewater_plant: Vatnshreinsistöð
+          watermill: Vatnsmylla
+          water_tower: Vatnsturn
+          water_well: Brunnur
+          water_works: Vatnsvinnsla
+          windmill: Vindmylla
           works: Verksmiðja
           "yes": Manngert
         military:
           airfield: Herflugvöllur
           barracks: Herbúðir
           bunker: Sprengjubyrgi
+          "yes": Hernaðar
         mountain_pass:
           "yes": Fjallaskarð
         natural:
@@ -733,11 +776,14 @@ is:
           accountant: Bókari
           administrative: Stjórnsýsla
           architect: Arkítektar
+          association: Samtök
           company: Fyrirtæki
+          educational_institution: Menntastofnun
           employment_agency: Vinnumiðlun
           estate_agent: Fasteignasali
           government: Stjórnarskrifstofa
           insurance: Tryggingaskrifstofa
+          it: Upplýsingatækniskrifstofa
           lawyer: Lögmaður
           ngo: Skrifstofa frjálsra félagasamtaka
           telecommunication: Fjarskiptaskrifstofa
@@ -745,9 +791,8 @@ is:
           "yes": Skrifstofa
         place:
           allotments: Úthlutuð svæði
-          block: Reitur
-          airport: Flugvöllur
           city: Borg
+          city_block: Götureitur
           country: Land
           county: Sýsla
           farm: Býli
@@ -758,12 +803,13 @@ is:
           islet: Smáeyja
           isolated_dwelling: Einangraður bústaður
           locality: Sveitarfélag
-          moor: Mýri
           municipality: Sveitarfélag
           neighbourhood: Nágrenni
           postcode: Póstnúmer
+          quarter: Hverfi
           region: Hérað
           sea: Hafið
+          square: Torg
           state: Ríki
           subdivision: Undirskipting
           suburb: Úthverfi
@@ -775,10 +821,8 @@ is:
           abandoned: Aflögð járnbraut
           construction: Járnbraut í byggingu
           disused: Aflögð járnbraut
-          disused_station: Aflögð járnbrautarstöð
           funicular: Kláfbraut
           halt: Lestarstopp
-          historic_station: Söguleg lestarstöð
           junction: Járnbrautatenging
           level_crossing: Þverun brautarteina
           light_rail: Léttlest
@@ -804,6 +848,7 @@ is:
           beauty: Snyrtivöruverslun
           beverages: Drykkjarfangaverslun
           bicycle: Hjólaverslun
+          bookmaker: Veðmangari
           books: Bókabúð
           boutique: Sérverslun
           butcher: Slátrari
@@ -842,12 +887,16 @@ is:
           hairdresser: Hársnyrting
           hardware: Verkfærabúð
           hifi: Hljómtækjaverslun
-          insurance: Tryggingar
+          houseware: Húsbúnaðarverslun
+          interior_decoration: Innanhúshönnun
           jewelry: Skartgripaverslun
           kiosk: Söluturn
+          kitchen: Eldhúsvörur
           laundry: Þvottahús
+          lottery: Lottó
           mall: Verslunarkjarni
           market: Markaður
+          massage: Nudd
           mobile_phone: Farsímaverslun
           motorcycle: Mótorhjólaverslun
           music: Tónlistarverslun
@@ -855,21 +904,27 @@ is:
           optician: Sjóntækjafræðingur
           organic: Verslun með lífrænt fæði
           outdoor: Útivistarverslun
+          paint: Málningarvöruverslun
+          pawnbroker: Veðlánari
           pet: Gæludýraverslun
           pharmacy: Lyfjabúð
           photo: Ljósmyndavöruverslun
-          salon: Snyrtistofa
+          seafood: Fiskmeti
           second_hand: Verslun með notað
           shoes: Skóbúð
-          shopping_centre: Verslunarmiðstöð
           sports: Íþróttavöruverslun
           stationery: Ritfangaverslun
           supermarket: Kjörbúð
           tailor: Klæðskeri
+          ticket: Miðasala
+          tobacco: Tóbaksverslun
           toys: Leikfangaverslun
           travel_agency: Ferðaskrifstofa
+          tyres: Dekkjaverslun
+          vacant: Laust verslunarrými
+          variety_store: Smávörumarkaður
           video: Videoleiga
-          wine: Án vínveitingaleyfis
+          wine: Vínbúð
           "yes": Verslun
         tourism:
           alpine_hut: Fjallaskáli
@@ -893,6 +948,7 @@ is:
           viewpoint: Útsýnisstaður
           zoo: Dýragarður
         tunnel:
+          building_passage: Undirgöng í gegnum byggingu
           culvert: Ræsi
           "yes": Göng
         waterway:
@@ -1160,14 +1216,34 @@ is:
     start_mapping: Hefja kortlagningu
     add_a_note:
       title: Enginn tími fyrir breytingar? Bættu við athugasemd!
+      paragraph_1_html: Það er auðvelt að bæta við minnispunkti ef þú vilt laga eitthvað
+        smávægilegt en hefur ekki tíma til að skrá þig og læra hvernig maður breytir
+        kortinu.
+      paragraph_2_html: |-
+        Farðu á <a href='%{map_url}'>landakortið</a> og smelltu á minnismiðatáknið:
+        <span class='icon note'></span>. Þetta mun bæta merki á kortið, sem þú getur fært til
+        með því að draga það. Bættu við skilaboðunum þínum, smelltu síðan á að vista, og annað kortagerðarfólk mun væntanlega rannsaka málið.
   fixthemap:
     title: Tilkynna vandamál / Laga kortið
     how_to_help:
       title: Hvernig á að hjálpa til
       join_the_community:
         title: Ganga í hópinn
+        explanation_html: |-
+          Ef þú hefur rekist á vandamál í kortagögnunum, til dæmis ef það vantar götu eða húsnúmer, er besta leiðin
+          að ganga til liðs við OpenStreetMap og bæta við eða laga gögnin sjálfur. \
+      add_a_note:
+        instructions_html: |-
+          Smelltu á <a class='icon note'></a> eða sama táknið í kortaglugganum.
+          Þetta mun bæta merki á kortið, sem þú getur fært til
+          með því að draga það. Bættu við skilaboðunum þínum, smelltu síðan á að vista, og annað kortagerðarfólk mun væntanlega rannsaka málið.
     other_concerns:
       title: Önnur íhugunarefni
+      explanation_html: "Ef þú ert að velta fyrir þér hvernig gögnin okkar eru notuð
+        eða einhverju varðandi efni þeirra, geturðu skoðað\n<a href='/copyright'>síðuna
+        varðandi höfundarrétt</a> varðandi nánari lagaskýringar, eða haft samband
+        við viðeigandi \n<a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF
+        vinnuhóp</a>.  \\"
   help_page:
     title: Til að fá hjálp
     introduction: |-
@@ -1244,7 +1320,9 @@ is:
       okkar varðandi ásættanlega notkun</a> auk <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">persónuverndarstefnu
       okkar</a>\n.<br> \nEndilega <a href='https://osmfoundation.org/Contact'>hafðu
       samband við OSMF</a> \nef þú ert með spurningar eða beiðnir varðandi notkunarleyfi,
-      höfundarrétt eða önnur lögfræðileg málefni."
+      höfundarrétt eða önnur lögfræðileg málefni.\n<br>\nOpenStreetMap, táknmerkið
+      með stækkunarglerinu og ástand kortsins eru <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">skrásett
+      vörumerki OSMF</a>."
     partners_title: Samstarfsaðilar
   notifier:
     diary_comment_notification:
@@ -1327,24 +1405,46 @@ is:
           af minnispunktunum þínum'
         subject_other: '[OpenStreetMap@] %{commenter} hefur gert athugasemd við minnispunkt
           sem þú hefur áhuga á'
+        your_note: '%{commenter} hefur sett athugasemd við einn af minnispunktunum
+          þínum nálægt %{place}.'
+        commented_note: '%{commenter} hefur sett athugasemd við minnispunkt á korti
+          sem þú hefur gert athugasemd við. Minnispunkturinn er nálægt %{place}.'
       closed:
         subject_own: '[OpenStreetMap] %{commenter} hefur leyst einn af minnispunktunum
           þínum'
         subject_other: '[OpenStreetMap@] %{commenter} hefur leyst minnispunkt sem
           þú hefur áhuga á'
+        your_note: '%{commenter} hefur leyst einn af minnispunktunum þínum nálægt
+          %{place}.'
+        commented_note: '%{commenter} hefur leyst minnispunkt á korti sem þú hefur
+          gert athugasemd við. Minnispunkturinn er nálægt %{place}.'
       reopened:
         subject_own: '[OpenStreetMap] %{commenter} hefur endurvirkjað einn af minnispunktunum
           þínum'
         subject_other: '[OpenStreetMap@] %{commenter} hefur endurvirkjað minnispunkt
           sem þú hefur áhuga á'
+        your_note: '%{commenter} hefur endurvirkjað einn af minnispunktunum þínum
+          nálægt %{place}.'
+        commented_note: '%{commenter} hefur endurvirkjað minnispunkt á korti sem þú
+          hefur gert athugasemd við. Minnispunkturinn er nálægt %{place}.'
       details: Nánari upplýsingar um minnispunktinn er að finna á %{url}.
     changeset_comment_notification:
       hi: Hæ %{to_user},
       greeting: Hæ,
       commented:
+        subject_own: '[OpenStreetMap] %{commenter} hefur gert athugasemd við eitt
+          af breytingasettunum þínum'
+        subject_other: '[OpenStreetMap@] %{commenter} hefur gert athugasemd við breytingasett
+          sem þú hefur áhuga á'
+        your_changeset: '%{commenter} hefur sett athugasemd við eitt af breytingasettunum
+          þínum sem búið var til %{time}'
+        commented_changeset: '%{commenter} hefur sett athugasemd við breytingasett
+          á korti sem þú fylgist með og var búið til af %{changeset_author} - %{time}'
         partial_changeset_with_comment: með umsögninni '%{changeset_comment}'
         partial_changeset_without_comment: án athugasemdar
       details: Nánari upplýsingar um breytingasettið er að finna á %{url}.
+      unsubscribe: Til að hætta áskrift að uppfærslum á þessu breytingasetti, farðu
+        þá á %{url} og smelltu á "Segja upp áskrift".
   message:
     inbox:
       title: Innhólf
@@ -1396,6 +1496,10 @@ is:
       no_sent_messages: Þú hefur ekki seint nein skeyti, hví ekki að hafa samband
         við einhverja %{people_mapping_nearby_link}?
       people_mapping_nearby: nálæga notendur
+    reply:
+      wrong_user: Þú hefur skráð þig inn sem `%{user}' en skilaboðin sem þú baðst
+        um að svara voru ekki send til þess notanda. Skráðu þig inn sem réttan notanda
+        til að geta svarað.
     read:
       title: Les skilaboð
       from: Frá
@@ -1406,6 +1510,9 @@ is:
       delete_button: Eyða
       back: Til baka
       to: Til
+      wrong_user: Þú hefur skráð þig inn sem `%{user}' en skilaboðin sem þú baðst
+        um að lesa voru ekki send af eða til þess notanda. Skráðu þig inn sem réttan
+        notanda til að geta svarað.
     sent_message_summary:
       delete_button: Eyða
     mark:
@@ -1423,6 +1530,8 @@ is:
       createnote: Bæta við minnispunkti
       license:
         copyright: Höfundarréttur OpenStreetMap og þáttakendur, með opnu notkunarleyfi
+      remote_failed: Breytingar mistókust - gakktu úr skugga um að JOSM eða Merkaartor
+        sé hlaðið inn og að fjarstjórnunarvalkosturinn sé virkur
     edit:
       not_public: Þú hefur ekki merkt breytingar þínar sem opinberar.
       not_public_description: Þú getur ekki lengur gert breytingar nema þær séu merktar
@@ -1456,6 +1565,7 @@ is:
       where_am_i: Hvar er þetta?
       where_am_i_title: Notar leitarvélina til að lýsa núverandi staðsetningu á kortinu
       submit_text: Byrja
+      reverse_directions_text: Snúa stefnu við
     key:
       table:
         entry:
@@ -1640,6 +1750,8 @@ is:
       public_traces_from: Ferlar eftir %{user}
       description: Skoða nýlega innsenda GPS-ferla
       tagged_with: ' með merkið %{tags}'
+      empty_html: Ekkert hér ennþá. <a href='%{upload_link}'>Sendu inn nýjan feril</a>
+        eða lærðu meira um GPS-ferlun á <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki-síðunni</a>.
     delete:
       scheduled_for_deletion: Þessum feril verður eitt
     make_public:
@@ -1698,6 +1810,8 @@ is:
       invalid: Auðkenningarteiknið er ekki gilt.
     revoke:
       flash: Þú afturkallaðir aðgangsteiknið fyrir %{application}
+    permissions:
+      missing: Þú hefur ekki gefið forritinu heimild fyrir aðgang að þessum eiginleikum
   oauth_clients:
     new:
       title: Skrá nýtt forrit
@@ -1734,6 +1848,9 @@ is:
       issued_at: Gefið út þann
       revoke: Eyða banninu
       my_apps: Forritin mín
+      no_apps: Ert þú að nota forrit sem þú myndir vilja skrá til notkunar hjá okkur
+        með %{oauth} staðlinum? Þú verður að skrá vefforritið áður en það fer að senda
+        OAuth-beiðnir á þessa þjónustu.
       registered_apps: 'Þú hefur skráð eftirfarandi forrit:'
       register_new: Skrá nýtt forrit
     form:
@@ -1755,6 +1872,10 @@ is:
       sorry: Því miður, þessi %{type} fannst ekki.
     create:
       flash: Nýtt OAuth forrit hefur verið skráð
+    update:
+      flash: Uppfærði upplýsingar biðlaraforritsins
+    destroy:
+      flash: Eyðilagði skráningu biðlaraforritsins
   user:
     login:
       title: Innskrá
@@ -1857,6 +1978,8 @@ is:
       password: 'Lykilorð:'
       confirm password: 'Staðfestu lykilorðið:'
       use external auth: Þú getur líka notað utanaðkomandi þjónustur til innskráningar
+      auth no password: Með auðkenningu frá þriðja aðila er ekki nauðsynlegt að nota
+        lykilorð, en einhver aukaverkfæri eða þjónar gætu samt þurft á því að halda.
       continue: Nýskrá
       terms accepted: Bestu þakkir fyrir að samþykkja nýju skilmálana vegna framlags
         þíns!
@@ -1867,10 +1990,14 @@ is:
     terms:
       title: Skilmálar vegna framlags
       heading: Skilmálar vegna framlags
+      read and accept: Lestu skilmálana og ýttu á 'Samþykkja' hnappinn til að staðfesta
+        að þý fallist á skilmálana fyrir núverandi- jafnt sem framtíðar- framlög þín.
       consider_pd: Til viðbótar við ofangreint samkomulag, lít ég svo á að framlög
         mín verði í almenningseigu (Public Domain)
       consider_pd_why: hvað þýðir þetta?
       consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      guidance: 'Upplýsingar sem hjálpa til við að skilja þessi hugtök: á <a href="%{summary}">mannamáli</a>
+        og nokkrar <a href="%{translations}">óformlegar þýðingar</a>'
       agree: Samþykkja
       declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       decline: Hafna
@@ -2028,6 +2155,8 @@ is:
     confirm:
       heading: Athuga með tölvupóstinn þinn!
       introduction_1: Við höfum sent þér staðfestingartölvupóst.
+      introduction_2: Staðfestu aðganginn þinn með því að smella á tengilinn í tölvupóstinum
+        og þá geturðu hafið kortlagningu.
       press confirm button: Hér getur þú staðfest að þú viljir virkja notandaaðganginn
         þinn.
       button: Staðfesta
@@ -2037,6 +2166,11 @@ is:
       reconfirm_html: Ef þú vilt að við sendum þér staðfestingarpóstinn aftur, <a
         href="%{reconfirm}">smelltu hér</a>.
     confirm_resend:
+      success: Við höfum sent staðfestingarskilaboð til %{email}, um leið og þú staðfestir
+        aðganginn þinn geturðu farið að vinna í kortunum.<br /><br />Ef þú ert að
+        nota ruslpóstsíukerfi sem sendir staðfestingarbeiðnir, gakktu úr skugga um
+        að %{sender} sé á lista yfir leyfða sendendur, því við erum ekki fær um að
+        svara neinum staðfestingarbeiðnum.
       failure: Notandinn %{name} fannst ekki.
     confirm_email:
       heading: Staðfesta breytingu á netfangi
@@ -2081,9 +2215,20 @@ is:
         \nvirkni.\n</p>\n<p>\nHafðu samband við <a href=\"%{webmaster}\">vefstjóra</a>
         ef þú \nvilt ræða þetta mál.\n</p>"
     auth_failure:
+      connection_failed: Tenging við auðkenningarþjónustu mistókst
+      invalid_credentials: Ógild auðkenni sannvottunar
       no_authorization_code: Enginn auðkenningarkóði
       unknown_signature_algorithm: Óþekkt reiknirit undirritunar
       invalid_scope: Ógilt notkunarsvið
+    auth_association:
+      heading: Auðkennið þitt er ekki ennþá tengt neinum OpenStreetMap-aðgangi.
+      option_1: |-
+        Ef þú ert ný(r) notandi í OpenStreetMap, skaltu útbúa nýjan aðgang
+        með því að nota innfyllingarformið hér fyrir neðan.
+      option_2: |-
+        Ef þú ert þegar með aðgang, geturðu skráð þig inn á aðganginn
+        með notandanafni og lykilorði og síðan tengt aðganginn
+        við auðkennið þitt í notandastillingunum.
   user_role:
     filter:
       not_an_administrator: Aðeins möppudýr geta sýslað með leyfi, og þú ert ekki
@@ -2091,6 +2236,7 @@ is:
       not_a_role: „%{role}“ er ekki gilt leyfi.
       already_has_role: Notandinn hefur þegar „%{role}“ leyfi
       doesnt_have_role: Notandinn er ekki með „%{role}“ leyfi.
+      not_revoke_admin_current_user: Get ekki svift þennan notanda möppudýrsréttindum.
     grant:
       title: Staðfestu leyfisveitingu
       heading: Staðfestu leyfisveitingu
@@ -2134,6 +2280,7 @@ is:
       back: Listi yfir öll bönn
       needs_view: Notandinn þarf að innskrá sig áður en bannið fellur úr gildi.
     filter:
+      block_expired: Bannið er þegar útrunnið og er ekki hægt að breyta.
       block_period: Banntíminn verður að vera í forstillingunum.
     create:
       try_contacting: Endilega reyndu að hafa samband við notendur áður en þú bannar
@@ -2215,6 +2362,9 @@ is:
       reopened_at_by_html: Endurvirkjað fyrir %{when} síðan af %{user}
     rss:
       title: Minnispunktar OpenStreetMap
+      description_area: Listi yfir minnispunkta sem hafa verið tilkynntir, gerðar
+        athugasemdir við eða hefur verið lokað á svæðinu þínu [(%{min_lat}|%{min_lon})
+        -- (%{max_lat}|%{max_lon})]
       description_item: RSS-streymi fyrir minnispunkt %{id}
       opened: nýr minnispunktur (nálægt %{place})
       commented: ný athugasemd (nálægt %{place})
@@ -2224,7 +2374,11 @@ is:
       comment: Athugasemd
       full: Allur minnispunkturinn
     mine:
+      title: Minnispunktar sem hafa verið sendir inn eða gerðar athugasemdir við af
+        %{user}
       heading: Minnispunktar frá %{user}
+      subheading: Minnispunktar sem hafa verið sendir inn eða gerðar athugasemdir
+        við af %{user}
       id: Auðkenni (ID)
       creator: Búið til af
       description: Lýsing
@@ -2276,6 +2430,7 @@ is:
         notes: Minnispunktar á korti
         data: Gögn korts
         gps: Opinberir GPS-ferlar
+        overlays: Virkja yfirlög til að auðvelda lausn vandamála á kortinu
         title: Lög
       copyright: © <a href='%{copyright_url}'>Þáttakendur í OpenStreetMap verkefninu</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Styrkja verkefnið</a>
@@ -2300,8 +2455,13 @@ is:
         intro: Fannstu mistök eða eitthvað sem vantar? Láttu aðra kortagerðarmenn
           vita svo hægt sé að laga það. Færðu kortamerkið á réttan stað og skrifaðu
           minnispunkt til að útskýra vandamálið.
+        advice: Minnispunkturinn þinn er opinber og gæti verið notaður til að uppfæra
+          kortið; því ættirðu ekki að setja inn neinar persónulegar upplýsingar, eða
+          upplýsingar úr höfundarvörðu efni.
         add: Bæta við minnispunkti
       show:
+        anonymous_warning: Þessi minnispunktur inniheldur athugasemdir frá óskráðum
+          notendum sem ætti að yfirfara sérstaklega.
         hide: Fela
         resolve: Leysa
         reactivate: Virkja aftur
@@ -2329,7 +2489,15 @@ is:
         continue_without_exit: Haltu áfram á %{name}
         slight_right_without_exit: Beygðu lítillega til hægri yfir á %{name}
         offramp_right_without_exit: Farðu á rampinn til hægri yfir á %{name}
+        offramp_right_with_directions: Farðu á rampinn til hægri í áttina að %{directions}
+        offramp_right_with_name_and_directions: Farðu á rampinn til hægri á %{name},
+          í áttina að %{directions}
+        offramp_right_without_directions: Farðu á rampinn til hægri
         onramp_right_without_exit: Beygðu til hægri á rampinum inn á %{name}
+        onramp_right_with_directions: Beygðu til hægri á rampinn í áttina að %{directions}
+        onramp_right_with_name_and_directions: Beygðu til hægri á rampinn til %{name},
+          í áttina að %{directions}
+        onramp_right_without_directions: Beygðu til hægri á rampinn
         endofroad_right_without_exit: Við enda vegarins skaltu beygja til hægri inn
           á %{name}
         merge_right_without_exit: Hliðraðu þér inn á akreinina til hægri inn á %{name}
@@ -2340,7 +2508,15 @@ is:
         sharp_left_without_exit: Kröpp vinstribeygja inn á %{name}
         turn_left_without_exit: Beygðu til vinstri yfir á %{name}
         offramp_left_without_exit: Farðu á rampinn til vinstri yfir á %{name}
+        offramp_left_with_directions: Farðu á rampinn til vinstri í áttina að %{directions}
+        offramp_left_with_name_and_directions: Farðu á rampinn til vinstri á %{name},
+          í áttina að %{directions}
+        offramp_left_without_directions: Farðu á rampinn til vinstri
         onramp_left_without_exit: Beygðu til vinstri á rampinum inn á %{name}
+        onramp_left_with_directions: Beygðu til vinstri á rampinn í áttina að %{directions}
+        onramp_left_with_name_and_directions: Beygðu til vinstri á rampinn til %{name},
+          í áttina að %{directions}
+        onramp_left_without_directions: Beygðu til vinstri á rampinn
         endofroad_left_without_exit: Við enda vegarins skaltu beygja til vinstri inn
           á %{name}
         merge_left_without_exit: Hliðraðu þér inn á akreinina til vinstri inn á %{name}
@@ -2348,10 +2524,10 @@ is:
         slight_left_without_exit: Beygðu lítillega til vinstri yfir á %{name}
         via_point_without_exit: (um punkt)
         follow_without_exit: Fylgja %{name}
-        roundabout_without_exit: Í hringtorginu, beygðu á %{name}
+        roundabout_without_exit: Í hringtorginu, beygðu útaf á %{name}
         leave_roundabout_without_exit: Farðu út úr hringtorginu - %{name}
         stay_roundabout_without_exit: Vertu áfram á hringtorginu - %{name}
-        start_without_exit: Byrjaðu við endann á %{name}
+        start_without_exit: Byrjaðu á %{name}
         destination_without_exit: Farðu á leiðarenda
         against_oneway_without_exit: Farðu á móti einstefnu á %{name}
         end_oneway_without_exit: Einstefna endar á %{name}

config/locales/it.yml

@@ -168,6 +168,8 @@ it:
         title_comment: Gruppo di modifiche %{id} - %{comment}
       join_discussion: Accedi per unirti alla discussione
       discussion: Discussione
+      still_open: Il gruppo di modifiche è ancora aperto - le discussioni saranno
+        disponibili quando verrà chiuso.
     node:
       title: 'Nodo: %{name}'
       history_title: 'Cronologia nodo: %{name}'
@@ -437,12 +439,19 @@ it:
           chair_lift: Seggiovia
           drag_lift: Sciovia
           gondola: Cabinovia
+          platter: Skilift a piattello
+          pylon: Pilone
           station: Stazione funivia
+          t-bar: Skilift ad ancora
         aeroway:
           aerodrome: Aerodromo
+          airstrip: Pista di atterraggio
           apron: Piazzale di sosta
           gate: Gate
+          hangar: Hangar
           helipad: Elisuperficie
+          holding_position: Posizione di attesa
+          parking_position: Posizione di parcheggio
           runway: Pista
           taxiway: Pista di rullaggio
           terminal: Terminal
@@ -477,37 +486,32 @@ it:
           crematorium: Crematorio
           dentist: Dentista
           doctors: Medici
-          dormitory: Dormitorio
           drinking_water: Acqua potabile
           driving_school: Scuola guida
           embassy: Ambasciata
-          emergency_phone: Colonnina SOS
           fast_food: Fast Food
           ferry_terminal: Terminal traghetti
-          fire_hydrant: Pompa antincendio
           fire_station: Vigili del fuoco
           food_court: Area ristorazione
           fountain: Fontana
           fuel: Stazione di rifornimento
           gambling: Gioco d'azzardo
           grave_yard: Cimitero
-          gym: Centro fitness / Palestra
+          grit_bin: Contenitore antigelo
-          health_centre: Casa di cura
           hospital: Ospedale
           hunting_stand: Postazione di caccia
           ice_cream: Gelateria
           kindergarten: Asilo infantile
           library: Biblioteca
-          market: Mercato
           marketplace: Mercato
           monastery: Monastero
           motorcycle_parking: Parcheggio per Moto
           nightclub: Night Club
-          nursery: Asilo nido
           nursing_home: Residenza sanitaria assistenziale
           office: Ufficio
           parking: Parcheggio
           parking_entrance: Entrata del parcheggio
+          parking_space: Posto di parcheggio
           pharmacy: Farmacia
           place_of_worship: Luogo di culto
           police: Polizia
@@ -517,7 +521,6 @@ it:
           prison: Prigione
           pub: Pub
           public_building: Edificio pubblico
-          reception_area: Area accoglienza
           recycling: Punto riciclaggio rifiuti
           restaurant: Ristorante
           retirement_home: Casa di Riposo
@@ -542,6 +545,7 @@ it:
           village_hall: Municipio
           waste_basket: Cestino rifiuti
           waste_disposal: Smaltimento dei rifiuti
+          water_point: Punto di rifornimento acqua
           youth_centre: Centro Giovanile
         boundary:
           administrative: Confine amministrativo
@@ -550,6 +554,7 @@ it:
           protected_area: Area protetta
         bridge:
           aqueduct: Acquedotto
+          boardwalk: Passerella
           suspension: Ponte sospeso
           swing: Ponte girevole
           viaduct: Viadotto
@@ -569,25 +574,31 @@ it:
           "yes": Negozio di Artigianato
         emergency:
           ambulance_station: Stazione delle ambulanze
+          assembly_point: Punto di ritrovo
           defibrillator: Defibrillatore
           landing_site: Luogo per l'atterraggio di emergenza
           phone: Telefono di emergenza
+          water_tank: Serbatoio d'acqua di emergenza
+          "yes": Emergenza
         highway:
           abandoned: Autostrada abbandonata
           bridleway: Percorso per equitazione
           bus_guideway: Corsia autobus a guida vincolata
           bus_stop: Fermata dell'autobus
           construction: Strada in costruzione
+          corridor: Corridoio
           cycleway: Percorso ciclabile
           elevator: Ascensore
           emergency_access_point: Colonnina SOS
           footway: Percorso pedonale
           ford: Guado
+          give_way: Segnale di dare precedenza
           living_street: Living Street
           milestone: Pietra miliare
           motorway: Autostrada
           motorway_junction: Uscita autostradale
           motorway_link: Autostrada
+          passing_place: Piazzola di sosta
           path: Sentiero
           pedestrian: Percorso pedonale
           platform: Piattaforma
@@ -604,6 +615,7 @@ it:
           services: Stazione di servizio
           speed_camera: Autovelox fisso
           steps: Scala
+          stop: Segnale di arresto
           street_lamp: Lampione
           tertiary: Strada terziaria
           tertiary_link: Strada terziaria
@@ -612,8 +624,8 @@ it:
           trail: Percorso escursionistico
           trunk: Superstrada
           trunk_link: Superstrada
+          turning_loop: Anello di inversione di marcia
           unclassified: Strada non classificata
-          unsurfaced: Strada non pavimentata
           "yes": Strada
         historic:
           archaeological_site: Sito archeologico
@@ -632,6 +644,7 @@ it:
           manor: Maniero
           memorial: Memoriale
           mine: Mina
+          mine_shaft: Pozzo minerario
           monument: Monumento
           roman_road: Strada romana
           ruins: Rovine
@@ -641,6 +654,7 @@ it:
           wayside_cross: Croce
           wayside_shrine: Edicola votiva
           wreck: Relitto
+          "yes": Sito storico
         junction:
           "yes": Incrocio
         landuse:
@@ -678,9 +692,9 @@ it:
         leisure:
           beach_resort: Stabilimento balneare
           bird_hide: Osservatorio Camuffato
-          club: Club
           common: Area comune (UK)
           dog_park: Parco per cani
+          firepit: Braciere
           fishing: Riserva di pesca
           fitness_centre: Centro Fitness
           fitness_station: Centro fitness
@@ -705,15 +719,44 @@ it:
           water_park: Parco acquatico
           "yes": Tempo libero
         man_made:
+          adit: Galleria mineraria
+          beacon: Fanale
+          beehive: Alveare
+          breakwater: Frangiflutti
+          bridge: Ponte
+          bunker_silo: Bunker
+          chimney: Ciminiera
+          crane: Gru
+          dyke: Argine
+          embankment: Terrapieno
+          flagpole: Asta portabandiera
+          gasometer: Gasometro
+          kiln: Fornace
           lighthouse: Faro
+          mast: Pilone
+          mine: Miniera
+          mineshaft: Pozzo minerario
+          monitoring_station: Stazione di monitoraggio
+          petroleum_well: Pozzo petrolifero
+          pier: Molo
           pipeline: Tubazione
+          silo: Silo
+          storage_tank: Cisterna di stoccaggio
+          surveillance: Sorveglianza
           tower: Torre
+          wastewater_plant: Impianto di depurazione delle acque
+          watermill: Mulino ad acqua
+          water_tower: Torre dell'acqua
+          water_well: Pozzo
+          water_works: Impianto idrico
+          windmill: Mulino a vento
           works: Fabbrica
           "yes": Artificiale
         military:
           airfield: Aeroporto militare
           barracks: Caserma
           bunker: Bunker
+          "yes": Militare
         mountain_pass:
           "yes": Passo di montagna
         natural:
@@ -759,11 +802,14 @@ it:
           accountant: Ragioniere
           administrative: Amministrazione
           architect: Architetto
+          association: Associazione
           company: Azienda
+          educational_institution: Istituto d'istruzione
           employment_agency: Agenzia di lavoro
           estate_agent: Agente immobiliare
           government: Ufficio governativo
           insurance: Agenzia di assicurazione
+          it: Ufficio IT
           lawyer: Avvocato
           ngo: Ufficio di una ONG (Organizzazione Non Governativa)
           telecommunication: Ufficio di telecomunicazioni
@@ -771,9 +817,8 @@ it:
           "yes": Ufficio
         place:
           allotments: Orti casalinghi
-          block: Blocco
-          airport: Aeroporto
           city: Città
+          city_block: Blocco urbano
           country: Nazione
           county: Contea (in Italia NON usare)
           farm: Area agricola
@@ -784,12 +829,13 @@ it:
           islet: Isoletta
           isolated_dwelling: Case sparse
           locality: Località (luogo con nome, non popolato)
-          moor: Molo
           municipality: Comune
           neighbourhood: Quartiere
           postcode: CAP
+          quarter: Quartiere
           region: Provincia
           sea: Mare
+          square: Piazza
           state: Regione
           subdivision: Suddivisione
           suburb: Quartiere
@@ -801,10 +847,8 @@ it:
           abandoned: Ferrovia abbandonata
           construction: Ferrovia in costruzione
           disused: Ferrovia in disuso
-          disused_station: Stazione ferroviaria in disuso
           funicular: Funicolare
           halt: Fermata del treno
-          historic_station: Stazione ferroviaria storica
           junction: Nodo ferroviario
           level_crossing: Passaggio a livello
           light_rail: Metropolitana leggera
@@ -830,6 +874,7 @@ it:
           beauty: Prodotti cosmetici
           beverages: Negozio bevande
           bicycle: Negozio biciclette
+          bookmaker: Centro scommesse
           books: Libreria
           boutique: Boutique
           butcher: Macellaio
@@ -868,12 +913,16 @@ it:
           hairdresser: Parrucchiere
           hardware: Ferramenta
           hifi: Hi-Fi
-          insurance: Assicurazioni
+          houseware: Negozio di casalinghi
+          interior_decoration: Decorazione d'interni
           jewelry: Gioielleria
           kiosk: Edicola
+          kitchen: Negozio di cucina
           laundry: Lavanderia
+          lottery: Lotteria
           mall: Centro commerciale
           market: Mercato
+          massage: Massaggio
           mobile_phone: Centro telefonia mobile
           motorcycle: Concessionario di motociclette
           music: Articoli musicali
@@ -881,21 +930,27 @@ it:
           optician: Ottico
           organic: Negozio di prodotti naturali ed ecologici
           outdoor: Negozio di articoli per sport all'aperto
+          paint: Negozio di vernici
+          pawnbroker: Banco dei pegni
           pet: Negozio animali
           pharmacy: Farmacia
           photo: Articoli fotografici
-          salon: Salone
+          seafood: Frutti di mare
           second_hand: Negozio oggetti usati
           shoes: Negozio di calzature
-          shopping_centre: Centro commerciale
           sports: Articoli sportivi
           stationery: Cartoleria
           supermarket: Supermercato
           tailor: Sarto
+          ticket: Biglietteria
+          tobacco: Tabaccheria
           toys: Negozio di giocattoli
           travel_agency: Agenzia di viaggi
+          tyres: Negozio di pneumatici
+          vacant: Spazio commerciale libero
+          variety_store: Negozio a prezzi fissi
           video: Videoteca
-          wine: Alcolici
+          wine: Negozio di vini
           "yes": Negozio
         tourism:
           alpine_hut: Rifugio alpino
@@ -1119,8 +1174,8 @@ it:
       trademarks_title_html: <span id="trademarks"></span>Marchi registrati
       trademarks_1_html: '"OpenStreetMap", il logo con la lente d''ingrandimento e
         "State of the Map" sono marchi registrati della <i>Fondazione OpenStreetMap</i>.
-        Se avete domande sull''uso dei marchi, inviatele al <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">gruppo
+        Se avete domande sull''uso dei marchi, vedi la nostra <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">politica
-        di lavoro per le licenze</a>.'
+        sui marchi</a>.'
   welcome_page:
     title: Benvenuto!
     introduction_html: Benvenuti in OpenStreetMap, la mappa del mondo libera e modificabile.
@@ -1261,7 +1316,9 @@ it:
       di utilizzo accettabile</a> ed alla nostra <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">informativa
       sulla privacy</a>\n<br> \nSi prega di <a href=\"https://osmfoundation.org/Contact\">contattare
       la OSMF</a> \nin caso di dubbi e problemi di licenza, copyright o altre questioni
-      legali."
+      legali.\n<br>\n\"OpenStreetMap\", il logo con la lente d'ingrandimento e \"State
+      of the Map\" sono <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">sono
+      marchi registrati della OSMF</a>."
     partners_title: Partner
   notifier:
     diary_comment_notification:
@@ -1501,6 +1558,7 @@ it:
       where_am_i: Dove lo trovo?
       where_am_i_title: Descrivi la posizione attuale usando il motore di ricerca
       submit_text: Vai
+      reverse_directions_text: Inverti la marcia
     key:
       table:
         entry:
@@ -2036,7 +2094,7 @@ it:
       public editing:
         heading: 'Modifiche pubbliche:'
         enabled: Abilitate. Non anonimo con il permesso di modificare i dati.
-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: che cos'è questo?
         disabled: Disabilitate senza il permesso di modificare i dati, tutte le modifiche
           precedenti sono anonime.
@@ -2112,7 +2170,7 @@ it:
       press confirm button: Premere sul pulsante di conferma sottostante per confermare
         il nuovo indirizzo email.
       button: Conferma
-      success: Confermato il cambio di indirizzo e-mail!
+      success: Confermata la modifica di indirizzo email!
       failure: Un indirizzo email con questo codice è già stato confermato.
       unknown_token: Questo codice di conferma è scaduto oppure non esiste.
     set_home:
@@ -2173,6 +2231,8 @@ it:
       not_a_role: La stringa `%{role}' non è un ruolo valido.
       already_has_role: L'utente possiede già il ruolo %{role}.
       doesnt_have_role: L'utente non possiede il ruolo %{role}.
+      not_revoke_admin_current_user: Impossibile rimuovere i privilegi di amministratore
+        all'utente corrente.
     grant:
       title: Conferma l'assegnazione del ruolo
       heading: Conferma l'assegnazione del ruolo
@@ -2397,6 +2457,9 @@ it:
         intro: Ti sei accorto di un errore o di qualcosa che manca? Fallo sapere agli
           altri mappatori così possono correggerlo. Sposta il puntatore nella posizione
           esatta e inserisci una nota per spiegare il problema.
+        advice: La tua nota è pubblica e potrebbe essere utilizzata per aggiornare
+          la mappa, pertanto non inserire informazioni personali e neppure dati provenienti
+          da mappe protette da copyright oppure elenchi.
         add: Aggiungi la nota
       show:
         anonymous_warning: Questa nota include commenti da parte di utenti anonimi
@@ -2428,7 +2491,15 @@ it:
         continue_without_exit: Prosegui su %{name}
         slight_right_without_exit: Svolta leggermente a destra in %{name}
         offramp_right_without_exit: Prendi la rampa sulla destra in %{name}
+        offramp_right_with_directions: Prendi la rampa a destra in direzione %{directions}
+        offramp_right_with_name_and_directions: Prendi la rampa a destra su %{name},
+          in direzione %{directions}
+        offramp_right_without_directions: Prendi la rampa a destra
         onramp_right_without_exit: Gira a destra sulla rampa in %{name}
+        onramp_right_with_directions: Gira a destra sulla rampa in direzione %{directions}
+        onramp_right_with_name_and_directions: Gira a destra sulla rampa su %{name},
+          in direzione %{directions}
+        onramp_right_without_directions: Gira a destra sulla rampa
         endofroad_right_without_exit: Alla fine della strada svolta a destra in %{name}
         merge_right_without_exit: Immettiti a destra in %{name}
         fork_right_without_exit: Al bivio svolta a destra in %{name}
@@ -2438,17 +2509,25 @@ it:
         sharp_left_without_exit: Svolta tutto a sinistra in %{name}
         turn_left_without_exit: Svolta a sinistra in %{name}
         offramp_left_without_exit: Prendi la rampa sulla sinistra in %{name}
+        offramp_left_with_directions: Prendi la rampa  a sinistra in direzione %{directions}
+        offramp_left_with_name_and_directions: Prendi la rampa a sinistra su %{name},
+          in direzione %{directions}
+        offramp_left_without_directions: Prendi la rampa a sinistra
         onramp_left_without_exit: Gira a sinistra sulla rampa in %{name}
+        onramp_left_with_directions: Gira a sinistra alla rampa in direzione %{directions}
+        onramp_left_with_name_and_directions: Gira a sinistra alla rampa su %{name},
+          in direzione %{directions}
+        onramp_left_without_directions: Gira a sinistra sulla rampa
         endofroad_left_without_exit: Alla fine della strada svolta a sinistra in %{name}
         merge_left_without_exit: Immettiti a sinistra in %{name}
         fork_left_without_exit: Al bivio svolta a sinistra in %{name}
         slight_left_without_exit: Svolta leggermente a sinistra in %{name}
         via_point_without_exit: (punto di passaggio)
         follow_without_exit: Segui %{name}
-        roundabout_without_exit: Alla rotonda prendi %{name}
+        roundabout_without_exit: Alla rotonda prendi l'uscita su %{name}
         leave_roundabout_without_exit: Esci dalla rotonda - %{name}
         stay_roundabout_without_exit: Rimani sulla rotonda - %{name}
-        start_without_exit: Inizia alla fine di %{name}
+        start_without_exit: Inizia a %{name}
         destination_without_exit: Raggiungi la destinazione
         against_oneway_without_exit: Vai contro il senso unico in %{name}
         end_oneway_without_exit: Fine del senso unico in %{name}

config/locales/ja.yml

@@ -159,6 +159,7 @@ ja:
         title_comment: 変更セット %{id} - %{comment}
       join_discussion: 議論に参加するにはログインしてください
       discussion: 議論
+      still_open: 変更セットが開いたままです - 議論を行うには変更セットが閉じられている必要があります。
     node:
       title: 'ノード: %{name}'
       history_title: 'ノードの履歴: %{name}'
@@ -450,33 +451,26 @@ ja:
           crematorium: 火葬場
           dentist: 歯科医
           doctors: 医師
-          dormitory: 寮
           drinking_water: 飲み水
           driving_school: 自動車学校
           embassy: 大使館
-          emergency_phone: 緊急電話
           fast_food: ファストフード
           ferry_terminal: フェリー乗り場
-          fire_hydrant: 消火栓
           fire_station: 消防署
           food_court: フードコート
           fountain: 噴水
           fuel: 燃料
           gambling: ギャンブル
           grave_yard: 墓地
-          gym: フィットネス センター/ジム
-          health_centre: 保健所
           hospital: 病院
           hunting_stand: ハンティング スタンド
           ice_cream: アイスクリーム販売店
           kindergarten: 幼稚園
           library: 図書館
-          market: 市場
           marketplace: 市場
           monastery: 修道院
           motorcycle_parking: バイクの駐輪場
           nightclub: ナイト クラブ
-          nursery: 保育所
           nursing_home: 老人ホーム
           office: オフィス
           parking: 駐車場
@@ -490,7 +484,6 @@ ja:
           prison: 刑務所
           pub: パブ
           public_building: 公共建築物
-          reception_area: レセプションエリア
           recycling: リサイクル場
           restaurant: レストラン
           retirement_home: 老人ホーム
@@ -586,7 +579,6 @@ ja:
           trunk: 国道
           trunk_link: 国道
           unclassified: 未分類の道路
-          unsurfaced: 未舗装道路
           "yes": 道路
         historic:
           archaeological_site: 考古学サイト
@@ -651,7 +643,6 @@ ja:
         leisure:
           beach_resort: ビーチ リゾート
           bird_hide: 観察小屋
-          club: クラブ
           common: 共有地
           dog_park: ドッグ・パーク
           fishing: 釣り場
@@ -682,6 +673,8 @@ ja:
         man_made:
           lighthouse: 灯台
           pipeline: パイプライン
+          silo: サイロ
+          storage_tank: 貯蔵タンク
           tower: 塔
           works: 工房
           "yes": 人工
@@ -735,6 +728,7 @@ ja:
           administrative: 管理
           architect: 建築士
           company: 会社
+          educational_institution: 教育施設
           employment_agency: 職業紹介
           estate_agent: 不動産代理店
           government: 官公庁
@@ -746,8 +740,6 @@ ja:
           "yes": オフィス
         place:
           allotments: 家庭菜園
-          block: ブロック
-          airport: 空港
           city: 市
           country: 国
           county: 郡
@@ -759,7 +751,6 @@ ja:
           islet: 小島
           isolated_dwelling: 免震住宅
           locality: 地域
-          moor: 沼地
           municipality: 市町村
           neighbourhood: 小字
           postcode: Postcode
@@ -776,10 +767,8 @@ ja:
           abandoned: 廃止鉄道
           construction: 建設中の鉄道
           disused: 廃線跡
-          disused_station: 廃駅
           funicular: ケーブル鉄道
           halt: 列車停止
-          historic_station: 廃駅
           junction: 鉄道連絡駅
           level_crossing: 踏切
           light_rail: ライトレール
@@ -843,7 +832,6 @@ ja:
           hairdresser: 美容室
           hardware: ホームセンター
           hifi: 高級オーディオ
-          insurance: 保険
           jewelry: 宝石店
           kiosk: キオスク
           laundry: クリーニング店
@@ -856,21 +844,24 @@ ja:
           optician: メガネ店
           organic: 有機食材店
           outdoor: アウトドア ショップ
+          paint: 画材店
           pet: ペット ショップ
           pharmacy: 薬局
           photo: 写真屋
-          salon: サロン
+          seafood: 海鮮品屋
           second_hand: 中古品店
           shoes: 靴屋
-          shopping_centre: ショッピング センター
           sports: スポーツ用品専門店
           stationery: 文房具店
           supermarket: スーパーマーケット
           tailor: 洋服店
+          ticket: チケット店
+          tobacco: タバコ屋
           toys: 玩具店
           travel_agency: 旅行代理店
+          variety_store: 雑貨店
           video: ビデオ ショップ
-          wine: 酒屋
+          wine: ワイン屋
           "yes": 店舗
         tourism:
           alpine_hut: 高山小屋
@@ -1054,8 +1045,8 @@ ja:
         href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">却下手順</a>をお読みになるか、<a
         href="http://dmca.openstreetmap.org">オンライン却下のページ</a>から直接申し立てを行ってください。
       trademarks_title_html: <span id="trademarks"></span>商標
-      trademarks_1_html: OpenStreetMapならびに拡大鏡のロゴおよびState of the MapはOpenStreetMap財団の登録商標です。商標の利用に関するお問い合わせは<a
+      trademarks_1_html: OpenStreetMapならびに拡大鏡のロゴおよびState of the MapはOpenStreetMap財団の登録商標です。商標の利用に関しては、<a
-        href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">ライセンス担当部</a>までお寄せください。
+        href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">商標利用ポリシー</a>を参照ください。
   welcome_page:
     title: ようこそ!
     introduction_html: フリーで編集可能な世界地図、OpenStreetMapへようこそ。サインアップしたので、マッピングの準備はすべて整いました。知っておかなければならない重要事項を簡単に説明します。
@@ -1150,10 +1141,11 @@ ja:
     open_data_html: OpenStreetMapは<i>オープンデータ</i>です。あなたはOpenStreetMapと協力者の著作権を表示すれば、いかなる目的でも無料で利用することができます。もし何らかの方法でデータを変更したり二次データを作成したりした場合も、同じライセンス条件下でのみ結果を配布できます。詳しくは、<a
       href='%{copyright_path}'>著作権とライセンス</a>をご覧ください。
     legal_title: 法律関係
-    legal_html: "このサイトおよび関連のサービスは<a href='https://osmfoundation.org/'>OpenStreetMap財団</a>
+    legal_html: "このサイトおよびその他の関連サービスは、コミュニティを代表して<a href='https://osmfoundation.org/'>OpenStreetMap財団</a>
-      (OSMF)のコミュニティから継承したものです。OpenStreetMap財団の運営するサービスの利用者には<a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">利用規定</a>ならびに当財団の<a
+      (OSMF) が運営しています。OpenStreetMap財団の運営するサービス利用者は、私たちの定める<a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">利用規定</a>ならびに当財団の<a
       href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">プライバシーに関する規定</a>の対象となります。\n<br>
-      \nライセンス、著作権その他法的な質問や問題がある場合は、<a href='https://osmfoundation.org/Contact'>OpenStreetMap財団までご連絡ください</a>。"
+      \nライセンス、著作権その他法的な質問や問題がある場合は、<a href='https://osmfoundation.org/Contact'>OpenStreetMap財団までご連絡ください</a>。\n<br>\nOpenStreetMapならびに拡大鏡のロゴおよびState
+      of the Mapは<a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">OpenStreetMap財団の登録商標</a>です。"
     partners_title: パートナー
   notifier:
     diary_comment_notification:
@@ -1339,7 +1331,7 @@ ja:
       get_directions_title: 2点を結ぶルートを検索
       from: 出発点
       to: 目的地
-      where_am_i: これはどこにありますか?
+      where_am_i: 現在表示中の位置情報
       where_am_i_title: 検索エンジンを使用して現在の場所を記述
       submit_text: 検索
     key:
@@ -1952,6 +1944,7 @@ ja:
       not_a_role: 文字列「%{role}」は、有効な権限ではありません。
       already_has_role: 利用者は既に %{role} 権限を付与されています。
       doesnt_have_role: ユーザーに %{role} 権限が付与されていません。
+      not_revoke_admin_current_user: 現在のユーザに管理者権限がありません。
     grant:
       title: 権限付与の確認
       heading: 権限付与の確認
@@ -2156,6 +2149,7 @@ ja:
     notes:
       new:
         intro: 間違いや情報の抜けがありましたか？　他のマッパーが修正できるよう、お知らせください。マーカーを正しい位置に移動し、問題を説明するメモを入力します。
+        advice: 投稿した地図メモは公開され、地図の更新に利用されます。そのため、著作権保護された地図や一覧情報からの転用情報や、個人情報の入力は行わないでください。
         add: メモを追加
       show:
         anonymous_warning: このメモはIP利用者によるコメントも含んでいるため、個別に確認してください。

config/locales/ka.yml

@@ -336,30 +336,23 @@ ka:
           crematorium: კრემატორიუმი
           dentist: დანტისტი
           doctors: ექიმი
-          dormitory: საერთო საცხოვრებელი
           drinking_water: სასმელი წყალი
           driving_school: ავტოსკოლა
           embassy: საელჩო
-          emergency_phone: საგანგებო სიტუაციების სამსახურის ტელეფონი
           fast_food: სწრაფი კვება
           ferry_terminal: ბორანის სადგური
-          fire_hydrant: სახანძრო ჰიდრანტი
           fire_station: სახანძრო განყოფილება
           fountain: შადრევანი
           fuel: საწვავი
           grave_yard: საფლავი
-          gym: ფიტნეს ცენტრი / სავარჯიშო დარბაზი
-          health_centre: ჯანმრთელობის ცენტრი
           hospital: საავადმყოფო
           hunting_stand: სანადირო კოშკურა
           ice_cream: ნაყინი
           kindergarten: საბავშვო ბაღი
           library: ბიბლიოთეკა
-          market: მაღაზია
           marketplace: ბაზარი
           monastery: მონასტერი
           nightclub: ღამის კლუბი
-          nursery: პანსიონატი
           nursing_home: მოხუცებულთა თავშესაფარი
           office: ოფისი
           parking: ავტოსადგომი
@@ -373,7 +366,6 @@ ka:
           prison: ციხე
           pub: პაბი
           public_building: საჯარო შენობა
-          reception_area: მიმღები
           recycling: ნაგავსაყრელი
           restaurant: რესტორანი
           retirement_home: მოხუცებულთა თავშესაფარი
@@ -458,7 +450,6 @@ ka:
           traffic_signals: შუქნიშანი
           trail: ბილიკი
           unclassified: ადგილობრივი გზა
-          unsurfaced: უზედაპირო გზა
           "yes": გზა
         historic:
           archaeological_site: არქეოლოგიური გათხრები
@@ -514,7 +505,6 @@ ka:
           vineyard: ვენახი
           "yes": მიწათსარგებლობა
         leisure:
-          club: კლუბი
           dog_park: ძაღლების პარკი
           fishing: სათევზაო ტერიტორია
           fitness_centre: ფიტნეს-ცენტრი
@@ -601,8 +591,6 @@ ka:
           travel_agent: ტურისტული სააგენტო
           "yes": ოფისი
         place:
-          block: კვარტალი
-          airport: აეროპორტი
           city: ქალაქი
           country: ქვეყანა
           county: ოლქი
@@ -612,7 +600,6 @@ ka:
           houses: სახლები
           island: კუნძული
           islet: პატარა კუნძული
-          moor: ტორფნარი
           municipality: მუნიციპალიტეტი
           neighbourhood: სამეზობლო
           postcode: საფოსტო ინდექსი
@@ -628,10 +615,8 @@ ka:
           abandoned: მიტოვებული რკინიგზა
           construction: რკინიგზის რემონტი
           disused: მიტოვებული რკინიგზა
-          disused_station: მიტოვებული რკინიგზის სადგური
           funicular: ფუნიკულიორი
           halt: მატარებლის გაჩერება
-          historic_station: ისტორიული რკინიგზის სადგური
           level_crossing: სარკინიგზო გადასასვლელი
           light_rail: მსუბუქი რკინიგზა
           monorail: მონორელსი
@@ -678,7 +663,6 @@ ka:
           gift: საჩუქრების მაღაზია
           greengrocer: ხილ-ბოსტნეულის მაღაზია
           hairdresser: საპარიკმახერო
-          insurance: სადაზღვევო
           jewelry: საიუველირო მაღაზია
           kiosk: ჯიხური
           laundry: სამრეცხაო
@@ -693,10 +677,8 @@ ka:
           pet: ზოომაღაზია
           pharmacy: აფთიაქი
           photo: ფოტომაღაზია
-          salon: სალონი
           second_hand: მეორადების მაღაზია
           shoes: ფეხსაცმლის მაღაზია
-          shopping_centre: სავაჭრო ცენტრი
           sports: სპორტული მაღაზია
           stationery: საკანცელარიო მაღაზია
           supermarket: სუპერმარკეტი

config/locales/kab.yml

@@ -4,6 +4,7 @@
 # Author: Belkacem77
 # Author: Mastanabal
 # Author: Mhenni
+# Author: MustaphaLateb
 # Author: Sayem AtVkm
 # Author: SlimaneAmiri
 ---
@@ -440,33 +441,26 @@ kab:
           crematorium: Tanerɣut
           dentist: Amejjay n tuɣmas
           doctors: Imejjayen
-          dormitory: Anaḍḍas
           drinking_water: Aman n tissit
           driving_school: Aɣerbaz n uselmed n tenheṛt
           embassy: Tamahelt
-          emergency_phone: Tiliɣri n utrab
           fast_food: Učči arurad
           ferry_terminal: Anemdu n ufirri
-          fire_hydrant: Amsexsay n tmes
           fire_station: Taqcelt  n isexsayen
           food_court: Tamnaḍt n wučči
           fountain: Tala
           fuel: Aserɣu
           gambling: Uraren yidrimen
           grave_yard: Tajebbant
-          gym: Fitness / tajimnastikt
-          health_centre: Almus n tdawsa
           hospital: Sbiṭar
           hunting_stand: Tanefsart n uselfeɣ
           ice_cream: Tamagrist
           kindergarten: Tibḥirt n warrac
           library: Tanedlist
-          market: Alzuz
           marketplace: Ssuq
           monastery: Amunastiṛ
           motorcycle_parking: Aneɣsar n imuṭuten
           nightclub: Tazeqqa n yiḍ
-          nursery: Tanectalt
           nursing_home: Axxam n tastaɣt s udawi
           office: Tanarit
           parking: Aneɣsar
@@ -480,7 +474,6 @@ kab:
           prison: Lḥebs
           pub: Ttberna
           public_building: Azadaɣ azayez
-          reception_area: Tamnaḍt n usiweḍ
           recycling: Point de wallus n usseqdec
           restaurant: Asečču
           retirement_home: Axxam n testaɣt
@@ -575,9 +568,12 @@ kab:
           stone: Ablaḍ
           tomb: Tanḍelt
         landuse:
+          basin: Amdun
           farm: Tibḥirt
           farmland: Akal n tkerrazt
           forest: Tiẓgi
+          landfill: Agudu
+          railway: Avrid tmacit
         leisure:
           stadium: Annar
         natural:
@@ -608,8 +604,6 @@ kab:
           "yes": Tanarit
         place:
           allotments: Talmat n twacult
-          block: Iḥder
-          airport: Anafag
           city: Tiɣremt
           country: Tamurt
           county: Tamurt
@@ -961,6 +955,9 @@ kab:
     key:
       table:
         entry:
+          forest: Tiẓgi
+          lake:
+          - Amdun
           school:
           - Aɣerbaz
           - Tasdawit

config/locales/km.yml

@@ -276,23 +276,18 @@ km:
           crematorium: កន្លែងបញ្ចុះសព
           dentist: ទន្ដបណ្ឌិត
           doctors: វេជ្ជបណ្ឌិត
-          dormitory: អន្តេវាសិកដ្ឋាន
           drinking_water: ទឹកផឹក
           driving_school: សាលាបង្រៀនបើកបរ
           embassy: ស្ថានទូត
-          emergency_phone: ទូរស័ព្ទសង្រ្គោះបន្ទាន់
           fire_station: ស្ថានីយ៍អគ្គីភ័យ
           food_court: អាហារដ្ឋាន
           fountain: ទឺកផុស
           fuel: ឥន្ធនៈ
           grave_yard: វាលផ្នូរខ្មោច
-          gym: មណ្ឌលឬកន្លែងហាត់ប្រាណ
-          health_centre: មណ្ឌលសុខភាព
           hospital: មន្ទីរពេទ្យ
           ice_cream: ការ៉េម
           kindergarten: សាលាមតេ្តយ្យ
           library: បណ្ណាល័យ
-          market: ផ្សារ
           marketplace: ទីផ្សារ
           nightclub: ក្លឹបរាត្រី
           office: ការិយាល័យ
@@ -420,7 +415,6 @@ km:
           travel_agent: ភ្នាក់ងារទេសចរណ៍
           "yes": ការិយាល័យ
         place:
-          airport: អាកាសយានដ្ឋាន
           city: ទីក្រុង
           county: ប្រទេស
           house: ផ្ទះ
@@ -435,7 +429,6 @@ km:
           abandoned: ផ្លូវដែកបោះបង់ចោល
           construction: ផ្លូវដែកកំពុងស្ថាបនា
           disused: ផ្លូវដែកឈប់ប្រើ
-          disused_station: ស្ថានីយ៍ផ្លូវដែកឈប់ប្រើ
           station: ស្ថានីយ៍ផ្លូវដែក
           subway: ស្ថានីយ៍រថភ្លើងក្រោមដី
           subway_entrance: ច្រកចូលស្ថានីយ៍រថភ្លើងក្រោមដី

config/locales/kn.yml

@@ -307,27 +307,21 @@ kn:
           crematorium: ‍‍ಚಿತಾಗಾರ
           dentist: ದಂತವೈದ್ಯ
           doctors: ವೈದ್ಯರು
-          dormitory: ‍‍ಧರ್ಮಶಾಲೆ
           drinking_water: ಕುಡಿಯುವ ನೀರು
           driving_school: ‍‍ವಾಹನ ಚಾಲನೆಯ ತರಬೇತಿ ಶಾಲೆ
           embassy: ‍‍ರಾಯಭಾರ ಕಚೇರಿಯ
-          emergency_phone: ‍‍ತುರ್ತು ದೂರವಾಣಿ
           fast_food: ‍‍ಫಾಸ್ಟ್ ಫುಡ್
           ferry_terminal: ‍‍ಹಾಯಿದೋಣಿ ನಿಲ್ದಾಣ
-          fire_hydrant: ‍‍ಬೆಂಕಿ ಕೊಳಾಯಿ
           fire_station: ‍‍ಅಗ್ನಿಶಾಮಕ ಠಾಣೆ
           fountain: ‍ಕಾರಂಜಿ
           fuel: ‍ಇಂಧನ
           grave_yard: ಸ್ಮಾಶಾನ
-          health_centre: ‍‍ಆರೋಗ್ಯ ಕೇಂದ್ರ
           hospital: ಆಸ್ಪತ್ರೆ
           ice_cream: ‍ಐಸ್ ಕ್ರೀಂ
           kindergarten: ‍‍‍ಶಿಶುವಿಹಾರ
           library: ಗ್ರಂಥಾಲಯ
-          market: ‍‍ಮಾರುಕಟ್ಟೆ
           marketplace: ‍‍ಮಾರುಕಟ್ಟೆ
           monastery: ‍‍ಮಠ
-          nursery: ‍‍ನರ್ಸರಿ
           office: ಕಛೇರಿ
           pharmacy: ‍‍ಔ‍ಷಧಾಲಯ
           place_of_worship: ‍‍ಆರಾಧನಾ ಮಂದಿರ
@@ -418,7 +412,6 @@ kn:
           ngo: ಸರ್ಕಾರೇತರ ಕಛೇರಿ
           "yes": ಕಛೇರಿ
         place:
-          airport: ವಿಮಾನ ನಿಲ್ದಾಣ
           city: ನಗರ
           country: ದೇಶ
           house: ಮನೆ
@@ -433,7 +426,6 @@ kn:
           "yes": ಊರು
         railway:
           halt: ರೈಲು ನಿಲ್ದಾಣ
-          historic_station: ಐತಿಹಾಸಿಕ ರೈಲು ನಿಲ್ದಾಣ
           junction: ರೈಲು ಜಂಕ್ಷನ್
           monorail: ಮೊನೊರೈಲು
           station: ರೈಲು ನಿಲ್ದಾಣ

config/locales/ko.yml

@@ -451,33 +451,26 @@ ko:
           crematorium: 화장장
           dentist: 치과
           doctors: 의원
-          dormitory: 기숙사
           drinking_water: 음수대
           driving_school: 운전 학원
           embassy: 대사관
-          emergency_phone: 긴급 전화
           fast_food: 패스트 푸드
           ferry_terminal: 페리 부두
-          fire_hydrant: 소화전
           fire_station: 소방서
           food_court: 푸드코트
           fountain: 분수대
           fuel: 주유소
           gambling: 도박장
           grave_yard: 묘지
-          gym: 피트니스 센터 / 체육관
-          health_centre: 보건소
           hospital: 병원
           hunting_stand: 사냥장
           ice_cream: 아이스크림
           kindergarten: 유치원
           library: 도서관
-          market: 시장
           marketplace: 시장
           monastery: 수도원
           motorcycle_parking: 오토바이 주차장
           nightclub: 나이트 클럽
-          nursery: 보육원
           nursing_home: 복지관
           office: 사옥
           parking: 주차장
@@ -491,7 +484,6 @@ ko:
           prison: 교도소
           pub: 술집
           public_building: 공공 건물
-          reception_area: 접수 구역
           recycling: 재활용장
           restaurant: 음식점
           retirement_home: 노인정
@@ -578,6 +570,7 @@ ko:
           services: 고속도로 휴게소
           speed_camera: 속도 카메라
           steps: 계단
+          stop: 정지 표지
           street_lamp: 가로등
           tertiary: 3차 도로
           tertiary_link: 3차 도로
@@ -587,7 +580,6 @@ ko:
           trunk: 대로 또는 간선 도로
           trunk_link: 간선 도로
           unclassified: 분류되지 않은 도로
-          unsurfaced: 비포장 도로
           "yes": 도로
         historic:
           archaeological_site: 유적지
@@ -615,6 +607,7 @@ ko:
           wayside_cross: 도로변의 십자가
           wayside_shrine: 길가의 신사
           wreck: 난파선
+          "yes": 유적지
         junction:
           "yes": 분기점
         landuse:
@@ -652,7 +645,6 @@ ko:
         leisure:
           beach_resort: 해수욕장
           bird_hide: 조류 관찰소
-          club: 클럽
           common: 공유지
           dog_park: 반려견 공원
           fishing: 낚시터
@@ -679,9 +671,16 @@ ko:
           water_park: 워터 파크
           "yes": 여가
         man_made:
+          beehive: 벌통
+          bridge: 다리
+          chimney: 굴뚝
+          dyke: 제방
           lighthouse: 등대
+          mineshaft: 갱도
           pipeline: 파이프라인
           tower: 탑
+          water_well: 우물
+          windmill: 풍차
           works: 공장
           "yes": 인공물
         military:
@@ -738,6 +737,7 @@ ko:
           estate_agent: 부동산 중개
           government: 정부 기관
           insurance: 보험 회사 사옥
+          it: IT 오피스
           lawyer: 변호사 사무실
           ngo: 비정부 기구 사무실
           telecommunication: 통신 회사 사옥
@@ -745,8 +745,6 @@ ko:
           "yes": 사옥
         place:
           allotments: 텃밭
-          block: 벽돌
-          airport: 공항
           city: 시
           country: 국가
           county: 군
@@ -758,7 +756,6 @@ ko:
           islet: 작은 섬
           isolated_dwelling: 독립 주택
           locality: 지역
-          moor: 습지
           municipality: 시정촌
           neighbourhood: 마을
           postcode: 우편 번호
@@ -775,10 +772,8 @@ ko:
           abandoned: 폐선된 철도
           construction: 건설 중인 철도
           disused: 폐선된 철도
-          disused_station: 폐역된 철도역
           funicular: 케이블 카
           halt: 기차 정지
-          historic_station: 역사적인 철도역
           junction: 철도 분기점
           level_crossing: 건널목
           light_rail: 경전철
@@ -842,7 +837,6 @@ ko:
           hairdresser: 미용실
           hardware: 철물점
           hifi: 고급 오디오
-          insurance: 보험
           jewelry: 보석 상점
           kiosk: 키오스크 숍
           laundry: 세탁소
@@ -858,10 +852,9 @@ ko:
           pet: 애완 동물 가게
           pharmacy: 약국
           photo: 사진관
-          salon: 가게
+          seafood: 해산물
           second_hand: 중고품 가게
           shoes: 신발 가게
-          shopping_centre: 쇼핑 센터
           sports: 스포츠용품점
           stationery: 문구점
           supermarket: 수퍼마켓
@@ -2307,7 +2300,7 @@ ko:
         roundabout_without_exit: '%{name}의 회전교차로에서'
         leave_roundabout_without_exit: 회전교차로를 떠나세요 - %{name}
         stay_roundabout_without_exit: 회전교차로에 머무세요 - %{name}
-        start_without_exit: '%{name}의 끝에서 시작'
+        start_without_exit: '%{name}에서 시작'
         destination_without_exit: 목적지에 도달합니다
         against_oneway_without_exit: '%{name}(으)로 한 방향으로 가세요'
         end_oneway_without_exit: '%{name}에서의 한 방향의 끝'