From 06058c1d2219acebe98bb0ec9c213b5bb268c0ca Mon Sep 17 00:00:00 2001
From: NopMap <nop@wanderreitkarte.de>
Date: Sun, 18 Mar 2018 10:30:01 +0100
Subject: [PATCH 01/37] added presets for horseback travel improved hiking and
 horse route relations

---
 data/presets/fields/distance.json             |  6 +++++
 data/presets/fields/horse_dressage.json       | 11 ++++++++++
 data/presets/fields/horse_riding.json         | 11 ++++++++++
 data/presets/fields/horse_scale.json          | 16 ++++++++++++++
 data/presets/fields/horse_stables.json        | 11 ++++++++++
 data/presets/fields/trailblazing_osmc.json    |  5 +++++
 data/presets/fields/trailblazing_text.json    |  5 +++++
 data/presets/fields/trailblazing_wiki.json    |  5 +++++
 data/presets/fields/watering_place.json       |  5 +++++
 data/presets/presets/amenity/fountain.json    |  4 ++++
 data/presets/presets/highway/path.json        |  1 +
 data/presets/presets/highway/track.json       |  3 ++-
 .../presets/tourism/trail_riding_station.json | 22 +++++++++++++++++++
 data/presets/presets/type/route/hiking.json   |  7 +++++-
 data/presets/presets/type/route/horse.json    |  5 +++++
 15 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 data/presets/fields/distance.json
 create mode 100644 data/presets/fields/horse_dressage.json
 create mode 100644 data/presets/fields/horse_riding.json
 create mode 100644 data/presets/fields/horse_scale.json
 create mode 100644 data/presets/fields/horse_stables.json
 create mode 100644 data/presets/fields/trailblazing_osmc.json
 create mode 100644 data/presets/fields/trailblazing_text.json
 create mode 100644 data/presets/fields/trailblazing_wiki.json
 create mode 100644 data/presets/fields/watering_place.json
 create mode 100644 data/presets/presets/tourism/trail_riding_station.json

diff --git a/data/presets/fields/distance.json b/data/presets/fields/distance.json
new file mode 100644
index 000000000..0f8077bfa
--- /dev/null
+++ b/data/presets/fields/distance.json
@@ -0,0 +1,6 @@
+{
+    "key": "distance",
+    "type": "text",
+    "label": "Total distance",
+    "placeholder": "0"
+}
diff --git a/data/presets/fields/horse_dressage.json b/data/presets/fields/horse_dressage.json
new file mode 100644
index 000000000..c1df84053
--- /dev/null
+++ b/data/presets/fields/horse_dressage.json
@@ -0,0 +1,11 @@
+{
+    "key": "sport",
+    "type": "check",
+    "label": "Dressage riding",
+    "strings": {
+        "options": {
+            "undefined": "No",
+            "equestrian": "Offered"
+        }
+    }
+}
diff --git a/data/presets/fields/horse_riding.json b/data/presets/fields/horse_riding.json
new file mode 100644
index 000000000..375283f79
--- /dev/null
+++ b/data/presets/fields/horse_riding.json
@@ -0,0 +1,11 @@
+{
+    "key": "leisure",
+    "type": "check",
+    "label": "Horseback riding",
+    "strings": {
+        "options": {
+            "undefined": "No",
+            "horse_riding": "Offered"
+        }
+    }
+}
diff --git a/data/presets/fields/horse_scale.json b/data/presets/fields/horse_scale.json
new file mode 100644
index 000000000..1c2dc6e11
--- /dev/null
+++ b/data/presets/fields/horse_scale.json
@@ -0,0 +1,16 @@
+{
+    "key": "horse_scale",
+    "type": "combo",
+    "label": "Horseback Riding Difficulty",
+    "placeholder": "Difficult, Dangerous...",
+    "strings": {
+        "options": {
+            "common": "Easy: No problems or difficulties. (default)",
+            "demanding": "Use with caution: Uneven way, occasional difficult passages.",
+            "difficult": "Difficult: Way narrow and exposed. May contain obstacles to step over and narrow passages.",
+            "critical": "Borderline: Passable only for experienced riders and horses. Major obstacles. Bridges should be examined carefully.",
+            "dangerous": "Dangerous: Passable only for very experienced riders and horses and only in good weather. Dismount.",
+            "impossible": "Impassable: Way or bridge not passable for horses. Too narrow, insuffient support, obstacles like ladders. Danger of life."
+        }
+    }
+}
diff --git a/data/presets/fields/horse_stables.json b/data/presets/fields/horse_stables.json
new file mode 100644
index 000000000..1600a3cf6
--- /dev/null
+++ b/data/presets/fields/horse_stables.json
@@ -0,0 +1,11 @@
+{
+    "key": "amenity",
+    "type": "check",
+    "label": "Riding stable",
+    "strings": {
+        "options": {
+            "stables": "Riding stable",
+            "undefined": "No"
+        }
+    }
+}
diff --git a/data/presets/fields/trailblazing_osmc.json b/data/presets/fields/trailblazing_osmc.json
new file mode 100644
index 000000000..4ce2b4557
--- /dev/null
+++ b/data/presets/fields/trailblazing_osmc.json
@@ -0,0 +1,5 @@
+{
+    "key": "osmc:symbol",
+    "type": "text",
+    "label": "Machine readable trailblazing"
+}
diff --git a/data/presets/fields/trailblazing_text.json b/data/presets/fields/trailblazing_text.json
new file mode 100644
index 000000000..289a1dae1
--- /dev/null
+++ b/data/presets/fields/trailblazing_text.json
@@ -0,0 +1,5 @@
+{
+    "key": "symbol",
+    "type": "textarea",
+    "label": "Trailblazing description"
+}
diff --git a/data/presets/fields/trailblazing_wiki.json b/data/presets/fields/trailblazing_wiki.json
new file mode 100644
index 000000000..4e2b93e7d
--- /dev/null
+++ b/data/presets/fields/trailblazing_wiki.json
@@ -0,0 +1,5 @@
+{
+    "key": "wiki:symbol",
+    "type": "text",
+    "label": "OSM Wiki name of trailblazing graphic"
+}
diff --git a/data/presets/fields/watering_place.json b/data/presets/fields/watering_place.json
new file mode 100644
index 000000000..0210294d7
--- /dev/null
+++ b/data/presets/fields/watering_place.json
@@ -0,0 +1,5 @@
+{
+    "key": "watering_place",
+    "type": "defaultCheck",
+    "label": "Accessible for horses"
+}
diff --git a/data/presets/presets/amenity/fountain.json b/data/presets/presets/amenity/fountain.json
index 05bc7d092..a41ee82f3 100644
--- a/data/presets/presets/amenity/fountain.json
+++ b/data/presets/presets/amenity/fountain.json
@@ -1,5 +1,9 @@
 {
     "icon": "poi-fountain",
+    "fields": [
+        "name",
+        "watering_place"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json
index dec8a8fe6..d8af52105 100644
--- a/data/presets/presets/highway/path.json
+++ b/data/presets/presets/highway/path.json
@@ -12,6 +12,7 @@
         "mtb/scale",
         "mtb/scale/uphill",
         "mtb/scale/imba",
+        "horse_scale",
         "ref"
     ],
     "geometry": [
diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json
index 9e23b3341..1ea0dc579 100644
--- a/data/presets/presets/highway/track.json
+++ b/data/presets/presets/highway/track.json
@@ -11,7 +11,8 @@
         "smoothness",
         "mtb/scale",
         "mtb/scale/uphill",
-        "mtb/scale/imba"
+        "mtb/scale/imba",
+        "horse_scale"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/tourism/trail_riding_station.json b/data/presets/presets/tourism/trail_riding_station.json
new file mode 100644
index 000000000..660e732b2
--- /dev/null
+++ b/data/presets/presets/tourism/trail_riding_station.json
@@ -0,0 +1,22 @@
+{
+    "icon": "horse_riding",
+    "fields": [
+        "name",
+        "horse_stables",
+        "horse_riding",
+        "horse_dressage",
+        "address",
+        "phone",
+        "website",
+        "description"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "tourism": "trail_riding_station"
+    },
+    "name": "Trail riding station",
+    "matchScore": 2.0
+}
diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json
index 059f652d3..3917b8eba 100644
--- a/data/presets/presets/type/route/hiking.json
+++ b/data/presets/presets/type/route/hiking.json
@@ -4,7 +4,12 @@
         "name",
         "ref_route",
         "operator",
-        "network_foot"
+        "network_foot",
+        "description",
+        "distance",
+        "trailblazing_text",
+        "trailblazing_osmc",
+        "trailblazing_wiki"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/horse.json b/data/presets/presets/type/route/horse.json
index 53c6ddc98..551be6747 100644
--- a/data/presets/presets/type/route/horse.json
+++ b/data/presets/presets/type/route/horse.json
@@ -4,6 +4,11 @@
         "name",
         "ref_route",
         "operator",
+        "description",
+        "distance",
+        "trailblazing_text",
+        "trailblazing_osmc",
+        "trailblazing_wiki",
         "network_horse"
     ],
     "geometry": [

From 4e5b5a806e2ce2699bc772010a812b86cc435bb8 Mon Sep 17 00:00:00 2001
From: xortiz <xavier.ortiz.ch@gmail.com>
Date: Tue, 3 Apr 2018 20:20:12 -0400
Subject: [PATCH 02/37] added column in presets/presets/advertising

---
 data/presets.yaml                            |  4 ++++
 data/presets/presets.json                    | 14 ++++++++++++++
 data/presets/presets/advertising/column.json | 14 ++++++++++++++
 data/taginfo.json                            |  8 ++++++++
 dist/locales/en.json                         |  8 ++++++--
 5 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 data/presets/presets/advertising/column.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 6d2ad96b5..7a18c3b95 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1688,6 +1688,10 @@ en:
         # advertising=billboard
         name: Billboard
         terms: '<translate with synonyms or related terms for ''Billboard'', separated by commas>'
+      advertising/column:
+        # advertising=column
+        name: Column
+        terms: '<translate with synonyms or related terms for ''Column'', separated by commas>'
       aerialway:
         # aerialway=*
         name: Aerialway
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 177181ca0..4be16e5ba 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -197,6 +197,20 @@
             },
             "name": "Billboard"
         },
+        "advertising/column": {
+            "fields": [
+                "direction",
+                "lit"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "advertising": "column"
+            },
+            "name": "Column"
+        },
         "aerialway/station": {
             "icon": "aerialway",
             "geometry": [
diff --git a/data/presets/presets/advertising/column.json b/data/presets/presets/advertising/column.json
new file mode 100644
index 000000000..05c83399e
--- /dev/null
+++ b/data/presets/presets/advertising/column.json
@@ -0,0 +1,14 @@
+{
+    "fields": [
+       "direction",
+       "lit"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "advertising": "column"
+    },
+    "name": "Column"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index b95f36328..7cd168fed 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -117,6 +117,14 @@
                 "way"
             ]
         },
+        {
+            "key": "advertising",
+            "value": "column",
+            "description": "Column",
+            "object_types": [
+                "node"
+            ]
+        },
         {
             "key": "aerialway",
             "value": "station",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 877661180..a25a6cff2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2811,6 +2811,10 @@
                     "name": "Billboard",
                     "terms": ""
                 },
+                "advertising/column": {
+                    "name": "Column",
+                    "terms": ""
+                },
                 "aerialway/station": {
                     "name": "Aerialway Station",
                     "terms": ""
@@ -6665,7 +6669,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Basemap of Austria, based on goverment data.",
+                "description": "Basemap of Austria, based on government data.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6727,7 +6731,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Map tiles by Stamen Design, under CC BY 3.0"
+                    "text": "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL"
                 },
                 "name": "Stamen Terrain"
             },

From 242a01a3e11edbf73a4832b6dfda6ee4fb5420af Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 3 Apr 2018 22:44:52 -0400
Subject: [PATCH 03/37] Import osm-community-index and debug flag so we can
 look at it

---
 css/80_app.css          |  2 +-
 data/index.js           |  9 +++++++++
 modules/core/context.js |  1 +
 modules/svg/debug.js    | 19 ++++++++++++++++++-
 package.json            |  1 +
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index c7a7a885d..041f1340f 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3043,7 +3043,7 @@ img.tile-debug {
 .nocolor { color: rgba(0, 0, 0, 0); }
 .red     { color: rgba(255, 0, 0, 0.75); }
 .green   { color: rgba(0, 255, 0, 0.75); }
-.blue    { color: rgba(0, 0, 255, 0.75); }
+.blue    { color: rgba(176, 176, 255, 0.75); }
 .yellow  { color: rgba(255, 255, 0, 0.75); }
 .cyan    { color: rgba(0, 255, 255, 0.75); }
 .magenta { color: rgba(255, 0, 255, 0.75); }
diff --git a/data/index.js b/data/index.js
index f2ae2544b..efe68ee9e 100644
--- a/data/index.js
+++ b/data/index.js
@@ -12,6 +12,11 @@ export { default as dataImperial } from './imperial.json';
 export { default as dataDriveLeft } from './drive-left.json';
 export { en as dataEn } from '../dist/locales/en.json';
 
+import {
+    features as ociFeatures,
+    resources as ociResources
+} from 'osm-community-index';
+
 import { dataImagery } from './imagery.json';
 import { presets } from './presets/presets.json';
 import { defaults } from './presets/defaults.json';
@@ -22,6 +27,10 @@ import maki from '@mapbox/maki';
 export var dataFeatureIcons = maki.layouts.all.all;
 
 export var data = {
+    community: {
+        features: ociFeatures,
+        resources: ociResources
+    },
     imagery: dataImagery,
     presets: {
         presets: presets,
diff --git a/modules/core/context.js b/modules/core/context.js
index 72e5ecd00..cffed7bef 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -316,6 +316,7 @@ export function coreContext() {
         tile: false,        // tile boundaries
         collision: false,   // label collision bounding boxes
         imagery: false,     // imagery bounding polygons
+        community: false,   // community bounding polygons
         imperial: false,    // imperial (not metric) bounding polygons
         driveLeft: false,   // driveLeft bounding polygons
         target: false       // touch targets
diff --git a/modules/svg/debug.js b/modules/svg/debug.js
index 71f007417..26e6e112e 100644
--- a/modules/svg/debug.js
+++ b/modules/svg/debug.js
@@ -1,3 +1,5 @@
+import _values from 'lodash-es/values';
+
 import { select as d3_select } from 'd3-selection';
 
 import { geoPolygonIntersectsPolygon } from '../geo';
@@ -20,6 +22,7 @@ export function svgDebug(projection, context) {
         var showsTile = context.getDebug('tile');
         var showsCollision = context.getDebug('collision');
         var showsImagery = context.getDebug('imagery');
+        var showsCommunity = context.getDebug('community');
         var showsImperial = context.getDebug('imperial');
         var showsDriveLeft = context.getDebug('driveLeft');
         var showsTouchTargets = context.getDebug('target');
@@ -34,6 +37,9 @@ export function svgDebug(projection, context) {
         if (showsImagery) {
             debugData.push({ class: 'orange', label: 'imagery' });
         }
+        if (showsCommunity) {
+            debugData.push({ class: 'blue', label: 'community' });
+        }
         if (showsImperial) {
             debugData.push({ class: 'cyan', label: 'imperial' });
         }
@@ -71,7 +77,7 @@ export function svgDebug(projection, context) {
 
 
         var layer = selection.selectAll('.layer-debug')
-            .data(showsImagery || showsImperial || showsDriveLeft ? [0] : []);
+            .data(showsImagery || showsCommunity || showsImperial || showsDriveLeft ? [0] : []);
 
         layer.exit()
             .remove();
@@ -102,6 +108,17 @@ export function svgDebug(projection, context) {
             .attr('class', 'debug-imagery debug orange');
 
 
+        var community = layer.selectAll('path.debug-community')
+            .data(showsCommunity ? _values(data.community.features) : []);
+
+        community.exit()
+            .remove();
+
+        community.enter()
+            .append('path')
+            .attr('class', 'debug-community debug blue');
+
+
         var imperial = layer
             .selectAll('path.debug-imperial')
             .data(showsImperial ? [dataImperial] : []);
diff --git a/package.json b/package.json
index 973e062a4..7ab950f56 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "mocha-phantomjs-core": "^2.1.0",
     "name-suggestion-index": "0.1.5",
     "npm-run-all": "^4.0.0",
+    "osm-community-index": "~0.3.0",
     "phantomjs-prebuilt": "~2.1.11",
     "request": "^2.85.0",
     "rollup": "~0.57.0",

From 5829b643f06263d692ae677bcc9d8307724eab61 Mon Sep 17 00:00:00 2001
From: xortiz <xavier.ortiz.ch@gmail.com>
Date: Wed, 4 Apr 2018 10:21:32 -0400
Subject: [PATCH 04/37] modified column to advertising_column, changed vertex
 to area

---
 data/presets.yaml                             |  8 +++---
 data/presets/presets.json                     | 28 +++++++++----------
 .../{column.json => advertising_column.json}  |  6 ++--
 data/taginfo.json                             | 17 +++++------
 dist/locales/en.json                          |  8 +++---
 5 files changed, 34 insertions(+), 33 deletions(-)
 rename data/presets/presets/advertising/{column.json => advertising_column.json} (57%)

diff --git a/data/presets.yaml b/data/presets.yaml
index 7a18c3b95..30173b4cd 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1684,14 +1684,14 @@ en:
         # 'addr:*=*'
         name: Address
         terms: '<translate with synonyms or related terms for ''Address'', separated by commas>'
+      advertising/advertising_column:
+        # advertising=advertising_column
+        name: Advertising Column
+        terms: '<translate with synonyms or related terms for ''Advertising Column'', separated by commas>'
       advertising/billboard:
         # advertising=billboard
         name: Billboard
         terms: '<translate with synonyms or related terms for ''Billboard'', separated by commas>'
-      advertising/column:
-        # advertising=column
-        name: Column
-        terms: '<translate with synonyms or related terms for ''Column'', separated by commas>'
       aerialway:
         # aerialway=*
         name: Aerialway
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4be16e5ba..c87a59f32 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -182,6 +182,20 @@
             "name": "Address",
             "matchScore": 0.15
         },
+        "advertising/advertising_column": {
+            "fields": [
+                "direction",
+                "lit"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "advertising": "advertising_column"
+            },
+            "name": "Advertising Column"
+        },
         "advertising/billboard": {
             "fields": [
                 "direction",
@@ -197,20 +211,6 @@
             },
             "name": "Billboard"
         },
-        "advertising/column": {
-            "fields": [
-                "direction",
-                "lit"
-            ],
-            "geometry": [
-                "point",
-                "vertex"
-            ],
-            "tags": {
-                "advertising": "column"
-            },
-            "name": "Column"
-        },
         "aerialway/station": {
             "icon": "aerialway",
             "geometry": [
diff --git a/data/presets/presets/advertising/column.json b/data/presets/presets/advertising/advertising_column.json
similarity index 57%
rename from data/presets/presets/advertising/column.json
rename to data/presets/presets/advertising/advertising_column.json
index 05c83399e..982181a8e 100644
--- a/data/presets/presets/advertising/column.json
+++ b/data/presets/presets/advertising/advertising_column.json
@@ -5,10 +5,10 @@
     ],
     "geometry": [
         "point",
-        "vertex"
+        "area"
     ],
     "tags": {
-        "advertising": "column"
+        "advertising": "advertising_column"
     },
-    "name": "Column"
+    "name": "Advertising Column"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 7cd168fed..03d401894 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -108,6 +108,15 @@
                 "area"
             ]
         },
+        {
+            "key": "advertising",
+            "value": "advertising_column",
+            "description": "Advertising Column",
+            "object_types": [
+                "node",
+                "area"
+            ]
+        },
         {
             "key": "advertising",
             "value": "billboard",
@@ -117,14 +126,6 @@
                 "way"
             ]
         },
-        {
-            "key": "advertising",
-            "value": "column",
-            "description": "Column",
-            "object_types": [
-                "node"
-            ]
-        },
         {
             "key": "aerialway",
             "value": "station",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a25a6cff2..36f6ef264 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2807,12 +2807,12 @@
                     "name": "Address",
                     "terms": ""
                 },
-                "advertising/billboard": {
-                    "name": "Billboard",
+                "advertising/advertising_column": {
+                    "name": "Advertising Column",
                     "terms": ""
                 },
-                "advertising/column": {
-                    "name": "Column",
+                "advertising/billboard": {
+                    "name": "Billboard",
                     "terms": ""
                 },
                 "aerialway/station": {

From 7055a2a95c57244c47d300c9f32a0a202e23c05f Mon Sep 17 00:00:00 2001
From: xortiz <xavier.ortiz.ch@gmail.com>
Date: Wed, 4 Apr 2018 12:06:25 -0400
Subject: [PATCH 05/37] misunderstood name change, reverted to column, only
 changed the name within the file

---
 data/presets.yaml                             |  8 +++---
 data/presets/presets.json                     | 28 +++++++++----------
 .../{advertising_column.json => column.json}  |  2 +-
 data/taginfo.json                             | 18 ++++++------
 dist/locales/en.json                          |  8 +++---
 5 files changed, 32 insertions(+), 32 deletions(-)
 rename data/presets/presets/advertising/{advertising_column.json => column.json} (79%)

diff --git a/data/presets.yaml b/data/presets.yaml
index 30173b4cd..4de13bf77 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1684,14 +1684,14 @@ en:
         # 'addr:*=*'
         name: Address
         terms: '<translate with synonyms or related terms for ''Address'', separated by commas>'
-      advertising/advertising_column:
-        # advertising=advertising_column
-        name: Advertising Column
-        terms: '<translate with synonyms or related terms for ''Advertising Column'', separated by commas>'
       advertising/billboard:
         # advertising=billboard
         name: Billboard
         terms: '<translate with synonyms or related terms for ''Billboard'', separated by commas>'
+      advertising/column:
+        # advertising=column
+        name: Advertising Column
+        terms: '<translate with synonyms or related terms for ''Advertising Column'', separated by commas>'
       aerialway:
         # aerialway=*
         name: Aerialway
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c87a59f32..353d9aca0 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -182,20 +182,6 @@
             "name": "Address",
             "matchScore": 0.15
         },
-        "advertising/advertising_column": {
-            "fields": [
-                "direction",
-                "lit"
-            ],
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "tags": {
-                "advertising": "advertising_column"
-            },
-            "name": "Advertising Column"
-        },
         "advertising/billboard": {
             "fields": [
                 "direction",
@@ -211,6 +197,20 @@
             },
             "name": "Billboard"
         },
+        "advertising/column": {
+            "fields": [
+                "direction",
+                "lit"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "advertising": "column"
+            },
+            "name": "Advertising Column"
+        },
         "aerialway/station": {
             "icon": "aerialway",
             "geometry": [
diff --git a/data/presets/presets/advertising/advertising_column.json b/data/presets/presets/advertising/column.json
similarity index 79%
rename from data/presets/presets/advertising/advertising_column.json
rename to data/presets/presets/advertising/column.json
index 982181a8e..b17ebe1fc 100644
--- a/data/presets/presets/advertising/advertising_column.json
+++ b/data/presets/presets/advertising/column.json
@@ -8,7 +8,7 @@
         "area"
     ],
     "tags": {
-        "advertising": "advertising_column"
+        "advertising": "column"
     },
     "name": "Advertising Column"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 03d401894..3bdee6095 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -108,15 +108,6 @@
                 "area"
             ]
         },
-        {
-            "key": "advertising",
-            "value": "advertising_column",
-            "description": "Advertising Column",
-            "object_types": [
-                "node",
-                "area"
-            ]
-        },
         {
             "key": "advertising",
             "value": "billboard",
@@ -126,6 +117,15 @@
                 "way"
             ]
         },
+        {
+            "key": "advertising",
+            "value": "column",
+            "description": "Advertising Column",
+            "object_types": [
+                "node",
+                "area"
+            ]
+        },
         {
             "key": "aerialway",
             "value": "station",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 36f6ef264..d1b09f958 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2807,14 +2807,14 @@
                     "name": "Address",
                     "terms": ""
                 },
-                "advertising/advertising_column": {
-                    "name": "Advertising Column",
-                    "terms": ""
-                },
                 "advertising/billboard": {
                     "name": "Billboard",
                     "terms": ""
                 },
+                "advertising/column": {
+                    "name": "Advertising Column",
+                    "terms": ""
+                },
                 "aerialway/station": {
                     "name": "Aerialway Station",
                     "terms": ""

From 2ed2d79aef840b7b998ab6d83dd10b10f0d4c02e Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 4 Apr 2018 23:49:42 -0400
Subject: [PATCH 06/37] Thank the user for their contribution

---
 css/80_app.css        |  7 ++++---
 data/core.yaml        |  2 ++
 dist/locales/en.json  |  2 ++
 modules/modes/save.js | 26 ++++++++++++++++++++++++
 modules/ui/success.js | 47 +++++++++++++++++++++++++++++++++----------
 package.json          |  1 +
 6 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index 041f1340f..6b4e4005c 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3595,10 +3595,11 @@ img.tile-debug {
 /* Success Modal
 ------------------------------------------------------- */
 .save-success p {
-    padding: 15px 15px 0 15px;
+    padding: 15px 20px 0 20px;
 }
-.save-success a.details {
-    padding-left: 15px;
+.save-success .details {
+    margin: 0px 5px;
+    white-space: nowrap;
 }
 .save-success .button {
     padding-top: 15px;
diff --git a/data/core.yaml b/data/core.yaml
index 178db1db2..3ff0eb9ba 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -529,6 +529,8 @@ en:
   success:
     edited_osm: "Edited OSM!"
     just_edited: "You just edited OpenStreetMap!"
+    thank_you: "Thank you for improving the map."
+    thank_you_location: "Thank you for improving the map around {where}."
     view_on_osm: "View on OSM"
     facebook: "Share on Facebook"
     twitter: "Share on Twitter"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 563a6eb16..eb92d2b49 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -646,6 +646,8 @@
         "success": {
             "edited_osm": "Edited OSM!",
             "just_edited": "You just edited OpenStreetMap!",
+            "thank_you": "Thank you for improving the map.",
+            "thank_you_location": "Thank you for improving the map around {where}.",
             "view_on_osm": "View on OSM",
             "facebook": "Share on Facebook",
             "twitter": "Share on Twitter",
diff --git a/modules/modes/save.js b/modules/modes/save.js
index d8f14addb..5a98d03ab 100644
--- a/modules/modes/save.js
+++ b/modules/modes/save.js
@@ -28,6 +28,8 @@ import {
     modeSelect
 } from './index';
 
+import { services } from '../services';
+
 import {
     uiConflicts,
     uiConfirm,
@@ -66,6 +68,7 @@ export function modeSave(context) {
     var _conflicts = [];
     var _errors = [];
     var _origChanges;
+    var _location;
 
 
     function cancel(selectedID) {
@@ -305,6 +308,7 @@ export function modeSave(context) {
             var history = context.history();
             var changes = history.changes(actionDiscardTags(history.difference()));
             if (changes.modified.length || changes.created.length || changes.deleted.length) {
+                loadLocation();  // so it is ready when we display the save screen
                 osm.putChangeset(changeset, changes, uploadCallback);
             } else {        // changes were insignificant or reverted by user
                 d3_select('.inspector-wrap *').remove();
@@ -468,6 +472,7 @@ export function modeSave(context) {
 
         var ui = uiSuccess(context)
             .changeset(changeset)
+            .location(_location)
             .on('cancel', function() { context.ui().sidebar.hide(); });
 
         context.enter(modeBrowse(context).sidebar(ui));
@@ -486,6 +491,27 @@ export function modeSave(context) {
     }
 
 
+    // Reverse geocode current map location so we can display a message on
+    // the success screen like "Thank you for editing around city, state."
+    function loadLocation() {
+        _location = null;
+        if (!services.geocoder) return;
+
+        services.geocoder.reverse(context.map().center(), function(err, result) {
+            if (err || !result || !result.address) return;
+
+            var parts = [];
+            var addr = result.address;
+            var city = addr && (addr.suburb || addr.city || addr.county);
+            if (city) parts.push(city);
+            var region = addr && (addr.state || addr.country);
+            if (region) parts.push(region);
+
+            _location = parts.join(', ');
+        });
+    }
+
+
     mode.enter = function() {
         function done() {
             context.ui().sidebar.show(commit);
diff --git a/modules/ui/success.js b/modules/ui/success.js
index eb12d7f3d..2f5372971 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -1,6 +1,7 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
+import whichPolygon from 'which-polygon';
 import { t } from '../util/locale';
 import { tooltip } from '../util/tooltip';
 import { svgIcon } from '../svg';
@@ -8,8 +9,9 @@ import { utilRebind } from '../util/rebind';
 
 
 export function uiSuccess(context) {
-    var dispatch = d3_dispatch('cancel'),
-        changeset;
+    var dispatch = d3_dispatch('cancel');
+    var _changeset;
+    var _location;
 
 
     function success(selection) {
@@ -33,22 +35,26 @@ export function uiSuccess(context) {
 
         body
             .append('p')
-            .html(t('success.help_html'));
+            .append('strong')
+            .append('em')
+            .html(t('success.thank_you' + (_location ? '_location' : ''), { where: _location }));
 
-        body
+        var detailLink = body
+            .append('p')
+            .html(t('success.help_html'))
             .append('a')
             .attr('class', 'details')
             .attr('target', '_blank')
             .attr('tabindex', -1)
-            .call(svgIcon('#icon-out-link', 'inline'))
             .attr('href', t('success.help_link_url'))
+            .call(svgIcon('#icon-out-link', 'inline'))
             .append('span')
             .text(t('success.help_link_text'));
 
         var osm = context.connection();
         if (!osm) return;
 
-        var changesetURL = osm.changesetURL(changeset.id);
+        var changesetURL = osm.changesetURL(_changeset.id);
 
         var viewOnOsm = body
             .append('a')
@@ -66,7 +72,13 @@ export function uiSuccess(context) {
             .append('div')
             .text(t('success.view_on_osm'));
 
-        var message = (changeset.tags.comment || t('success.edited_osm')).substring(0, 130) +
+        body
+            .call(showShareLinks, changesetURL);
+    }
+
+
+    function showShareLinks(selection, changesetURL) {
+        var message = (_changeset.tags.comment || t('success.edited_osm')).substring(0, 130) +
             ' ' + changesetURL;
 
         var sharing = [
@@ -75,7 +87,7 @@ export function uiSuccess(context) {
             { key: 'google', value: 'https://plus.google.com/share?url=' + encodeURIComponent(changesetURL) }
         ];
 
-        body.selectAll('.button.social')
+        selection.selectAll('.button.social')
             .data(sharing)
             .enter()
             .append('a')
@@ -84,14 +96,27 @@ export function uiSuccess(context) {
             .attr('href', function(d) { return d.value; })
             .call(tooltip()
                 .title(function(d) { return t('success.' + d.key); })
-                .placement('bottom'))
+                .placement('bottom')
+            )
             .each(function(d) { d3_select(this).call(svgIcon('#logo-' + d.key, 'social')); });
     }
 
 
+    function showCommunities(selection) {
+
+    }
+
+
     success.changeset = function(_) {
-        if (!arguments.length) return changeset;
-        changeset = _;
+        if (!arguments.length) return _changeset;
+        _changeset = _;
+        return success;
+    };
+
+
+    success.location = function(_) {
+        if (!arguments.length) return _location;
+        _location = _;
         return success;
     };
 
diff --git a/package.json b/package.json
index 7ab950f56..79ec8deb0 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "node-diff3": "1.0.0",
     "osm-auth": "1.0.2",
     "rbush": "2.0.2",
+    "which-polygon": "2.2.0",
     "wmf-sitematrix": "0.1.4"
   },
   "devDependencies": {

From 712b4cb19e150e5cd250b633c897539806f3cfe4 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Fri, 6 Apr 2018 18:51:59 -0400
Subject: [PATCH 07/37] Add communities to save screen

---
 css/80_app.css        | 56 +++++++++++++++++++-------
 data/core.yaml        |  2 +-
 data/index.js         | 18 ++++++++-
 dist/locales/en.json  |  2 +-
 modules/ui/success.js | 91 +++++++++++++++++++++++++++++++++++--------
 5 files changed, 136 insertions(+), 33 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index 6b4e4005c..88b6bd351 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3552,8 +3552,7 @@ img.tile-debug {
     text-align: center;
 }
 
-.modal-actions button,
-.save-success a.button {
+.modal-actions button {
     font-weight: normal;
     color: #7092ff;
     border-bottom: 1px solid #ccc;
@@ -3562,12 +3561,16 @@ img.tile-debug {
     text-align: center;
     display: inline-block;
 }
-
-.modal-actions button:hover
-.save-success a.button:hover {
+.modal-actions button:hover {
     background-color: #ececec;
 }
 
+.logo-small {
+    height: 40px;
+    width: 40px;
+    margin: auto;
+}
+
 .logo {
     height: 100px;
     width: 100%;
@@ -3589,35 +3592,60 @@ img.tile-debug {
     color: #7092ff;
 }
 .modal-actions .logo-reset {
-    color: #E06C5E;
+    color: #e06c5e;
 }
 
 /* Success Modal
 ------------------------------------------------------- */
+.save-summary,
+.save-shareLinks,
+.save-communityLinks {
+    padding: 0px 20px;
+}
+
 .save-success p {
-    padding: 15px 20px 0 20px;
+    padding-top: 15px;
 }
 .save-success .details {
     margin: 0px 5px;
     white-space: nowrap;
 }
-.save-success .button {
+.save-summary .button {
     padding-top: 15px;
 }
-.save-success .logo-osm {
+.save-summary .logo-osm {
     color: #7092ff;
-    margin-bottom: 10px;
 }
-.save-success a.button.social {
+
+.save-shareLinks,
+.save-communityLinks {
+    border-top: 1px solid #ccc;
+}
+
+.save-shareLinks a.button.social {
     height: auto;
     border-bottom: none;
 }
-.save-success .icon.social {
-    height: 80px;
-    width: 80px;
+.save-shareLinks .icon.social {
+    height: 40px;
+    width: 40px;
     color: #7092ff;
 }
 
+.save-success a.button {
+    font-weight: normal;
+    color: #7092ff;
+    border-bottom: 1px solid #ccc;
+    border-radius: 0;
+    height: 40px;
+    width: 40px;
+    text-align: center;
+    display: inline-block;
+}
+.save-success a.button:hover {
+    background-color: #ececec;
+}
+
 /* Splash Modal
 ------------------------------------------------------- */
 .modal-actions .logo-walkthrough,
diff --git a/data/core.yaml b/data/core.yaml
index 3ff0eb9ba..8abde2eb0 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -535,7 +535,7 @@ en:
     facebook: "Share on Facebook"
     twitter: "Share on Twitter"
     google: "Share on Google+"
-    help_html: Your changes should appear in the "Standard" layer in a few minutes. Other layers, and certain features, may take longer.
+    help_html: Your changes should appear on OpenStreetMap within a few minutes. It may take longer for maps elsewhere to receive updates.
     help_link_text: Details
     help_link_url: "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
   confirm:
diff --git a/data/index.js b/data/index.js
index efe68ee9e..c1b282fab 100644
--- a/data/index.js
+++ b/data/index.js
@@ -12,6 +12,7 @@ export { default as dataImperial } from './imperial.json';
 export { default as dataDriveLeft } from './drive-left.json';
 export { en as dataEn } from '../dist/locales/en.json';
 
+
 import {
     features as ociFeatures,
     resources as ociResources
@@ -26,10 +27,25 @@ import { fields } from './presets/fields.json';
 import maki from '@mapbox/maki';
 export var dataFeatureIcons = maki.layouts.all.all;
 
+import _values from 'lodash-es/values';
+import whichPolygon from 'which-polygon';
+
+// workaround for which-polygon
+// only supports `properties`, not `id`
+// https://github.com/mapbox/which-polygon/pull/6
+var features = _values(ociFeatures).map(function(feature) {
+    feature.properties = { id: feature.id };
+    return feature;
+});
+
 export var data = {
     community: {
         features: ociFeatures,
-        resources: ociResources
+        resources: ociResources,
+        query: whichPolygon({
+            type: 'FeatureCollection',
+            features: features
+        })
     },
     imagery: dataImagery,
     presets: {
diff --git a/dist/locales/en.json b/dist/locales/en.json
index eb92d2b49..29f0c86c0 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -652,7 +652,7 @@
             "facebook": "Share on Facebook",
             "twitter": "Share on Twitter",
             "google": "Share on Google+",
-            "help_html": "Your changes should appear in the \"Standard\" layer in a few minutes. Other layers, and certain features, may take longer.",
+            "help_html": "Your changes should appear on OpenStreetMap within a few minutes. It may take longer for maps elsewhere to receive updates.",
             "help_link_text": "Details",
             "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
         },
diff --git a/modules/ui/success.js b/modules/ui/success.js
index 2f5372971..5ec8e260b 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -1,8 +1,10 @@
+import _filter from 'lodash-es/filter';
+
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import whichPolygon from 'which-polygon';
 import { t } from '../util/locale';
+import { data } from '../../data';
 import { tooltip } from '../util/tooltip';
 import { svgIcon } from '../svg';
 import { utilRebind } from '../util/rebind';
@@ -33,13 +35,17 @@ export function uiSuccess(context) {
             .append('div')
             .attr('class', 'body save-success fillL');
 
-        body
+        var summary = body
+            .append('div')
+            .attr('class', 'save-summary');
+
+        summary
             .append('p')
             .append('strong')
             .append('em')
             .html(t('success.thank_you' + (_location ? '_location' : ''), { where: _location }));
 
-        var detailLink = body
+        summary
             .append('p')
             .html(t('success.help_html'))
             .append('a')
@@ -56,28 +62,58 @@ export function uiSuccess(context) {
 
         var changesetURL = osm.changesetURL(_changeset.id);
 
-        var viewOnOsm = body
-            .append('a')
-            .attr('class', 'button col12 osm')
-            .attr('target', '_blank')
-            .attr('href', changesetURL);
+        var table = summary
+            .append('table')
+            .attr('class', 'summary-table');
 
-        viewOnOsm
+        var row = table
+            .append('tr')
+            .attr('class', 'summary-row');
+
+        row
+            .append('td')
+            .attr('class', 'summary-icon')
+            .append('a')
+            .attr('target', '_blank')
+            .attr('href', changesetURL)
             .append('svg')
-            .attr('class', 'logo logo-osm')
+            .attr('class', 'logo-small')
             .append('use')
             .attr('xlink:href', '#logo-osm');
 
-        viewOnOsm
-            .append('div')
+        row
+            .append('td')
+            .attr('class', 'summary-detail')
+            .append('a')
+            .attr('target', '_blank')
+            .attr('href', changesetURL)
             .text(t('success.view_on_osm'));
 
-        body
-            .call(showShareLinks, changesetURL);
+
+        // Gather community polygon IDs intersecting the map..
+        var matchFeatures = data.community.query(context.map().center(), true);
+        var matchIDs = matchFeatures.map(function(feature) { return feature.id; });
+
+        // Gather community resources that are either global or match a polygon.
+        var matchResources = _filter(data.community.resources, function(v) {
+            return v.featureId === null || matchIDs.indexOf(v.featureId) !== -1;
+        });
+
+        if (matchResources.length) {
+            body
+                .call(showCommunityLinks, matchResources);
+        } else {
+            body
+                .call(showShareLinks, changesetURL);
+        }
     }
 
 
     function showShareLinks(selection, changesetURL) {
+        var shareLinks = selection
+            .append('div')
+            .attr('class', 'save-shareLinks');
+
         var message = (_changeset.tags.comment || t('success.edited_osm')).substring(0, 130) +
             ' ' + changesetURL;
 
@@ -87,7 +123,7 @@ export function uiSuccess(context) {
             { key: 'google', value: 'https://plus.google.com/share?url=' + encodeURIComponent(changesetURL) }
         ];
 
-        selection.selectAll('.button.social')
+        shareLinks.selectAll('.button.social')
             .data(sharing)
             .enter()
             .append('a')
@@ -102,8 +138,31 @@ export function uiSuccess(context) {
     }
 
 
-    function showCommunities(selection) {
+    function showCommunityLinks(selection, matchResources) {
+        var communityLinks = selection
+            .append('div')
+            .attr('class', 'save-communityLinks');
 
+        var table = communityLinks
+            .append('table')
+            .attr('class', 'community-table');
+
+        var row = table.selectAll('.community-row')
+            .data(matchResources);
+
+        var rowEnter = row.enter()
+            .append('tr')
+            .attr('class', 'community-row');
+
+        rowEnter
+            .append('td')
+            .attr('class', 'community-icon')
+            .text(function(d) { return d.type; });
+
+        rowEnter
+            .append('td')
+            .attr('class', 'community-detail')
+            .text(function(d) { return d.name; });
     }
 
 

From 0731a120c6296459446acc477a118e373d469a77 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 7 Apr 2018 12:39:03 -0400
Subject: [PATCH 08/37] Improve "View on OSM" save section

---
 css/80_app.css        | 15 +++++++--------
 data/core.yaml        | 12 +++++++-----
 dist/locales/en.json  | 12 +++++++-----
 modules/ui/success.js | 16 ++++++++++++++--
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index 88b6bd351..585459070 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3600,22 +3600,21 @@ img.tile-debug {
 .save-summary,
 .save-shareLinks,
 .save-communityLinks {
-    padding: 0px 20px;
+    padding: 0px 20px 15px 20px;
 }
 
+.save-success table,
 .save-success p {
-    padding-top: 15px;
+    margin-top: 15px;
+}
+.save-success td {
+    vertical-align: top;
+    padding: 0 10px 5px 10px;
 }
 .save-success .details {
     margin: 0px 5px;
     white-space: nowrap;
 }
-.save-summary .button {
-    padding-top: 15px;
-}
-.save-summary .logo-osm {
-    color: #7092ff;
-}
 
 .save-shareLinks,
 .save-communityLinks {
diff --git a/data/core.yaml b/data/core.yaml
index 8abde2eb0..8895d3f03 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -527,17 +527,19 @@ en:
       memberlist: 'Relation members were changed by both you and {user}.'
       tags: 'You changed the <b>{tag}</b> tag to "{local}" and {user} changed it to "{remote}".'
   success:
-    edited_osm: "Edited OSM!"
     just_edited: "You just edited OpenStreetMap!"
     thank_you: "Thank you for improving the map."
     thank_you_location: "Thank you for improving the map around {where}."
-    view_on_osm: "View on OSM"
-    facebook: "Share on Facebook"
-    twitter: "Share on Twitter"
-    google: "Share on Google+"
     help_html: Your changes should appear on OpenStreetMap within a few minutes. It may take longer for maps elsewhere to receive updates.
     help_link_text: Details
     help_link_url: "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
+    view_on_osm: "View these changes on OpenStreetMap"
+    changeset_id: "Changeset ID: {changeset_id}"
+    edited_osm: "Edited OSM!"
+    facebook: "Share on Facebook"
+    twitter: "Share on Twitter"
+    google: "Share on Google+"
+    like_osm: "Like OpenStreetMap? Connect with others and learn more:"
   confirm:
     okay: "OK"
     cancel: "Cancel"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 29f0c86c0..5a57c6f36 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -644,17 +644,19 @@
             }
         },
         "success": {
-            "edited_osm": "Edited OSM!",
             "just_edited": "You just edited OpenStreetMap!",
             "thank_you": "Thank you for improving the map.",
             "thank_you_location": "Thank you for improving the map around {where}.",
-            "view_on_osm": "View on OSM",
+            "help_html": "Your changes should appear on OpenStreetMap within a few minutes. It may take longer for maps elsewhere to receive updates.",
+            "help_link_text": "Details",
+            "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F",
+            "view_on_osm": "View these changes on OpenStreetMap",
+            "changeset_id": "Changeset ID: {changeset_id}",
+            "edited_osm": "Edited OSM!",
             "facebook": "Share on Facebook",
             "twitter": "Share on Twitter",
             "google": "Share on Google+",
-            "help_html": "Your changes should appear on OpenStreetMap within a few minutes. It may take longer for maps elsewhere to receive updates.",
-            "help_link_text": "Details",
-            "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
+            "like_osm": "Like OpenStreetMap? Connect with others and learn more:"
         },
         "confirm": {
             "okay": "OK",
diff --git a/modules/ui/success.js b/modules/ui/success.js
index 5ec8e260b..ae29802bc 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -81,14 +81,20 @@ export function uiSuccess(context) {
             .append('use')
             .attr('xlink:href', '#logo-osm');
 
-        row
+        var summaryDetail = row
             .append('td')
-            .attr('class', 'summary-detail')
+            .attr('class', 'summary-detail');
+
+        summaryDetail
             .append('a')
             .attr('target', '_blank')
             .attr('href', changesetURL)
             .text(t('success.view_on_osm'));
 
+        summaryDetail
+            .append('div')
+            .text(t('success.changeset_id', { changeset_id: _changeset.id }));
+
 
         // Gather community polygon IDs intersecting the map..
         var matchFeatures = data.community.query(context.map().center(), true);
@@ -143,6 +149,12 @@ export function uiSuccess(context) {
             .append('div')
             .attr('class', 'save-communityLinks');
 
+        communityLinks
+            .append('p')
+            .append('strong')
+            .append('em')
+            .html(t('success.like_osm'));
+
         var table = communityLinks
             .append('table')
             .attr('class', 'community-table');

From 89798ad865d2813e95379a0bce69dc5d4f28d4f8 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 7 Apr 2018 13:44:44 -0400
Subject: [PATCH 09/37] Add community translation resource and `npm run
 translations`

---
 build_data.js           |  182 ++---
 data/locales.json       |    1 +
 data/update_locales.js  |   39 +-
 dist/locales/ar.json    |  824 ++++++++++++++++++--
 dist/locales/ast.json   |   16 -
 dist/locales/bg-BG.json | 1642 ---------------------------------------
 dist/locales/bg.json    |  194 ++++-
 dist/locales/bn.json    |   10 +-
 dist/locales/bs.json    |    3 -
 dist/locales/ca.json    |   78 +-
 dist/locales/ckb.json   |   10 +-
 dist/locales/cs.json    |  128 ++-
 dist/locales/da.json    |  248 +++++-
 dist/locales/de.json    |  380 ++++++++-
 dist/locales/el.json    |   17 -
 dist/locales/en-GB.json |   67 +-
 dist/locales/en.json    |  224 ++++++
 dist/locales/eo.json    |  114 ++-
 dist/locales/es.json    |  383 ++++++++-
 dist/locales/et.json    |  174 ++++-
 dist/locales/fa.json    |  652 +++++++++++++++-
 dist/locales/fi.json    |  507 +++++++++---
 dist/locales/fr.json    |  189 ++++-
 dist/locales/gl.json    |  105 ++-
 dist/locales/he.json    |  624 +++++++++++++--
 dist/locales/hr.json    |   43 +-
 dist/locales/hu.json    |   76 +-
 dist/locales/hy.json    |    3 -
 dist/locales/id.json    |    9 -
 dist/locales/is.json    |  383 ++++++++-
 dist/locales/it.json    |  603 ++++++++++++--
 dist/locales/ja.json    |  340 +++++++-
 dist/locales/ko.json    |   81 +-
 dist/locales/ku.json    |  289 ++++++-
 dist/locales/lt.json    |   15 -
 dist/locales/mg.json    |   23 +-
 dist/locales/mk.json    |   15 -
 dist/locales/ms.json    |   55 +-
 dist/locales/nl.json    |   19 -
 dist/locales/no.json    |    9 -
 dist/locales/pl.json    |   39 +-
 dist/locales/pt-BR.json |  249 +++++-
 dist/locales/pt.json    |  130 +++-
 dist/locales/ro.json    |   53 +-
 dist/locales/ru.json    |  175 ++++-
 dist/locales/si.json    |    3 -
 dist/locales/sk.json    |   19 -
 dist/locales/sl.json    |   16 -
 dist/locales/so.json    |  382 ++++++++-
 dist/locales/sr.json    |   12 -
 dist/locales/sv.json    |  508 +++++++++++-
 dist/locales/tl.json    |  174 ++++-
 dist/locales/tr.json    |   19 -
 dist/locales/uk.json    |   65 +-
 dist/locales/vi.json    |  333 +++++++-
 dist/locales/yue.json   |    3 -
 dist/locales/zh-CN.json |   31 +-
 dist/locales/zh-HK.json |  201 ++++-
 dist/locales/zh-TW.json |  307 +++++++-
 59 files changed, 8738 insertions(+), 2755 deletions(-)
 delete mode 100644 dist/locales/bg-BG.json

diff --git a/build_data.js b/build_data.js
index ec7d64968..d77cae01f 100644
--- a/build_data.js
+++ b/build_data.js
@@ -106,10 +106,12 @@ module.exports = function buildData() {
     };
 };
 
+
 function read(f) {
     return JSON.parse(fs.readFileSync(f, 'utf8'));
 }
 
+
 function validate(file, instance, schema) {
     var validationErrors = jsonschema.validate(instance, schema).errors;
     if (validationErrors.length) {
@@ -125,19 +127,19 @@ function validate(file, instance, schema) {
     }
 }
 
+
 function generateCategories(tstrings) {
     var categories = {};
     glob.sync(__dirname + '/data/presets/categories/*.json').forEach(function(file) {
-        var field = read(file),
-            id = 'category-' + path.basename(file, '.json');
-
-        tstrings.categories[id] = {name: field.name};
-
+        var field = read(file);
+        var id = 'category-' + path.basename(file, '.json');
+        tstrings.categories[id] = { name: field.name };
         categories[id] = field;
     });
     return categories;
 }
 
+
 function generateFields(tstrings) {
     var fields = {};
     glob.sync(__dirname + '/data/presets/fields/**/*.json').forEach(function(file) {
@@ -171,9 +173,9 @@ function suggestionsToPresets(presets) {
     for (var key in suggestions) {
         for (var value in suggestions[key]) {
             for (var name in suggestions[key][value]) {
-                var item = key + '/' + value + '/' + name,
-                    tags = {},
-                    count = suggestions[key][value][name].count;
+                var item = key + '/' + value + '/' + name;
+                var tags = {};
+                var count = suggestions[key][value][name].count;
 
                 if (existing[name] && count > existing[name].count) {
                     delete presets[existing[name].category];
@@ -187,10 +189,10 @@ function suggestionsToPresets(presets) {
         }
     }
 
-    function addSuggestion(category, tags, name, count) {
-        var tag = category.split('/'),
-            parent = presets[tag[0] + '/' + tag[1]];
 
+    function addSuggestion(category, tags, name, count) {
+        var tag = category.split('/');
+        var parent = presets[tag[0] + '/' + tag[1]];
 
         // Hacky code to add healthcare tagging not yet present in name-suggestion-index
         // This will be fixed by https://github.com/osmlab/name-suggestion-index/issues/57
@@ -230,16 +232,20 @@ function suggestionsToPresets(presets) {
     return presets;
 }
 
+
 function stripLeadingUnderscores(str) {
-    return str.split('/').map(function(s) { return s.replace(/^_/,''); }).join('/');
+    return str.split('/')
+        .map(function(s) { return s.replace(/^_/,''); })
+        .join('/');
 }
 
+
 function generatePresets(tstrings) {
     var presets = {};
 
     glob.sync(__dirname + '/data/presets/presets/**/*.json').forEach(function(file) {
-        var preset = read(file),
-            id = stripLeadingUnderscores(file.match(/presets\/presets\/([^.]*)\.json/)[1]);
+        var preset = read(file);
+        var id = stripLeadingUnderscores(file.match(/presets\/presets\/([^.]*)\.json/)[1]);
 
         validate(file, preset, presetSchema);
 
@@ -247,14 +253,15 @@ function generatePresets(tstrings) {
             name: preset.name,
             terms: (preset.terms || []).join(',')
         };
+
         presets[id] = preset;
     });
 
     presets = _merge(presets, suggestionsToPresets(presets));
     return presets;
-
 }
 
+
 function generateTranslations(fields, presets, tstrings) {
     var translations = _cloneDeep(tstrings);
 
@@ -301,8 +308,8 @@ function generateTranslations(fields, presets, tstrings) {
     return translations;
 }
 
-function generateTaginfo(presets, fields) {
 
+function generateTaginfo(presets, fields) {
     var taginfo = {
         'data_format': 1,
         'data_url': 'https://raw.githubusercontent.com/openstreetmap/iD/master/data/taginfo.json',
@@ -320,96 +327,86 @@ function generateTaginfo(presets, fields) {
     };
 
     _forEach(presets, function(preset) {
+        if (preset.suggestion) return;
 
-        if (preset.suggestion)
-            return;
+        var keys = Object.keys(preset.tags);
+        var last = keys[keys.length - 1];
+        var tag = { key: last };
 
-        var keys = Object.keys(preset.tags),
-            last = keys[keys.length - 1],
-            tag = { key: last };
-
-        if (!last)
-            return;
+        if (!last) return;
 
         if (preset.tags[last] !== '*') {
             tag.value = preset.tags[last];
         }
-
         if (preset.name) {
-          tag.description = [ preset.name ];
+            tag.description = [ preset.name ];
         }
-
         if (preset.geometry) {
-          setObjectType(tag, preset);
+            setObjectType(tag, preset);
         }
-
         if (isMaki(preset.icon)) {
-            tag.icon_url = 'https://raw.githubusercontent.com/mapbox/maki/master/icons/' + preset.icon + '-15.svg?sanitize=true';
+            tag.icon_url = 'https://raw.githubusercontent.com/mapbox/maki/master/icons/' +
+                preset.icon + '-15.svg?sanitize=true';
         }
 
         coalesceTags(taginfo, tag);
     });
 
     _forEach(fields, function(field) {
-
         var keys = field.keys || [ field.key ] || [];
 
         keys.forEach(function(key) {
             if (field.strings && field.strings.options) {
-               var values = Object.keys(field.strings.options);
-               values.forEach(function(value) {
-                   var tag = { key:   key,
-                               value: value };
-                   if (field.label) {
-                      tag.description = [ field.label ];
-                   }
-                   coalesceTags(taginfo, tag);
-               });
-            }
-            else {
-               var tag = { key: key };
-               if (field.label) {
-                  tag.description = [ field.label ];
-               }
-               coalesceTags(taginfo, tag);
+                var values = Object.keys(field.strings.options);
+                values.forEach(function(value) {
+                    var tag = { key: key, value: value };
+                    if (field.label) {
+                        tag.description = [ field.label ];
+                    }
+                    coalesceTags(taginfo, tag);
+                });
+            } else {
+                var tag = { key: key };
+                if (field.label) {
+                    tag.description = [ field.label ];
+                }
+                coalesceTags(taginfo, tag);
             }
         });
     });
 
     _forEach(taginfo.tags, function(elem) {
-       if (elem.description)
-          elem.description = elem.description.join(', ');
+        if (elem.description)
+            elem.description = elem.description.join(', ');
     });
 
+
     function coalesceTags(taginfo, tag) {
+        if (!tag.key) return;
 
-       if (!tag.key)
-         return;
+        var currentTaginfoEntries = taginfo.tags.filter(function(t) {
+            return (t.key === tag.key && t.value === tag.value);
+        });
 
-       var currentTaginfoEntries = taginfo.tags.filter(function(t) {
-           return (t.key    === tag.key &&
-                   t.value  === tag.value);
-       });
+        if (currentTaginfoEntries.length === 0) {
+            taginfo.tags.push(tag);
+            return;
+        }
 
-       if (currentTaginfoEntries.length === 0) {
-         taginfo.tags.push(tag);
-         return;
-       }
+        if (!tag.description)
+            return;
 
-       if (!tag.description)
-         return;
+        if (!currentTaginfoEntries[0].description) {
+            currentTaginfoEntries[0].description = tag.description;
+            return;
+        }
 
-       if (!currentTaginfoEntries[0].description) {
-         currentTaginfoEntries[0].description = tag.description;
-         return;
-       }
+        var isNewDescription = currentTaginfoEntries[0].description
+            .indexOf(tag.description[0]) === -1;
 
-       var isNewDescription = currentTaginfoEntries[0].description
-                                   .indexOf(tag.description[0]) === -1;
-
-       if (isNewDescription) {
-         currentTaginfoEntries[0].description.push(tag.description[0]);
-       }
+        if (isNewDescription) {
+            currentTaginfoEntries[0].description.push(tag.description[0]);
+        }
     }
 
     function isMaki(icon) {
@@ -418,18 +415,20 @@ function generateTaginfo(presets, fields) {
     }
 
     function setObjectType(tag, input) {
-      tag.object_types = [];
-      const mapping = { 'point'    : 'node',
-                        'vertex'   : 'node',
-                        'line'     : 'way',
-                        'relation' : 'relation',
-                        'area'     : 'area' };
+        tag.object_types = [];
+        const mapping = {
+            'point'    : 'node',
+            'vertex'   : 'node',
+            'line'     : 'way',
+            'relation' : 'relation',
+            'area'     : 'area'
+        };
 
-      input.geometry.forEach(function(geom) {
-         if (tag.object_types.indexOf(mapping[geom]) === -1) {
-           tag.object_types.push(mapping[geom]);
-         }
-      });
+        input.geometry.forEach(function(geom) {
+            if (tag.object_types.indexOf(mapping[geom]) === -1) {
+                tag.object_types.push(mapping[geom]);
+            }
+        });
     }
 
     return taginfo;
@@ -486,19 +485,20 @@ function translationsToYAML(translations) {
 
 function writeEnJson(tstrings) {
     var readCoreYaml = readFileProm('data/core.yaml', 'utf8');
-    var readImagery = readFileProm(
-        'node_modules/editor-layer-index/i18n/en.yaml',
-        'utf8'
-    );
+    var readImagery = readFileProm('node_modules/editor-layer-index/i18n/en.yaml', 'utf8');
+    var readCommunity = readFileProm('node_modules/osm-community-index/i18n/en.yaml', 'utf8');
 
-    return Promise.all([readCoreYaml, readImagery]).then(function(data) {
+    return Promise.all([readCoreYaml, readImagery, readCommunity]).then(function(data) {
         var core = YAML.load(data[0]);
         var imagery = YAML.load(data[1]);
-        var en = _merge(core, { en: { presets: tstrings } }, imagery);
-        return writeFileProm(
-            'dist/locales/en.json',
-            JSON.stringify(en, null, 4)
+        var community = YAML.load(data[2]);
+        var en = _merge(
+            core,
+            { en: { presets: tstrings } },
+            imagery,
+            { en: { community: community.en } }
         );
+        return writeFileProm('dist/locales/en.json', JSON.stringify(en, null, 4));
     });
 }
 
diff --git a/data/locales.json b/data/locales.json
index a8d8cdb11..92cec1647 100644
--- a/data/locales.json
+++ b/data/locales.json
@@ -127,6 +127,7 @@
             "rtl": false
         },
         "lij": {
+            "rtl": false
         },
         "lt": {
             "rtl": false
diff --git a/data/update_locales.js b/data/update_locales.js
index c89391921..d94a8008b 100644
--- a/data/update_locales.js
+++ b/data/update_locales.js
@@ -5,11 +5,11 @@ const _isEmpty = requireESM('lodash-es/isEmpty').default;
 const _merge = requireESM('lodash-es/merge').default;
 
 var request = require('request').defaults({ maxSockets: 1 });
-var yaml = require('js-yaml');
+var YAML = require('js-yaml');
 var fs = require('fs');
 var stringify = require('json-stable-stringify');
 
-var resources = ['core', 'presets', 'imagery'];
+var resources = ['core', 'presets', 'imagery', 'community'];
 var outdir = './dist/locales/';
 var api = 'https://www.transifex.com/api/2/';
 var projectURL = api + 'project/id-editor/';
@@ -27,18 +27,24 @@ var projectURL = api + 'project/id-editor/';
 
 var auth = JSON.parse(fs.readFileSync('./transifex.auth', 'utf8'));
 
-var sourceCore = yaml.load(fs.readFileSync('./data/core.yaml', 'utf8')),
-    sourcePresets = yaml.load(fs.readFileSync('./data/presets.yaml', 'utf8')),
-    sourceImagery = yaml.load(fs.readFileSync('./node_modules/editor-layer-index/i18n/en.yaml', 'utf8'));
+var sourceCore = YAML.load(fs.readFileSync('./data/core.yaml', 'utf8'));
+var sourcePresets = YAML.load(fs.readFileSync('./data/presets.yaml', 'utf8'));
+var sourceImagery = YAML.load(fs.readFileSync('./node_modules/editor-layer-index/i18n/en.yaml', 'utf8'));
+var sourceCommunity = YAML.load(fs.readFileSync('./node_modules/osm-community-index/i18n/en.yaml', 'utf8'));
 
 
-asyncMap(resources, getResource, function(err, locales) {
+asyncMap(resources, getResource, function(err, results) {
     if (err) return console.log(err);
 
-    var locale = _merge(sourceCore, sourcePresets, sourceImagery),
-        dataLocales = {};
+    var locale = _merge(
+        sourceCore,
+        sourcePresets,
+        sourceImagery,
+        { en: { community: sourceCommunity.en } }  // add namespace
+    );
+    var dataLocales = {};
 
-    locales.forEach(function(l) {
+    results.forEach(function(l) {
         locale = _merge(locale, l);
     });
 
@@ -50,6 +56,7 @@ asyncMap(resources, getResource, function(err, locales) {
                 var obj = {};
                 obj[code] = locale[code];
                 fs.writeFileSync(outdir + code + '.json', JSON.stringify(obj, null, 4));
+
                 getLanguageInfo(code, function(err, info) {
                     var rtl = info && info.rtl;
                     // exceptions: see #4783
@@ -81,7 +88,11 @@ function getResource(resource, callback) {
 
             var locale = {};
             results.forEach(function(result, i) {
-                locale[codes[i]] = result;
+                if (resource === 'community' && Object.keys(result).length) {
+                    locale[codes[i]] = { community: result };  // add namespace
+                } else {
+                    locale[codes[i]] = result;
+                }
             });
 
             callback(null, locale);
@@ -100,7 +111,7 @@ function getLanguage(resourceURL) {
             if (err) return callback(err);
             console.log(resp.statusCode + ': ' + url);
             var content = JSON.parse(body).content;
-            callback(null, yaml.safeLoad(content)[code]);
+            callback(null, YAML.safeLoad(content)[code]);
         });
     };
 }
@@ -134,9 +145,9 @@ function getLanguages(resource, callback) {
 
 function asyncMap(inputs, func, callback) {
     setTimeout(function() {
-        var remaining = inputs.length,
-            results = [],
-            error;
+        var remaining = inputs.length;
+        var results = [];
+        var error;
 
         inputs.forEach(function(d, i) {
             func(d, function done(err, data) {
diff --git a/dist/locales/ar.json b/dist/locales/ar.json
index 387e914a9..d42ef946f 100644
--- a/dist/locales/ar.json
+++ b/dist/locales/ar.json
@@ -1,5 +1,10 @@
 {
     "ar": {
+        "icons": {
+            "information": "معلومات",
+            "remove": "إزالة",
+            "undo": "تراجع"
+        },
         "modes": {
             "add_area": {
                 "title": "مساحة",
@@ -708,15 +713,24 @@
                 "select_left_click": "{leftclick} انقر نقرة بالزر الأيسر على عنصر ما لاختياره. سيقوم ذلك بتمييز العنصر بحد متوهج ينبض باستمرار، وسيظهر شريط جانبي يعرض لك تفاصيل عن العنصر المُختار، كاسمه وعنوانه ونحو ذلك.",
                 "select_right_click": "{rightclick} انقر نقرة بالزر الأيمن على عنصر ما لإظهار قائمة التعديل، والتي تعرض لك الأوامر المتاحة لتعديل العنصر، كتحريكه أو تدويره أو حذفه.",
                 "multiselect_h": "الاختيار المتعدد",
+                "multiselect_shift_click": "`{shift}`+{leftclick} لاختيار أكثر من عنصر في نفس الوقت. يجعل ذلك من السهل تحريك أو حذف أكثر من عنصر في نفس الوقت.",
+                "multiselect_lasso": "هناك طريقة أخرى لاخيار عدة عناصر في نفس الوقت وهي بالضغط مع الاستمرار على مفتاح `{shift}`، ثم الضغط مع الاستمرار على زر الفأرة الأيسر {leftclick} وسحب الفأرة لرسم مساحة حُرة للتحديد. وبذلك سيتم تحديد جميع النقاط بداخل مساحة الرسم المرسومة.",
                 "undo_redo_h": "التراجع والإعادة",
+                "undo_redo": "يتم حفظ تعديلاتك وتخزينها في المتصفح حتى تقوم باختيار حفظها على خادوم OpenStreetMap.\nيمكنك التراجع عن التعديلات عن طريق الضغط على زر **التراجع** {undo}، أو العودة عن التراجع عن طريق الضغط على زر **الإعادة** {redo}.",
                 "save_h": "الحفظ",
+                "save": "انقر زر **حفظ** {save} لإنهاء تعديلاتك وإرسالها إلى OpenStreetMap. ينبغي عليك أن تتذكر حفظ تعديلاتك بشكل متكرر حتى لا يضيع مجهودك!",
+                "save_validation": "في شاشة الحفظ، سيكون لديك الفرصة لكتابة تعليق أو ملاحظات على ما قمت به من تعديلات. كما سيقوم المحرر iD تلقائيا بعمل بعض الفحوصات الأساسية عن البيانات التي قد تكون ناقصة وقد يقدم بعض الاقتراحات والتحذيرات المفيدة إن كان هناك شيء ما لا يبدو صحيحا. ",
                 "upload_h": "الرفع",
                 "upload": "قبل رفع تغييراتك ينبغي عليك إدخال [تعليق على التغييرات](https://wiki.openstreetmap.org/wiki/Good_changeset_comments). ثم اضغط على **رفع** لإرسال تغييراتك إلى خرائط OpenStreetMap, حيث ستدمج هذه التغييرات مع الخرائط وتكون مرئية للجميع.",
                 "backups_h": "النسخ الاحتياطي التلقائي",
-                "keyboard_h": "اختصارات لوحة المفاتيح"
+                "backups": "إن لم تستطع إنهاء وحفظ تعديلاتك في نفس الجلسة، على سبيل المثال إنطفاء جهاز حاسوبك فجأة أو حدوث عطل في متصفحك أدى إلى غلقه بشكل مفاجيء أو نحو ذلك، فلا تقلق فإن تعديلاتك لا تزال محفوظة في متصفحك. حيث يمكنك العودة لاحقا (على نفس جهازك ونفس المتصفح)، وسيعرض عليك محرر iD استعادة أعمالك من حيث تركتها.",
+                "keyboard_h": "اختصارات لوحة المفاتيح",
+                "keyboard": "يمكنك عرض قائمة باختصارات لوحة المفاتيح عن طريق الضغط على مفتاح `?`."
             },
             "feature_editor": {
                 "title": "محرر العناصر",
+                "intro": "يظهر *محرر العناصر* على جانب الخريطة، ويتيح لك عرض وتحرير جميع المعلومات المتعلقة بالعنصر المُختار.",
+                "definitions": "يعرض لك القسم العلوي نوع العنصر.\nكما يحتوي القسم الأوسط على *حقول* تعرض خصائص وسمات العنصر، كالاسم والعنوان.",
                 "type_h": "نوع العنصر",
                 "fields_h": "الحقول",
                 "tags_h": "الوسوم"
@@ -937,15 +951,17 @@
             },
             "key": {
                 "alt": "Alt",
+                "backspace": "Backspace",
+                "cmd": "Cmd",
                 "ctrl": "Ctrl",
                 "delete": "Delete",
                 "del": "Del",
                 "end": "End",
                 "enter": "Enter",
                 "esc": "Esc",
-                "home": "الرئيسية",
+                "home": "Home",
                 "option": "خيارات",
-                "pause": "إلباث",
+                "pause": "Pause",
                 "pgdn": "PgDn",
                 "pgup": "PgUp",
                 "return": "رجوع",
@@ -1002,7 +1018,7 @@
                 "title": "تحرير",
                 "drawing": {
                     "title": "رسم",
-                    "place_point": "أضف نقطة"
+                    "place_point": "إضافة نقطة"
                 },
                 "operations": {
                     "title": "عمليات",
@@ -1197,6 +1213,7 @@
                     "placeholder": "...8 ,4 ,2"
                 },
                 "aerialway/summer/access": {
+                    "label": "دخول (في الصيف)",
                     "options": {
                         "both": "كلاهما",
                         "entry": "مدخل",
@@ -1323,7 +1340,8 @@
                     "label": "وقت الاستلام"
                 },
                 "comment": {
-                    "label": "التعليق على التغييرات"
+                    "label": "التعليق على التغييرات",
+                    "placeholder": "وصف موجز لمساهماتك وتعديلاتك (مطلوب)"
                 },
                 "communication_multi": {
                     "label": "أنواع الاتصال"
@@ -1630,6 +1648,9 @@
                 "information": {
                     "label": "النوع"
                 },
+                "intermittent": {
+                    "label": "متقطع"
+                },
                 "internet_access": {
                     "label": "خدمة إنترنت",
                     "options": {
@@ -1662,26 +1683,37 @@
                 "leaf_cycle": {
                     "label": "دورة أوراق الشجر",
                     "options": {
-                        "evergreen": "دائم الخضرة"
+                        "deciduous": "نفضية",
+                        "evergreen": "دائمة الخضرة",
+                        "mixed": "مختلط",
+                        "semi_deciduous": "شبه نفضية",
+                        "semi_evergreen": "شبه دائمة الخضرة"
                     }
                 },
                 "leaf_cycle_singular": {
+                    "label": "الفينولوجيا الأوراق",
                     "options": {
-                        "evergreen": "دائم الخضرة"
+                        "deciduous": "نفضية",
+                        "evergreen": "دائمة الخضرة",
+                        "semi_deciduous": "شبه نفضية",
+                        "semi_evergreen": "شبه دائمة الخضرة"
                     }
                 },
                 "leaf_type": {
                     "label": "نوع ورق الشجر",
                     "options": {
                         "broadleaved": "عريضة الأوراق",
-                        "leafless": "بدون أوراق"
+                        "leafless": "بدون أوراق",
+                        "mixed": "مختلط",
+                        "needleleaved": "إبرية"
                     }
                 },
                 "leaf_type_singular": {
                     "label": "نوع ورق الشجر",
                     "options": {
                         "broadleaved": "عريضة الأوراق",
-                        "leafless": "بدون أوراق"
+                        "leafless": "بدون أوراق",
+                        "needleleaved": "إبرية"
                     }
                 },
                 "leisure": {
@@ -1729,6 +1761,9 @@
                 "memorial": {
                     "label": "النوع"
                 },
+                "monitoring_multi": {
+                    "label": "رصد"
+                },
                 "mtb/scale": {
                     "placeholder": "0, 1, 2, 3..."
                 },
@@ -1793,6 +1828,7 @@
                 "oneway": {
                     "label": "مسار واحد",
                     "options": {
+                        "alternating": "بالتناوب",
                         "no": "لا",
                         "undefined": "يفترض أنها لا",
                         "yes": "نعم"
@@ -1801,6 +1837,7 @@
                 "oneway_yes": {
                     "label": "مسار واحد",
                     "options": {
+                        "alternating": "بالتناوب",
                         "no": "لا",
                         "undefined": "يفترض أنها نعم",
                         "yes": "نعم"
@@ -1858,6 +1895,7 @@
                     "options": {
                         "downhill": "انحدار",
                         "ice_skate": "تزلج على الجليد",
+                        "nordic": "شمال أوروبا",
                         "playground": "ساحة لعب"
                     }
                 },
@@ -1874,6 +1912,12 @@
                 "playground/baby": {
                     "label": "مقعد طفل"
                 },
+                "playground/max_age": {
+                    "label": "الحد الأقصى للعمر"
+                },
+                "playground/min_age": {
+                    "label": "الحد الأدنى للعمر"
+                },
                 "population": {
                     "label": "السكان"
                 },
@@ -1889,6 +1933,9 @@
                 "railway": {
                     "label": "النوع"
                 },
+                "recycling_accepts": {
+                    "label": "يقبل"
+                },
                 "ref": {
                     "label": "الرمز المرجعي"
                 },
@@ -1905,6 +1952,9 @@
                 "ref_road_number": {
                     "label": "رقم الطريق"
                 },
+                "ref_route": {
+                    "label": "رقم المسار"
+                },
                 "ref_runway": {
                     "label": "رقم المدرج"
                 },
@@ -2125,6 +2175,17 @@
                     "label": "النوع",
                     "placeholder": "الافتراضي"
                 },
+                "usage_rail": {
+                    "label": "إستعمال",
+                    "options": {
+                        "branch": "ثانوي",
+                        "industrial": "صناعي",
+                        "main": "رئيسي",
+                        "military": "عسكري",
+                        "test": "تجريبي",
+                        "tourism": "سياحي"
+                    }
+                },
                 "vending": {
                     "label": "أنواع البضائع"
                 },
@@ -2139,11 +2200,20 @@
                 "volcano/status": {
                     "label": "حالة البركان",
                     "options": {
-                        "active": "نشط"
+                        "active": "نشط",
+                        "extinct": "خامد"
                     }
                 },
                 "volcano/type": {
-                    "label": "نوع البركان"
+                    "label": "نوع البركان",
+                    "options": {
+                        "scoria": "سكوريا",
+                        "shield": "درعي",
+                        "stratovolcano": "طبقي"
+                    }
+                },
+                "voltage": {
+                    "label": "جهد كهربائي"
                 },
                 "wall": {
                     "label": "النوع"
@@ -2192,7 +2262,7 @@
                     "terms": "نقل البضائع بالكابلات "
                 },
                 "aerialway/station": {
-                    "name": "محطة النقل بالكابلات "
+                    "name": "محطة النقل بالكابلات"
                 },
                 "aeroway": {
                     "name": "جوي"
@@ -2205,6 +2275,10 @@
                     "name": "ساحة المطار",
                     "terms": "ساحة المطار"
                 },
+                "aeroway/gate": {
+                    "name": "بوابة المطار",
+                    "terms": "بوابة المطار"
+                },
                 "aeroway/hangar": {
                     "name": "حظيرة الطائرات",
                     "terms": "حظائر الطائرات"
@@ -2221,6 +2295,10 @@
                     "name": "طريق للمدرج",
                     "terms": "طريق للمدرج,طريق تدريج الطائرات"
                 },
+                "aeroway/terminal": {
+                    "name": "محطة المطار",
+                    "terms": "محطة المطار"
+                },
                 "amenity": {
                     "name": "مرفق"
                 },
@@ -2240,6 +2318,10 @@
                     "name": "حانة",
                     "terms": "بار , حانة , خمَّارَة ,مَشْرَب"
                 },
+                "amenity/bbq": {
+                    "name": "مكان مخصص للشواء",
+                    "terms": "شواء، باربيكيو"
+                },
                 "amenity/bench": {
                     "name": "مقعد",
                     "terms": "مقعد, مقعد طويل"
@@ -2264,6 +2346,9 @@
                     "name": "تحويل أموال",
                     "terms": "<translate with synonyms or related terms for 'Currency Exchange', separated by commas>"
                 },
+                "amenity/bus_station": {
+                    "name": "محطة حافلات"
+                },
                 "amenity/cafe": {
                     "name": "مقهى",
                     "terms": "مقهى, مطعم, ناد ليلي"
@@ -2304,7 +2389,12 @@
                     "terms": "ساعة"
                 },
                 "amenity/college": {
-                    "name": "أرض كلية"
+                    "name": "أرض كلية",
+                    "terms": "أرض كلية"
+                },
+                "amenity/community_centre": {
+                    "name": "مركز اجتماعي",
+                    "terms": "مركز اجتماعي"
                 },
                 "amenity/compressed_air": {
                     "name": "هواء مضغوط"
@@ -2313,11 +2403,20 @@
                     "name": "دار العدل",
                     "terms": "مجمع المحاكم, دار العدل, دار القضاء"
                 },
+                "amenity/coworking_space": {
+                    "name": "مساحة عمل مشتركة"
+                },
                 "amenity/dentist": {
-                    "name": "طبيب أسنان"
+                    "name": "طبيب أسنان",
+                    "terms": "طبيب أسنان"
                 },
                 "amenity/doctors": {
-                    "name": "طبيب"
+                    "name": "طبيب",
+                    "terms": "طبيب"
+                },
+                "amenity/dojo": {
+                    "name": "دوجو /  أكاديمية الفنون القتالية",
+                    "terms": "دوجو; أكاديمية الفنون القتالية"
                 },
                 "amenity/drinking_water": {
                     "name": "مياه شرب",
@@ -2334,6 +2433,9 @@
                     "name": "وجبات سريعة",
                     "terms": "مأكولات السريعة"
                 },
+                "amenity/ferry_terminal": {
+                    "name": "المحطة البحرية"
+                },
                 "amenity/fire_station": {
                     "name": "محطة إطفاء حريق",
                     "terms": "محطة إطفاء"
@@ -2357,11 +2459,17 @@
                     "name": "أرض مستشفى",
                     "terms": "أرض مستشفى; مستشفى"
                 },
+                "amenity/ice_cream": {
+                    "name": "محل بيع المثلجات",
+                    "terms": "مثلجات"
+                },
                 "amenity/internet_cafe": {
-                    "name": "مقهى إنترنت"
+                    "name": "مقهى إنترنت",
+                    "terms": "مقهى إنترنت"
                 },
                 "amenity/kindergarten": {
-                    "name": "روضة أطفال"
+                    "name": "روضة أطفال",
+                    "terms": "روضة أطفال"
                 },
                 "amenity/library": {
                     "name": "مكتبة",
@@ -2375,9 +2483,16 @@
                     "name": "موقف دراجات نارية",
                     "terms": "دراجة نارية, دراجة بخارية; موقف; مواقف; ركن"
                 },
+                "amenity/music_school": {
+                    "name": "مدرسة موسيقى",
+                    "terms": "مدرسة موسيقى"
+                },
                 "amenity/nightclub": {
                     "name": "ملهى ليلي"
                 },
+                "amenity/nursing_home": {
+                    "name": "دار التمريض"
+                },
                 "amenity/parking": {
                     "name": "موقف سيارات",
                     "terms": "مواقف سيارات عامة ، مصف للسيارات، مواقف مركبات عمومية, مركن سيارات, جراج"
@@ -2410,6 +2525,10 @@
                     "name": "مسجد",
                     "terms": "مسجد, جامع"
                 },
+                "amenity/planetarium": {
+                    "name": "قبة فلكية",
+                    "terms": "قبة فلكية، قبة سماوية، بلانتاريوم"
+                },
                 "amenity/police": {
                     "name": "شرطة",
                     "terms": "مركز الشرطة, الشرطة "
@@ -2422,6 +2541,10 @@
                     "name": "مكتب البريد",
                     "terms": "دائرة البريد, مكتب البريد, مكتب بريد"
                 },
+                "amenity/prison": {
+                    "name": "سجن",
+                    "terms": "سجن"
+                },
                 "amenity/pub": {
                     "name": "حانة",
                     "terms": "مشرب, حانة, خمارة"
@@ -2430,11 +2553,16 @@
                     "name": "محطة الحراسة",
                     "terms": "محطة الحراسة"
                 },
+                "amenity/recycling": {
+                    "name": "حاوية إعادة تدوير",
+                    "terms": "حاوية إعادة تدوير"
+                },
                 "amenity/recycling_centre": {
-                    "name": "مركز إعادة تدوير"
+                    "name": "مركز إعادة تدوير",
+                    "terms": "مركز إعادة تدوير"
                 },
                 "amenity/register_office": {
-                    "name": "مكتب تسجيل"
+                    "name": "مكتب السجل المدني"
                 },
                 "amenity/restaurant": {
                     "name": "مطعم",
@@ -2450,8 +2578,25 @@
                     "name": "مأوى",
                     "terms": "مأوى, ملجأ, ملاذ, سقيفة, وقاء"
                 },
+                "amenity/social_facility": {
+                    "name": "مؤسسة اجتماعية",
+                    "terms": "مؤسسة اجتماعية"
+                },
                 "amenity/social_facility/food_bank": {
-                    "name": "بنك غذاء"
+                    "name": "بنك الطعام",
+                    "terms": "بنك الطعام"
+                },
+                "amenity/social_facility/group_home": {
+                    "name": "دار المسنين",
+                    "terms": "دار المسنين"
+                },
+                "amenity/social_facility/homeless_shelter": {
+                    "name": "ملجأ مشردين",
+                    "terms": "ملجأ مشردين، مأوى"
+                },
+                "amenity/social_facility/nursing_home": {
+                    "name": "دار التمريض",
+                    "terms": "دار التمريض"
                 },
                 "amenity/studio": {
                     "name": "أستوديو"
@@ -2483,15 +2628,32 @@
                     "name": "أرض جامعة",
                     "terms": "أرض جامعة, حرم جامعي"
                 },
+                "amenity/vending_machine": {
+                    "name": "آلة بيع",
+                    "terms": "آلة بيع"
+                },
                 "amenity/vending_machine/cigarettes": {
-                    "name": "آلة بيع السجائر"
+                    "name": "آلة بيع السجائر",
+                    "terms": "سجائر"
+                },
+                "amenity/vending_machine/drinks": {
+                    "name": "آلة بيع المشروبات",
+                    "terms": "مشروبات"
+                },
+                "amenity/vending_machine/news_papers": {
+                    "name": "آلة بيع الجرائد"
+                },
+                "amenity/vending_machine/newspapers": {
+                    "name": "آلة بيع الجرائد",
+                    "terms": "جرائد"
                 },
                 "amenity/vending_machine/parking_tickets": {
                     "name": "ماكينة بيع تذاكر وقوف",
                     "terms": "ماكينة تذاكر"
                 },
                 "amenity/veterinary": {
-                    "name": "طبيب حيوانات"
+                    "name": "بيطري",
+                    "terms": "بيطري، طبيب حيوانات"
                 },
                 "amenity/waste_basket": {
                     "name": "سلة مهملات",
@@ -2635,7 +2797,8 @@
                     "terms": "جراج; جراج سيارات; موقف; موقف سيارات; ركن; ركنة"
                 },
                 "building/greenhouse": {
-                    "name": "دفيئة زراعية"
+                    "name": "دفيئة زراعية",
+                    "terms": "دفيئة زراعية; بيت بلاستيكي; بيت زجاجي"
                 },
                 "building/hospital": {
                     "name": "مبنى مستشفى",
@@ -2661,6 +2824,10 @@
                     "name": "مبنى روضة أطفال",
                     "terms": "روضة; أطفال"
                 },
+                "building/mosque": {
+                    "name": "مبنى المسجد",
+                    "terms": "مبنى المسجد"
+                },
                 "building/public": {
                     "name": "مبنى عمومي",
                     "terms": "عام; عمومي"
@@ -2685,12 +2852,40 @@
                     "name": "مبنى شبه منفصل",
                     "terms": "<translate with synonyms or related terms for 'Semi-Detached House', separated by commas>"
                 },
+                "building/stadium": {
+                    "name": "مبنى الملعب",
+                    "terms": "مبنى الملعب"
+                },
+                "building/temple": {
+                    "name": "مبنى المعبد",
+                    "terms": "مبنى المعبد"
+                },
                 "building/train_station": {
                     "name": "محطة قطار"
                 },
+                "building/transportation": {
+                    "name": "مبنى للنقل العام",
+                    "terms": "مبنى للنقل العام"
+                },
                 "building/university": {
                     "name": "مبنى جامعي"
                 },
+                "building/warehouse": {
+                    "name": "مستودع",
+                    "terms": "مستودع; مخزن"
+                },
+                "club": {
+                    "name": "نادي",
+                    "terms": "نادي"
+                },
+                "craft": {
+                    "name": "حرفة",
+                    "terms": "حرفة"
+                },
+                "craft/basket_maker": {
+                    "name": "صانع السلال",
+                    "terms": "صانع السلال"
+                },
                 "craft/beekeeper": {
                     "name": "مربي النحل",
                     "terms": "مربي النحل, نحال"
@@ -2712,7 +2907,8 @@
                     "terms": "بيرة; جعة"
                 },
                 "craft/carpenter": {
-                    "name": "نجار"
+                    "name": "نجار",
+                    "terms": "نجار"
                 },
                 "craft/caterer": {
                     "name": "منظم حفلات",
@@ -2730,41 +2926,86 @@
                     "name": "كهربائي",
                     "terms": "كهربائي"
                 },
+                "craft/electronics_repair": {
+                    "name": "خدمة تصليح الأجهزة الإلكترونية",
+                    "terms": "خدمة تصليح الأجهزة الإلكترونية"
+                },
                 "craft/gardener": {
-                    "name": "بستاني"
+                    "name": "بستاني",
+                    "terms": "بستاني"
+                },
+                "craft/handicraft": {
+                    "name": "حرفي",
+                    "terms": "حرفي"
                 },
                 "craft/jeweler": {
                     "name": "بائع مجوهرات"
                 },
+                "craft/locksmith": {
+                    "name": "قفال - صانع أقفال"
+                },
                 "craft/painter": {
                     "name": "دهّان"
                 },
                 "craft/photographer": {
-                    "name": "مصور"
+                    "name": "مصور",
+                    "terms": "مصور"
+                },
+                "craft/photographic_laboratory": {
+                    "name": "مختبر التصوير",
+                    "terms": "مختبر التصوير"
                 },
                 "craft/plumber": {
-                    "name": "سمكري"
+                    "name": "سباك",
+                    "terms": "سباك; سمكري"
                 },
                 "craft/pottery": {
                     "name": "مصنع فخار وخزف",
                     "terms": "فخار; خزف; بورسلين"
                 },
+                "craft/roofer": {
+                    "name": "بنّاء السقف",
+                    "terms": "بنّاء السقف"
+                },
                 "craft/saddler": {
-                    "name": "صانع سراج"
+                    "name": "صانع سراج",
+                    "terms": "صانع سراج"
+                },
+                "craft/sailmaker": {
+                    "name": "صانع أشرعة",
+                    "terms": "صانع أشرعة"
+                },
+                "craft/sawmill": {
+                    "name": "منشرة",
+                    "terms": "منشرة"
+                },
+                "craft/sculptor": {
+                    "name": "نحّات",
+                    "terms": "نحّات"
                 },
                 "craft/shoemaker": {
-                    "name": "إسكافي"
+                    "name": "إسكافي",
+                    "terms": "إسكافي"
                 },
                 "craft/tailor": {
                     "name": "خياط"
                 },
-                "craft/tiler": {
-                    "name": "خياط"
+                "craft/upholsterer": {
+                    "name": "منجد",
+                    "terms": "منجد; تنجيد; أثاث"
+                },
+                "craft/watchmaker": {
+                    "name": "ساعاتي (ساعات يدوية)",
+                    "terms": "ساعاتي"
                 },
                 "emergency/ambulance_station": {
                     "name": "محطة إسعاف",
                     "terms": "محطة إسعاف, محطة اسعاف"
                 },
+                "emergency/defibrillator": {
+                    "name": "مزيل الرجفان",
+                    "terms": "مزيل الرجفان"
+                },
                 "emergency/fire_hydrant": {
                     "name": "خرطوم إطفاء",
                     "terms": "خرطوم; مطافئ; إطفاء; اطفاء"
@@ -2793,6 +3034,50 @@
                     "name": "ممر مائي",
                     "terms": "ممر مائي; ممر; مائي; ماء"
                 },
+                "healthcare": {
+                    "name": "مرفق الرعاية الصحية",
+                    "terms": "مرفق الرعاية الصحية"
+                },
+                "healthcare/alternative": {
+                    "name": "متخصص في الطب البديل",
+                    "terms": "متخصص في الطب البديل"
+                },
+                "healthcare/audiologist": {
+                    "name": "أخصائي السمع",
+                    "terms": "أخصائي السمع"
+                },
+                "healthcare/blood_donation": {
+                    "name": "مركز التبرع بالدم",
+                    "terms": "تبرع بالدم"
+                },
+                "healthcare/occupational_therapist": {
+                    "name": "أخصائي العلاج الوظيفي",
+                    "terms": "أخصائي العلاج الوظيفي"
+                },
+                "healthcare/optometrist": {
+                    "name": "أخصائي البصريات",
+                    "terms": "أخصائي البصريات"
+                },
+                "healthcare/physiotherapist": {
+                    "name": "أخصائي العلاج الطبيعي",
+                    "terms": "أخصائي العلاج الطبيعي"
+                },
+                "healthcare/podiatrist": {
+                    "name": "طبيب الأقدام",
+                    "terms": "طبيب الأقدام; الأرجل"
+                },
+                "healthcare/psychotherapist": {
+                    "name": "معالج نفسي",
+                    "terms": "معالج نفسي"
+                },
+                "healthcare/rehabilitation": {
+                    "name": "مركز إعادة التأهيل",
+                    "terms": "مركز إعادة التأهيل"
+                },
+                "healthcare/speech_therapist": {
+                    "name": "معالج النطق",
+                    "terms": "معالج النطق، نطق"
+                },
                 "highway": {
                     "name": "طريق سريع"
                 },
@@ -2800,6 +3085,13 @@
                     "name": "طريق الخيول",
                     "terms": "طريق الخيول, ممر للخيول"
                 },
+                "highway/bus_stop": {
+                    "name": "موقف حافلات"
+                },
+                "highway/corridor": {
+                    "name": "ممر داخلي",
+                    "terms": "ممر داخلي; رواق"
+                },
                 "highway/crossing": {
                     "name": "معبر طريق",
                     "terms": "معبر; عبور; عبور طريق; عبور شارع; معبر شارع; معبر طريق"
@@ -2812,6 +3104,10 @@
                     "name": "مسار دراجات",
                     "terms": "طريق دراجات; مسار دراجات"
                 },
+                "highway/elevator": {
+                    "name": "مصعد",
+                    "terms": "مصعد"
+                },
                 "highway/footway": {
                     "name": "طريق مشي بالأقدام",
                     "terms": "ممشى بالأقدام"
@@ -2839,6 +3135,14 @@
                     "name": "طريق",
                     "terms": "طريق , ممر , مسلك , درب"
                 },
+                "highway/pedestrian_area": {
+                    "name": "منطقة للمشاة",
+                    "terms": "منطقة للمشاة"
+                },
+                "highway/pedestrian_line": {
+                    "name": "شارع للمشاة",
+                    "terms": "شارع للمشاة"
+                },
                 "highway/primary": {
                     "name": "طريق رئيسي",
                     "terms": "شارع رئيسي"
@@ -2847,6 +3151,10 @@
                     "name": "رابط لطريق رئيسي",
                     "terms": "رابط لطريق رئيسي"
                 },
+                "highway/raceway": {
+                    "name": "مضمار سباق السيارات والدراجات النارية",
+                    "terms": "مضمار سباق، سيارات، دراجات نارية"
+                },
                 "highway/residential": {
                     "name": "طريق سكني",
                     "terms": "شارع سكني"
@@ -2896,7 +3204,8 @@
                     "terms": "خدمة سيارات; منطقة خدمة سيارات; منطقة خدمية"
                 },
                 "highway/speed_camera": {
-                    "name": "كاميرا مراقبة"
+                    "name": "كاميرا مراقبة السرعة",
+                    "terms": "كاميرا مراقبة السرعة"
                 },
                 "highway/steps": {
                     "name": "درج",
@@ -2907,7 +3216,8 @@
                     "terms": "إشارة توقف، ممنوع الوقوف، قف"
                 },
                 "highway/street_lamp": {
-                    "name": "مصباح الشارع"
+                    "name": "مصباح الشارع",
+                    "terms": "مصباح الشارع"
                 },
                 "highway/tertiary": {
                     "name": "طريق ثالثي",
@@ -2941,6 +3251,10 @@
                     "name": "دائرة رجوع",
                     "terms": "دائرة رجوع"
                 },
+                "highway/unclassified": {
+                    "name": "طريق غير مصنف",
+                    "terms": "طريق غير مصنف"
+                },
                 "historic": {
                     "name": "موقع تاريخي",
                     "terms": "موقع تأريخي"
@@ -2954,8 +3268,8 @@
                     "terms": "صخرة حدودية"
                 },
                 "historic/castle": {
-                    "name": "حصن",
-                    "terms": "حصن"
+                    "name": "حصن / قلعة",
+                    "terms": "حصن; قلعة; قصر"
                 },
                 "historic/memorial": {
                     "name": "نصب تذكاري",
@@ -2969,16 +3283,25 @@
                     "name": "آثار",
                     "terms": "أطلال"
                 },
+                "historic/tomb": {
+                    "name": "قبر / ضريح",
+                    "terms": "قبر، ضريح"
+                },
                 "historic/wayside_shrine": {
                     "name": "مقام نصراني على الطريق",
                     "terms": "مقام نصراني على الطريق"
                 },
+                "junction": {
+                    "name": "مفترق طرق",
+                    "terms": "مفترق طرق"
+                },
                 "landuse": {
                     "name": "أرض",
                     "terms": "<ترجم بالمصطلحات أو المرادفات لـ \"الأراضي\"، فاصلا المدخلات بالفاصلة \",\">"
                 },
                 "landuse/aquaculture": {
-                    "name": "مزرعة سمكية"
+                    "name": "مزرعة سمكية",
+                    "terms": "مزرعة سمكية"
                 },
                 "landuse/basin": {
                     "name": "حوض",
@@ -3000,7 +3323,8 @@
                     "name": "أرض زراعية"
                 },
                 "landuse/farmland": {
-                    "name": "أرض زراعية"
+                    "name": "أرض زراعية",
+                    "terms": "أرض زراعية، فلاحة"
                 },
                 "landuse/farmyard": {
                     "name": "فناء المزرعة",
@@ -3014,10 +3338,30 @@
                     "name": "عشب",
                     "terms": "عشب, غطاء أخضر"
                 },
+                "landuse/greenhouse_horticulture": {
+                    "name": "الدفيئات الزراعية",
+                    "terms": "الدفيئات الزراعية"
+                },
+                "landuse/harbour": {
+                    "name": "مرفأ",
+                    "terms": "مرفأ، ميناء"
+                },
                 "landuse/industrial": {
                     "name": "منطقة صناعية",
                     "terms": "صناعية; صناعي; صناعات; منطقة صناعات; منطقة صناعة; صناعة; صنع"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "مقبرة السيارات",
+                    "terms": "مقبرة السيارات"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "مسلخ",
+                    "terms": "مسلخ"
+                },
+                "landuse/landfill": {
+                    "name": "مكب نفايات",
+                    "terms": "مكب نفايات"
+                },
                 "landuse/meadow": {
                     "name": "مرج",
                     "terms": " مرج, روضة, مخضرة"
@@ -3026,6 +3370,22 @@
                     "name": "منطقة عسكرية",
                     "terms": "جيش, قوات مسلحة, عسكرية"
                 },
+                "landuse/military/airfield": {
+                    "name": "قاعدة جوية",
+                    "terms": "قاعدة جوية، مطار عسكري"
+                },
+                "landuse/military/barracks": {
+                    "name": "ثكنة عسكرية",
+                    "terms": "ثكنة عسكرية"
+                },
+                "landuse/military/bunker": {
+                    "name": "ملجأ عسكري",
+                    "terms": "ملجأ عسكري"
+                },
+                "landuse/military/checkpoint": {
+                    "name": "نقطة تفتيش عسكرية",
+                    "terms": "نقطة تفتيش عسكرية"
+                },
                 "landuse/military/danger_area": {
                     "name": "منطقة خطرة",
                     "terms": "منطقة خطر; خطر"
@@ -3034,6 +3394,10 @@
                     "name": "قاعدة بحرية",
                     "terms": "بحرية; بحري; بحر; قاعدة"
                 },
+                "landuse/military/nuclear_explosion_site": {
+                    "name": "موقع الانفجار النووي",
+                    "terms": "موقع الانفجار النووي"
+                },
                 "landuse/military/office": {
                     "name": "مكتب عسكري"
                 },
@@ -3056,6 +3420,10 @@
                     "name": "محجر",
                     "terms": "محجر"
                 },
+                "landuse/recreation_ground": {
+                    "name": "ميدان الألعاب",
+                    "terms": "ميدان الألعاب"
+                },
                 "landuse/residential": {
                     "name": "منطقة سكنية",
                     "terms": "منطقة سكانية; سكان; سكنية; سكن; منطقة سكن"
@@ -3072,6 +3440,10 @@
                     "name": "الترفيه",
                     "terms": "الترفيه"
                 },
+                "leisure/beach_resort": {
+                    "name": "منتجع الشاطئ",
+                    "terms": "منتجع الشاطئ"
+                },
                 "leisure/bowling_alley": {
                     "name": "بولينغ",
                     "terms": "بولينغ، بولينج"
@@ -3084,6 +3456,10 @@
                     "name": "قاعة الرقص",
                     "terms": "قاعة الرقص"
                 },
+                "leisure/dancing_school": {
+                    "name": "مدرسة الرقص",
+                    "terms": "مدرسة الرقص"
+                },
                 "leisure/dog_park": {
                     "name": "حديقة كلاب",
                     "terms": "حديقة كلاب"
@@ -3102,7 +3478,7 @@
                 },
                 "leisure/golf_course": {
                     "name": "معلب جولف",
-                    "terms": "معلب جولف"
+                    "terms": "معلب جولف، غولف"
                 },
                 "leisure/horse_riding": {
                     "name": "منشأة ركوب خيل",
@@ -3116,12 +3492,17 @@
                     "name": "مرسى السفن",
                     "terms": "حوض سفن, رصيف سفن, مرسى سفن"
                 },
+                "leisure/miniature_golf": {
+                    "name": "ملعب الجولف المصغرة",
+                    "terms": "ملعب الجولف المصغرة، غولف"
+                },
                 "leisure/nature_reserve": {
-                    "name": "محمية طبيعية"
+                    "name": "محمية طبيعية",
+                    "terms": "محمية طبيعية"
                 },
                 "leisure/park": {
-                    "name": "حديقة",
-                    "terms": "منتزه"
+                    "name": "منتزه",
+                    "terms": "منتزه، حديقة"
                 },
                 "leisure/pitch": {
                     "name": "ملعب رياضي",
@@ -3139,10 +3520,26 @@
                     "name": "ملعب كرة السلة",
                     "terms": "ملعب كرة السلة"
                 },
+                "leisure/pitch/beachvolleyball": {
+                    "name": "ملعب كرة الطائرة الشاطئية",
+                    "terms": "ملعب"
+                },
+                "leisure/pitch/cricket": {
+                    "name": "ملعب كريكت",
+                    "terms": "ملعب كريكت"
+                },
                 "leisure/pitch/equestrian": {
                     "name": "حلبة ركوب خيل",
                     "terms": "حلبة; ساحة; حلبة ركوب; ساحة ركوب; خيل; ركوب خيل"
                 },
+                "leisure/pitch/rugby_league": {
+                    "name": "ملعب اتحاد الرغبي",
+                    "terms": "ملعب اتحاد الرغبي، رجبي"
+                },
+                "leisure/pitch/rugby_union": {
+                    "name": "ملعب دوري الرغبي",
+                    "terms": "ملعب دوري الرغبي، رجبي"
+                },
                 "leisure/pitch/skateboard": {
                     "name": "حديقة تزلج",
                     "terms": "حديقة تزلج، ساحة تزلج"
@@ -3151,6 +3548,10 @@
                     "name": "ملعب كرة القدم",
                     "terms": "ملعب كرة القدم"
                 },
+                "leisure/pitch/table_tennis": {
+                    "name": "طاولة كرة المضرب",
+                    "terms": "طاولة كرة المضرب"
+                },
                 "leisure/pitch/tennis": {
                     "name": "ملعب تنس",
                     "terms": "معلب كرة التنس"
@@ -3167,6 +3568,14 @@
                     "name": "منتجع",
                     "terms": "منتجع"
                 },
+                "leisure/running_track": {
+                    "name": "مضمار ركض",
+                    "terms": "مضمار ركض"
+                },
+                "leisure/sauna": {
+                    "name": "سونا",
+                    "terms": "سونا"
+                },
                 "leisure/slipway": {
                     "name": "مزلقة سفن",
                     "terms": "مزلقة سفن"
@@ -3216,22 +3625,40 @@
                     "terms": "جسر"
                 },
                 "man_made/chimney": {
-                    "name": "مدخنة"
+                    "name": "مدخنة",
+                    "terms": "مدخنة"
+                },
+                "man_made/crane": {
+                    "name": "رافعة",
+                    "terms": "رافعة"
                 },
                 "man_made/cutline": {
                     "name": "خط الفصل",
                     "terms": "خط الفصل"
                 },
+                "man_made/flagpole": {
+                    "name": "سارية العلم",
+                    "terms": "سارية العلم"
+                },
                 "man_made/lighthouse": {
                     "name": "منارة",
                     "terms": "منارة , فنارة"
                 },
+                "man_made/monitoring_station": {
+                    "name": "محطة الرصد",
+                    "terms": "محطة الرصد"
+                },
                 "man_made/observation": {
                     "name": "برج مراقبة",
                     "terms": "برمج المراقبة، أبراج المراقبة، أبراج المشاهدة، "
                 },
+                "man_made/observatory": {
+                    "name": "مرصد",
+                    "terms": "مرصد"
+                },
                 "man_made/petroleum_well": {
-                    "name": "بئر نفط"
+                    "name": "بئر نفط",
+                    "terms": "بئر نفط، بترول"
                 },
                 "man_made/pier": {
                     "name": "رصيف بحري",
@@ -3242,20 +3669,24 @@
                     "terms": "خط أنابيب"
                 },
                 "man_made/pumping_station": {
-                    "name": "محطة ضخ"
+                    "name": "محطة ضخ",
+                    "terms": "محطة ضخ"
                 },
                 "man_made/silo": {
                     "name": "صومعة",
                     "terms": "صومعة; صومعة غلال"
                 },
                 "man_made/storage_tank": {
-                    "name": "خزان"
+                    "name": "خزان",
+                    "terms": "خزان"
                 },
                 "man_made/surveillance": {
-                    "name": "مراقبة"
+                    "name": "مراقبة",
+                    "terms": "مراقبة"
                 },
                 "man_made/surveillance_camera": {
-                    "name": "كاميرا مراقبة"
+                    "name": "كاميرا مراقبة",
+                    "terms": "كاميرا مراقبة"
                 },
                 "man_made/survey_point": {
                     "name": "نقطة مسح",
@@ -3274,7 +3705,8 @@
                     "terms": "خزان مائي"
                 },
                 "man_made/water_well": {
-                    "name": "بئر ماء"
+                    "name": "بئر ماء",
+                    "terms": "بئر ماء"
                 },
                 "man_made/water_works": {
                     "name": "محطة مياه",
@@ -3284,6 +3716,10 @@
                     "name": "طاحونة مائية",
                     "terms": "طاحونة مائية"
                 },
+                "man_made/windmill": {
+                    "name": "طاحونة هوائية",
+                    "terms": "طاحونة هوائية"
+                },
                 "man_made/works": {
                     "name": "مصنع",
                     "terms": "مصنع"
@@ -3332,20 +3768,29 @@
                     "name": "مرج",
                     "terms": "مرج"
                 },
+                "natural/mud": {
+                    "name": "وحل",
+                    "terms": "وحل، طين"
+                },
                 "natural/peak": {
                     "name": "قمة",
                     "terms": "قمة, ذروة"
                 },
+                "natural/ridge": {
+                    "name": "نتوء جبلي",
+                    "terms": "نتوء جبلي، قمة"
+                },
                 "natural/sand": {
-                    "name": "رمل"
+                    "name": "رمل",
+                    "terms": "رمل"
                 },
                 "natural/scree": {
                     "name": "ركام حجارة",
                     "terms": "ركام حجارة، تلة، مجموعة صخور، تلة حصاة"
                 },
                 "natural/scrub": {
-                    "name": "أدغال",
-                    "terms": "دغل; أدغال"
+                    "name": "أراضي الأشجار القمئية",
+                    "terms": "دغل; أدغال; أراضي الأشجار القمئية"
                 },
                 "natural/spring": {
                     "name": "نبع",
@@ -3359,7 +3804,8 @@
                     "name": "خط أشجار"
                 },
                 "natural/volcano": {
-                    "name": "بركان"
+                    "name": "بركان",
+                    "terms": "بركان"
                 },
                 "natural/water": {
                     "name": "مياه",
@@ -3410,14 +3856,19 @@
                 },
                 "office/association": {
                     "name": "جمعية ",
-                    "terms": "جمعية، منظمة غير ربحية "
+                    "terms": "جمعية، منظمة غير ربحية"
                 },
                 "office/charity": {
                     "name": "منظمة خيرية",
                     "terms": "منظمة خيرية"
                 },
                 "office/company": {
-                    "name": "مكتب شركة"
+                    "name": "مكتب شركة",
+                    "terms": "إدارة شركة، إدارة مؤسسة، إدارة عامة"
+                },
+                "office/coworking": {
+                    "name": "مساحة عمل مشتركة",
+                    "terms": "مساحة عمل مشتركة"
                 },
                 "office/educational_institution": {
                     "name": "مؤسسة تعليمية ",
@@ -3427,6 +3878,10 @@
                     "name": "مكتب التوظيف ",
                     "terms": "إدارة شؤون الموظفين، مكتب العمل"
                 },
+                "office/energy_supplier": {
+                    "name": "شركة مرافق الكهرباء",
+                    "terms": "شركة مرافق الكهرباء"
+                },
                 "office/estate_agent": {
                     "name": "مكتب عقاري",
                     "terms": "الطابو، دائرة السجل العقاري، إدارة تسجيل الممتلكات"
@@ -3448,13 +3903,17 @@
                     "terms": "رئاسة الوزراء، إدارة الدولة، المكتب العام، "
                 },
                 "office/government/register_office": {
-                    "name": "مكتب تسجيل",
-                    "terms": "مكتب تسجيل"
+                    "name": "مكتب السجل المدني",
+                    "terms": "مكتب السجل المدني"
                 },
                 "office/government/tax": {
                     "name": "مكتب الضرائب",
                     "terms": "مكتب الضرائب"
                 },
+                "office/guide": {
+                    "name": "مكتب الدليل السياحي",
+                    "terms": "مكتب الدليل السياحي; مكتب المرشد السياحي"
+                },
                 "office/insurance": {
                     "name": "مكتب تأمينات",
                     "terms": "مديرية المعاشات، دائرة التأمينات الاجتماعية، إدارة التأمين"
@@ -3520,6 +3979,10 @@
                     "name": "شركة المياه",
                     "terms": "شركة المياه"
                 },
+                "piste": {
+                    "name": "منحدر تزلج",
+                    "terms": "منحدر تزلج"
+                },
                 "place": {
                     "name": "قصر"
                 },
@@ -3538,6 +4001,10 @@
                     "name": "جزيرة",
                     "terms": "جزيرة"
                 },
+                "place/islet": {
+                    "name": "جزيرة صغيرة",
+                    "terms": "جزيرة صغيرة"
+                },
                 "place/isolated_dwelling": {
                     "name": "مساكن متفرقة",
                     "terms": "مساكن متفرقة"
@@ -3549,6 +4016,10 @@
                 "place/neighbourhood": {
                     "name": "حي سكني"
                 },
+                "place/plot": {
+                    "name": "قطعة الأرض",
+                    "terms": "قطعة الأرض"
+                },
                 "place/square": {
                     "name": "ساحة",
                     "terms": "ساحة"
@@ -3615,6 +4086,34 @@
                     "name": "محول كهربائي",
                     "terms": "محول الكهربائي"
                 },
+                "public_transport/linear_platform_bus": {
+                    "name": "موقف حافلات",
+                    "terms": "موقف حافلات"
+                },
+                "public_transport/linear_platform_train": {
+                    "name": "رصيف سكة حديد",
+                    "terms": "رصيف سكة حديد"
+                },
+                "public_transport/platform_train": {
+                    "name": "رصيف سكة حديد",
+                    "terms": "رصيف سكة حديد"
+                },
+                "public_transport/station_aerialway": {
+                    "name": "محطة النقل بالكابلات",
+                    "terms": "محطة النقل بالكابلات; محطة تلفريك"
+                },
+                "public_transport/station_bus": {
+                    "name": "محطة الحافلات",
+                    "terms": "محطة الحافلات"
+                },
+                "public_transport/station_subway": {
+                    "name": "محطة مترو",
+                    "terms": "محطة مترو"
+                },
+                "public_transport/station_train": {
+                    "name": "محطة القطار",
+                    "terms": "محطة القطار"
+                },
                 "railway": {
                     "name": "سكة حديد"
                 },
@@ -3638,18 +4137,31 @@
                     "name": "قطار جبلي مائل",
                     "terms": "قطار جبلي مائل"
                 },
+                "railway/halt": {
+                    "name": "موقف القطار"
+                },
                 "railway/level_crossing": {
                     "name": "معبر سكة حديد (طريق)",
                     "terms": "معبر سكة حديد; معبر"
                 },
+                "railway/light_rail": {
+                    "name": "قطار خفيف",
+                    "terms": "قطار خفيف"
+                },
                 "railway/monorail": {
                     "name": "سكة حديدة مفردة",
                     "terms": "سكة حديدة مفردة"
                 },
+                "railway/platform": {
+                    "name": "رصيف سكة حديد"
+                },
                 "railway/rail": {
                     "name": "قطار",
                     "terms": "قطار"
                 },
+                "railway/station": {
+                    "name": "محطة سكة حديد"
+                },
                 "railway/subway": {
                     "name": "مترو الأنفاق",
                     "terms": "مترو الأنفاق"
@@ -3662,10 +4174,16 @@
                     "name": "ترام",
                     "terms": "ترام"
                 },
+                "railway/tram_stop": {
+                    "name": "موقف ترام"
+                },
                 "relation": {
                     "name": "علاقة",
                     "terms": "علاقة"
                 },
+                "roundabout": {
+                    "name": "دوار مروري"
+                },
                 "route/ferry": {
                     "name": "مسار عبّارة",
                     "terms": "مسار عبّارة, مسار سفن"
@@ -3678,6 +4196,10 @@
                     "name": "محل خمور",
                     "terms": "محل خمور"
                 },
+                "shop/art": {
+                    "name": "متجر الفنون",
+                    "terms": "متجر فنون"
+                },
                 "shop/baby_goods": {
                     "name": "متجر سلع أطفال"
                 },
@@ -3689,6 +4211,9 @@
                     "name": "مخبز",
                     "terms": "مخبز"
                 },
+                "shop/bathroom_furnishing": {
+                    "name": "متجر أثاث الحمام"
+                },
                 "shop/beauty": {
                     "name": "محل تجميل",
                     "terms": "محل تجميل"
@@ -3702,7 +4227,8 @@
                     "terms": "محل دراجات هوائية; متجر دراجات; محل دراجات; بائع دراجات"
                 },
                 "shop/books": {
-                    "name": "متجر كتب"
+                    "name": "متجر كتب",
+                    "terms": "مكتبة، كتب"
                 },
                 "shop/boutique": {
                     "name": "بوتيك",
@@ -3712,6 +4238,10 @@
                     "name": "جزار",
                     "terms": "جزار, محل بيع لحوم. محل جزارة, لحوم"
                 },
+                "shop/candles": {
+                    "name": "متجر الشموع",
+                    "terms": "متجر الشموع"
+                },
                 "shop/car": {
                     "name": "وكالة سيارات",
                     "terms": "وكالة سيارات"
@@ -3725,10 +4255,12 @@
                     "terms": "محل تصليح سيارات; ورشة تصليح; ورشة; ميكانيكي"
                 },
                 "shop/carpet": {
-                    "name": "متجر سجاد"
+                    "name": "متجر سجاد",
+                    "terms": "متجر سجاد; زرابي"
                 },
                 "shop/cheese": {
-                    "name": "متجر أجبان"
+                    "name": "متجر أجبان",
+                    "terms": "متجر أجبان"
                 },
                 "shop/chocolate": {
                     "name": "متجر شوكولاتة"
@@ -3752,6 +4284,22 @@
                 "shop/copyshop": {
                     "name": "متجر نسخ وتصوير"
                 },
+                "shop/cosmetics": {
+                    "name": "متجر مستحضرات التجميل",
+                    "terms": "متجر مستحضرات التجميل"
+                },
+                "shop/craft": {
+                    "name": "متجر الفنون والحرف",
+                    "terms": "متجر الفنون والحرف"
+                },
+                "shop/curtain": {
+                    "name": "محل بيع الستائر",
+                    "terms": "ستائر"
+                },
+                "shop/dairy": {
+                    "name": "متجر الألبان",
+                    "terms": "متجر الألبان، الألبان"
+                },
                 "shop/deli": {
                     "name": "محل أطعمة لذيذة",
                     "terms": "محل أطعمة لذيذة, ديلي"
@@ -3768,6 +4316,10 @@
                     "name": "محل إلكترونيات",
                     "terms": "محل إلكترونيات"
                 },
+                "shop/fabric": {
+                    "name": "محل بيع الأقمشة",
+                    "terms": "الأقمشة"
+                },
                 "shop/farm": {
                     "name": "المنتج",
                     "terms": "المنتج"
@@ -3803,14 +4355,30 @@
                     "name": "محل أجهزة",
                     "terms": "محل بيع عتاد"
                 },
+                "shop/herbalist": {
+                    "name": "محل بيع الأعشاب الطبية",
+                    "terms": "محل بيع الأعشاب الطبية"
+                },
                 "shop/hifi": {
                     "name": "محل بيع أجهزة عالية الدقة",
                     "terms": "محل بيع أجهزة عالية الدقة"
                 },
+                "shop/houseware": {
+                    "name": "متجر الأدوات المنزلية",
+                    "terms": "متجر الأدوات المنزلية"
+                },
+                "shop/interior_decoration": {
+                    "name": "متجر الديكور الداخلي",
+                    "terms": "متجر الديكور الداخلي"
+                },
                 "shop/jewelry": {
                     "name": "محل بيع مجوهرات",
                     "terms": "محل بيع المجوهرات, محل بيع الذهب"
                 },
+                "shop/kiosk": {
+                    "name": "كشك",
+                    "terms": "كشك"
+                },
                 "shop/laundry": {
                     "name": "محل غسيل ملابس",
                     "terms": "غسيل ملابس"
@@ -3823,6 +4391,14 @@
                     "name": "مركز تسوق مول",
                     "terms": "مركز تسوق, مول"
                 },
+                "shop/massage": {
+                    "name": "صالون التدليك",
+                    "terms": "صالون التدليك"
+                },
+                "shop/medical_supply": {
+                    "name": "متجر مستلزمات طبية",
+                    "terms": "متجر مستلزمات طبية"
+                },
                 "shop/mobile_phone": {
                     "name": "محل بيع هواتف",
                     "terms": "محل بيع هواتف"
@@ -3835,10 +4411,38 @@
                     "name": "محل بيع موسيقى",
                     "terms": "محل بيع الموسيقى"
                 },
+                "shop/musical_instrument": {
+                    "name": "محل بيع الآلات الموسيقية",
+                    "terms": "محل بيع الآلات الموسيقية"
+                },
+                "shop/newsagent": {
+                    "name": "محل بيع الجرائد",
+                    "terms": "جرائد"
+                },
+                "shop/nutrition_supplements": {
+                    "name": "متجر المكملات الغذائية",
+                    "terms": "متجر المكملات الغذائية، مكملات غذائية"
+                },
                 "shop/optician": {
                     "name": "محل بيع نظارات",
                     "terms": "محل بيع نظارات"
                 },
+                "shop/organic": {
+                    "name": "محل بيع المنتجات العضوية",
+                    "terms": "منتجات عضوية"
+                },
+                "shop/paint": {
+                    "name": "متجر الطلاء",
+                    "terms": "طلاء"
+                },
+                "shop/pastry": {
+                    "name": "متجر الحلويات",
+                    "terms": "متجر الحلويات"
+                },
+                "shop/perfumery": {
+                    "name": "متجر العطور",
+                    "terms": "عطور"
+                },
                 "shop/pet": {
                     "name": "محل حيوانات أليفة",
                     "terms": "محل حيوانات أليفة"
@@ -3851,6 +4455,18 @@
                     "name": "متجر ألعاب نارية",
                     "terms": "ألعاب نارية"
                 },
+                "shop/radiotechnics": {
+                    "name": "متجر المكونات الإلكترونية",
+                    "terms": "متجر المكونات الإلكترونية"
+                },
+                "shop/seafood": {
+                    "name": "مسمكة / متجر المأكولات البحرية",
+                    "terms": "مأكولات بحرية، مسمكة ، سمك"
+                },
+                "shop/second_hand": {
+                    "name": "محل لبيع البضائع المستعملة",
+                    "terms": "محل لبيع البضائع المستعملة"
+                },
                 "shop/shoes": {
                     "name": "محل بيع أحذية",
                     "terms": "محل بيع أحذية"
@@ -3867,6 +4483,22 @@
                     "name": "سوبر ماركت",
                     "terms": "سوبرماركت, متجر كبير"
                 },
+                "shop/tailor": {
+                    "name": "خياط",
+                    "terms": "خياط"
+                },
+                "shop/tea": {
+                    "name": "محل بيع الشاي",
+                    "terms": "محل بيع الشاي،  شاي"
+                },
+                "shop/tiles": {
+                    "name": "محل بيع البلاط",
+                    "terms": "محل بيع البلاط، بلاط، خزف"
+                },
+                "shop/tobacco": {
+                    "name": "محل بيع التبغ",
+                    "terms": "تبغ، سيجارة"
+                },
                 "shop/toys": {
                     "name": "محل ألعاب",
                     "terms": "محل ألعاب"
@@ -3894,6 +4526,10 @@
                     "name": "متجر العاب الفيديو",
                     "terms": "متجر العاب الفيديو"
                 },
+                "shop/watches": {
+                    "name": "متجر الساعات اليدوية",
+                    "terms": "متجر الساعات اليدوية"
+                },
                 "shop/weapons": {
                     "name": "متجر أسلحة"
                 },
@@ -3905,11 +4541,16 @@
                     "terms": "سياحة"
                 },
                 "tourism/alpine_hut": {
-                    "name": "داراستراحة",
+                    "name": "كوخ جبلي",
                     "terms": "دار استراحة"
                 },
+                "tourism/apartment": {
+                    "name": "شقة سياحية",
+                    "terms": "شقة سياحية"
+                },
                 "tourism/aquarium": {
-                    "name": "حوض سمك"
+                    "name": "حوض سمك",
+                    "terms": "حوض سمك"
                 },
                 "tourism/artwork": {
                     "name": "عمل فني",
@@ -3919,16 +4560,25 @@
                     "name": "معلم سياحي",
                     "terms": "معلم سياحي, مكان سياحي"
                 },
+                "tourism/camp_site": {
+                    "name": "مكان التخييم",
+                    "terms": "مكان التخييم"
+                },
                 "tourism/caravan_site": {
                     "name": "موقف عربات كبيرة",
                     "terms": "موقف عربات كبيرة"
                 },
+                "tourism/chalet": {
+                    "name": "كوخ لقضاء العطلة",
+                    "terms": "كوخ لقضاء العطلة"
+                },
                 "tourism/gallery": {
-                    "name": "رواق فنون"
+                    "name": "رواق الفنون",
+                    "terms": "رواق الفنون، متحف الفنون"
                 },
                 "tourism/guest_house": {
-                    "name": "استراحة",
-                    "terms": "استراحة"
+                    "name": "دار الضيافة",
+                    "terms": "دار الضيافة"
                 },
                 "tourism/hostel": {
                     "name": "نزل",
@@ -3939,14 +4589,20 @@
                     "terms": "فندق"
                 },
                 "tourism/information": {
-                    "name": "معلومات",
-                    "terms": "معلومات"
+                    "name": "معلومات سياحية",
+                    "terms": "معلومات سياحية"
+                },
+                "tourism/information/board": {
+                    "name": "لوحة المعلومات",
+                    "terms": "لوحة المعلومات"
                 },
                 "tourism/information/map": {
-                    "name": "خريطة"
+                    "name": "خريطة",
+                    "terms": "خريطة"
                 },
                 "tourism/information/office": {
-                    "name": "مكتب معلومات السياحة"
+                    "name": "مكتب المعلومات السياحية",
+                    "terms": "مكتب المعلومات السياحية"
                 },
                 "tourism/motel": {
                     "name": "فندق رخيص",
@@ -3976,6 +4632,10 @@
                     "name": "مخفف سرعة",
                     "terms": "مطب; مخفف; مهديء; مهدئ; ممهل; تخفيف; تمهيل; مطب صناعي"
                 },
+                "traffic_calming/bump": {
+                    "name": "مطب",
+                    "terms": "مطب"
+                },
                 "type/boundary": {
                     "name": "حدود",
                     "terms": "حدود"
@@ -4017,7 +4677,7 @@
                 },
                 "type/route/bus": {
                     "name": "مسار الباصات",
-                    "terms": "مسار باصات"
+                    "terms": "مسار باصات، حافلات"
                 },
                 "type/route/detour": {
                     "name": "مسار طريق جانبي",
@@ -4039,10 +4699,18 @@
                     "name": "مسار ركوب",
                     "terms": "مسار ركوب"
                 },
+                "type/route/light_rail": {
+                    "name": "مسار القطار الخفيف",
+                    "terms": "قطار خفيف، ترام"
+                },
                 "type/route/pipeline": {
                     "name": "مسار خط أنابيب",
                     "terms": "مسار خط أنابيب"
                 },
+                "type/route/piste": {
+                    "name": "مسار التزلج",
+                    "terms": "تزلج"
+                },
                 "type/route/power": {
                     "name": "مسار خط كهربائي",
                     "terms": "مسار الطاقة, مسار الكهرباء"
@@ -4051,6 +4719,10 @@
                     "name": "مسار طريق",
                     "terms": "مسار الطريق"
                 },
+                "type/route/subway": {
+                    "name": "مسار مترو",
+                    "terms": "مسار مترو"
+                },
                 "type/route/train": {
                     "name": "مسار قطار",
                     "terms": "مسار القطار"
@@ -4067,6 +4739,10 @@
                     "name": "موقع",
                     "terms": "موقع"
                 },
+                "type/waterway": {
+                    "name": "مجرى مائي",
+                    "terms": "مجرى مائي، ممر مائي"
+                },
                 "vertex": {
                     "name": "أخرى",
                     "terms": "أخرى"
@@ -4116,7 +4792,11 @@
                 },
                 "waterway/stream": {
                     "name": "مجرى",
-                    "terms": "مجرى"
+                    "terms": "مجرى، جدول مائي"
+                },
+                "waterway/stream_intermittent": {
+                    "name": "مجرى متقطع",
+                    "terms": "مجرى متقطع"
                 },
                 "waterway/water_point": {
                     "name": "مياه الشرب البحرية",
@@ -4127,8 +4807,8 @@
                     "terms": "شلال"
                 },
                 "waterway/weir": {
-                    "name": "سد",
-                    "terms": "سد"
+                    "name": "هدار - سد صغير",
+                    "terms": "هدار، سد صغير"
                 }
             }
         },
diff --git a/dist/locales/ast.json b/dist/locales/ast.json
index 87e66f121..ad4f27676 100644
--- a/dist/locales/ast.json
+++ b/dist/locales/ast.json
@@ -2018,9 +2018,6 @@
                     "label": "Tipu",
                     "placeholder": "Predetermináu"
                 },
-                "vending": {
-                    "label": "Tipu de mercancía"
-                },
                 "visibility": {
                     "label": "Visibilidá",
                     "options": {
@@ -4461,15 +4458,6 @@
                 "type/restriction/no_u_turn": {
                     "name": "Sin cambiu de sentíu"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Xirar sólo a la izquierda"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Xirar sólo a la drecha"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Xiru torgáu"
-                },
                 "type/route": {
                     "name": "Ruta"
                 },
@@ -4722,7 +4710,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Mapa base d'Austria, basáu en datos del gobiernu.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -4783,9 +4770,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Mosaicu del mapa por Stamen Design, baxo CC BY 3.0"
-                },
                 "name": "Terrén Stamen"
             },
             "tf-cycle": {
diff --git a/dist/locales/bg-BG.json b/dist/locales/bg-BG.json
deleted file mode 100644
index 935d0b745..000000000
--- a/dist/locales/bg-BG.json
+++ /dev/null
@@ -1,1642 +0,0 @@
-{
-    "bg-BG": {
-        "modes": {
-            "add_area": {
-                "title": "Площ",
-                "description": "Добавяне на паркове, сгради, езера или други площи към картата.",
-                "tail": "Щракнете върху картата, за да започнете чертането на площен обект като парк, езеро или сграда."
-            },
-            "add_line": {
-                "title": "Линия",
-                "description": "Добавяне на пътища, улици, пешеходни алеи, канали или други линейни обекти към картата.",
-                "tail": "Щракнете върху картата, за да започнете да чертаете път, пътека или маршрут."
-            },
-            "add_point": {
-                "title": "Точка",
-                "description": "Добавяне на ресторанти, паметници, пощенски кутии или други точки към картата.",
-                "tail": "Щракнете върху картата за да добавите точка."
-            },
-            "browse": {
-                "title": "Разглеждане",
-                "description": "Движете и увеличете картата."
-            },
-            "draw_area": {
-                "tail": "Щракнете, за да добавите възли към вашия площен обект. Щракнете върху първия възел, за да завършите площния обект."
-            },
-            "draw_line": {
-                "tail": "Щракнете, за да добавите още възли към линията. Щракнете върху други линии, за да ги свържете и двойно щракване, за да завършите линията."
-            }
-        },
-        "operations": {
-            "add": {
-                "annotation": {
-                    "point": "Добавена е точка.",
-                    "vertex": "Добавен е възел към път.",
-                    "relation": "Добавена е връзка"
-                }
-            },
-            "start": {
-                "annotation": {
-                    "line": "Започната е линия.",
-                    "area": "Започнат е площен обект."
-                }
-            },
-            "continue": {
-                "key": "A",
-                "title": "Продължи",
-                "description": "Продължи тази линия.",
-                "not_eligible": "Линията не може да бъде продължена.",
-                "multiple": "Няколко линии могат да бъдат продължени тук. За да изберете линия натиснете бутон Shift и кликнете върху линията, за да я изберете.",
-                "annotation": {
-                    "line": "Продължена е линия.",
-                    "area": "Продължен е площен обект."
-                }
-            },
-            "cancel_draw": {
-                "annotation": "Чертането е отказано."
-            },
-            "change_role": {
-                "annotation": "Сменена е ролята на член на релация."
-            },
-            "change_tags": {
-                "annotation": "Променени са тагове."
-            },
-            "circularize": {
-                "title": "Направете окръжност",
-                "description": {
-                    "line": "Направете тази линия кръг.",
-                    "area": "Превърнете този площен обект в окръжност."
-                },
-                "key": "O",
-                "annotation": {
-                    "line": "Линията е превърната в окръжност.",
-                    "area": "Площният обект е превърнат в окръжност."
-                },
-                "not_closed": "Този обект не може да стане кръг, защото не е затворен.",
-                "too_large": "Това не може да бъде направено кръгло, защото не достатъчна част от него е видима към момента.",
-                "connected_to_hidden": "Това не може да бъде кръгло, защото е свързано със скрит обект."
-            },
-            "orthogonalize": {
-                "title": "Квадрат",
-                "description": {
-                    "line": "Изправете ъглите на линията.",
-                    "area": "Изправете ъглите на полигона."
-                },
-                "key": "S",
-                "annotation": {
-                    "line": "Изправихте ъглите на линия.",
-                    "area": "Изправихте ъглите на площен обект."
-                },
-                "not_squarish": "Това не може да бъде квадрат, защото не е квадратно.",
-                "too_large": "Това не може да бъде направено квадратно, защото не достатъчна част от него е видима в момента.",
-                "connected_to_hidden": "Това не може да бъде кръгло, защото е свързано със скрит обект."
-            },
-            "straighten": {
-                "title": "Изправям",
-                "description": "Изправи тази линията.",
-                "key": "S",
-                "annotation": "Изправи линия.",
-                "too_bendy": "Това не може да се изправи защото се огъва твърде много.",
-                "connected_to_hidden": "Тази линия не може да се изправи, защото е свързана със скрит обект."
-            },
-            "delete": {
-                "title": "Изтриване",
-                "annotation": {
-                    "point": "Изтрита е точка.",
-                    "vertex": "Изтрит е възел от път.",
-                    "line": "Изтрита е линия.",
-                    "area": "Изтрит е площен обект.",
-                    "relation": "Изтрита е релация."
-                }
-            },
-            "add_member": {
-                "annotation": "Добавен член към релация."
-            },
-            "delete_member": {
-                "annotation": "Премахнат член на релация."
-            },
-            "connect": {
-                "annotation": {
-                    "point": "Свързан е път с точка.",
-                    "vertex": "Свързан е път с друг път.",
-                    "line": "Свързан е път с линия.",
-                    "area": "Свързан е път с площен обект."
-                }
-            },
-            "disconnect": {
-                "title": "Прекъсване",
-                "description": "Разделете тези линии/площни обекти едни от други.",
-                "key": "D",
-                "annotation": "Разделени са линии/площни обекти.",
-                "not_connected": "Няма достатъчно линии/площни обекти за разделяне тук.",
-                "connected_to_hidden": "Това не може да бъде",
-                "relation": "Това не може да се разпадне, защото свързва части от релацията."
-            },
-            "merge": {
-                "title": "Обединяване",
-                "description": "Обедини обектите.",
-                "key": "C",
-                "annotation": "Обедини {n} обекти.",
-                "not_eligible": "Тези обекти не могат да бъдат обединени.",
-                "restriction": "Тези обекти не могат да се обединят, защото поне единият е  част от \"{relation}\" връзка.",
-                "incomplete_relation": "Тези обекти не могат да се обединят, защото поне единият не е бил напълно изтеглен.",
-                "conflicting_tags": "Тези обекти не могат да се обединят, защото някои от тях имат противоречиви стойности."
-            },
-            "move": {
-                "title": "Преместване",
-                "key": "M",
-                "annotation": {
-                    "point": "Преместена е точка.",
-                    "vertex": "Преместен е възел от път.",
-                    "line": "Преместена е линия.",
-                    "area": "Преместен е площен обект"
-                }
-            },
-            "rotate": {
-                "title": "Въртене",
-                "key": "R",
-                "annotation": {
-                    "line": "Завъртяна е линия.",
-                    "area": "Завъртян е площен обект."
-                }
-            },
-            "reverse": {
-                "title": "Объръщане",
-                "description": "Сменете посоката на линията с противоположната.",
-                "key": "V",
-                "annotation": "Обърната е посоката на линия."
-            },
-            "split": {
-                "title": "Разделяне",
-                "description": {
-                    "line": "Разделете линията на две при този възел.",
-                    "area": "Разделете границата на площния обект на две.",
-                    "multiple": "Разделете на две линиите/границите на площния обект при този възел."
-                },
-                "key": "X",
-                "annotation": {
-                    "line": "Разделете линия.",
-                    "area": "Разделете границата на площния обект.",
-                    "multiple": "Разделете {n} линии/граници на площни обекти. "
-                },
-                "not_eligible": "Линиите не могат да бъдат разделяни в началото или края им.",
-                "multiple_ways": "Има твърде много линии за разделяне тук.",
-                "connected_to_hidden": "Това не може да се разцепи, защото е свързано със скрит обект."
-            },
-            "restriction": {
-                "help": {
-                    "select": "Клик за селекция на пътен сегмент",
-                    "toggle": "Натиснете за обръщане на ограниченията за завиване",
-                    "toggle_on": "Натиснете за добавяне на \"{restriction}\" ограничение.",
-                    "toggle_off": "Натиснете за премахване на \"{restriction}\" ограничение."
-                },
-                "annotation": {
-                    "create": "Добавено ограничение в завойте",
-                    "delete": "Изтрийте ограничение за завиване."
-                }
-            }
-        },
-        "undo": {
-            "tooltip": "Назад: {action}",
-            "nothing": "Нищо за отменяне."
-        },
-        "redo": {
-            "tooltip": "Отново: {action}",
-            "nothing": "Нищо за повторение."
-        },
-        "tooltip_keyhint": "Бързи клавиши:",
-        "browser_notice": "Този редактор се поддържа във Firefox, Chrome, Safari, Opera и Internet Explorer 11 и следващи. Моля обновете своя браузър или използвайте  Potlatch 2, за да редактирате картата.",
-        "translate": {
-            "translate": "Превод",
-            "localized_translation_label": "Многоезично име",
-            "localized_translation_language": "Изберете език",
-            "localized_translation_name": "Име"
-        },
-        "logout": "изход",
-        "loading_auth": "Свързване с OpenStreetMap...",
-        "report_a_bug": "Докладвай грешка",
-        "help_translate": "Помощ за превода",
-        "feature_info": {
-            "hidden_warning": "{count} скрити обекти",
-            "hidden_details": "Следните обекти са скрити: {details}"
-        },
-        "status": {
-            "error": "Не може да се свърже с API-то.",
-            "offline": "API-то е офлайн. Моля опитайте да редактирате по-късно.",
-            "readonly": "API-то е в режим само за четене. Ще трябва да почакате, за да запазите вашите промени."
-        },
-        "commit": {
-            "upload_explanation": "Промените, които качвате ще са видими на всички карти използващи данни от OpenStreetMap.",
-            "upload_explanation_with_user": "Промените, които качвате като {user} ще са видими на всички карти използващи данни от OpenStreetMap.",
-            "cancel": "Отказ",
-            "changes": "{count} промени",
-            "warnings": "Предупреждения",
-            "modified": "Променени",
-            "deleted": "Изтрити",
-            "created": "Създадени"
-        },
-        "contributors": {
-            "list": "Редакции от {users}",
-            "truncated_list": "Редакции от {users} и още {count} други"
-        },
-        "geometry": {
-            "point": "точка",
-            "vertex": "чупка",
-            "line": "линия",
-            "area": "площ",
-            "relation": "връзка"
-        },
-        "geocoder": {
-            "search": "Търси навсякъде...",
-            "no_results_visible": "Няма резултати във видимата част на картата",
-            "no_results_worldwide": "Няма намерени резултати"
-        },
-        "geolocate": {
-            "title": "Показване на моето местоположение",
-            "locating": "Зареждане, моля изчакайте..."
-        },
-        "inspector": {
-            "no_documentation_combination": "Няма налична документация за тази комбинация от тагове",
-            "no_documentation_key": "Няма налична документация за този ключ",
-            "show_more": "Покажи още",
-            "view_on_osm": "Вижте на openstreetmap.org",
-            "all_fields": "Всички полета",
-            "all_tags": "Всички тагове",
-            "all_members": "Всички членове",
-            "all_relations": "Всички релации",
-            "new_relation": "Нова връзка...",
-            "role": "Роля",
-            "choose": "Изберете вид обект",
-            "results": "{n} резултата за {search}",
-            "reference": "Вижте в OpenStreetMap Wiki",
-            "back_tooltip": "Смяна на обект",
-            "remove": "Премахнете",
-            "search": "Търсене",
-            "unknown": "Неизвестно",
-            "incomplete": "<не е свалено>",
-            "feature_list": "Търсене на обекти",
-            "edit": "Редактиране на обект",
-            "check": {
-                "yes": "Да",
-                "no": "Не"
-            },
-            "none": "Никакъв",
-            "node": "Възел",
-            "way": "Начин",
-            "relation": "Релация",
-            "location": "Местоположение",
-            "add_fields": "Добави поле:"
-        },
-        "background": {
-            "title": "Изображения",
-            "description": "Изображения настройки",
-            "none": "Никакъв",
-            "best_imagery": "Най-известен източник на изображения за това местоположение",
-            "custom": "Обичаен",
-            "reset": "презареждане"
-        },
-        "map_data": {
-            "title": "Картни Данни",
-            "description": "Картни Данни",
-            "data_layers": "Слоеве с данни",
-            "map_features": "Обекти от картата",
-            "autohidden": "Тези обекти бяха скрити автоматично, защото щяха да са пказани твърде много на екрана. Можете да увеличите, за да ги редактирате."
-        },
-        "feature": {
-            "points": {
-                "description": "Точки"
-            },
-            "traffic_roads": {
-                "tooltip": "Шосета, Улици, и др."
-            },
-            "service_roads": {
-                "description": "Обслужващи Улици"
-            },
-            "paths": {
-                "description": "Пътеки",
-                "tooltip": "Тротоари, Пешеходни Зони, Велосипедни Алеи, и т.н."
-            },
-            "buildings": {
-                "description": "Сгради",
-                "tooltip": "Сгради, Заслони, Гаражи, и т.н."
-            },
-            "landuse": {
-                "description": "Обекти за земеползване",
-                "tooltip": "Гори, Земеделски Земи, Жилищни зони, Търговски зони, и т.н."
-            },
-            "boundaries": {
-                "description": "Граници",
-                "tooltip": "Административни Граници"
-            },
-            "water": {
-                "description": "Водни Обекти"
-            },
-            "rail": {
-                "description": "Железопътни Обекти",
-                "tooltip": "Железопътни линии"
-            },
-            "power": {
-                "description": "Енергийни обекти",
-                "tooltip": "Електропроводи , Електроцентрали, Подстанции, и т.н."
-            },
-            "past_future": {
-                "description": "Минал/Бъдещ"
-            },
-            "others": {
-                "description": "Други",
-                "tooltip": "Всичко Друго"
-            }
-        },
-        "area_fill": {
-            "partial": {
-                "description": "Частично Попълнен"
-            }
-        },
-        "restore": {
-            "heading": "Имате незапазени промени",
-            "description": "Искате ли да възстановите незаписаните промени от предишна сесия?"
-        },
-        "save": {
-            "title": "Запис",
-            "no_changes": "Няма промени за запис.",
-            "error": "Грешки настъпили докато се опитваме да запазим",
-            "status_code": "Сървърът върна статус с код {code}",
-            "unknown_error_details": "Моля уверете се че сте свързани с интернет.",
-            "unsaved_changes": "Имате незаписани промени",
-            "conflict": {
-                "header": "Решение на несъвместими редакции.",
-                "count": "Несъвместими {num} от {total}",
-                "previous": "< Предишен",
-                "next": "Следващ >",
-                "keep_remote": "Използвай техните",
-                "restore": "Възстанови",
-                "delete": "Остави Изтрито",
-                "done": "Всички несъответствия са решени!"
-            }
-        },
-        "merge_remote_changes": {
-            "conflict": {
-                "nodelist": "Възлите са били променени и от вас и от {user}. ",
-                "memberlist": "Части от връзката бяха променени и от вас и от {user}.",
-                "tags": "Вие променихте <b>{tag}</b> таг на \"{local}\" и {user} се промени на \"{remote}\"."
-            }
-        },
-        "success": {
-            "edited_osm": "Редактирахте OSM!",
-            "just_edited": "Вие редактирахте OpenStreetMap!",
-            "view_on_osm": "Вижте в OSM",
-            "facebook": "Споделете във Facebook",
-            "twitter": "Сподели в Twitter",
-            "google": "Сподели в Google+",
-            "help_link_text": "Детайли"
-        },
-        "confirm": {
-            "cancel": "Отказ"
-        },
-        "splash": {
-            "welcome": "Добре дошли в iD редактора за OpenStreetMap",
-            "text": "iD e лесен, но мощен инструмент за попълване на най-добрата свободна карта на света. Това е версия {version}. За повече информация вижте {website} и докладвайте за бъгове в {github}.",
-            "walkthrough": "Започнете опознавателната обиколка"
-        },
-        "source_switch": {
-            "live": "live",
-            "lose_changes": "Имате незапазени промени. Смяната на картния сървър ще ги отхвърли. Сигурни ли сте, че искате да смените сървърите?",
-            "dev": "dev"
-        },
-        "tag_reference": {
-            "description": "Описание",
-            "on_wiki": "{tag} в wiki.osm.org",
-            "used_with": "използва се с {type}"
-        },
-        "validations": {
-            "untagged_point": "Точка без тагове.",
-            "untagged_point_tooltip": "Изберете типът обект който описва каква е тази точка.",
-            "untagged_line": "Линия без таг",
-            "untagged_line_tooltip": "Изберете типът обект който описва каква е тази линия.",
-            "untagged_area": "Площен обект без таг",
-            "untagged_area_tooltip": "Изберете типът обект който описва каква е тази площ.",
-            "tag_suggests_area": "Тагът {tag} предполага линията да е площен обект, но тя не е",
-            "deprecated_tags": "Отхвърлени тагове: {tags}"
-        },
-        "cannot_zoom": "Не можете да намалявате повече в текущия режим.",
-        "full_screen": "Превключи на Цял Екран",
-        "mapillary_images": {
-            "tooltip": "Снимки за ниво на улицата от Mapillary"
-        },
-        "mapillary": {
-            "view_on_mapillary": "Вижте тази снимка на Mapillary"
-        },
-        "help": {
-            "title": "Помощ"
-        },
-        "intro": {
-            "graph": {
-                "block_number": "<value for addr:block_number>",
-                "county": "<value for addr:county>",
-                "district": "<value for addr:district>",
-                "hamlet": "<value for addr:hamlet>",
-                "neighbourhood": "<value for addr:neighbourhood>",
-                "province": "<value for addr:province>",
-                "quarter": "<value for addr:quarter>",
-                "state": "<value for addr:state>",
-                "subdistrict": "<value for addr:subdistrict>",
-                "suburb": "<value for addr:suburb>",
-                "countrycode": "bg"
-            },
-            "navigation": {
-                "title": "Навигация"
-            },
-            "points": {
-                "title": "Точки"
-            },
-            "areas": {
-                "title": "Площи"
-            },
-            "lines": {
-                "title": "Линии"
-            },
-            "startediting": {
-                "title": "Започване на редакция",
-                "save": "Не забравяйте да записвате редовно промените, които правите!",
-                "start": "Започнете да картографирате!"
-            }
-        },
-        "presets": {
-            "categories": {
-                "category-rail": {
-                    "name": "Железопътни Обекти"
-                },
-                "category-water-area": {
-                    "name": "Водни Обекти"
-                },
-                "category-water-line": {
-                    "name": "Водни Обекти"
-                }
-            },
-            "fields": {
-                "access": {
-                    "options": {
-                        "designated": {
-                            "description": "Достъпът позволен според указателни табели или специфични местни разпоредби",
-                            "title": "По предназначение"
-                        },
-                        "destination": {
-                            "description": "Достъпът разрешен само за достигане до дестинация",
-                            "title": "До дестинация"
-                        },
-                        "no": {
-                            "description": "Забранен публичният достъп",
-                            "title": "Забранен"
-                        },
-                        "permissive": {
-                            "description": "Достъпът позволен докато собственика позволява",
-                            "title": "Частичен"
-                        },
-                        "private": {
-                            "description": "Достъпът разрешен само с позволение на собственика",
-                            "title": "Частен"
-                        },
-                        "yes": {
-                            "description": "Достъпът позволен с нормативен акт; право на преминаване",
-                            "title": "Разрешен"
-                        }
-                    },
-                    "types": {
-                        "bicycle": "Велосипеди",
-                        "foot": "Пешеходен",
-                        "horse": "Коне",
-                        "motor_vehicle": "МПС"
-                    }
-                },
-                "address": {
-                    "label": "Адрес",
-                    "placeholders": {
-                        "city": "Град",
-                        "country": "Държава",
-                        "district": "Община",
-                        "housename": "Къща",
-                        "housenumber": "123",
-                        "place": "Място",
-                        "province": "Област",
-                        "state": "Икономически район NUT2",
-                        "street": "Улица",
-                        "subdistrict": "Землище",
-                        "suburb": "Квартал"
-                    }
-                },
-                "admin_level": {
-                    "label": "Административно деление"
-                },
-                "aeroway": {
-                    "label": "Вид"
-                },
-                "amenity": {
-                    "label": "Вид"
-                },
-                "atm": {
-                    "label": "Банкомат"
-                },
-                "barrier": {
-                    "label": "Вид"
-                },
-                "bicycle_parking": {
-                    "label": "Вид"
-                },
-                "boundary": {
-                    "label": "Вид"
-                },
-                "building": {
-                    "label": "Сграда"
-                },
-                "building_area": {
-                    "label": "Сграда"
-                },
-                "capacity": {
-                    "label": "Капацитет",
-                    "placeholder": "50, 100, 200..."
-                },
-                "collection_times": {
-                    "label": "График на събиране"
-                },
-                "construction": {
-                    "label": "Вид"
-                },
-                "country": {
-                    "label": "Държава"
-                },
-                "crossing": {
-                    "label": "Вид"
-                },
-                "cycleway": {
-                    "options": {
-                        "none": {
-                            "title": "Никакъв"
-                        }
-                    }
-                },
-                "denomination": {
-                    "label": "Вероизповедание"
-                },
-                "denotation": {
-                    "label": "Название"
-                },
-                "description": {
-                    "label": "Описание"
-                },
-                "electrified": {
-                    "options": {
-                        "no": "Не"
-                    }
-                },
-                "elevation": {
-                    "label": "Надморска височина"
-                },
-                "emergency": {
-                    "label": "Спешни случаи"
-                },
-                "entrance": {
-                    "label": "Вид"
-                },
-                "fax": {
-                    "label": "Факс",
-                    "placeholder": "+31 42 123 4567"
-                },
-                "fee": {
-                    "label": "Такса"
-                },
-                "fixme": {
-                    "label": "Поправи ме"
-                },
-                "highway": {
-                    "label": "Вид"
-                },
-                "historic": {
-                    "label": "Вид"
-                },
-                "iata": {
-                    "label": "IATA"
-                },
-                "icao": {
-                    "label": "ICAO"
-                },
-                "incline": {
-                    "label": "Наклон"
-                },
-                "internet_access": {
-                    "label": "Интернет достъп",
-                    "options": {
-                        "no": "Не",
-                        "terminal": "Терминал",
-                        "wired": "Кабелен",
-                        "wlan": "Wifi",
-                        "yes": "Да"
-                    }
-                },
-                "lamp_type": {
-                    "label": "Тип"
-                },
-                "landuse": {
-                    "label": "Вид"
-                },
-                "lanes": {
-                    "label": "Платна",
-                    "placeholder": "1, 2, 3..."
-                },
-                "layer": {
-                    "label": "Слой"
-                },
-                "leisure": {
-                    "label": "Вид"
-                },
-                "levels": {
-                    "label": "Нива",
-                    "placeholder": "2, 4, 6..."
-                },
-                "location": {
-                    "label": "Местоположение"
-                },
-                "man_made": {
-                    "label": "Вид"
-                },
-                "maxspeed": {
-                    "label": "Ограничение на скоростта",
-                    "placeholder": "40, 50, 60..."
-                },
-                "name": {
-                    "label": "Име",
-                    "placeholder": "Популярно наименование (ако има такова)"
-                },
-                "natural": {
-                    "label": "Природа"
-                },
-                "network": {
-                    "label": "Мрежа"
-                },
-                "note": {
-                    "label": "Бележка"
-                },
-                "office": {
-                    "label": "Вид"
-                },
-                "oneway": {
-                    "label": "Еднопосочнoст",
-                    "options": {
-                        "no": "Не",
-                        "yes": "Да"
-                    }
-                },
-                "oneway_yes": {
-                    "label": "Еднопосочен",
-                    "options": {
-                        "no": "Не",
-                        "yes": "Да"
-                    }
-                },
-                "opening_hours": {
-                    "label": "Работно време"
-                },
-                "operator": {
-                    "label": "Оператор"
-                },
-                "park_ride": {
-                    "label": "Буферен паркинг"
-                },
-                "parking": {
-                    "label": "Вид"
-                },
-                "phone": {
-                    "label": "Телефон",
-                    "placeholder": "+31 42 123 4567"
-                },
-                "place": {
-                    "label": "Вид"
-                },
-                "power": {
-                    "label": "Вид"
-                },
-                "railway": {
-                    "label": "Вид"
-                },
-                "relation": {
-                    "label": "Вид"
-                },
-                "religion": {
-                    "label": "Религия"
-                },
-                "restriction": {
-                    "label": "Вид"
-                },
-                "route": {
-                    "label": "Вид"
-                },
-                "route_master": {
-                    "label": "Вид"
-                },
-                "service": {
-                    "label": "Вид"
-                },
-                "shelter": {
-                    "label": "Навес"
-                },
-                "shop": {
-                    "label": "Вид"
-                },
-                "structure": {
-                    "label": "Структура",
-                    "options": {
-                        "bridge": "Мост",
-                        "cutting": "Изкоп",
-                        "embankment": "Насип",
-                        "tunnel": "Тунел"
-                    },
-                    "placeholder": "Неизвестен"
-                },
-                "supervised": {
-                    "label": "Под наблюдение"
-                },
-                "surface": {
-                    "label": "Повърхност"
-                },
-                "takeaway": {
-                    "options": {
-                        "no": "Не",
-                        "yes": "Да"
-                    }
-                },
-                "tourism": {
-                    "label": "Вид"
-                },
-                "trail_visibility": {
-                    "label": "Видимост на туристическата пътека"
-                },
-                "water": {
-                    "label": "Вид"
-                },
-                "waterway": {
-                    "label": "Вид"
-                },
-                "website": {
-                    "label": "Уебсайт",
-                    "placeholder": "http://example.com/"
-                },
-                "wetland": {
-                    "label": "Вид"
-                },
-                "wheelchair": {
-                    "label": "Достъп за инвалиди"
-                },
-                "wikipedia": {
-                    "label": "Wikipedia"
-                }
-            },
-            "presets": {
-                "address": {
-                    "name": "Адрес"
-                },
-                "aeroway": {
-                    "name": "Въздухоплаване"
-                },
-                "aeroway/aerodrome": {
-                    "name": "Летище"
-                },
-                "aeroway/apron": {
-                    "name": "Стоянка за самолети"
-                },
-                "aeroway/hangar": {
-                    "name": "Хангар"
-                },
-                "aeroway/helipad": {
-                    "name": "Хеликоптерна площадка"
-                },
-                "aeroway/runway": {
-                    "name": "Летателна писта"
-                },
-                "aeroway/taxiway": {
-                    "name": "Рольожка"
-                },
-                "amenity": {
-                    "name": "Услуги"
-                },
-                "amenity/atm": {
-                    "name": "Банкомат"
-                },
-                "amenity/bank": {
-                    "name": "Банка"
-                },
-                "amenity/bar": {
-                    "name": "Бар"
-                },
-                "amenity/bench": {
-                    "name": "Пейка"
-                },
-                "amenity/bicycle_parking": {
-                    "name": "Паркинг за велосипеди"
-                },
-                "amenity/bicycle_rental": {
-                    "name": "Наем на велосипеди"
-                },
-                "amenity/cafe": {
-                    "name": "Кафене"
-                },
-                "amenity/car_rental": {
-                    "name": "Коли под наем"
-                },
-                "amenity/car_sharing": {
-                    "name": "Споделяне на коли"
-                },
-                "amenity/car_wash": {
-                    "name": "Автомивка"
-                },
-                "amenity/cinema": {
-                    "name": "Кино"
-                },
-                "amenity/courthouse": {
-                    "name": "Съд"
-                },
-                "amenity/drinking_water": {
-                    "name": "Чешма"
-                },
-                "amenity/embassy": {
-                    "name": "Посолство"
-                },
-                "amenity/fast_food": {
-                    "name": "Бърза закуска"
-                },
-                "amenity/fire_station": {
-                    "name": "Пожарна"
-                },
-                "amenity/fountain": {
-                    "name": "Фонтан"
-                },
-                "amenity/fuel": {
-                    "name": "Бензиностанция"
-                },
-                "amenity/grave_yard": {
-                    "name": "Гробище"
-                },
-                "amenity/library": {
-                    "name": "Библиотека"
-                },
-                "amenity/marketplace": {
-                    "name": "Пазар"
-                },
-                "amenity/pharmacy": {
-                    "name": "Аптека"
-                },
-                "amenity/place_of_worship": {
-                    "name": "Религиозен храм"
-                },
-                "amenity/place_of_worship/buddhist": {
-                    "name": "Будистки храм"
-                },
-                "amenity/place_of_worship/christian": {
-                    "name": "Църква"
-                },
-                "amenity/place_of_worship/jewish": {
-                    "name": "Синагога"
-                },
-                "amenity/place_of_worship/muslim": {
-                    "name": "Джамия"
-                },
-                "amenity/police": {
-                    "name": "Полиция"
-                },
-                "amenity/post_box": {
-                    "name": "Пощенска кутия"
-                },
-                "amenity/post_office": {
-                    "name": "Поща"
-                },
-                "amenity/pub": {
-                    "name": "Пъб"
-                },
-                "amenity/restaurant": {
-                    "name": "Ресторант"
-                },
-                "amenity/swimming_pool": {
-                    "name": "Плувен басейн"
-                },
-                "amenity/taxi": {
-                    "name": "Такси стоянка"
-                },
-                "amenity/telephone": {
-                    "name": "Телефон"
-                },
-                "amenity/theatre": {
-                    "name": "Театър"
-                },
-                "amenity/toilets": {
-                    "name": "Тоалетна"
-                },
-                "amenity/townhall": {
-                    "name": "Кметство"
-                },
-                "amenity/waste_basket": {
-                    "name": "Кош за боклук"
-                },
-                "area": {
-                    "name": "Площ"
-                },
-                "barrier": {
-                    "name": "Преграда"
-                },
-                "barrier/block": {
-                    "name": "Бетонен блок"
-                },
-                "barrier/bollard": {
-                    "name": "Колче"
-                },
-                "barrier/cattle_grid": {
-                    "name": "Тексаска мрежа"
-                },
-                "barrier/city_wall": {
-                    "name": "Градска стена"
-                },
-                "barrier/cycle_barrier": {
-                    "name": "Велосипедна преграда"
-                },
-                "barrier/entrance": {
-                    "name": "Вход"
-                },
-                "barrier/fence": {
-                    "name": "Ограда"
-                },
-                "barrier/gate": {
-                    "name": "Портал"
-                },
-                "barrier/hedge": {
-                    "name": "Жив плет"
-                },
-                "barrier/kissing_gate": {
-                    "name": "Препятствие за животни"
-                },
-                "barrier/lift_gate": {
-                    "name": "Бариера"
-                },
-                "barrier/retaining_wall": {
-                    "name": "Подпорна стена"
-                },
-                "barrier/stile": {
-                    "name": "Стълби за преминаване през ограда"
-                },
-                "barrier/toll_booth": {
-                    "name": "Будка за тол такса"
-                },
-                "barrier/wall": {
-                    "name": "Стена"
-                },
-                "boundary/administrative": {
-                    "name": "Административна граница"
-                },
-                "building": {
-                    "name": "Сграда"
-                },
-                "building/apartments": {
-                    "name": "Жилищен блок"
-                },
-                "building/house": {
-                    "name": "Къща"
-                },
-                "emergency/phone": {
-                    "name": "Телефон за спешна помощ"
-                },
-                "highway": {
-                    "name": "Път"
-                },
-                "highway/bridleway": {
-                    "name": "Конска пътека"
-                },
-                "highway/cycleway": {
-                    "name": "Велоалея"
-                },
-                "highway/footway": {
-                    "name": "Пешеходна алея"
-                },
-                "highway/living_street": {
-                    "name": "Жилищна улица"
-                },
-                "highway/mini_roundabout": {
-                    "name": "Малко кръгово кръстовище"
-                },
-                "highway/motorway": {
-                    "name": "Автомагистрала"
-                },
-                "highway/motorway_link": {
-                    "name": "Автомагистрална връзка"
-                },
-                "highway/path": {
-                    "name": "Пътека"
-                },
-                "highway/primary": {
-                    "name": "Първокласен път"
-                },
-                "highway/primary_link": {
-                    "name": "Връзка с първокласен път"
-                },
-                "highway/residential": {
-                    "name": "Улица"
-                },
-                "highway/road": {
-                    "name": "Непроучен път"
-                },
-                "highway/secondary": {
-                    "name": "Второкласен път"
-                },
-                "highway/secondary_link": {
-                    "name": "Връзка с второкласен път"
-                },
-                "highway/service": {
-                    "name": "Сервизна улица"
-                },
-                "highway/service/alley": {
-                    "name": "Тясна уличка между имоти"
-                },
-                "highway/service/drive-through": {
-                    "name": "Обслужване без напускане на автомобила"
-                },
-                "highway/service/driveway": {
-                    "name": "Алея за коли към жилище"
-                },
-                "highway/service/emergency_access": {
-                    "name": "За достъп при спешни случаи"
-                },
-                "highway/service/parking_aisle": {
-                    "name": "Път в паркинг"
-                },
-                "highway/steps": {
-                    "name": "Стъпала"
-                },
-                "highway/street_lamp": {
-                    "name": "Улична лампа"
-                },
-                "highway/tertiary": {
-                    "name": "Третокласен път"
-                },
-                "highway/tertiary_link": {
-                    "name": "Връзка с третокласен път"
-                },
-                "highway/traffic_signals": {
-                    "name": "Светофари"
-                },
-                "highway/trunk": {
-                    "name": "Скоростен път"
-                },
-                "highway/trunk_link": {
-                    "name": "Връзка със скоростен път"
-                },
-                "highway/turning_circle": {
-                    "name": "Място за обръщане"
-                },
-                "historic": {
-                    "name": "Място с историческо значение"
-                },
-                "historic/archaeological_site": {
-                    "name": "Археологически обект"
-                },
-                "historic/boundary_stone": {
-                    "name": "Граничен камък"
-                },
-                "historic/castle": {
-                    "name": "Замък"
-                },
-                "historic/memorial": {
-                    "name": "Мемориална плоча"
-                },
-                "historic/monument": {
-                    "name": "Паметник"
-                },
-                "historic/ruins": {
-                    "name": "Руини"
-                },
-                "historic/wayside_cross": {
-                    "name": "Крайпътен кръст"
-                },
-                "historic/wayside_shrine": {
-                    "name": "Крайпътен параклис"
-                },
-                "landuse/basin": {
-                    "name": "Басейн"
-                },
-                "landuse/cemetery": {
-                    "name": "Гробищен парк"
-                },
-                "landuse/construction": {
-                    "name": "Строеж"
-                },
-                "landuse/farmyard": {
-                    "name": "Селскостопански двор"
-                },
-                "landuse/forest": {
-                    "name": "Гора"
-                },
-                "landuse/grass": {
-                    "name": "Трева"
-                },
-                "landuse/meadow": {
-                    "name": "Пасище"
-                },
-                "landuse/orchard": {
-                    "name": "Овощна градина "
-                },
-                "landuse/quarry": {
-                    "name": "Кариера"
-                },
-                "landuse/vineyard": {
-                    "name": "Лозе"
-                },
-                "leisure": {
-                    "name": "Отдих"
-                },
-                "leisure/garden": {
-                    "name": "Градина"
-                },
-                "leisure/golf_course": {
-                    "name": "Голф игрище"
-                },
-                "leisure/marina": {
-                    "name": "Яхт клуб"
-                },
-                "leisure/park": {
-                    "name": "Парк"
-                },
-                "leisure/pitch": {
-                    "name": "Спортно игрище"
-                },
-                "leisure/pitch/american_football": {
-                    "name": "Игрище за американски футбол"
-                },
-                "leisure/pitch/baseball": {
-                    "name": "Игрище за бейзбол"
-                },
-                "leisure/pitch/basketball": {
-                    "name": "Баскетболно игрище"
-                },
-                "leisure/pitch/soccer": {
-                    "name": "Футболно игрище"
-                },
-                "leisure/pitch/tennis": {
-                    "name": "Тенис корт"
-                },
-                "leisure/pitch/volleyball": {
-                    "name": "Волейболно игрище"
-                },
-                "leisure/playground": {
-                    "name": "Детска площадка"
-                },
-                "leisure/slipway": {
-                    "name": "Хелинг"
-                },
-                "leisure/stadium": {
-                    "name": "Стадион"
-                },
-                "leisure/swimming_pool": {
-                    "name": "Плувен басейн"
-                },
-                "line": {
-                    "name": "Линия"
-                },
-                "man_made": {
-                    "name": "Съоръжения"
-                },
-                "man_made/breakwater": {
-                    "name": "Вълнолом"
-                },
-                "man_made/cutline": {
-                    "name": "Просека"
-                },
-                "man_made/lighthouse": {
-                    "name": "Морски фар"
-                },
-                "man_made/pier": {
-                    "name": "Кей"
-                },
-                "man_made/pipeline": {
-                    "name": "Тръбопровод"
-                },
-                "man_made/survey_point": {
-                    "name": "Геодезическа точка"
-                },
-                "man_made/tower": {
-                    "name": "Кула"
-                },
-                "man_made/wastewater_plant": {
-                    "name": "Пречиствателна станция"
-                },
-                "man_made/water_tower": {
-                    "name": "Водна кула"
-                },
-                "man_made/water_works": {
-                    "name": "Помпена станция"
-                },
-                "natural": {
-                    "name": "Природа"
-                },
-                "natural/bay": {
-                    "name": "Залив"
-                },
-                "natural/beach": {
-                    "name": "Плаж"
-                },
-                "natural/cliff": {
-                    "name": "Скала"
-                },
-                "natural/coastline": {
-                    "name": "Брегова линия"
-                },
-                "natural/glacier": {
-                    "name": "Ледник"
-                },
-                "natural/grassland": {
-                    "name": "Степ"
-                },
-                "natural/heath": {
-                    "name": "Малки храсти"
-                },
-                "natural/peak": {
-                    "name": "Връх"
-                },
-                "natural/scrub": {
-                    "name": "Шубрак"
-                },
-                "natural/spring": {
-                    "name": "Извор"
-                },
-                "natural/tree": {
-                    "name": "Дърво"
-                },
-                "natural/water": {
-                    "name": "Водна площ"
-                },
-                "natural/water/lake": {
-                    "name": "Езеро"
-                },
-                "natural/water/pond": {
-                    "name": "Малко езеро"
-                },
-                "natural/water/reservoir": {
-                    "name": "Язовир"
-                },
-                "natural/wetland": {
-                    "name": "Блатиста зона"
-                },
-                "natural/wood": {
-                    "name": "Гора"
-                },
-                "office": {
-                    "name": "Офис"
-                },
-                "place": {
-                    "name": "Населени места"
-                },
-                "place/city": {
-                    "name": "Град над 100 000"
-                },
-                "place/hamlet": {
-                    "name": "Махала"
-                },
-                "place/island": {
-                    "name": "Остров"
-                },
-                "place/isolated_dwelling": {
-                    "name": "Изолирано жилище"
-                },
-                "place/locality": {
-                    "name": "Местност"
-                },
-                "place/town": {
-                    "name": "Град под 100 000"
-                },
-                "place/village": {
-                    "name": "Село"
-                },
-                "point": {
-                    "name": "Точка"
-                },
-                "power": {
-                    "name": "Енергетика"
-                },
-                "power/line": {
-                    "name": "Електропровод"
-                },
-                "power/pole": {
-                    "name": "Електрически стълб"
-                },
-                "power/sub_station": {
-                    "name": "Подстанция"
-                },
-                "power/tower": {
-                    "name": "Жере"
-                },
-                "power/transformer": {
-                    "name": "Трансформатор"
-                },
-                "railway": {
-                    "name": "ЖП транспорт"
-                },
-                "railway/abandoned": {
-                    "name": "Изоставена железопътна линия"
-                },
-                "railway/disused": {
-                    "name": "Закрита железопътна линия"
-                },
-                "railway/monorail": {
-                    "name": "Монорелсов път"
-                },
-                "railway/rail": {
-                    "name": "ЖП линия"
-                },
-                "railway/subway": {
-                    "name": "Метро"
-                },
-                "railway/subway_entrance": {
-                    "name": "Вход на метростанция"
-                },
-                "railway/tram": {
-                    "name": "Трамвайни релси"
-                },
-                "relation": {
-                    "name": "Релация"
-                },
-                "route/ferry": {
-                    "name": "Фериботна връзка"
-                },
-                "shop": {
-                    "name": "Магазин"
-                },
-                "shop/alcohol": {
-                    "name": "Магазин за алкохол"
-                },
-                "shop/bakery": {
-                    "name": "Пекарна"
-                },
-                "shop/beauty": {
-                    "name": "Козметик"
-                },
-                "shop/beverages": {
-                    "name": "Магазин за алкохол и цигари"
-                },
-                "shop/bicycle": {
-                    "name": "Магазин за велосипеди"
-                },
-                "shop/boutique": {
-                    "name": "Бутик"
-                },
-                "shop/butcher": {
-                    "name": "Колбаси"
-                },
-                "shop/car": {
-                    "name": "Автомобили"
-                },
-                "shop/car_parts": {
-                    "name": "Авточасти"
-                },
-                "shop/car_repair": {
-                    "name": "Сервиз автомобили"
-                },
-                "shop/clothes": {
-                    "name": "Магазин за дрехи"
-                },
-                "shop/computer": {
-                    "name": "Компютърен магазин"
-                },
-                "shop/convenience": {
-                    "name": "Магазин за хранителни стоки"
-                },
-                "shop/deli": {
-                    "name": "Магазин за деликатеси"
-                },
-                "shop/department_store": {
-                    "name": "Универсален магазин"
-                },
-                "shop/doityourself": {
-                    "name": "Магазин \"Направи си сам\""
-                },
-                "shop/electronics": {
-                    "name": "Магазин за електроника"
-                },
-                "shop/farm": {
-                    "name": "Щанд за плодове и зеленчуци"
-                },
-                "shop/fishmonger": {
-                    "name": "Магазин за риба"
-                },
-                "shop/florist": {
-                    "name": "Магазин за цветя"
-                },
-                "shop/furniture": {
-                    "name": "Мебелен магазин"
-                },
-                "shop/garden_centre": {
-                    "name": "Градински център"
-                },
-                "shop/gift": {
-                    "name": "Магазин за подаръци"
-                },
-                "shop/greengrocer": {
-                    "name": "Плод-зеленчук"
-                },
-                "shop/hairdresser": {
-                    "name": "Фризьорски салон"
-                },
-                "shop/hardware": {
-                    "name": "Железария"
-                },
-                "shop/hifi": {
-                    "name": "Магазин за аудиотехника"
-                },
-                "shop/jewelry": {
-                    "name": "Бижутер"
-                },
-                "shop/laundry": {
-                    "name": "Пералня"
-                },
-                "shop/mall": {
-                    "name": "Мол"
-                },
-                "shop/mobile_phone": {
-                    "name": "Магазин за мобилни телефони"
-                },
-                "shop/motorcycle": {
-                    "name": "Магазин за мотоциклети"
-                },
-                "shop/music": {
-                    "name": "Музикален магазин"
-                },
-                "shop/optician": {
-                    "name": "Оптика"
-                },
-                "shop/pet": {
-                    "name": "Зоо магазин"
-                },
-                "shop/shoes": {
-                    "name": "Магазин за обувки"
-                },
-                "shop/sports": {
-                    "name": "Спортен магазин"
-                },
-                "shop/stationery": {
-                    "name": "Магазин за канцеларски стоки"
-                },
-                "shop/supermarket": {
-                    "name": "Супермаркет"
-                },
-                "shop/toys": {
-                    "name": "Магазин за играчки"
-                },
-                "shop/travel_agency": {
-                    "name": "Туристическа агенция"
-                },
-                "shop/tyres": {
-                    "name": "Магазин за автомобилни гуми"
-                },
-                "shop/vacant": {
-                    "name": "Свободна търговска площ"
-                },
-                "shop/variety_store": {
-                    "name": "Смесен магазин"
-                },
-                "shop/video": {
-                    "name": "Видеотека"
-                },
-                "tourism": {
-                    "name": "Туризъм"
-                },
-                "tourism/alpine_hut": {
-                    "name": "Хижа"
-                },
-                "tourism/artwork": {
-                    "name": "Произведение на изкуството"
-                },
-                "tourism/attraction": {
-                    "name": "Туристическа атракция"
-                },
-                "tourism/caravan_site": {
-                    "name": "Паркинг за каравани"
-                },
-                "tourism/guest_house": {
-                    "name": "Къща за гости"
-                },
-                "tourism/hostel": {
-                    "name": "Хостел"
-                },
-                "tourism/hotel": {
-                    "name": "Хотел"
-                },
-                "tourism/information": {
-                    "name": "Информация"
-                },
-                "tourism/motel": {
-                    "name": "Мотел"
-                },
-                "tourism/museum": {
-                    "name": "Музей"
-                },
-                "tourism/picnic_site": {
-                    "name": "Място за пикник"
-                },
-                "tourism/theme_park": {
-                    "name": "Увеселителен парк"
-                },
-                "tourism/viewpoint": {
-                    "name": "Точка с хубава гледка"
-                },
-                "tourism/zoo": {
-                    "name": "Зоологическа градина"
-                },
-                "type/boundary": {
-                    "name": "Граница"
-                },
-                "type/boundary/administrative": {
-                    "name": "Административна граница"
-                },
-                "type/multipolygon": {
-                    "name": "Мултиполигон"
-                },
-                "type/restriction": {
-                    "name": "Ограничение"
-                },
-                "type/restriction/no_right_turn": {
-                    "name": "Без десен завой"
-                },
-                "type/restriction/no_u_turn": {
-                    "name": "Без обратен завой"
-                },
-                "type/restriction/only_left_turn": {
-                    "name": "Завой само на ляво"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Завой само на дясно"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Без завиване"
-                },
-                "type/route": {
-                    "name": "Маршрут"
-                },
-                "type/route/bicycle": {
-                    "name": "Велосипеден маршрут"
-                },
-                "type/route/bus": {
-                    "name": "Автобусен маршрут"
-                },
-                "type/route/detour": {
-                    "name": "Обходен маршрут"
-                },
-                "type/route/ferry": {
-                    "name": "Фериботна връзка"
-                },
-                "type/route/foot": {
-                    "name": "Пешеходен маршрут"
-                },
-                "type/route/pipeline": {
-                    "name": "Трасе на тръбопровод"
-                },
-                "type/route/power": {
-                    "name": "Трасе на електропровод"
-                },
-                "type/route/road": {
-                    "name": "Път"
-                },
-                "type/route/train": {
-                    "name": "Железопътен маршрут"
-                },
-                "type/route/tram": {
-                    "name": "Трамваен маршрут"
-                },
-                "type/route_master": {
-                    "name": "Маршрутна схема"
-                },
-                "vertex": {
-                    "name": "Друг"
-                },
-                "waterway": {
-                    "name": "Води"
-                },
-                "waterway/canal": {
-                    "name": "Канал"
-                },
-                "waterway/dam": {
-                    "name": "Язовирна стена"
-                },
-                "waterway/ditch": {
-                    "name": "Канавка"
-                },
-                "waterway/drain": {
-                    "name": "Отводнителен канал"
-                },
-                "waterway/river": {
-                    "name": "Река"
-                },
-                "waterway/riverbank": {
-                    "name": "Речен бряг"
-                },
-                "waterway/stream": {
-                    "name": "Поток"
-                },
-                "waterway/weir": {
-                    "name": "Преливник"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/dist/locales/bg.json b/dist/locales/bg.json
index c55fe0f1e..ea3642676 100644
--- a/dist/locales/bg.json
+++ b/dist/locales/bg.json
@@ -1,5 +1,10 @@
 {
     "bg": {
+        "icons": {
+            "information": "Информация",
+            "remove": "премахване",
+            "undo": "отмени"
+        },
         "modes": {
             "add_area": {
                 "title": "Площ",
@@ -291,6 +296,33 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Разстояние",
+                "via": "През",
+                "via_node_only": "Само възел",
+                "via_up_to_one": "До 1 път"
+            },
+            "help": {
+                "turn": {
+                    "no_left_turn": "ЗАБРАНЕНО завиването наляво {indirect}",
+                    "no_right_turn": "ЗАБРАНЕНО завиването надясно {indirect}",
+                    "no_u_turn": "ЗАБРАНЕНО завиването в обратна посока {indirect}",
+                    "no_straight_on": "ЗАБРАНЕНО движението направо {indirect}",
+                    "only_left_turn": "САМО ляв завой {indirect}",
+                    "only_right_turn": "САМО десен завой {indirect}",
+                    "only_u_turn": "САМО обратен завой {indirect}",
+                    "only_straight_on": "САМО направо {indirect}",
+                    "allowed_left_turn": "Ляв завой позволен {indirect}",
+                    "allowed_right_turn": "Десен завой позволен {indirect}",
+                    "allowed_u_turn": "Обратен завой позволен {indirect}",
+                    "allowed_straight_on": "Движение направо позволено {indirect}"
+                },
+                "from": "ОТ",
+                "via": "ПРЕЗ",
+                "to": "ДО"
+            }
+        },
         "undo": {
             "tooltip": "Назад: {action}",
             "nothing": "Нищо за отменяне."
@@ -364,7 +396,34 @@
             },
             "history": {
                 "key": "H",
-                "title": "История"
+                "title": "История",
+                "version": "Версия",
+                "last_edit": "Последна редакция",
+                "edited_by": "Редактирано от",
+                "changeset": "Промяна",
+                "unknown": "Неизвестно",
+                "link_text": "История на openstreetmap.org"
+            },
+            "location": {
+                "key": "L",
+                "title": "Местоположение",
+                "unknown_location": "Неизвестно местоположение"
+            },
+            "measurement": {
+                "key": "M",
+                "title": "Измерване",
+                "selected": "{n} избрани",
+                "geometry": "Геометрия",
+                "closed_line": "затворена линия",
+                "closed_area": "затворена площ",
+                "center": "Център",
+                "perimeter": "Обиколка",
+                "length": "Дължина",
+                "area": "Площ",
+                "location": "Местоположение",
+                "metric": "Метрична",
+                "imperial": "Имперска",
+                "node_count": "Брой възли"
             }
         },
         "geometry": {
@@ -386,6 +445,7 @@
         "inspector": {
             "no_documentation_combination": "Няма налична документация за тази комбинация от тагове",
             "no_documentation_key": "Няма налична документация за този ключ",
+            "documentation_redirect": "Тази документация беше пренасочена към нова страница",
             "show_more": "Покажи още",
             "view_on_osm": "Вижте на openstreetmap.org",
             "all_fields": "Всички полета",
@@ -400,14 +460,24 @@
             "back_tooltip": "Смяна на обект",
             "remove": "Премахнете",
             "search": "Търсене",
+            "multiselect": "Избрани обекти",
             "unknown": "Неизвестно",
             "incomplete": "<не е свалено>",
             "feature_list": "Търсене на обекти",
             "edit": "Редактиране на обект",
             "check": {
                 "yes": "Да",
-                "no": "Не"
+                "no": "Не",
+                "reverser": "Смяна на посока"
             },
+            "radio": {
+                "structure": {
+                    "type": "Вид",
+                    "default": "По подразбиране",
+                    "layer": "Слой"
+                }
+            },
+            "add": "Добавяне",
             "none": "Никакъв",
             "node": "Възел",
             "way": "Начин",
@@ -418,27 +488,57 @@
         "background": {
             "title": "Изображения",
             "description": "Изображения настройки",
+            "key": "B",
+            "backgrounds": "Базови карти",
             "none": "Никакъв",
             "best_imagery": "Най-известен източник на изображения за това местоположение",
+            "switch": "Превключете обратно на тази базова карта",
             "custom": "Обичаен",
-            "reset": "презареждане"
+            "custom_button": "Редактирайте персонализираната базова карта",
+            "custom_prompt": "Въведете URL шаблон за тайлове.  Валидни токени са:\n - {zoom} или {z}, {x}, {y} за Z/X/Y тайл схема\n - {-y} или {ty} за обърнати TMS Y координати\n - {u} за куадтайл схема\n - {switch:a,b,c} за DNS сървърно мултиплексиране\n\nПример:\n{example}",
+            "overlays": "Подложки",
+            "imagery_source_faq": "Информация за изображение / Докладвайте проблем",
+            "reset": "презареждане",
+            "display_options": "Опции за показване",
+            "brightness": "Яркост",
+            "contrast": "Контраст",
+            "saturation": "Наситеност",
+            "minimap": {
+                "description": "Покажи мини карта",
+                "tooltip": "Покажи мащабирана карта за помощ при локализирането на текущата показана площ.",
+                "key": "/"
+            },
+            "fix_misalignment": "Коригиране отместването на изображението",
+            "offset": "Провлачете където и да е в сивата зона отдолу, за да коригирате отместването на изображението или въведете стойността на отместването в метри."
         },
         "map_data": {
             "title": "Картни Данни",
             "description": "Картни Данни",
+            "key": "F",
             "data_layers": "Слоеве с данни",
+            "layers": {
+                "osm": {
+                    "tooltip": "Картографски данни от OpenStreetMap",
+                    "title": "OpenStreetMap данни"
+                }
+            },
+            "fill_area": "Запълване на площи",
             "map_features": "Обекти от картата",
-            "autohidden": "Тези обекти бяха скрити автоматично, защото щяха да са пказани твърде много на екрана. Можете да увеличите, за да ги редактирате."
+            "autohidden": "Тези обекти бяха скрити автоматично, защото щяха да са пказани твърде много на екрана. Можете да увеличите, за да ги редактирате.",
+            "osmhidden": "Тези обекти бяха скрити автоматично, защото слоят в OpenStreetMap е скрит."
         },
         "feature": {
             "points": {
-                "description": "Точки"
+                "description": "Точки",
+                "tooltip": "Точки на интерес"
             },
             "traffic_roads": {
+                "description": "Пътища с трафик",
                 "tooltip": "Шосета, Улици, и др."
             },
             "service_roads": {
-                "description": "Обслужващи Улици"
+                "description": "Обслужващи Улици",
+                "tooltip": "Обслужващи пътища, пътища в паркинг, полски пътища, и др."
             },
             "paths": {
                 "description": "Пътеки",
@@ -457,7 +557,8 @@
                 "tooltip": "Административни Граници"
             },
             "water": {
-                "description": "Водни Обекти"
+                "description": "Водни Обекти",
+                "tooltip": "Реки, езера, малки езера, язовири, и др."
             },
             "rail": {
                 "description": "Железопътни Обекти",
@@ -468,7 +569,8 @@
                 "tooltip": "Електропроводи , Електроцентрали, Подстанции, и т.н."
             },
             "past_future": {
-                "description": "Минал/Бъдещ"
+                "description": "Минал/Бъдещ",
+                "tooltip": "Проектни, В строеж, Изоставени, Разрушени, и др."
             },
             "others": {
                 "description": "Други",
@@ -476,34 +578,54 @@
             }
         },
         "area_fill": {
+            "wireframe": {
+                "description": "Без запълване (тънки линии)",
+                "tooltip": "Пускането на режим тънки линии помага да се вижда по-лесно фоновото изображение.",
+                "key": "W"
+            },
             "partial": {
-                "description": "Частично Попълнен"
+                "description": "Частично Попълнен",
+                "tooltip": "Площите са изобразени със запълване само около вътрешните им ръбове. (Препоръчително за начинаещи картографи)"
+            },
+            "full": {
+                "description": "Плътно запълване",
+                "tooltip": "Площите са изобразени плътно запълнени."
             }
         },
         "restore": {
             "heading": "Имате незапазени промени",
-            "description": "Искате ли да възстановите незаписаните промени от предишна сесия?"
+            "description": "Искате ли да възстановите незаписаните промени от предишна сесия?",
+            "restore": "Възстанови моите промени",
+            "reset": "Отмени моите промени"
         },
         "save": {
             "title": "Запис",
+            "help": "Прегледайте вашите промени и ги качете в OpenStreetMap, правейки ги видими за другите потребители.",
             "no_changes": "Няма промени за запис.",
             "error": "Грешки настъпили докато се опитваме да запазим",
             "status_code": "Сървърът върна статус с код {code}",
             "unknown_error_details": "Моля уверете се че сте свързани с интернет.",
+            "uploading": "Качване на промените в OpenStreetMap...",
+            "conflict_progress": "Проверка за конфликти: {num} от {total}",
             "unsaved_changes": "Имате незаписани промени",
             "conflict": {
                 "header": "Решение на несъвместими редакции.",
                 "count": "Несъвместими {num} от {total}",
                 "previous": "< Предишен",
                 "next": "Следващ >",
+                "keep_local": "Запази моите",
                 "keep_remote": "Използвай техните",
                 "restore": "Възстанови",
                 "delete": "Остави Изтрито",
-                "done": "Всички несъответствия са решени!"
+                "download_changes": "Или свали osmChange файл",
+                "done": "Всички несъответствия са решени!",
+                "help": "Друг потребител е променил част от същите обекти, които променихте.\nКликнете на всеки от обектите по-долу за повече информация относно конфликта и изберете дали да запазите\nвашите промени или тези на другия потребител.\n"
             }
         },
         "merge_remote_changes": {
             "conflict": {
+                "deleted": "Този обект беше изтрит от {user}.",
+                "location": "Този обект беше преместен от вас и {user}.",
                 "nodelist": "Възлите са били променени и от вас и от {user}. ",
                 "memberlist": "Части от връзката бяха променени и от вас и от {user}.",
                 "tags": "Вие променихте <b>{tag}</b> таг на \"{local}\" и {user} се промени на \"{remote}\"."
@@ -516,33 +638,47 @@
             "facebook": "Споделете във Facebook",
             "twitter": "Сподели в Twitter",
             "google": "Сподели в Google+",
-            "help_link_text": "Детайли"
+            "help_html": "Вашите промени би трябвало да се появят в слой \"Стандартен\" след няколко минути. При други слоеве и някои определен обекти това може да отнеме по-дълго време.",
+            "help_link_text": "Детайли",
+            "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
         },
         "confirm": {
+            "okay": "OK",
             "cancel": "Отказ"
         },
         "splash": {
             "welcome": "Добре дошли в iD редактора за OpenStreetMap",
             "text": "iD e лесен, но мощен инструмент за попълване на най-добрата свободна карта на света. Това е версия {version}. За повече информация вижте {website} и докладвайте за бъгове в {github}.",
-            "walkthrough": "Започнете опознавателната обиколка"
+            "walkthrough": "Започнете опознавателната обиколка",
+            "start": "Редактиране сега"
         },
         "source_switch": {
             "live": "live",
             "lose_changes": "Имате незапазени промени. Смяната на картния сървър ще ги отхвърли. Сигурни ли сте, че искате да смените сървърите?",
             "dev": "dev"
         },
+        "version": {
+            "whats_new": "Какво ново в iD {version}"
+        },
         "tag_reference": {
             "description": "Описание",
             "on_wiki": "{tag} в wiki.osm.org",
             "used_with": "използва се с {type}"
         },
         "validations": {
+            "disconnected_highway": "Прекъснат път",
+            "disconnected_highway_tooltip": "Пътищата трябва да бъдат свързани с други пътища или входове на сгради.",
+            "old_multipolygon": "Тагове за мултиполигон на външен път",
+            "old_multipolygon_tooltip": "Този вид мултиполигон е отхвърлен. Моля, сложете таговете на самия мултиполигон вместо на външния му път. ",
             "untagged_point": "Точка без тагове.",
             "untagged_point_tooltip": "Изберете типът обект който описва каква е тази точка.",
             "untagged_line": "Линия без таг",
             "untagged_line_tooltip": "Изберете типът обект който описва каква е тази линия.",
             "untagged_area": "Площен обект без таг",
             "untagged_area_tooltip": "Изберете типът обект който описва каква е тази площ.",
+            "untagged_relation": "Релация без тагове",
+            "untagged_relation_tooltip": "Изберете типът обект, който описва каква е тази релация.",
+            "many_deletions": "Изтривате {n} обекта: {p} възела, {l} линии, {a} площи, {r} релации. Сигурни ли сте, че искате да направите това? Това ще ги изтрие от картата, която всеки вижда на openstreetmap.org.",
             "tag_suggests_area": "Тагът {tag} предполага линията да е площен обект, но тя не е",
             "deprecated_tags": "Отхвърлени тагове: {tags}"
         },
@@ -2436,15 +2572,6 @@
                 "type/restriction/no_u_turn": {
                     "name": "Без обратен завой"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Завой само на ляво"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Завой само на дясно"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Без завиване"
-                },
                 "type/route": {
                     "name": "Маршрут"
                 },
@@ -2722,9 +2849,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Картни тайлове от Stamen Design, под CC BY 3.0"
-                },
                 "name": "Stamen Топография"
             },
             "tf-cycle": {
@@ -2739,6 +2863,26 @@
                 },
                 "name": "Thunderforest Ландшафт"
             }
+        },
+        "community": {
+            "Central-Pennsylvania-OSM": {
+                "name": "Централна Пенсилвания OSM"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Чатануга",
+                "description": "OpenStreetMap потребителската група за Чатануга"
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap Ню Йорк",
+                "description": "Картографи и OpenStreetMap потребители, разработчици и ентусиасти в района на Ню Йорк Метрополитън"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Портланд",
+                "description": "Картографи и OpenStreetMap потребители в района на Портланд"
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap US Slack"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/bn.json b/dist/locales/bn.json
index 57042c608..bf77381e0 100644
--- a/dist/locales/bn.json
+++ b/dist/locales/bn.json
@@ -1,5 +1,9 @@
 {
     "bn": {
+        "icons": {
+            "information": "তথ্য",
+            "remove": "অপসারণ"
+        },
         "modes": {
             "add_area": {
                 "title": "এলাকা",
@@ -25,6 +29,9 @@
             },
             "draw_line": {
                 "tail": "রেখাটিতে অারো নোড সংযোজন-এর জন্য ক্লিক করুন। অন্যান্য রেখাগুলির সাথে সংযোজন-এর জন্য তাদের উপর ক্লিক করুন। রেখাটি শেষ করার জন্য দুইবার ক্লিক করুন।"
+            },
+            "drag_node": {
+                "connected_to_hidden": "এটি সম্পাদনা করা যাবে না কারণ এটি একটি গোপন বৈশিষ্টের সাথে যুক্ত।"
             }
         },
         "operations": {
@@ -94,7 +101,8 @@
                     "vertex": "একটি গমনপথ থেকে একটি নোড মুছে ফেলা হয়েছে।",
                     "line": "একটি রেখা মুছে ফেলা হয়েছে।",
                     "area": "একটি এলাকা মুছে ফেলা হয়েছে।",
-                    "relation": "একটি সম্পর্ক মুছে ফেলা হয়েছে।"
+                    "relation": "একটি সম্পর্ক মুছে ফেলা হয়েছে।",
+                    "multiple": "{n}টি অপসারিত বৈশিষ্ট।"
                 }
             },
             "add_member": {
diff --git a/dist/locales/bs.json b/dist/locales/bs.json
index 5b925cc05..7f92e82ac 100644
--- a/dist/locales/bs.json
+++ b/dist/locales/bs.json
@@ -655,9 +655,6 @@
                 "trail_visibility": {
                     "label": "Vidljivost traga"
                 },
-                "vending": {
-                    "label": "Vrsta dobara"
-                },
                 "water": {
                     "label": "Vrsta"
                 },
diff --git a/dist/locales/ca.json b/dist/locales/ca.json
index 336fc2cc7..d2724669e 100644
--- a/dist/locales/ca.json
+++ b/dist/locales/ca.json
@@ -1,5 +1,10 @@
 {
     "ca": {
+        "icons": {
+            "information": "Informació",
+            "remove": "Eliminar",
+            "undo": "Desfer"
+        },
         "modes": {
             "add_area": {
                 "title": "Àrea",
@@ -306,8 +311,19 @@
                     "no_left_turn": "Prohibició del gir a l'esquerra {indirecte}",
                     "no_right_turn": "Prohibició del gir a la dreta {indirecte}",
                     "no_u_turn": "Prohibició del gir total  {indirecte}",
-                    "no_straight_on": "Prohibició de seguir recte {indirecte}"
-                }
+                    "no_straight_on": "Prohibició de seguir recte {indirecte}",
+                    "only_left_turn": "NOMÉS gir a l'esquerra {indirecte}",
+                    "only_right_turn": "NOMÉS gir a la dreta {indirecte}",
+                    "only_u_turn": "NOMÉS gir total {indirecte}",
+                    "only_straight_on": "NOMÉS seguir recte {indirecte}",
+                    "allowed_left_turn": "Gir a l'esquerra permès {indirecte}",
+                    "allowed_right_turn": "Gir a la dreta permès {indirecte}",
+                    "allowed_u_turn": "Gir total permès {indirecte}",
+                    "allowed_straight_on": "Segui recte permès {indirecte}"
+                },
+                "from": "DES DE",
+                "via": "VIA",
+                "to": "A"
             }
         },
         "undo": {
@@ -478,6 +494,7 @@
             "title": "Fons",
             "description": "Paràmetres de configuració del fons",
             "key": "B",
+            "backgrounds": "Fons",
             "none": "Cap",
             "best_imagery": "Font d'imatgeria millor coneguda per a aquesta ubicació",
             "switch": "Senyals de trànsit ",
@@ -727,7 +744,8 @@
                 "save_h": "Desar",
                 "upload_h": "Puja",
                 "backups_h": "Copia de seguretat automàtica",
-                "keyboard_h": "Dreceres de teclat"
+                "keyboard_h": "Dreceres de teclat",
+                "keyboard": "Pots veure una llista de dreceres del teclat prement la tecla `?`."
             },
             "feature_editor": {
                 "title": "Editor de característiques",
@@ -2366,9 +2384,6 @@
                     "label": "Tipus",
                     "placeholder": "Predeterminat"
                 },
-                "vending": {
-                    "label": "Tipus de mercaderies"
-                },
                 "visibility": {
                     "label": "Visibilitat",
                     "options": {
@@ -4721,18 +4736,6 @@
                     "name": "Prohibició del gir total",
                     "terms": "Prohibit canviar de sentit"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Només gir a l'esquerra",
-                    "terms": "Gir a l'esquerra obligatori"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Només gir a la dreta",
-                    "terms": "Gir a la dreta obligatori"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Prohibició de tots els girs",
-                    "terms": "Prohibit girar, no girs, cap gir, no girar, seguir recte"
-                },
                 "type/route": {
                     "name": "Ruta",
                     "terms": "Ruta"
@@ -4987,7 +4990,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Mapa Base d'Austria, basat en dades governamentals.",
+                "description": "Mapa base d'Àustria, basat en dades governamentals.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -5048,9 +5051,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Quadricula de mapes de Stamen Design, sota CC BY 3.0"
-                },
                 "name": "Stamen Terrain"
             },
             "tf-cycle": {
@@ -5065,6 +5065,40 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "OSM-India-facebook": {
+                "description": "Millora OpenStreetMap a l'Índia"
+            },
+            "OSM-japan-facebook": {
+                "name": "Comunitat de Japó d'OpenStreetMap",
+                "description": "Mapador i usuari d'OpenStreetMap a Japó"
+            },
+            "OSM-japan-twitter": {
+                "name": "Twitter de Japó d'OpenStreetMap",
+                "description": "Etiqueta a Twitter: {url}"
+            },
+            "OSM-TW-facebook": {
+                "name": "Comunitat de Taiwan d'OpenStreetMap",
+                "description": "Grup de Facebook per mapadors i usuaris d'OpenStreetMap per discutir assumptes sobre Taiwan."
+            },
+            "OSM-SoCal": {
+                "name": "OpenStreetMap Califòrnia del Sud",
+                "extendedDescription": "OpenStreetMap (OSM) Califòrnia del Sud és per a tothom interessat en el mapatge que s'uneixi a treballar amb OpenStreetMap. OpenStreetMap, la Viquipèdia dels mapes, és un mapa de codi obert gratuït del món sent creat per més de 1000000 de voluntaris al voltant del món. Tothom és benvingut. Si no coneixes OpenStreetMap, t'ensenyarem. Si tens una idea d'un projecte de mapatge o fins i tot una excursió de camp que el grup pot fer, genial!"
+            },
+            "OSM-AR-telegram": {
+                "name": "Telegram d'OpenStreetMap Argentina",
+                "description": "Uneix-te a la comunitat argentina d'OpenStreetMap a Telegram",
+                "extendedDescription": "Uneix-te a la comunitat per aprendre més sobre OpenStreetMap, pregunta o participa a les nostres reunions. Tothom és benvingut!"
+            },
+            "OSM-AR-twitter": {
+                "name": "Twitter d'Argentina d'OpenStreetMap",
+                "description": "Segueix-nos a Twitter a {url}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap a Reddit",
+                "description": "/r/openstreetmap/ és un bon lloc per aprendre més sobre OpenStreetMap. Pregunta'ns qualsevol cosa!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/ckb.json b/dist/locales/ckb.json
index c4e0968d5..312d5611d 100644
--- a/dist/locales/ckb.json
+++ b/dist/locales/ckb.json
@@ -2,7 +2,8 @@
     "ckb": {
         "modes": {
             "add_area": {
-                "title": "ناوچە"
+                "title": "ناوچە",
+                "description": "زیادکردنی باخچە و بینا و گۆم و شوێنی تر بۆ سەر نەخشەکە."
             },
             "add_line": {
                 "title": "هێڵ"
@@ -11,13 +12,18 @@
                 "title": "خاڵ"
             }
         },
+        "operations": {
+            "continue": {
+                "title": "بەردەوامبوون"
+            }
+        },
         "tooltip_keyhint": "کورتبڕ:",
         "translate": {
             "translate": "وەرگێڕان",
             "localized_translation_language": "هەڵبژاردنی زمان",
             "localized_translation_name": "ناو"
         },
-        "logout": "دەرچوون",
+        "logout": "چوونە دەرەوە",
         "report_a_bug": "ناردنی هەڵە",
         "help_translate": "یارمەتیدان بۆ وەرگێڕان",
         "commit": {
diff --git a/dist/locales/cs.json b/dist/locales/cs.json
index ae3552878..d6b22e89d 100644
--- a/dist/locales/cs.json
+++ b/dist/locales/cs.json
@@ -1,5 +1,10 @@
 {
     "cs": {
+        "icons": {
+            "information": "Zobrazit popis z wiki.osm.org",
+            "remove": "Odstranit",
+            "undo": "Zpět"
+        },
         "modes": {
             "add_area": {
                 "title": "Plocha",
@@ -7,8 +12,8 @@
                 "tail": "Klikněte na mapu a začněte tak kreslit plochu, jako třeba park, jezero nebo budovu."
             },
             "add_line": {
-                "title": "Čára",
-                "description": "Přidat do mapy silnice, ulice, stezky, potoky či jiné čáry.",
+                "title": "Linie",
+                "description": "Přidat do mapy silnice, ulice, stezky, potoky či jiné linie.",
                 "tail": "Klikněte na mapu a začněte tak kreslit silnice, stezky nebo trasy."
             },
             "add_point": {
@@ -25,6 +30,9 @@
             },
             "draw_line": {
                 "tail": "Body k linii přidáte kliknutím. Když kliknete na jinou linii, připojíte linie k sobě. Editaci ukončíte dvojklikem."
+            },
+            "drag_node": {
+                "connected_to_hidden": "Tento objekt nelze upravit, protože je spojen se skrytým objektem."
             }
         },
         "operations": {
@@ -44,9 +52,9 @@
             "continue": {
                 "key": "A",
                 "title": "Pokračovat",
-                "description": "Navázat na čáru.",
-                "not_eligible": "Nelze navázat na žádnou čáru.",
-                "multiple": "Zde je možné navázat na několik čar. Stiskněte klávesu Shift a kliknutím zvolte jednu z čar.",
+                "description": "Navázat na linii.",
+                "not_eligible": "Nelze navázat na žádnou linii.",
+                "multiple": "Zde je možné navázat na několik linií. Stiskněte klávesu Shift a kliknutím zvolte jednu z nich.",
                 "annotation": {
                     "line": "Prodloužena linie.",
                     "area": "Plocha pokračuje."
@@ -93,11 +101,11 @@
             },
             "straighten": {
                 "title": "Narovnat",
-                "description": "Narovnat tuto čáru.",
+                "description": "Narovnat tuto linii.",
                 "key": "S",
                 "annotation": "Narovnána linie.",
                 "too_bendy": "Objekt nelze narovnat, protože je příliš zakroucený.",
-                "connected_to_hidden": "Čáru nelze narovnat, protože je napojená na skrytý objekt."
+                "connected_to_hidden": "Linii nelze narovnat, protože je napojená na skrytý objekt."
             },
             "delete": {
                 "title": "Smazat",
@@ -288,6 +296,22 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Vzdálenost",
+                "distance_up_to": "Do max: {distance}",
+                "via": "Přes",
+                "via_node_only": "Pouze bod",
+                "via_up_to_one": "Max 1 cesta",
+                "via_up_to_two": "Max 2 cesty"
+            },
+            "help": {
+                "indirect": "(nepřímé)",
+                "from": "Z",
+                "via": "PŘES",
+                "to": "DO"
+            }
+        },
         "undo": {
             "tooltip": "Zpět: {action}",
             "nothing": "Není co vracet."
@@ -910,7 +934,9 @@
             },
             "areas": {
                 "title": "Plochy",
+                "add_playground": "*Plochy* používáme pro hranice budov, lesů, jezer apod.{br}Ovšem také jimi můžeme detailně zakreslit prvky, které by normálně byly body.**Přidejte plochu tlačítkem {button} Plocha**",
                 "start_playground": "Pojďme přidat toto dětské hřiště. Plochu vytvoříte naklikáním bodů okolo.\n**Začněte kliknutím do rohu**",
+                "continue_playground": "Pokračujte přidáváním bodů do rohů hřiště. {br}\nPlochu můžete spojit s existující pěšinou. (Pokud tomu naopak chcete zabránit držte klávesu Alt)\n**Přidejte další body do hřiště**",
                 "finish_playground": "Dokončete plochu kliknutím na první či poslední bod (též lze klávesou Enter).\n**Dokončete obrys hřšitě.**",
                 "search_playground": "**Vyhledejte '{preset}'.**",
                 "choose_playground": "**Zvolte {preset}.**",
@@ -952,7 +978,7 @@
             },
             "buildings": {
                 "title": "Budovy",
-                "add_building": "OSM je mimojiné také největší databází budov.{br}\nPokud někde budova chybí, můžete přidat její obrys.\n**Přidejte novou plochu tlačítkem {button} Plocha**",
+                "add_building": "OSM je mimojiné také největší databází budov.{br}\nPokud někde budova chybí, můžete přidat její obrys.{br}\nPozor: letecké snímky v ČR často nesedí - neopravujte, prosím, existující budovy, pokud si nejste jisti.\n**Přidejte novou plochu tlačítkem {button} Plocha**",
                 "start_building": "Pojďme přidat třeba tenhle barák.{br}\nZkuste budovu oklikat co nejpřesněji.\n**Začněte kreslit kliknutím do rohu**",
                 "continue_building": "Přidejte postupně další body do rohů, můžete i přizoomovat.{br}\nZadávání ukončíte kliknutím na první či poslední bod.\n**Dokončete obrys budovy**",
                 "retry_building": "Nějak se vám to asi nezdařilo. Zkuste to prosím znovu.",
@@ -975,6 +1001,8 @@
             },
             "startediting": {
                 "title": "Začít s editací",
+                "help": "Nyní jste připraveni editovat OpenStreetMap!{br}\nTuto prohlídku si můžete kdykoliv znovu přehrát nebo se podívejte na další dokumentaci stisknutím {button} tlačítka Nápověda.",
+                "shortcuts": "Seznam příkazů a jejich klávesové zkratky můžete zobrazit stisknutím klávesy `{key}`.",
                 "save": "Nezapomeňte pravidelně ukládat své úpravy!",
                 "start": "Začít mapovat!"
             }
@@ -1012,19 +1040,27 @@
                 "title": "Procházení",
                 "navigation": {
                     "title": "Navigace",
-                    "zoom": "Přiblížit / /oddálit"
+                    "pan": "Posun mapy",
+                    "pan_more": "Posun mapy o jednu obrazovku",
+                    "zoom": "Přiblížit / /oddálit",
+                    "zoom_more": "Více přiblížit / oddálit"
                 },
                 "help": {
-                    "title": "Nápověda"
+                    "title": "Nápověda",
+                    "help": "Zobrazit nápovědu",
+                    "keyboard": "Zobrazit klávesové zkratky"
                 },
                 "display_options": {
                     "title": "Vlastnosti zobrazení",
                     "background": "Zobrazit volby pozadí",
+                    "background_switch": "Zapnout předchozí použité pozadí",
                     "map_data": "Zobrazit volby mapových dat",
                     "fullscreen": "Vstoupit do režimu celé obrazovky",
+                    "wireframe": "Přepnout výplň budov",
                     "minimap": "Přepnout minimapu"
                 },
                 "selecting": {
+                    "title": "Vybrání prvků",
                     "select_one": "Zvolit jednu vlastnost",
                     "select_multi": "Zvolit více vlastností"
                 }
@@ -2382,9 +2418,6 @@
                     "label": "Typ",
                     "placeholder": "Výchozí"
                 },
-                "vending": {
-                    "label": "Druh zboží"
-                },
                 "visibility": {
                     "label": "Viditelnost",
                     "options": {
@@ -3652,6 +3685,9 @@
                     "name": "Jezdecká stezka",
                     "terms": "jezdecká stezka,jezdecká trasa,stezka pro jezdce,stezka pro koně,koňská stezka"
                 },
+                "highway/bus_stop": {
+                    "name": "Zastávka autobusu"
+                },
                 "highway/corridor": {
                     "name": "Chodba",
                     "terms": "chodba,koridor"
@@ -3681,7 +3717,7 @@
                 },
                 "highway/give_way": {
                     "name": "Značka Dej přednost",
-                    "terms": "dej přednost v jízdě,dej přednost,značka přednosti v jízdě,vedlejší silnice,vedlejší ulice"
+                    "terms": "dej přednost v jízdě,dej přednost,značka přednosti v jízdě,vedlejší silnice,vedlejší ulice"
                 },
                 "highway/living_street": {
                     "name": "Obytná zóna",
@@ -3783,7 +3819,7 @@
                 },
                 "highway/stop": {
                     "name": "Stopka",
-                    "terms": "stopka,stop,dej přednost v jízdě,přednost,značka,dopravní značka"
+                    "terms": "stopka,stop,stůj,dej přednost v jízdě,přednost,značka,dopravní značka"
                 },
                 "highway/street_lamp": {
                     "name": "Pouliční lampa",
@@ -4723,6 +4759,9 @@
                 "public_transport/stop_area": {
                     "name": "Oblast zastávky"
                 },
+                "public_transport/stop_position": {
+                    "name": "Místo zastavení veřejné dopravy"
+                },
                 "public_transport/stop_position_aerialway": {
                     "name": "Místo zastavení lanovky"
                 },
@@ -4796,6 +4835,9 @@
                     "name": "Úzkorozchodná dráha",
                     "terms": "úzkorozchodná dráha,úzkokolejná dráha,úzkokolejka"
                 },
+                "railway/platform": {
+                    "name": "Železniční nástupiště"
+                },
                 "railway/rail": {
                     "name": "Kolej",
                     "terms": "koleje,železnice,vlak,trať"
@@ -4825,6 +4867,9 @@
                     "name": "Tramvaj",
                     "terms": "tramvaj,tranvaj,šalina,šmirgl,tramvajka,elektrika,električka,tram"
                 },
+                "railway/tram_stop": {
+                    "name": "Zastávka tramvaje"
+                },
                 "relation": {
                     "name": "Relace",
                     "terms": "relace,vztah,seznam,objekt"
@@ -5475,18 +5520,6 @@
                     "name": "Zákaz otáčení",
                     "terms": "otáčení,otočit,u-turn"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Přikázaný směr jízdy vlevo",
-                    "terms": "přikázáno jet vlevo,jen vlevo,pouze vlevo,odbočit vlevo"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Přikázaný směr jízdy vpravo",
-                    "terms": "přikázáno jet vpravo,jen vpravo,pouze vpravo,odbočit vpravo"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Přikázaný směr jízdy přímo",
-                    "terms": "přikázaný směr jízdy rovně,zákaz odbočit,zákaz zatočit,pouze rovně,pouze přímo,jen rovně,jen přímo"
-                },
                 "type/route": {
                     "name": "Trasa",
                     "terms": "trasa,cesta,linka,stopa,značka,spojení"
@@ -5825,6 +5858,47 @@
                     "text": "Mapy © Thunderforest, data © přispěvatelé OpenStreetMap"
                 }
             }
+        },
+        "community": {
+            "Bay-Area-OpenStreetMappers": {
+                "name": "Bay Area OpenStreetMappers",
+                "description": "Vylepšete OpenStreetMap v Bay Area"
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "OSM Střední Pensylvánie"
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM"
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapování DC",
+                "description": "Vylepšete OpenStreetMap na území DC"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "Uživatelská skupina OpenStreetMap pro Chatanoogu"
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap NYC"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland"
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap US Slack",
+                "description": "Všichni jsou vítaní! Přihlaste se na {signupUrl}"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Maptime Australia Slack",
+                "description": "Přihlaste se na {signupUrl}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap na Redditu",
+                "description": "/r/openstreetmap/ je vynikající místo, kde lze zjistit více o OpenStreetMap. Zeptejte se nás na cokoliv!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/da.json b/dist/locales/da.json
index bec733df3..6351e27b8 100644
--- a/dist/locales/da.json
+++ b/dist/locales/da.json
@@ -1,5 +1,10 @@
 {
     "da": {
+        "icons": {
+            "information": "info",
+            "remove": "fjern",
+            "undo": "fortryd"
+        },
         "modes": {
             "add_area": {
                 "title": "Område",
@@ -291,6 +296,42 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Afstand",
+                "distance_up_to": "Op til {distance}",
+                "via": "Via",
+                "via_node_only": "Kun node",
+                "via_up_to_one": "Op til 1 vej",
+                "via_up_to_two": "Op til 2 veje"
+            },
+            "help": {
+                "indirect": "(indirekte)",
+                "turn": {
+                    "no_left_turn": "INGEN venstresving {indirect}",
+                    "no_right_turn": "INGEN højresving {indirect}",
+                    "no_u_turn": "INGEN u-vending {indirect}",
+                    "no_straight_on": "INGEN ligeudkørsel {indirect}",
+                    "only_left_turn": "KUN venstresving {indirect}",
+                    "only_right_turn": "KUN højresving {indirect}",
+                    "only_u_turn": "KUN u-vending {indirect}",
+                    "only_straight_on": "KUN ligeudkørsel {indirect}",
+                    "allowed_left_turn": "Venstresving tilladt {indirect}",
+                    "allowed_right_turn": "Højresving tilladt {indirect}",
+                    "allowed_u_turn": "U-vending tilladt  {indirect}",
+                    "allowed_straight_on": "Ligeudkørsel tilladt {indirect}"
+                },
+                "from": "FRA",
+                "via": "VIA",
+                "to": "TIL",
+                "from_name": "{from} {fromName}",
+                "from_name_to_name": "{from} {fromName} {to} {toName}",
+                "via_names": "{via} {viaNames}",
+                "select_from": "Klik for at markere et {from}-vejsegment",
+                "select_from_name": "Klik for at vælge {fromName} som {from}",
+                "toggle": "Klik for at skifte til \"{turn}\""
+            }
+        },
         "undo": {
             "tooltip": "Fortryd: {action}",
             "nothing": "Intet at fortryde."
@@ -712,6 +753,7 @@
                 "select_left_click": "{leftclick} Venstre-klik på et kortobjekt for at markere det. Dette vil fremhæve det med en pulserende glød, og i kanten af kortet vises detaljer om objektet, såsom navn og adresse.",
                 "select_right_click": "{rightclick} Højreklik på et kortobjekt for at vise redigeringsmenuen, som viser de mulige værktøjer der kan anvendes, såsom rotation, flytning og sletning.",
                 "multiselect_h": "Multi-markering",
+                "multiselect_shift_click": "`{shift}`+{leftclick} venstreklik for at markere flere kortobjekter ad gangen. Dette gør det nemmere at flytte eller slette flere objekter i en operation.",
                 "save_h": "Gem"
             },
             "feature_editor": {
@@ -741,6 +783,44 @@
                 "offsets_h": "Justering af luftfoto-offset",
                 "offset": "Den registrerede position for et luftfoto er nogle gange ikke helt korrekt i forhold til kortet. Hvis du ser at bygninger og veje generelt er forskudt mellem kort og luftfoto, kan det være luftfotoet der er unøjagtigt, så i stedet for at flytte alle kortobjekter kan du justere baggrunden så den er samstemmende med kortets data ved at åbne \"Juster luftfoto-offset\" i bunden af Baggrundsindstillinger-fanen.",
                 "offset_change": "Klik på de små trekanter for at justere offset i små intervaller, eller hold venstre musetast nede og træk indenfor den grå firkant for at trække luftfotoet på plads."
+            },
+            "field": {
+                "restrictions": {
+                    "title": "Hjælp til svingbegrænsninger",
+                    "about": {
+                        "title": "Om",
+                        "about": "Dette felt gør det muligt at inspicere og redigere svingbegrænsninger. Det viser en model af det valgte vejkryds inklusiv forbundne veje i nærheden.",
+                        "from_via_to": "En svingbegrænsning indeholder altid: en **FRA-vej**, en **TIL-vej** og enten en **VIA-node** eller en eller flere **VIA-veje**.",
+                        "maxdist": "Med \"{distField}\"-kontrolelementet indstilles hvor langt omkring der søges efter forbundne veje,",
+                        "maxvia": "Med \"{viaField}\"-kontrolelementet justeres hvor mange VIA-veje der kan inkluderes. (tip: så få som muligt bør foretrækkes)"
+                    },
+                    "inspecting": {
+                        "title": "Inspektion",
+                        "about": "Før musen over ethvert **FRA**-segment for at se om det har eksisterende svingbegrænsninger. Ethvert muligt **TIL**-segment vil tegnes med en farvet skygge der viser om en begrænsning eksisterer.",
+                        "from_shadow": "{fromShadow} **FRA-segment**",
+                        "allow_shadow": "{allowShadow} **TIL tilladt**",
+                        "restrict_shadow": "{restrictShadow} **TIL begrænset**",
+                        "only_shadow": "{onlyShadow} **TIL kun (påbudt)**",
+                        "restricted": "\"Begrænset\" indikerer at der er en specifik svingbegrænsning, for eksempel \"ingen venstresving\".",
+                        "only": "\"Kun (påbudt)\" indikerer at et køretøj der følger denne rute kun kan vælge denne vej, for eksempel \"kun ligeudkørsel\"."
+                    },
+                    "modifying": {
+                        "title": "Redigering",
+                        "about": "For at redigere svingbegrænsninger skal du først klikke på det startende **FRA**-segment for at vælge dette. Det valgte segment vil pulsere og alle mulige **TIL**-segmenter vil blive vist med et sving-symbol.",
+                        "indicators": "Klik nu på et dreje-symbol for at skifte det mellem \"tilladt\", \"begrænset\" og \"kun (påbudt)\".",
+                        "allow_turn": "{allowTurn} **TIL tilladt**",
+                        "restrict_turn": "{restrictTurn} **TIL begrænset**",
+                        "only_turn": "{onlyTurn} **TIL kun (påbudt)**"
+                    },
+                    "tips": {
+                        "title": "Tips",
+                        "simple": "**Foretræk simple begrænsninger i stedet for komplekse.**",
+                        "simple_example": "Undgå for eksempel en begrænsning med en VIA-vej hvis en simplere med en VIA-node ville være tilstrækkeligt.",
+                        "indirect": "**Nogle begrænsninger vises med teksten \"(indirekte)\" og tegnes med en lysere farve.**",
+                        "indirect_example": "Disse begrænsninger eksisterer på grund af andre begrænsninger i nærheden. For eksempel vil en begrænsning med \"kun ligeudkørsel\" i et kryds skabe indirekte \"ingen sving\"-begrænsninger for alle øvrige veje gennem krydset.",
+                        "indirect_noedit": "Du kan ikke redigere indirekte svingbegrænsninger. I stedet skal du redigere den nærtliggende direkte svingbegrænsning."
+                    }
+                }
             }
         },
         "intro": {
@@ -2448,9 +2528,6 @@
                     "label": "Type",
                     "placeholder": "Standard"
                 },
-                "vending": {
-                    "label": "Varetype"
-                },
                 "visibility": {
                     "label": "Synlighed",
                     "options": {
@@ -2504,6 +2581,9 @@
                 "wheelchair": {
                     "label": "Kørestolsadgang"
                 },
+                "wholesale": {
+                    "label": "Engros"
+                },
                 "width": {
                     "label": "Bredde (meter)"
                 },
@@ -2612,6 +2692,10 @@
                     "name": "Lufthavnsterminal",
                     "terms": "Lufthavnsterminal"
                 },
+                "allotments/plot": {
+                    "name": "Fælleshave",
+                    "terms": "fælleshave,have,fællesskab"
+                },
                 "amenity": {
                     "name": "Facilitet"
                 },
@@ -2675,10 +2759,17 @@
                     "name": "Valutaveksling",
                     "terms": "Valutaveksling"
                 },
+                "amenity/bus_station": {
+                    "name": "Busstation/rutebilstation"
+                },
                 "amenity/cafe": {
                     "name": "Cafe",
                     "terms": "Cafe, Café"
                 },
+                "amenity/car_pooling": {
+                    "name": "Samkørselsplads",
+                    "terms": "samkørsel,bildeling,deling,deleøkonomi"
+                },
                 "amenity/car_rental": {
                     "name": "Biludlejning",
                     "terms": "Biludlejning"
@@ -2711,6 +2802,14 @@
                     "name": "Klinik",
                     "terms": "Klinik"
                 },
+                "amenity/clinic/abortion": {
+                    "name": "Abortklinik",
+                    "terms": "abort,fosteruddrivelse,provokeret abort,foster,"
+                },
+                "amenity/clinic/fertility": {
+                    "name": "Fertilitetsklinik",
+                    "terms": "Fertilitet, børn, graviditet, reagensglas"
+                },
                 "amenity/clock": {
                     "name": "Ur",
                     "terms": "Ur"
@@ -2766,6 +2865,9 @@
                     "name": "Fast food",
                     "terms": "Fastfood, Grillbar, Pølsevogn"
                 },
+                "amenity/ferry_terminal": {
+                    "name": "Færgeterminal"
+                },
                 "amenity/fire_station": {
                     "name": "Brandstation",
                     "terms": "<oversæt med synonymer eller beslægtet termer for 'Brandstation', adskilt med kommaer>"
@@ -2814,16 +2916,25 @@
                     "name": "Bibliotek",
                     "terms": "<oversæt med synonymer eller beslægtet termer for 'Bibliotek', adskilt med kommaer>"
                 },
+                "amenity/love_hotel": {
+                    "name": "Kærlighedshotel",
+                    "terms": "kærlighed, romantik, samvær"
+                },
                 "amenity/marketplace": {
                     "name": "Markedsplads",
                     "terms": "Markedsplads"
                 },
+                "amenity/monastery": {
+                    "name": "Kloster-område",
+                    "terms": "kloster, nonne, katedral, kapel, kirke, gud, bøn"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Motorcykelparkering",
                     "terms": "Motorcykelparkering"
                 },
                 "amenity/music_school": {
-                    "name": "Musikskole"
+                    "name": "Musikskole",
+                    "terms": "musik,skole,undervisning"
                 },
                 "amenity/nightclub": {
                     "name": "Natklub",
@@ -2925,7 +3036,8 @@
                     "terms": "Rangerstation"
                 },
                 "amenity/recycling": {
-                    "name": "Genbrugscontainer"
+                    "name": "Genbrugscontainer",
+                    "terms": "genbrug, miljø, ressourcer"
                 },
                 "amenity/recycling_centre": {
                     "name": "Genbrugsplads",
@@ -2957,6 +3069,10 @@
                     "name": "Brusebad",
                     "terms": "bruser,styrtebad"
                 },
+                "amenity/smoking_area": {
+                    "name": "Rygeområde",
+                    "terms": "rygning, tobak, røg"
+                },
                 "amenity/social_facility": {
                     "name": "Sociale faciliteter",
                     "terms": "Sociale faciliteter"
@@ -3402,6 +3518,10 @@
                     "name": "Urmager",
                     "terms": "Urmager"
                 },
+                "craft/confectionery": {
+                    "name": "Slikproducent",
+                    "terms": "slik, sukker, bolcher, chokolade, søde sager"
+                },
                 "craft/distillery": {
                     "name": "Distelleri",
                     "terms": "distellering,alkohol,sprit"
@@ -3650,6 +3770,14 @@
                     "name": "Golfvandbunker",
                     "terms": "Golfvandbunker"
                 },
+                "healthcare": {
+                    "name": "Sundhedsfacilitet",
+                    "terms": "sundhed, klinik, sygdom, kirurgi"
+                },
+                "healthcare/alternative": {
+                    "name": "Alternativ medicin",
+                    "terms": "alternativ, akupunktur, aromaterapi, urteterapi, urter,hypnose"
+                },
                 "healthcare/alternative/chiropractic": {
                     "name": "Kiropraktor"
                 },
@@ -3666,10 +3794,12 @@
                     "terms": "Blodbank, Donorblodbank"
                 },
                 "healthcare/hospice": {
+                    "name": "Hospice",
                     "terms": "terminal,død,sygdom"
                 },
                 "healthcare/midwife": {
-                    "name": "Jordemoder"
+                    "name": "Jordemoder",
+                    "terms": "baby, fødsel, graviditet"
                 },
                 "healthcare/optometrist": {
                     "name": "Optiker",
@@ -3694,6 +3824,9 @@
                     "name": "Ridesti",
                     "terms": "Ridesti, Hestesti"
                 },
+                "highway/bus_stop": {
+                    "name": "Busstop / trinbrædt"
+                },
                 "highway/corridor": {
                     "name": "Indendørskorridor",
                     "terms": "Indendørskorridor, Indendørspassage"
@@ -4076,6 +4209,10 @@
                     "name": "Voksen spillecenter",
                     "terms": "Voksen spillecenter, Spillehal"
                 },
+                "leisure/amusement_arcade": {
+                    "name": "Spillehal",
+                    "terms": "spil, game, gaming, pinball, flipper, videospil"
+                },
                 "leisure/bird_hide": {
                     "name": "Fugletårn",
                     "terms": "Fugletårn"
@@ -4092,6 +4229,9 @@
                     "name": "Dansehal",
                     "terms": "Dansehal, Dansested"
                 },
+                "leisure/dancing_school": {
+                    "name": "Danseskole"
+                },
                 "leisure/dog_park": {
                     "name": "Hundepark",
                     "terms": "Hundepark"
@@ -4140,6 +4280,10 @@
                     "name": "Naturreservat",
                     "terms": "Naturreservat"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "Udendørs siddepladser",
+                    "terms": "siddeplads, udendørs, spise, drikke, cafe, restaurant"
+                },
                 "leisure/park": {
                     "name": "Park",
                     "terms": "Park, Parkområde"
@@ -4168,6 +4312,10 @@
                     "name": "Beachvolleybane",
                     "terms": "beachvolley,beach,volley,beach volley"
                 },
+                "leisure/pitch/boules": {
+                    "name": "Boules/petanque-bane",
+                    "terms": "petanque, boules"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Bowling græsplæne",
                     "terms": "Bowling græsplæne, Keglebane"
@@ -4220,6 +4368,10 @@
                     "name": "Løbebane (Løb)",
                     "terms": "Løbebane (Løb)"
                 },
+                "leisure/sauna": {
+                    "name": "Sauna",
+                    "terms": "sauna, varme"
+                },
                 "leisure/slipway": {
                     "name": "Bådrampe",
                     "terms": "Bådrampe, Skibsrampe"
@@ -4260,6 +4412,10 @@
                     "name": "Mineindgang",
                     "terms": "Mineindgang"
                 },
+                "man_made/antenna": {
+                    "name": "Antenne",
+                    "terms": "antenne, radio, frekvens, kommunikation, tv, fjernsyn"
+                },
                 "man_made/breakwater": {
                     "name": "Bølgebryder",
                     "terms": "Bølgebryder"
@@ -4272,6 +4428,10 @@
                     "name": "Skorsten",
                     "terms": "Skorsten"
                 },
+                "man_made/crane": {
+                    "name": "Kran",
+                    "terms": "kran, løft, grej"
+                },
                 "man_made/cutline": {
                     "name": "Skærelinje",
                     "terms": "Skærelinje"
@@ -4303,6 +4463,10 @@
                     "name": "Observationstårn",
                     "terms": "observationstårn, udkigstårn"
                 },
+                "man_made/observatory": {
+                    "name": "Observatorie",
+                    "terms": "astronomi, astrofysik, meteorologi"
+                },
                 "man_made/petroleum_well": {
                     "name": "Oliebrønd",
                     "terms": "Oliebrønd"
@@ -4423,6 +4587,9 @@
                     "name": "Hede",
                     "terms": "Hede"
                 },
+                "natural/mud": {
+                    "name": "Mudder"
+                },
                 "natural/peak": {
                     "name": "Højdedrag",
                     "terms": "Højdedrag, Bakketop, Bjergtop"
@@ -4495,9 +4662,25 @@
                     "name": "Kontor",
                     "terms": "Kontor"
                 },
+                "office/accountant": {
+                    "name": "Revisor-kontor",
+                    "terms": "revisor, regnskab, tal, matematik"
+                },
                 "office/administrative": {
                     "name": "Administrativt kontor"
                 },
+                "office/adoption_agency": {
+                    "name": "Adoptionsbureau",
+                    "terms": "adoption, børn, barnløshed"
+                },
+                "office/advertising_agency": {
+                    "name": "Reklamebureau",
+                    "terms": "reklame, tv, marketing, radio"
+                },
+                "office/architect": {
+                    "name": "Arkitekt-kontor",
+                    "terms": "arkitekt, tegning, bygning"
+                },
                 "office/coworking": {
                     "name": "Kontorfællesskab",
                     "terms": "Kontorfællesskab, Fællesskabsarbejdsplads"
@@ -5378,18 +5561,6 @@
                     "name": "Ingen U-vending",
                     "terms": "Ingen U-vending"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Kun venstresving tilladt",
-                    "terms": "Kun venstresving tilladt"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Kun højresving tilladt",
-                    "terms": "Kun højresving tilladt"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Ingen sving tilladt",
-                    "terms": "Ingen sving tilladt"
-                },
                 "type/route": {
                     "name": "Rute",
                     "terms": "Rute"
@@ -5525,39 +5696,46 @@
             },
             "DigitalGlobe-Premium": {
                 "attribution": {
-                    "text": "Betingelser & tilbagemelding"
+                    "text": "Vilkår & tilbagemelding"
                 },
                 "description": "Premium DigitalGlobe satellitfoto.",
                 "name": "DigitalGlobe Premium fotos"
             },
             "DigitalGlobe-Premium-vintage": {
                 "attribution": {
-                    "text": "Vilkår & Tilbagemelding"
+                    "text": "Vilkår & tilbagemelding"
                 },
                 "description": "Luftfoto grænser og optagelsesdatoer. Tekstmærkater optræder ved zoom-niveau 14 og højere.",
                 "name": "DigitalGlobe Premium ældre fotos"
             },
             "DigitalGlobe-Standard": {
                 "attribution": {
-                    "text": "Betingelser & tilbagemelding"
+                    "text": "Vilkår & tilbagemelding"
                 },
                 "description": "Standard DigitalGlobe satellitfotos.",
                 "name": "DigitalGlobe Standard fotos"
             },
             "DigitalGlobe-Standard-vintage": {
                 "attribution": {
-                    "text": "Vilkår & Tilbagemelding"
+                    "text": "Vilkår & tilbagemelding"
                 },
                 "description": "Luftfoto grænser og optagelsesdatoer. Tekstmærkater optræder ved zoom-niveau 14 og højere.",
                 "name": "DigitalGlobe Standard ældre fotos"
             },
             "EsriWorldImagery": {
                 "attribution": {
-                    "text": "Betingelser & tilbegemelding"
+                    "text": "Vilkår & tilbagemelding"
                 },
                 "description": "Esri World fotos.",
                 "name": "Esri World fotos"
             },
+            "EsriWorldImageryClarity": {
+                "attribution": {
+                    "text": "Vilkår & tilbagemelding"
+                },
+                "description": "Esri arkivfotos som kan være af bedre kvalitet og mere præcise end standard-laget.",
+                "name": "Esri World fotos (Clarity) Beta"
+            },
             "MAPNIK": {
                 "attribution": {
                     "text": "© OpenStreetMap bidragsydere, CC BY-SA"
@@ -5567,7 +5745,7 @@
             },
             "Mapbox": {
                 "attribution": {
-                    "text": "Betingelser & tilbegemelding"
+                    "text": "Vilkår & tilbagemelding"
                 },
                 "description": "Satellit og luft-foto.",
                 "name": "Mapbox Satellite"
@@ -5626,25 +5804,40 @@
                 "name": "TIGER Roads 2017"
             },
             "Waymarked_Trails-Cycling": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap-bidragsydere, CC by-SA 3.0"
+                },
                 "name": "Afmærkede spor: Cykling"
             },
             "Waymarked_Trails-Hiking": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap-bidragsydere, CC by-SA 3.0"
+                },
                 "name": "Afmærkede spor: Vandring"
             },
             "Waymarked_Trails-MTB": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap-bidragsydere, CC by-SA 3.0"
+                },
                 "name": "Afmærkede spor: MTB"
             },
             "Waymarked_Trails-Skating": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap-bidragsydere, CC by-SA 3.0"
+                },
                 "name": "Afmærkede spor: Skøjtning"
             },
             "Waymarked_Trails-Winter_Sports": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap-bidragsydere, CC by-SA 3.0"
+                },
                 "name": "Afmærkede spor: Vintersport"
             },
             "basemap.at": {
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Basiskort for Østrig, baseret på offentlige data.",
+                "description": "© waymarkedtrails.org, OpenStreetMap-bidragsydere, CC by-SA 3.0",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -5662,7 +5855,7 @@
             },
             "mapbox_locator_overlay": {
                 "attribution": {
-                    "text": "Betingelser & tilbagemelding"
+                    "text": "Vilkår & tilbagemelding"
                 },
                 "description": "Viser større objekter for at hjælpe dig med at finde vej.",
                 "name": "Lokaliserings-overlag"
@@ -5705,9 +5898,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Kort-fliser af Stamen Design, under CC BY 3.0"
-                },
                 "name": "Stamen Terræn"
             },
             "tf-cycle": {
diff --git a/dist/locales/de.json b/dist/locales/de.json
index 32b760c42..0b1a6e57a 100644
--- a/dist/locales/de.json
+++ b/dist/locales/de.json
@@ -1,5 +1,10 @@
 {
     "de": {
+        "icons": {
+            "information": "Info",
+            "remove": "entfernen",
+            "undo": "rückgängig"
+        },
         "modes": {
             "add_area": {
                 "title": "Fläche",
@@ -1814,6 +1819,9 @@
                 "except": {
                     "label": "Ausnahmen"
                 },
+                "faces": {
+                    "label": "Gesichter"
+                },
                 "fax": {
                     "label": "Fax",
                     "placeholder": "+31 42 123 4567"
@@ -1944,6 +1952,9 @@
                 "indoor": {
                     "label": "Im Gebäude"
                 },
+                "industrial": {
+                    "label": "Typ"
+                },
                 "information": {
                     "label": "Typ"
                 },
@@ -2064,6 +2075,10 @@
                     "label": "Höchstgeschwindigkeit",
                     "placeholder": "40, 50, 60 …"
                 },
+                "maxspeed/advisory": {
+                    "label": "Richtgeschwindigkeit",
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "Maximale Parkzeit"
                 },
@@ -2652,8 +2667,19 @@
                     "label": "Typ",
                     "placeholder": "Standard"
                 },
+                "usage_rail": {
+                    "label": "Nutzungsart",
+                    "options": {
+                        "branch": "Zweigstrecke",
+                        "industrial": "Güterverkehrsstrecke",
+                        "main": "Hauptstrecke",
+                        "military": "Militärische Nutzung",
+                        "test": "Teststrecke",
+                        "tourism": "Touristische Nutzung"
+                    }
+                },
                 "vending": {
-                    "label": "Dienstleistung"
+                    "label": "Warentyp"
                 },
                 "visibility": {
                     "label": "Sichtbarkeit",
@@ -2833,6 +2859,10 @@
                     "name": "Flughafenterminal",
                     "terms": "Flughafenterminal, Flughafen-Abfertigungs-Gebäude, Flughafen-Empfangs-Gebäude"
                 },
+                "allotments/plot": {
+                    "name": "Gemeinschaftsgartenparzelle",
+                    "terms": "Gemeinschaftsgartenparzelle, Gartenparzelle, Kleingartenparzelle"
+                },
                 "amenity": {
                     "name": "Einrichtung"
                 },
@@ -3061,6 +3091,10 @@
                     "name": "Wochenmarkt",
                     "terms": "Wochenmarkt, Marktverkauf, Markt"
                 },
+                "amenity/monastery": {
+                    "name": "Klostergelände",
+                    "terms": "Klostergelände"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Motorradparkplatz",
                     "terms": "Motorrad-Parkplatz"
@@ -3265,6 +3299,10 @@
                     "name": "Zigarettenautomat",
                     "terms": "Zigarettenautomat"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "Kaffeeautomat",
+                    "terms": "Kaffeeautomat"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "Kondomautomat",
                     "terms": "Kondomautomat"
@@ -3273,6 +3311,14 @@
                     "name": "Getränkeautomat",
                     "terms": "Getränkeautomat, Getränkespender"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "Elektro-Zubehör-Automat",
+                    "terms": "Elektro-Zubehör-Automat"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "Münz-Sourvenir-Präge-Automat",
+                    "terms": "Münz-Sourvenir-Präge-Automat"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "Hundekottütenspender",
                     "terms": "Hundekot-Tütenspender, Kottütenspender, Kottütenautomat, "
@@ -3281,6 +3327,18 @@
                     "name": "Frauenhygiene-Automat",
                     "terms": "Frauenhygiene-Automat"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "Lebensmittel-Verkaufs-Automat ",
+                    "terms": "Lebensmittel-Verkaufs-Automat "
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "Tankautomat",
+                    "terms": "Tankautomat"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "Speiseeis-Automat",
+                    "terms": "Speiseeis-Automat"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Zeitungsautomat"
                 },
@@ -3300,6 +3358,10 @@
                     "name": "Fahrkartenautomat",
                     "terms": "Fahrkartenautomat"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "Briefmarkenautomat",
+                    "terms": "Briefmarkenautomat"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "Süßigkeitenautomat",
                     "terms": "Süßigkeitenautomat"
@@ -4103,6 +4165,10 @@
                     "name": "Autobahnanschluss",
                     "terms": "Autobahnanschluss, Autobahnauffahrt, Autobahnabfahrt, Auffahrt, Abfahrt"
                 },
+                "highway/passing_place": {
+                    "name": "Ausweichstelle",
+                    "terms": "Haltebucht"
+                },
                 "highway/path": {
                     "name": "Weg",
                     "terms": "Mehrzweck-Weg, Wanderweg, Reitweg, Radweg, Fußweg, Pfad"
@@ -4462,6 +4528,10 @@
                     "name": "Spielhalle",
                     "terms": "Spielhalle"
                 },
+                "leisure/beach_resort": {
+                    "name": "Strandresort",
+                    "terms": "Strandresort, Strandhotelanalge, Badestrandresort, Badestrandhotelanlage"
+                },
                 "leisure/bird_hide": {
                     "name": "Vogelbeobachtungsturm",
                     "terms": "Vogelbeobachtungsturm, Vogelbeobachtungshütte"
@@ -4578,6 +4648,10 @@
                     "name": "Naturschutzgebiet",
                     "terms": "Naturschutzgebiet, Landschaftsschutzgebiet, Naturreservat, Naturschutzpark"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "Außengastronomie",
+                    "terms": "Außengastronomie, Gastgarten, Schanigarten"
+                },
                 "leisure/park": {
                     "name": "Park",
                     "terms": "Park, Parkanlage, Esplanade, Lustgarten"
@@ -4706,6 +4780,10 @@
                     "name": "Bergwerk - Stolleneingang",
                     "terms": "Stollen (horizontaler Tunnel im Bergbau), Stollenmundloch"
                 },
+                "man_made/antenna": {
+                    "name": "Antennenmast",
+                    "terms": "Antennenanlage, Sendemast "
+                },
                 "man_made/breakwater": {
                     "name": "Wellenbrecher",
                     "terms": "Wellenbrecher, Buhnen, Mole"
@@ -4757,6 +4835,10 @@
                     "name": "Aussichtsturm",
                     "terms": "Ausguck, Ausblick, Beobachtungsstand"
                 },
+                "man_made/observatory": {
+                    "name": "Observatorium",
+                    "terms": "Sternenwarte"
+                },
                 "man_made/petroleum_well": {
                     "name": "Erdölpumpe",
                     "terms": "Tiefpumpe, Pferdekopfpumpe"
@@ -4881,6 +4963,10 @@
                     "name": "Heidelandschaft",
                     "terms": "Heidelandschaft, Strauchheiden"
                 },
+                "natural/mud": {
+                    "name": "Schlamm",
+                    "terms": "Schlamm, Schlick, Morast"
+                },
                 "natural/peak": {
                     "name": "Berggipfel",
                     "terms": "Gipfel,Felsnadel,Hügel,Berg,Bergspitze,Bergkuppe,Zipfel"
@@ -5592,7 +5678,7 @@
                     "terms": "Badezimmereinrichtungsgeschäft,Badeinrichtungsgeschäft"
                 },
                 "shop/beauty": {
-                    "name": "Kosmetikladen",
+                    "name": "Schönheitssalon",
                     "terms": "Schönheits-Salon, Nagelstudio"
                 },
                 "shop/beauty/nails": {
@@ -5692,7 +5778,7 @@
                     "terms": "Kopieranstalt,Copy-Shop"
                 },
                 "shop/cosmetics": {
-                    "name": "Drogerie",
+                    "name": "Kosmetikladen",
                     "terms": "Drogerie,Kosmetikladen"
                 },
                 "shop/craft": {
@@ -5917,6 +6003,10 @@
                     "name": "Tierhandlung",
                     "terms": "Tierhandlung, Zoohandlung"
                 },
+                "shop/pet_grooming": {
+                    "name": "Tierfriseur",
+                    "terms": "Hundefriseur, Tierfriseur"
+                },
                 "shop/photo": {
                     "name": "Fotofachgeschäft",
                     "terms": "Fotoladen, Fotograf, Fotogeschäft"
@@ -6013,7 +6103,7 @@
                     "terms": "Staubsaugergeschäft,Staubsaugerladen"
                 },
                 "shop/variety_store": {
-                    "name": "Gemischtwarenhandel",
+                    "name": "Billigladen",
                     "terms": "Gemischtwarenladen, Kaufgeschäft"
                 },
                 "shop/video": {
@@ -6058,7 +6148,7 @@
                 },
                 "tourism/apartment": {
                     "name": "Ferienwohnung",
-                    "terms": "Ferienwohnung, Gästewohnung, Gästeapartment"
+                    "terms": "Ferienwohnung, Gästewohnung, Gästeapartment, Ferienappartement, Gästeappartement"
                 },
                 "tourism/aquarium": {
                     "name": "Aquarium",
@@ -6204,11 +6294,11 @@
                     "terms": "Abbiegebeschränkung, Beschränkung, Einschränkung"
                 },
                 "type/restriction/no_left_turn": {
-                    "name": "Linksabbiegeverbot",
+                    "name": "Kein Linksabbiegen",
                     "terms": "Linksabbiegeverbot, Linksabbiegen verboten, kein Linksabbiegen, kein Abbiegen nach links"
                 },
                 "type/restriction/no_right_turn": {
-                    "name": "Rechtsabbiegeverbot",
+                    "name": "Kein Rechtsabbiegen",
                     "terms": "Rechtsabbiegeverbot, Rechtsabbiegen verboten, kein Rechtsabbiegen, kein Abbiegen nach rechts"
                 },
                 "type/restriction/no_straight_on": {
@@ -6216,20 +6306,24 @@
                     "terms": "Geradeausfahrverbot, Geradeausfahren verboten, geradeaus fahren nicht erlaubt"
                 },
                 "type/restriction/no_u_turn": {
-                    "name": "Kehrtwendeverbot",
-                    "terms": "Kehrtwendeverbot, Kehrtwende verboten, Umkehren verboten, Umdrehen verboten"
+                    "name": "Keine Kehrtwende",
+                    "terms": "Kehrtwendeverbot, Kehrtwende verboten, Umkehren verboten, Umdrehen verboten, Keine Kehrtwende, Kein Umdrehen, Keine Umkehren"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "Linksabbiegegebot",
-                    "terms": "Linksabbiegegebot, Links abbiegen geboten, nur links abbiegen erlaubt"
+                    "name": "Nur Linksabbiegen",
+                    "terms": "Nur Linksabbiegen, Linksabbiegegebot, nur Abbiegen nach Links"
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "Rechtsabbiegegebot",
-                    "terms": "Rechtsabbiegegebot, Rechts abbiegen geboten, nur rechts abbiegen erlaubt"
+                    "name": "Nur Rechtsabbiegen",
+                    "terms": "Nur Rechtsabbiegen, Rechtsabbiegegebot, Nur Abbiegen nach Rechts"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "Kein Abbiegen",
-                    "terms": "Abbiegeverbot, nur geradeaus, Abbiegen verboten"
+                    "name": "Nur geradeaus",
+                    "terms": "Nur geradeaus"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Nur Kehrtwende",
+                    "terms": "Nur Kehrtwende, Kehrtwendegebot, Nur Umkehren, Umkehrgebpt"
                 },
                 "type/route": {
                     "name": "Route",
@@ -6524,7 +6618,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Amtliche Verwaltungsgrundkarte von Österreich",
+                "description": "basemap von Österreich, basiert auf Regierungsdaten",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6586,7 +6680,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Kacheln © Stamen Design, CC-BY 3.0"
+                    "text": "Kacheln © Stamen Design, CC BY 3.0, Kartendaten © OpenStreetMap-Mitwirkende, ODbL 1.0"
                 },
                 "name": "Stamen Terrain"
             },
@@ -6602,6 +6696,258 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "OSM-BGD-facebook": {
+                "extendedDescription": "Mappen in Bangladesch? Hast du Fragen, willst du dich mit der bangladesischen OSM Gemeinschaft verbinden? Kontaktiere uns unter {Url}. Alle sind willkommen!"
+            },
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap Indien - Nachbarschaftsmapping",
+                "description": "Verbessere OpenStreetMap in Indien",
+                "extendedDescription": "Mappen in Indien? Hast du Fragen, willst du dich mit der indischen OSM Gemeinschaft verbinden? Kontaktiere uns unter {Url}. Alle sind willkommen!"
+            },
+            "OSM-IDN-facebook": {
+                "extendedDescription": "Mappen in Indonesien? Hast du Fragen, willst du dich mit der indonesischen OSM Gemeinschaft verbinden? Kontaktiere uns unter {Url}. Alle sind willkommen!"
+            },
+            "OSM-japan-facebook": {
+                "name": "OpenStreetMap Gemeinschaft Japan",
+                "description": "Mapper und OpenStreetMap Benutzer in Japan"
+            },
+            "OSM-japan-mailinglist": {
+                "name": "OpenStreetMap Japan Mailingliste",
+                "description": "Talk-ja ist die offizielle Mailingliste für die Japanische OSM-Gemeinschaft"
+            },
+            "OSM-japan-twitter": {
+                "name": "OpenStreetMap Japan Twitter",
+                "description": "Hashtag auf Twitter: {url}"
+            },
+            "OSM-MNG-facebook": {
+                "name": "OpenStreetMap Mongolien",
+                "extendedDescription": "Mappen in Mongolien? Hast du Fragen, willst du dich mit der mongolischen OSM Gemeinschaft verbinden? Kontaktiere uns unter {Url}. Alle sind willkommen!"
+            },
+            "OSM-Nepal-facebook": {
+                "name": "OpenStreetMap Nepal",
+                "extendedDescription": "Mappen in Nepal? Hast du Fragen, willst du dich mit der nepalesischen OSM Gemeinschaft verbinden? Kontaktiere uns unter {Url}. Alle sind willkommen!"
+            },
+            "OSM-PH-facebook": {
+                "name": "OpenStreetMap PH Facebook",
+                "description": "Willkommen zu OpenStreetMap auf den Philippinen, wo wir alle Filipinos ermutigen zu dem OpenStreetMap Projekt beizutragen."
+            },
+            "OSM-PH-mailinglist": {
+                "name": "Talk-ph Mailingliste",
+                "description": "Eine Mailingliste umd OpenStreetMap auf den Philippinen zu diskutieren"
+            },
+            "OSM-PH-slack": {
+                "name": "OpenStreetMap Philippinen Slack",
+                "description": "Alle sind willkommen, melde dich an: {signupUrl}"
+            },
+            "OSM-PH-telegram": {
+                "name": "OpenStreetMap Philippinen Telegram",
+                "description": "Inoffizielle lokale Telegram Gemeinschaft von OpenStreetMap Mitwirkenden und Freunden auf den Philippinen"
+            },
+            "OSM-RU-forum": {
+                "name": "OpenStreetMap Russland forum",
+                "description": "OpenStreetMap Russland web forum"
+            },
+            "OSM-RU-telegram": {
+                "name": "OpenStreetMap Russland telegram",
+                "description": "OpenStreetMap Russland telegram chat"
+            },
+            "OSM-LKA-facebook": {
+                "extendedDescription": "Mappen in Sri Lanka? Hast du Fragen, willst du dich mit der sri-lankischen OSM Gemeinschaft verbinden? Kontaktiere uns unter {Url}. Alle sind willkommen!"
+            },
+            "OSM-TW-facebook": {
+                "name": "OpenStreetMap Taiwan Gemeinschaft",
+                "description": "Facebook Gruppe für Mapper und OpenStreetMap Benutzer um über Angelegenheiten für Taiwan zu diskutieren."
+            },
+            "OSM-TW-mailinglist": {
+                "name": "OpenStreetMap Taiwan Mailingliste",
+                "description": "Talk-tw is eine offizielle Mailingliste for the Gemeinschaft um über Taiwan-Angelegenheite zu diskutieren"
+            },
+            "be-irc": {
+                "description": "Folge #osmbe auf irc.oftc.net (port 6667)"
+            },
+            "byosm": {
+                "name": "OpenStreetMap Weißrussland",
+                "description": "OpenStreetMap Weißrussland telegram chat"
+            },
+            "talk-cz-mailinglist": {
+                "name": "Talk-cz Mailingliste",
+                "description": "Talk-cz is die offizielle Mailingliste for the tschechische OSM-Gemeinschaft"
+            },
+            "OSM-ES-telegram": {
+                "name": "@OSMes on Telegram",
+                "description": "OpenStreetMap Spanien Telegram chat"
+            },
+            "OSM-Vancouver-meetup": {
+                "name": "OpenStreetMap Vancouver",
+                "description": "Mapper und OpenStreetMap Benutzer in Vancouver, Kanada"
+            },
+            "Bay-Area-OpenStreetMappers": {
+                "name": "Bay Area (San Francisco) OpenStreetMapper",
+                "description": "Verbessere OpenStreetMap in der Bay Area (San Francisco)",
+                "extendedDescription": "Diese Gruppe beschäftigt sich mit der Vergrößerung der OpenStreetMap Gemeinschaft hier in der Bay Area (San Francisco). Unsere Veranstaltungen sind für alle offen, sowohl für Open Source Liebhaber, Radfahrenden, GIS Fachleute, Geocachers und alle anderen. Alle die an Karten, Kartenerstellung und freien Karte interessiert sind, sind in unserer Gruppe und bei unseren Veranstaltungen willkommen."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "Zentral-Pennsylvania OSM",
+                "description": "Online Mapping Gemeinscahft des State College, Pennsylvania"
+            },
+            "Code-for-San-Jose-Slack": {
+                "name": "Conding für San Jose Slack",
+                "description": "Alle sind willkommen! Melde dich bei {signupUrl}, dann nutze den #osm Kanal."
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM",
+                "description": "Die OpenStreetMap Benutzergruppe für Dallas-Fort Worth",
+                "extendedDescription": "Dallas, Fort Worth und alle Städte dazwischen are strotzen vor kreativen und computererfahrenen Menschen. Die Vision für diese Benutzergruppe ist das finden von neuen Möglichkeiten die erstaunlichen Ressourcen von OSM zu nutzen."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Treffen für Kartenliebhaber in und um Philadelphia",
+                "extendedDescription": "GeoPhilly vereinigt Entwickler, Geographen, Data geeks, Open Source Liebhaber, civic hacker und Kartensüchtige in unserer gemeinsamen Leidenschaft für Karten und die Geschichten die sie erzählen. Wenn du Karten in deiner Arbeit benutzte oder einfach nur lernen willst, das ist der Treffpunkt für dich! Unsere Veranstaltungen beabsichtigen offen, freundlichen, lehrreich und sozial zu sein und range from reichen von \"happy hours\" bis \"lightning talks\" oder sogar Workshops. Bilde mit uns eine diverse und inspirierende OSM-Gemeinschaft community in Philadelphia!"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Washington DC Mappen",
+                "description": "Verbessere OpenStreetMap im Gebiet Washington DC",
+                "extendedDescription": "Wir sind eine Gruppe von ehrenamtlichen Mappern die OpenStreetMap in Washington DC verbessern wollen. Wir wollen unser Wissen über das OSM-Ökosystem, Datanalayse, Kartegraphie und GIS an andere weitergeben. Wir treffen uns jeden Monat bei Veranstaltungen um uns jedes Mal auf einen Teil unsere Stadt zu konzentrieren."
+            },
+            "Maptime-ME-meetup": {
+                "name": "MaptimeME",
+                "description": "Mapper und OpenStreetMap Benutzer in und um Portland, USA",
+                "extendedDescription": "Maptime ist - ziemlich wörtlich - Zeit zum Mappen.  Unsere Ziel ist die Türen für kartografische Möglichkeiten für alle Interessierten zu öffenen, wir stellen Zeit und Raum zum gemeinschaftlichen Lernen, Erkunden und zur Kartenerzeugung bereit und benutzen gemeinsam Mapping Tools und Technologien."
+            },
+            "OpenCleveland-meetup": {
+                "name": "Open Cleveland",
+                "description": "Verbessere OpenStreetMap in Cleveland, USA",
+                "extendedDescription": "Open Geo Cleveland zielt darauf ab es Menschen zu ermöglichen über geographischen Daten und insbesondere OpenStreetMap zu diskutieren und Wissen zu teilen, ebenso Offene Geospatial Software zum managen, editieren und anzeigen von geographischen Daten sowie Engagement zur Nutzung in Nordost Ohio, USA. Wir sind eine Untergruppe von maptime =)"
+            },
+            "OSM-Boston": {
+                "name": "OpenStreetMap Boston",
+                "description": "Mapper und OpenStreetMap Benutzer in Boston, USA",
+                "extendedDescription": "OpenStreetMap ist die freie und wiki-artige Karte der Welt mit hundertausenden täglich Mitwirkenden wie du. Das verbessern der Karte ist einfach und macht Spaß! Triff uns sowohl bei Veranstaltungen als auch vor Ort bei unseren Bemühungen die beste Karte von Boston und dem Rest der Welt zu machen!"
+            },
+            "OSM-Central-Salish-Sea": {
+                "name": "OpenStreetMap Central Salish Sea",
+                "description": "Mapper und OpenStreetMap Benutzer und um Mount Vernon, USA",
+                "extendedDescription": "OpenStreetMap (OSM) ist die weltweite Karte gemacht von Menschen wie dir. Es ist die Karte zu der du beitragt und die frei zugänglich ist wie Wikipedia. Besuche osm.org für mehr Information. Wir treffen uns immer wieder um über Karten zu reden, zu Mappen und Spaß zu haben!"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "Die OpenStreetMap Benutzergruppe für Chattanooga"
+            },
+            "OSM-Colorado": {
+                "name": "OpenStreetMap Colorado",
+                "description": "Mapper und OpenStreetMap Benutzer in Colorado, USA",
+                "extendedDescription": "OpenStreetMap (OSM) Colorado ist die lokale Zusammenarbeiten von Menschen die zu einer freien Karte beitragen wollen. Wir ermutigen unsere Mapper Treffen in ganz Colorado zu organisieren oder vozuschlagen. Treffen können einfach zum Kennenlernen, OSM-Lernen bis zum Fortgeschritenenen Training oder Mapathons (Mapping Parties) sein."
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap New York City",
+                "description": "Mappe und OpenStreetMap Benutzer, Entwickler und Liebhaber in der Metroplregion New York"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland, USA",
+                "description": "Mapper und OpenStreetMap Benutzer in Portland",
+                "extendedDescription": "OpenStreetMap (OSM) ist die weltweite Karte gemacht von Menschen wie dir. Es ist die Karte zu der du beitragt und die frei zugänglich ist wie Wikipedia. Besuche osm.org für mehr Information und komm zu einer unserer Treffen um über Karten zu reden, OSM zu verbessern und Spaß zu haben!"
+            },
+            "OSM-Seattle": {
+                "name": "OpenStreetMap Seattle",
+                "description": "Mapper und OpenStreetMap Benutzer in Seattlem USA"
+            },
+            "OSM-SoCal": {
+                "name": "OpenStreetMap Süd-Kalifornien, USA",
+                "description": "Lass uns Spaß haben, etwas zu OSM Los Angeles beitragen und mehr über Mappen lernen!",
+                "extendedDescription": "OpenStreetMap (OSM) Süd-Kalifornien ist für alle am Mappen interessierte um zusammen zu kommen und mit OpenStreetMap zu arbeiten. OpenStreetMap, das Wikipedia der Karten, ist eine freie weltweite open-source Karte, die von über eine Million von Freiwilligen rund um die Globus erzeugt wird. Wenn du OpenStreetMap nicht kennst, unterstützen wird dich. Wenn du eine Idee für ein Kartenprojekt oder einen Erkundungsrundgang hast, den die Gruppe durchführen kann wäre das großartig!"
+            },
+            "OSM-South-Bay": {
+                "name": "OSM South Bay",
+                "description": "Mapping-Nächste veranstalted von \"Code for San Jose\"",
+                "extendedDescription": "\"Code for San Jose\", die lokale \"Code for America\" Brigade, veransalted monatlichen Mapping-Nächte jeweils Donnerstag abend in Zentrum von San José. Triff andere South Bay Mapper, unterstütze lokale Mapping-Projekte und erfahre von anderen zivilen Technik-Projekten. Du brauchst keine Erfahrung im Programmieren oder mit GIS."
+            },
+            "OSM-Tampa-Bay": {
+                "name": "OpenStreetMap Tampa Bay",
+                "description": "Mapper und OpenStreetMap Benutzer in Tampa Bay, USA",
+                "extendedDescription": "OSM Tampa Bay ist eine Gruppe von Bewohner die sich treffen und die definitiv beste OSM-Karte von Tampa Bay machen, die freie und editierbare Karte der Welt. Wenn du dich für Karten, Open Source, GPS, Wandern, Radfahren oder ähnliches interessierst wirst du OpenStreetMap lieben! Stoße zu uns, wir treffen uns zum Reden und Mappen etwa einmal monatlich."
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap US Slack",
+                "description": "Alle sind willkommen! Melde dich unter {signupUrl}"
+            },
+            "OSM-US": {
+                "name": "OpenStreetMap US",
+                "description": "Wir helfen dabei OpenStreetMap in den USA zu verbessern.",
+                "extendedDescription": "Wir unterstützen OpenStreetMap durch eine jährliche Konferenz, Unterstützung von lokalen OSM-Gruppen, Aufbau von Partnerschaft und durch Verbreitung des Vorteilen von OSM. Beteiligte sich an OpenStreetMap US hier: {signupUrl}"
+            },
+            "OSM-Utah": {
+                "name": "OpenStreetMap Utah",
+                "description": "Mapper und OpenStreetMap Benutzer in Salt Lake City, USA",
+                "extendedDescription": "Activitäten beinhalten Workshop zum Erlernen des Mappens, Mapathong (Mapping Parties und Datensammlung vor Ort. Die Veranstaltungen finden in der SLC area statt, zumindest anfänglichen.  Wir suchen erfahrene Mapper und Menschen die OSM kennenlernenn wollen. Beteilige dich und lass und mappen!"
+            },
+            "OSM-Wyoming": {
+                "name": "OpenStreetMap Wyoming",
+                "description": "Mapper und OpenStreetMap Benutzer in Wyoming, USA",
+                "extendedDescription": "OpenStreetMap (OSM) Wyoming ist eine lokale Gemeinschaftsinitiative von menschen die gerne freie Karten tatkräftig unterstützen wollen. Wir ermuten alle unsere Mappler Veranstaltungen zum Mappen in Wyoming vozuschlagen oder zu veranstalten. Treffen können einfach zum Kennenlerne, zur Erlernenn von OSM-Grundlagen oder Fortgeschrittenem Training oder einfach Mappatons (Mapping Parties) sein."
+            },
+            "PHXGeo-meetup": {
+                "name": "PHXGeo Treffen",
+                "description": "Mapper und OpenStreetMap Benutzer in Phoenix, Arizona, USA",
+                "extendedDescription": "Das ist ein Treffpunkt für alle in Phoenix die Karten, GIS, OpenStreetMap, Kartographie und alle dazwischen mögen."
+            },
+            "PHXGeo-twitter": {
+                "name": "PHXGeo Twitter",
+                "description": "Folge uns auf Twitter unter {url}"
+            },
+            "Western-Slope-facebook": {
+                "name": "Western Slope OSM Facebook",
+                "description": "Mapper und OpenStreetMap Benutzer in und um Grand Junction, Colorado, USA"
+            },
+            "Western-Slope-meetup": {
+                "name": "Western Slope OSM Treffen",
+                "description": "Mapper und OpenStreetMap Benutzer in und um Grand Junction, Colorado, USA",
+                "extendedDescription": "Das Ziel dieser Gruppe ist OpenStreetMap in der Region einzuführen, eine Gemeinschaft von Mappern zu entwickeln, die erstaunlichsten Geodaten mit allen zur Verfügung stehenden Mitteln zu erzeugen und diese Daten in der ganzen Gegend bekannt zu machen. Stell dir einen ganz genaue Wanderkarte oder auch genaue Karte der Fahrradwege vor; oder alles andere was du willst, das ist die Freude von OpenStreetMap!"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Maptime Australia Slack",
+                "description": "Beteilige dich unter {signupUrl}"
+            },
+            "talk-au": {
+                "name": "Talk-au Mailing Liste",
+                "description": "Mappers in Australien chatten hier"
+            },
+            "OSM-AR-facebook": {
+                "name": "OpenStreetMap Argentinen Facebook",
+                "description": "Beteiligte dich bei der argentinischen OpenStreetMap Gemeinschaft auf Facebook",
+                "extendedDescription": "Beteilige dich an der Gemeinschaft um mehr über OpenStreetMap zu lernen, zu fragen oder an unseren Treffen teilzunehmen. Alle sind willkommen!"
+            },
+            "OSM-AR-forum": {
+                "name": "OpenStreetMap Argentinen web forum",
+                "description": "Beteilige dich am argentinischen OpenStreetMap web forum",
+                "extendedDescription": "Beteilige dich an der Gemeinschaft um emrh über OpenStreetMap zu lernen, zu fragen oder an unseren Treffen teilzunehmen, Alle sind willkommen!"
+            },
+            "OSM-AR-irc": {
+                "name": "OpenStreetMap Argentinen IRC",
+                "description": "Betielige dich an #osm-ar auf irc.oftc.net (Port 6667)"
+            },
+            "OSM-AR-mailinglist": {
+                "name": "Talk-ar Mailingiste",
+                "description": "Eine Mailingliste for the Gemeinschaft um OSM in Argentieren zu diskutieren"
+            },
+            "OSM-AR-telegram": {
+                "name": "OpenStreetMap Argentinen Telegram",
+                "description": "Beteilige dich an der argentinischen OpenStreetMap Gemeinschaft auf Telegram",
+                "extendedDescription": "Beteilige dich an der Gemeinschaft um emrh über OpenStreetMap zu lernen, zu fragen oder an unseren Treffen teilzunehmen, Alle sind willkommen!"
+            },
+            "OSM-AR-twitter": {
+                "name": "OpenStreetMap Argentinen Twitter",
+                "description": "Folge uns auf Twitter at {url}"
+            },
+            "OSM-br-twitter": {
+                "name": "OpenStreetMap Brasilien Twitter",
+                "description": "Folge uns auf Twitter {url}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap in Reddit",
+                "description": "/r/openstreetmap/ ist ein großartiger Ort umd mehr über OpenStreetMap zu lernen. Du kannst jede Frage stellen!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/el.json b/dist/locales/el.json
index c5ffd6800..e99ed38b5 100644
--- a/dist/locales/el.json
+++ b/dist/locales/el.json
@@ -1547,9 +1547,6 @@
                 "trees": {
                     "label": "Δέντρα"
                 },
-                "vending": {
-                    "label": "Είδος αγαθών"
-                },
                 "visibility": {
                     "label": "Ορατότητα",
                     "options": {
@@ -3466,15 +3463,6 @@
                 "type/restriction/no_u_turn": {
                     "name": "Όχι Αναστροφή"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Μόνο Αριστερή Στροφή"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Μόνο Δεξιά Στροφή"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Όχι Στροφές"
-                },
                 "type/route": {
                     "name": "Δρομολόγιο",
                     "terms": "Δρομολόγιο, Διαδρομή"
@@ -3681,11 +3669,6 @@
                 },
                 "name": "skobbler"
             },
-            "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Πλακίδια χάρτη από Stamen Design, υπό CC BY 3.0"
-                }
-            },
             "tf-cycle": {
                 "attribution": {
                     "text": "Χάρτες © Thunderforest, Δεδομένα © OpenStreetMap contributors"
diff --git a/dist/locales/en-GB.json b/dist/locales/en-GB.json
index b84f61a17..82480487e 100644
--- a/dist/locales/en-GB.json
+++ b/dist/locales/en-GB.json
@@ -2461,9 +2461,6 @@
                     "label": "Type",
                     "placeholder": "Default"
                 },
-                "vending": {
-                    "label": "Type of Goods"
-                },
                 "visibility": {
                     "label": "Visibility",
                     "options": {
@@ -4956,15 +4953,6 @@
                 "type/restriction/no_u_turn": {
                     "name": "No U-turn"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Left Turn Only"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Right Turn Only"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "No Turns"
-                },
                 "type/route": {
                     "name": "Route"
                 },
@@ -5192,7 +5180,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Basemap of Austria, based on goverment data.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -5253,9 +5240,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Map tiles by Stamen Design, under CC BY 3.0"
-                },
                 "name": "Stamen Terrain"
             },
             "tf-cycle": {
@@ -5270,6 +5254,57 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "Bay-Area-OpenStreetMappers": {
+                "name": "Bay Area OpenStreetMappers",
+                "description": "Improve OpenStreetMap in the Bay Area",
+                "extendedDescription": "This group is about growing the OpenStreetMap community here in the Bay Area. Our events are open to everyone, from open source enthusiasts, cyclists, GIS professionals, geocachers, and beyond. Anyone and everyone who is interested in maps, map making and free map data is welcome to join our group as well as attend our events."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "Central Pennsylvania OSM",
+                "description": "Online mapping community based out of State College, PA"
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM",
+                "description": "The OpenStreetMap user group for Dallas-Fort Worth",
+                "extendedDescription": "Dallas, Fort Worth, and all the cities in between are abounding with creative and tech-savvy people. The vision for this usergroup is to find new ways to use the amazing resource of OSM."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Meetup for map enthusiasts in the Philadelphia area",
+                "extendedDescription": "GeoPhilly unites developers, geographers, data geeks, open source enthusiasts, civic hackers and map addicts in our shared love of maps and the stories they tell. If you use maps as part of your work or just want to learn more, this is the meetup for you!  Our events aim to be open, friendly, educational and social and range from happy hours to lightning talks or even workshops. Come create a diverse, inspiring geospatial community in the Philadelphia with us!"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapping DC",
+                "description": "Improve OpenStreetMap in the DC area",
+                "extendedDescription": "We are a group of volunteer mappers who aim to improve the OpenStreetMap in the DC area. We also aim to teach others about the OSM ecosystem, data analytics, cartography, and GIS. We gather every other month at meetups to focus on one area of our city."
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "The OpenStreetMap user group for Chattanooga"
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap NYC",
+                "description": "Mappers and OpenStreetMap users, developers and enthusiasts in the New York Metropolitan area"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland",
+                "description": "Mappers and OpenStreetMap users in the Portland area",
+                "extendedDescription": "OpenStreetMap (OSM) is a map of the world made by people like you. It's a map that you build, that's given away for free like wikipedia. Check out osm.org for more, and come join us at a meetup to talk maps, contribute to OSM, and have fun!"
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap US Slack",
+                "description": "All are welcome! Sign up at {signupUrl}"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Maptime Australia Slack",
+                "description": "Sign up at {signupUrl}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap on Reddit",
+                "description": "/r/openstreetmap/ is a great place to learn more about OpenStreetMap.  Ask us anything!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 5a57c6f36..c6d80b9cb 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -6750,6 +6750,230 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap India - Participatory neighborhood mapping",
+                "description": "Improve OpenStreetMap in India",
+                "extendedDescription": "Mapping in India? Have questions, want to connect with the community here? Join us at {Url}. All are welcome!"
+            },
+            "OSM-japan-facebook": {
+                "name": "OpenStreetMap Japan Community",
+                "description": "Mappers and OpenStreetMap users in Japan"
+            },
+            "OSM-japan-mailinglist": {
+                "name": "OpenStreetMap Japan Mailinglist",
+                "description": "Talk-ja is an Official Mailinglist for Japanese Community"
+            },
+            "OSM-japan-twitter": {
+                "name": "OpenStreetMap Japan Twitter",
+                "description": "Hashtag on Twitter: {url}"
+            },
+            "OSM-PH-facebook": {
+                "name": "OpenStreetMap PH Facebook",
+                "description": "Welcome to OpenStreetMap Philippines, where we encourage all fellow Filipinos to contribute to the OpenStreetMap project."
+            },
+            "OSM-PH-mailinglist": {
+                "name": "Talk-ph Mailing List",
+                "description": "A mailing list to discuss OpenStreetMap in the Philippines"
+            },
+            "OSM-PH-slack": {
+                "name": "OpenStreetMap PH Slack",
+                "description": "All are welcome! Sign up at {signupUrl}"
+            },
+            "OSM-PH-telegram": {
+                "name": "OpenStreetMap PH Telegram",
+                "description": "Un-official, Telegram local community of OpenStreetMap contributors and friends in the Philippines"
+            },
+            "OSM-RU-forum": {
+                "name": "OpenStreetMap RU forum",
+                "description": "OpenStreetMap Russia web forum"
+            },
+            "OSM-RU-telegram": {
+                "name": "OpenStreetMap RU telegram",
+                "description": "OpenStreetMap Russia telegram chat"
+            },
+            "OSM-TW-facebook": {
+                "name": "OpenStreetMap Taiwan Community",
+                "description": "Facebook Group for Mappers and OpenStreetMap users to discuss matters about Taiwan."
+            },
+            "OSM-TW-mailinglist": {
+                "name": "OpenStreetMap Taiwan Mailinglist",
+                "description": "Talk-tw is an Official Mailinglist for the Communities to dicuss matters about Taiwan"
+            },
+            "byosm": {
+                "name": "OpenStreetMap Belarus",
+                "description": "OpenStreetMap Belarus telegram chat"
+            },
+            "talk-cz-mailinglist": {
+                "name": "Talk-cz Mailing List",
+                "description": "Talk-cz is the official mailing list for Czech community"
+            },
+            "OSM-ES-telegram": {
+                "name": "@OSMes on Telegram",
+                "description": "OpenStreetMap Spain Telegram chat"
+            },
+            "OSM-Vancouver-meetup": {
+                "name": "OpenStreetMap Vancouver",
+                "description": "Mappers and OpenStreetMap users in the Vancouver, BC area"
+            },
+            "Bay-Area-OpenStreetMappers": {
+                "name": "Bay Area OpenStreetMappers",
+                "description": "Improve OpenStreetMap in the Bay Area",
+                "extendedDescription": "This group is about growing the OpenStreetMap community here in the Bay Area. Our events are open to everyone, from open source enthusiasts, cyclists, GIS professionals, geocachers, and beyond. Anyone and everyone who is interested in maps, map making and free map data is welcome to join our group as well as attend our events."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "Central Pennsylvania OSM",
+                "description": "Online mapping community based out of State College, PA"
+            },
+            "Code-for-San-Jose-Slack": {
+                "name": "Code for San Jose Slack",
+                "description": "All are welcome! Sign up at {signupUrl}, then join the #osm channel."
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM",
+                "description": "The OpenStreetMap user group for Dallas-Fort Worth",
+                "extendedDescription": "Dallas, Fort Worth, and all the cities in between are abounding with creative and tech-savvy people. The vision for this usergroup is to find new ways to use the amazing resource of OSM."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Meetup for map enthusiasts in the Philadelphia area",
+                "extendedDescription": "GeoPhilly unites developers, geographers, data geeks, open source enthusiasts, civic hackers and map addicts in our shared love of maps and the stories they tell. If you use maps as part of your work or just want to learn more, this is the meetup for you!  Our events aim to be open, friendly, educational and social and range from happy hours to lightning talks or even workshops. Come create a diverse, inspiring geospatial community in the Philadelphia with us!"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapping DC",
+                "description": "Improve OpenStreetMap in the DC area",
+                "extendedDescription": "We are a group of volunteer mappers who aim to improve the OpenStreetMap in the DC area. We also aim to teach others about the OSM ecosystem, data analytics, cartography, and GIS. We gather every other month at meetups to focus on one area of our city."
+            },
+            "Maptime-ME-meetup": {
+                "name": "MaptimeME",
+                "description": "Mappers and OpenStreetMap users, around Portland, ME",
+                "extendedDescription": "Maptime is, rather literally, time for mapmaking.  Our mission is to open the doors of cartographic possibility to anyone interested by creating a time and space for collaborative learning, exploration, and map creation using mapping tools and technologies."
+            },
+            "OpenCleveland-meetup": {
+                "name": "Open Cleveland",
+                "description": "Improve OpenStreetMap in the Cleveland area",
+                "extendedDescription": "Open Geo Cleveland aims to be a resource for people to discuss and share knowledge on utilizing free geographic data sets especially OpenStreetMap, and Open geo-spatial software that manages, edits, and displays geographic data, and advocate for its use in Northeast Ohio. We're also a maptime chapter =)"
+            },
+            "OSM-Boston": {
+                "name": "OpenStreetMap Boston",
+                "description": "Mappers and OpenStreetMap users in the Boston area",
+                "extendedDescription": "OpenStreetMap is the free and open, wiki-style map of the world, with hundreds of thousands of contributions every day from people like you. Editing the map is simple, and fun! Join us both indoors and outdoors in our effort to create the best map of the Boston area and the rest of the world!"
+            },
+            "OSM-Central-Salish-Sea": {
+                "name": "OpenStreetMap Central Salish Sea",
+                "description": "Mappers and OpenStreetMap users around Mount Vernon, WA",
+                "extendedDescription": "OpenStreetMap is an map of the world made by people like you. It's a map that you build, that's given away for free like wikipedia. Check out osm.org for more. We meet all the time to talk maps, make maps and have fun!"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "The OpenStreetMap user group for Chattanooga"
+            },
+            "OSM-Colorado": {
+                "name": "OpenStreetMap Colorado",
+                "description": "Mappers and OpenStreetMap users in the state of Colorado, USA",
+                "extendedDescription": "OpenStreetMap (OSM) Colorado is a local collaboration of people interested in contributing their efforts to create free maps. We encourage all of our mappers to organize or suggest mapping events throughout the state. Meetup activities can be simple social mixers, OSM basic to advanced training, or community mapping parties."
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap NYC",
+                "description": "Mappers and OpenStreetMap users, developers and enthusiasts in the New York Metropolitan area"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland",
+                "description": "Mappers and OpenStreetMap users in the Portland area",
+                "extendedDescription": "OpenStreetMap (OSM) is a map of the world made by people like you. It's a map that you build, that's given away for free like wikipedia. Check out osm.org for more, and come join us at a meetup to talk maps, contribute to OSM, and have fun!"
+            },
+            "OSM-Seattle": {
+                "name": "OpenStreetMap Seattle",
+                "description": "Mappers and OpenStreetMap users in the Seattle area"
+            },
+            "OSM-SoCal": {
+                "name": "OpenStreetMap Southern California",
+                "description": "Let's have some fun, contribute something to Los Angeles, and learn about mapping!",
+                "extendedDescription": "OpenStreetMap (OSM) Southern California is for anyone interested in mapping to get together to work with OpenStreetMap.  OpenStreetMap, the Wikipedia of maps, is a free open-source map of the world being created by more than 1,000,000 volunteers around the globe.  Everyone is welcome.  If you don't know OpenStreetMap, we'll teach you. If you have an idea for a mapping project or even a field trip that the group can do, great!"
+            },
+            "OSM-South-Bay": {
+                "name": "OSM South Bay",
+                "description": "Map Nights hosted by Code for San Jose",
+                "extendedDescription": "Code for San Jose, the local Code for America brigade, hosts monthly Map Nights on Thursday nights in downtown San José. Meet fellow South Bay mappers, help out with local mapping projects, and hear about other civic tech projects. Programming and GIS skills are not required."
+            },
+            "OSM-Tampa-Bay": {
+                "name": "OpenStreetMap Tampa Bay",
+                "description": "Mappers and OpenStreetMap users in the Tampa Bay area",
+                "extendedDescription": "OSM Tampa Bay group for local residents to get together and build out the definitive map of Tampa Bay with OpenStreetMap, the free and editable map of the world.  If you're into maps, data, open source, GPS, hiking, cycling, et cetera, you'll love working with OpenStreetMap -- so join in! We'll get together and map and talk about new topics once-a-month or so."
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap US Slack",
+                "description": "All are welcome! Sign up at {signupUrl}"
+            },
+            "OSM-US": {
+                "name": "OpenStreetMap US",
+                "description": "We help grow and improve OpenStreetMap in the United States.",
+                "extendedDescription": "We support OpenStreetMap by holding annual conferences, providing community resources, building partnerships, and by spreading the word. Join OpenStreetMap US here: {signupUrl}"
+            },
+            "OSM-Utah": {
+                "name": "OpenStreetMap Utah",
+                "description": "Mappers and OpenStreetMap users in the Salt Lake City area",
+                "extendedDescription": "Activities may include things like Learn To Map workshops, mapping parties and outdoor data collection. The events will take place in the SLC area, at least initially.  We are looking for seasoned mappers as well as people new to OSM. Join and let's do some mapping!"
+            },
+            "OSM-Wyoming": {
+                "name": "OpenStreetMap Wyoming",
+                "description": "Mappers and OpenStreetMap users in the state of Wyoming",
+                "extendedDescription": "OpenStreetMap (OSM) Wyoming is a local collaboration of people interested in contributing their efforts to create free maps. We encourage all of our mappers to organize or suggest mapping events throughout the state. Meetup activities can be simple social mixers, OSM basic to advanced training, or community mapping parties."
+            },
+            "PHXGeo-meetup": {
+                "name": "PHXGeo Meetup",
+                "description": "Mappers and OpenStreetMap users in the Phoenix, AZ area",
+                "extendedDescription": "This is a meetup group for those in the Phoenix area who like maps, GIS, OpenStreetMap, cartography and anything in between."
+            },
+            "PHXGeo-twitter": {
+                "name": "PHXGeo Twitter",
+                "description": "Follow us on Twitter at {url}"
+            },
+            "Western-Slope-facebook": {
+                "name": "Western Slope OSM Facebook",
+                "description": "Mappers and OpenStreetMap users around Grand Junction, CO"
+            },
+            "Western-Slope-meetup": {
+                "name": "Western Slope OSM Meetup",
+                "description": "Mappers and OpenStreetMap users around Grand Junction, CO",
+                "extendedDescription": "The goal of this group is to introduce OpenStreetMap to the community, develop a community of mappers, create the most amazing geodata possible using whatever method we can and finally strategize in order to get this data out into our community. Imagine accurate trail signage! Imagine further development of bike paths! Imagine anything you want, that's the joy of OpenStreetMap!"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Maptime Australia Slack",
+                "description": "Sign up at {signupUrl}"
+            },
+            "OSM-AR-facebook": {
+                "name": "OpenStreetMap Argentina Facebook",
+                "description": "Join the OpenStreetMap Argentina community on Facebook",
+                "extendedDescription": "Join the community to learn more about OpenStreetMap, ask questions or participate in our meetings. Everyone is welcome!"
+            },
+            "OSM-AR-forum": {
+                "name": "OpenStreetMap Argentina web forum",
+                "description": "Join the OpenStreetMap Argentina web forum",
+                "extendedDescription": "Join the community to learn more about OpenStreetMap, ask questions or participate in our meetings. Everyone is welcome!"
+            },
+            "OSM-AR-irc": {
+                "name": "OpenStreetMap Argentina IRC",
+                "description": "Join #osm-ar on irc.oftc.net (port 6667)"
+            },
+            "OSM-AR-mailinglist": {
+                "name": "Talk-ar Mailing List",
+                "description": "A mailing list to discuss OpenStreetMap in Argentina"
+            },
+            "OSM-AR-telegram": {
+                "name": "OpenStreetMap Argentina Telegram",
+                "description": "Join the OpenStreetMap Argentina community on Telegram",
+                "extendedDescription": "Join the community to learn more about OpenStreetMap, ask questions or participate in our meetings. Everyone is welcome!"
+            },
+            "OSM-AR-twitter": {
+                "name": "OpenStreetMap Argentina Twitter",
+                "description": "Follow us on Twitter at {url}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap on Reddit",
+                "description": "/r/openstreetmap/ is a great place to learn more about OpenStreetMap.  Ask us anything!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/eo.json b/dist/locales/eo.json
index d7420c034..de1bb0dc6 100644
--- a/dist/locales/eo.json
+++ b/dist/locales/eo.json
@@ -1,5 +1,10 @@
 {
     "eo": {
+        "icons": {
+            "information": "informoj",
+            "remove": "forigi",
+            "undo": "malfari"
+        },
         "modes": {
             "add_area": {
                 "title": "Areo",
@@ -1812,6 +1817,9 @@
                 "except": {
                     "label": "Esceptoj"
                 },
+                "faces": {
+                    "label": "Flankoj"
+                },
                 "fax": {
                     "label": "Telekopiilo",
                     "placeholder": "+31 42 123 45 67"
@@ -1942,6 +1950,9 @@
                 "indoor": {
                     "label": "Interno"
                 },
+                "industrial": {
+                    "label": "Speco"
+                },
                 "information": {
                     "label": "Speco"
                 },
@@ -2062,6 +2073,10 @@
                     "label": "Rapidlimo",
                     "placeholder": "40, 50, 60…"
                 },
+                "maxspeed/advisory": {
+                    "label": "Konsilinda rapidlimo",
+                    "placeholder": "40, 50, 60…"
+                },
                 "maxstay": {
                     "label": "Maksimuma restad-tempo"
                 },
@@ -2408,7 +2423,7 @@
                     "label": "Speco de servo",
                     "options": {
                         "crossover": "Trakforko",
-                        "siding": "Preterpasejo",
+                        "siding": "Kromtrako",
                         "spur": "Branĉtrako",
                         "yard": "Ranĝadstaciaj trakoj"
                     }
@@ -2650,6 +2665,17 @@
                     "label": "Speco",
                     "placeholder": "Norma"
                 },
+                "usage_rail": {
+                    "label": "Uzo",
+                    "options": {
+                        "branch": "branĉa",
+                        "industrial": "industria",
+                        "main": "ĉefa",
+                        "military": "armea",
+                        "test": "testa",
+                        "tourism": "turisma"
+                    }
+                },
                 "vending": {
                     "label": "Specoj de varoj"
                 },
@@ -2831,6 +2857,10 @@
                     "name": "Flugstacio",
                     "terms": "flughaveno,terminalo"
                 },
+                "allotments/plot": {
+                    "name": "Parcelo de familia ĝardeno",
+                    "terms": "terpeco;parcelo;ĝardeno"
+                },
                 "amenity": {
                     "name": "Servejo"
                 },
@@ -3059,6 +3089,10 @@
                     "name": "Bazaro",
                     "terms": "foirejo,foiro,komercejo"
                 },
+                "amenity/monastery": {
+                    "name": "Monaĥeja tereno",
+                    "terms": "monahhejo,monahxejo,abatejo,klostro,klaŭstro"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Motorcikla parkumejo",
                     "terms": "motorciklejo,motociklejo"
@@ -3263,6 +3297,10 @@
                     "name": "Vendilo de cigaredoj",
                     "terms": "cigaredo,vendmaŝino"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "Vendilo de kafo",
+                    "terms": "kafmaŝino,teo"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "Vendilo de kondomoj",
                     "terms": "kondomo,vendmaŝimo,penisingo"
@@ -3271,6 +3309,14 @@
                     "name": "Vendilo de trinkaĵoj",
                     "terms": "vendilo de trinkajxoj,vendilo de trinkajsoj,trinkaĵoj"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "Vendilo de elektronikaĵoj",
+                    "terms": "ŝargiloj,piloj,kabloj,memoriloj,memorbastonetoj,SD-kartoj,memorkartoj"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "Vendilo de etenditaj moneroj",
+                    "terms": "moneretendilo,etendilo,memoraĵoj"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "Vendilo de saketoj por fekaĵoj",
                     "terms": "fekajhoj,fekajxoj,merdo,hundo"
@@ -3279,6 +3325,18 @@
                     "name": "Vendilo de virinaj higienaĵoj",
                     "terms": "menstrusorbiloj,tambonoj,persona higieno"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "Vendilo de manĝaĵo",
+                    "terms": "manghajho,mangxajxo"
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "Vendilo de benzino",
+                    "terms": "benzinstacio,diseloleo,benzino,brulaĵo,LPG,biodisel"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "Vendilo de glaciaĵoj",
+                    "terms": "glaciaĵo"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Vendilo de gazetoj"
                 },
@@ -3298,6 +3356,10 @@
                     "name": "Vendilo de vojimpostoj",
                     "terms": "vojimposto,vojimpostejo,vojimpostilo"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "Vendilo de poŝtmarkoj",
+                    "terms": "poŝtmarkoj"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "Vendilo de dolĉaĵoj",
                     "terms": "dolĉaĵoj,dolchajhoj,dolcxajxoj,sukeraĵoj,sukerajhoj,sukerajxoj,"
@@ -4101,6 +4163,10 @@
                     "name": "Aŭtovoja ligilo",
                     "terms": "enveturejo,elveturejo,aŭtoŝoseo,nodo"
                 },
+                "highway/passing_place": {
+                    "name": "Preterpasejo",
+                    "terms": "pasejo,preterveturejo"
+                },
                 "highway/path": {
                     "name": "Vojeto (piedpremita)",
                     "terms": "vojo,pado,irejo,piedvojeto"
@@ -4460,6 +4526,10 @@
                     "name": "Salono de ludoj",
                     "terms": "ludejo,amuzaparatoj,videoludoj,paĉinko,flipero,bilardo"
                 },
+                "leisure/beach_resort": {
+                    "name": "Sablobordo administrata (kun oportunaĵoj)",
+                    "terms": "plaĝo,strando,ripozcentro,sunbanejo"
+                },
                 "leisure/bird_hide": {
                     "name": "Bird-observejo",
                     "terms": "birdobservejo"
@@ -4576,6 +4646,10 @@
                     "name": "Natur-rezervejo",
                     "terms": "naturrezervejo,naturprotektejo,rezervejo,naturparko,nacia parko,konservejo"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "Seĝoj eksterdome",
+                    "terms": "seghoj,segxoj,benko,altano,teraso"
+                },
                 "leisure/park": {
                     "name": "Parko",
                     "terms": "herbejo,ripozejo,verdejo,ĝardenego"
@@ -4704,6 +4778,10 @@
                     "name": "Mineja koridoro",
                     "terms": "minejkoridoro,minejo horizontala,minejgalerio,galerio"
                 },
+                "man_made/antenna": {
+                    "name": "Anteno",
+                    "terms": "masto"
+                },
                 "man_made/breakwater": {
                     "name": "Ond-rompilo",
                     "terms": "ondorompilo,ondrompilo,digo,ĝeto"
@@ -4755,6 +4833,10 @@
                     "name": "Vidturo",
                     "terms": "observturo,turo"
                 },
+                "man_made/observatory": {
+                    "name": "Observejo",
+                    "terms": "astronomia,vetera,teleskopo"
+                },
                 "man_made/petroleum_well": {
                     "name": "Puto nafta",
                     "terms": "naftoputo,naftoŝakto,drilplatformo"
@@ -4879,6 +4961,10 @@
                     "name": "Erikejo",
                     "terms": "arbustaro,herbejo"
                 },
+                "natural/mud": {
+                    "name": "Kota tereno",
+                    "terms": "koto;malsekejo;ŝlimejo"
+                },
                 "natural/peak": {
                     "name": "Montpinto",
                     "terms": "montopinto,monto,supro,kulmino,supraĵo"
@@ -5463,8 +5549,8 @@
                     "terms": "relŝuo,relfino,finrelo"
                 },
                 "railway/disused": {
-                    "name": "Forlasita relvojo",
-                    "terms": "eksa fervojlinio,trako,relvojo"
+                    "name": "Neuzata relvojo",
+                    "terms": "eksa fervojlinio,trako,relvojo,forlasita fervojlinio"
                 },
                 "railway/funicular": {
                     "name": "Funikularo",
@@ -5915,6 +6001,10 @@
                     "name": "Dombesta vendejo",
                     "terms": "dombestoj,hejmbestoj,bestoj,kobajo,kuniklo,papago"
                 },
+                "shop/pet_grooming": {
+                    "name": "Dombesta beligejo",
+                    "terms": "frizejo,hartondisto,hundoj,katoj,hejmbestoj"
+                },
                 "shop/photo": {
                     "name": "Fotografia vendejo",
                     "terms": "fotografio,fotografarto"
@@ -6218,16 +6308,20 @@
                     "terms": "malpermeso,malantaŭen,U-forma,,Uforma,prohibo"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "Turno maldekstren devigita",
-                    "terms": "ordono,devigo,maldekstren"
+                    "name": "Nur turno maldekstren",
+                    "terms": "maldekstren,liven"
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "Turno dekstren devigita",
-                    "terms": "ordono,devigo,maldekstren"
+                    "name": "Nur turno dekstren",
+                    "terms": "dekstren"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "Veturo rekten devigita",
-                    "terms": "ordono,devigo,rekten,antaŭen"
+                    "name": "Nur veturo rekten",
+                    "terms": "rekten,antaŭen"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Nur turno malantaŭen",
+                    "terms": "malantaŭen,reveturen,U-turno"
                 },
                 "type/route": {
                     "name": "Kurso",
@@ -6584,7 +6678,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Map-kaheloj de Stamen Design, laŭ CC BY 3.0"
+                    "text": "Map-kaheloj de Stamen Design, laŭ CC BY 3.0. Datumoj de OpenStreetMap, laŭ ODbL"
                 },
                 "name": "Stamen Terrain"
             },
diff --git a/dist/locales/es.json b/dist/locales/es.json
index 8bd3bb4ff..17a279f19 100644
--- a/dist/locales/es.json
+++ b/dist/locales/es.json
@@ -1,5 +1,10 @@
 {
     "es": {
+        "icons": {
+            "information": "información",
+            "remove": "quitar",
+            "undo": "deshacer"
+        },
         "modes": {
             "add_area": {
                 "title": "Área",
@@ -291,6 +296,42 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Distancia",
+                "distance_up_to": "Hasta {distance}",
+                "via": "Vía",
+                "via_node_only": "Solo nodo",
+                "via_up_to_one": "Hasta 1 vía",
+                "via_up_to_two": "Hasta 2 vías"
+            },
+            "help": {
+                "indirect": "(indirecto)",
+                "turn": {
+                    "no_left_turn": "NO giro a la izquierda {indirect}",
+                    "no_right_turn": "NO giro a la derecha {indirect}",
+                    "no_u_turn": "NO giro en U {indirect}",
+                    "no_straight_on": "NO seguir derecho {indirect}",
+                    "only_left_turn": "SOLO giro a la izquierda {indirect}",
+                    "only_right_turn": "SOLO giro a la derecha {indirect}",
+                    "only_u_turn": "SOLO giro en U {indirect}",
+                    "only_straight_on": "SOLO seguir derecho {indirect}",
+                    "allowed_left_turn": "Giro a la izquierda permitido {indirect}",
+                    "allowed_right_turn": "Giro a la derecha permitido {indirect}",
+                    "allowed_u_turn": "Giro en U permitido {indirect}",
+                    "allowed_straight_on": "Seguir derecho permitido {indirect}"
+                },
+                "from": "DESDE",
+                "via": "VÍA",
+                "to": "HASTA",
+                "from_name": "{from} {fromName}",
+                "from_name_to_name": "{from} {fromName} {to} {toName}",
+                "via_names": "{via} {viaNames}",
+                "select_from": "Haga clic para seleccionar un segmento {from}",
+                "select_from_name": "Haga clic para seleccionar {from} {fromName}",
+                "toggle": "Haga clic para \"{turn}\""
+            }
+        },
         "undo": {
             "tooltip": "Deshacer: {action}",
             "nothing": "Nada que deshacer"
@@ -846,6 +887,44 @@
                 "using": "Para usar una traza de GPS para el mapeo, arrastre y suelte el archivo de datos en el editor de mapas. Si lo reconoce, lo dibujará en el mapa como una línea violeta brillante. Haga clic en el panel {data} **Datos del mapa** en el lateral del mapa para habilitar, deshabilitar o ampliar sus datos de GPS.",
                 "tracing": "La traza de GPS no se envía a OpenStreetMap; la mejor manera de usarla es dibujar en el mapa usándola como una guía para los nuevos elementos que agregue.",
                 "upload": "También puede [cargar los datos del GPS a OpenStreetMap](https://www.openstreetmap.org/trace/create) para que los usen otros usuarios."
+            },
+            "field": {
+                "restrictions": {
+                    "title": "Ayuda sobre restricciones de giro",
+                    "about": {
+                        "title": "Acerca de",
+                        "about": "Este campo permite inspeccionar y modificar restricciones de giro. Muestra un modelo de la intersección seleccionada incluyendo otras vías cercanas conectadas.",
+                        "from_via_to": "Una restricción de giro siempre contiene: una **vía DESDE**, una **vía HASTA**, y un **nodo VÍA** o una o más **vías VÍA**.",
+                        "maxdist": "El control deslizante \"{distField}\" controla qué tan lejos buscar vías adicionales conectadas.",
+                        "maxvia": "El control deslizante \"{viaField}\" ajusta cuántas vías se pueden incluir en la búsqueda. (Consejo: simple es mejor)"
+                    },
+                    "inspecting": {
+                        "title": "Inspeccionando",
+                        "about": "Desplácese sobre cualquier segmento **DESDE** para ver si tiene restricciones de giro. Cada destino **HASTA** posible se dibujará con una sombra de color que muestra si existe una restricción.",
+                        "from_shadow": "{fromShadow} **segmento DESDE**",
+                        "allow_shadow": "{allowShadow} **HASTA Permitido**",
+                        "restrict_shadow": "{restrictShadow} **HASTA Restringido**",
+                        "only_shadow": "{onlyShadow} **HASTA Solo**",
+                        "restricted": "\"Restringido\" significa que hay una restricción de giro, por ejemplo \"No girar a la izquierda\".",
+                        "only": "\"Solo\" significa que un vehículo que toma ese camino solo puede hacer esa elección, por ejemplo, \"Solo seguir derecho\"."
+                    },
+                    "modifying": {
+                        "title": "Modificando",
+                        "about": "Para modificar las restricciones de giro, primero haga clic en cualquier segmento de partida **DESDE** para seleccionarlo. El segmento seleccionado emitirá un pulso, y todos los posibles destinos **HASTA** aparecerán como símbolos de giro.",
+                        "indicators": "Luego, haga clic en un símbolo de giro para alternar entre \"Permitido\", \"Restringido\" y \"Solo\".",
+                        "allow_turn": "{allowTurn} **HASTA Permitido**",
+                        "restrict_turn": "{restrictTurn} **HASTA Restringido**",
+                        "only_turn": "{onlyTurn} **HASTA Solo**"
+                    },
+                    "tips": {
+                        "title": "Consejos",
+                        "simple": "**Prefiera restricciones simples sobre las complejas.**",
+                        "simple_example": "Por ejemplo, evite crear una restricción de vía-vía si una restricción de giro de nodo-vía simple funciona.",
+                        "indirect": "**Algunas restricciones muestran el texto \"(indirecto)\" y se dibujan más claras.**",
+                        "indirect_example": "Estas restricciones existen debido a otra restricción cercana. Por ejemplo, una restricción \"Solo seguir derecho\" creará indirectamente restricciones de \"No giro\" para todos los demás caminos a través de la intersección.",
+                        "indirect_noedit": "No se puede editar restricciones indirectas. En cambio, edite la restricción directa cercana."
+                    }
+                }
             }
         },
         "intro": {
@@ -1740,6 +1819,9 @@
                 "except": {
                     "label": "Excepciones"
                 },
+                "faces": {
+                    "label": "caras"
+                },
                 "fax": {
                     "label": "Fax",
                     "placeholder": "+31 42 123 4567"
@@ -1870,6 +1952,9 @@
                 "indoor": {
                     "label": "Interior"
                 },
+                "industrial": {
+                    "label": "Tipo"
+                },
                 "information": {
                     "label": "Tipo"
                 },
@@ -1990,6 +2075,10 @@
                     "label": "Límite de velocidad",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "label": "Límite de velocidad recomendada",
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "Estadía máxima"
                 },
@@ -2020,7 +2109,7 @@
                     "options": {
                         "0": "Más fácil (círculo blanco)",
                         "1": "Fácil (círculo verde)",
-                        "2": "Media (círculo azul)",
+                        "2": "Media (cuadrado azul)",
                         "3": "Difícil (diamante negro)",
                         "4": "Extremadamente difícil (doble diamante negro)"
                     },
@@ -2578,8 +2667,19 @@
                     "label": "Tipo",
                     "placeholder": "Predeterminado"
                 },
+                "usage_rail": {
+                    "label": "Tipo de uso",
+                    "options": {
+                        "branch": "Ramal",
+                        "industrial": "Industrial",
+                        "main": "Principal",
+                        "military": "Militar",
+                        "test": "Prueba",
+                        "tourism": "Turismo"
+                    }
+                },
                 "vending": {
-                    "label": "Tipo de producto"
+                    "label": "Tipos de bienes"
                 },
                 "visibility": {
                     "label": "Visibilidad",
@@ -2759,6 +2859,10 @@
                     "name": "Terminal de aeropuerto",
                     "terms": "terminal, pasajeros, aeropuerto"
                 },
+                "allotments/plot": {
+                    "name": "Parcela comunitaria",
+                    "terms": "jardín, huerto, huerta, comunitario, comunal, vecindad, huerto urbano, área, terreno, zona"
+                },
                 "amenity": {
                     "name": "Servicio"
                 },
@@ -2850,7 +2954,7 @@
                     "terms": "casino, azar, casa de juego, ruleta, black jack, póquer, tragamoneda"
                 },
                 "amenity/charging_station": {
-                    "name": "Estación de carga eléctrica",
+                    "name": "Estación de carga para vehículos eléctricos",
                     "terms": "recarga, electricidad, eléctrico, estación de carga para vehículo eléctrico, punto de recarga, electrolinera"
                 },
                 "amenity/childcare": {
@@ -2863,23 +2967,23 @@
                 },
                 "amenity/clinic": {
                     "name": "Clínica",
-                    "terms": "clínica, centro médico, hospital, consultorio"
+                    "terms": "clínica, centro médico, consultorio médico, centro de salud"
                 },
                 "amenity/clinic/abortion": {
                     "name": "Clínica de aborto",
-                    "terms": "aborto, abotar, interrupción, embarazo, interrupción embarazo, clínica de aborto, clinica aborto"
+                    "terms": "aborto, abotar, interrupción, embarazo, interrupción del embarazo, clínica de aborto, clínica de aborto"
                 },
                 "amenity/clinic/fertility": {
                     "name": "Clínica de fertilidad",
-                    "terms": "clínica de fertilidad, clinica de fertilidad, fertilidad, reproducción, reproduccion, esperma, ovulación, ovulacion"
+                    "terms": "clínica de fertilidad, clínica de fertilidad, fertilidad, reproducción, esperma, ovulación, ovulación, clínica de reproducción"
                 },
                 "amenity/clock": {
                     "name": "Reloj",
                     "terms": "cronómetro"
                 },
                 "amenity/college": {
-                    "name": "Instituto / Escuela profesional",
-                    "terms": "instituto, universidad, escuela profesional, educación terceria"
+                    "name": "Centro educativo post-bachillerato no universitario",
+                    "terms": "formación profesional, escuela profesional, educación terciaria, post-bachillerato, ciclo formativo de grado superior, FP, conservatorio"
                 },
                 "amenity/community_centre": {
                     "name": "Centro Comunitario",
@@ -2906,7 +3010,7 @@
                 },
                 "amenity/doctors": {
                     "name": "Doctor",
-                    "terms": "médico, galeno, consultorio"
+                    "terms": "médico, galeno, consultorio médico, ambulatorio médico, consulta médica"
                 },
                 "amenity/dojo": {
                     "name": "Academia de artes marciales",
@@ -2987,6 +3091,10 @@
                     "name": "Mercado",
                     "terms": "mercado, mercadillo, mercado público, plaza de mercado, feria"
                 },
+                "amenity/monastery": {
+                    "name": "Área de Monasterio",
+                    "terms": "área de monasterio, terreno de monasterio, monasterio, terreno sagrado, área religiosa"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Aparcamiento de motocicletas",
                     "terms": "motocicleta, moto, aparcamiento, parking, estacionamiento, parqueadero, parqueo, parqueadero de motocicletas, estacionamiento de motocicletas, parqueo de motocicletas"
@@ -3191,6 +3299,10 @@
                     "name": "Máquina expendedora de cigarrillos",
                     "terms": "tabaco, cigarro, cigarrillo, pucho, expendedor"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "Máquina expendedora de café",
+                    "terms": "Máquina expendedora de café, café, cafe"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "Máquina expendedora de condones",
                     "terms": "condones, condón, profiláctico, preservativo, expendedor"
@@ -3199,6 +3311,14 @@
                     "name": "Máquina expendedora de bebidas",
                     "terms": "bebida, gaseosa, refresco, expendedor"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "Máquina expendedora de electrónica",
+                    "terms": "Máquina expendedora de electrónica, cable, cargador, auricular, auriculares, teléfono, telefono, celular, tableta"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "Máquina expendedora de monedas planas",
+                    "terms": "Máquina expendedora de monedas planas, moneda, aplastar, alargar, aplanar, penique, recuerdo"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "Máquina expendedora de bolsa para excrementos",
                     "terms": "excremento, caca, bolsa, expendedor"
@@ -3207,6 +3327,18 @@
                     "name": "Máquina expendedora de higiene femenina",
                     "terms": "Máquina expendedora de higiene femenina, maquina expendedora, condón, tampón, tampon, almohadilla, toallita, toalla, mujer, mujeres, productos de higiene menstrual, cuidado personal"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "Máquina expendedora de alimentos",
+                    "terms": "Máquina expendedora de alimentos, comida, alimento, comestible"
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "Surtidor de combustible",
+                    "terms": "Surtidor de combustible, gasolina, combustible, biodiesel, gnc"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "Máquina expendedora de helados",
+                    "terms": "Máquina expendedora de helados, chocolate, helado, helado, paleta, vainilla"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Máquina expendedora de periódico"
                 },
@@ -3226,6 +3358,10 @@
                     "name": "Máquina expendedora del boleto de transporte",
                     "terms": "ticket, boleto, recibo, transporte público, autobús, bus, colectivo, micro, guagua, expendedor"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "Máquina expendedora del franqueo",
+                    "terms": "Máquina expendedora del franqueo, correo, franqueo, sello, estampillas"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "Máquina expendedora de snacks",
                     "terms": "snack, bocadillo, refrigerio, botanas, expendedor"
@@ -3441,8 +3577,8 @@
                     "terms": "Edificio cívico, edificio civico, cívico, civico, centro cívico, centro civico, ayuntamiento, biblioteca, piscina"
                 },
                 "building/college": {
-                    "name": "Edificio instituto",
-                    "terms": "edificio del instituto, edificio instituto, facultad"
+                    "name": "Edificio educativo post-bachillerato no universitario",
+                    "terms": "edificio del instituto, edificio instituto, centro educativo, centro formativo"
                 },
                 "building/commercial": {
                     "name": "Edificio comercial",
@@ -3464,10 +3600,12 @@
                     "name": "Entrada/Salida"
                 },
                 "building/farm": {
-                    "name": "Casa de Campo"
+                    "name": "Casa de campo",
+                    "terms": "Casa de campo, casa, campo, edificio agrícola, edificio agricola, agrícola, agricola, granja"
                 },
                 "building/farm_auxiliary": {
-                    "name": "Edificio agrícola"
+                    "name": "Edificio agrícola",
+                    "terms": "edificio agrícola, edificio agricola, agrícola, agricola, granja"
                 },
                 "building/garage": {
                     "name": "Garaje privado",
@@ -4027,6 +4165,10 @@
                     "name": "Enlace de autopista",
                     "terms": "enlace, acceso, autopista, autovía, salida"
                 },
+                "highway/passing_place": {
+                    "name": "Lugar de paso",
+                    "terms": "lugar de paso, parada, zona de descanso"
+                },
                 "highway/path": {
                     "name": "Sendero",
                     "terms": "vereda, sendero, senda, camino, vía, ramal, trocha, atajo, travesía, huella, rastro"
@@ -4386,6 +4528,10 @@
                     "name": "Sala de juegos recreativos",
                     "terms": "juegos, videojuegos, simuladores, máquinas, maquinas, pinball, fichines"
                 },
+                "leisure/beach_resort": {
+                    "name": "Balneario",
+                    "terms": "resort, complejo, playa, complejo de playa, balneario"
+                },
                 "leisure/bird_hide": {
                     "name": "Observatorio de aves",
                     "terms": "observatorio, refugio, ave, pájaro, vida silvestre, naturaleza"
@@ -4403,7 +4549,8 @@
                     "terms": "sala de baile, pista de baile, baile de salón, bolero, conga, cha-cha-chá, fox-trot, mambo, son cubano, meregue, milonga, pasodoble, polka, rock and roll, rumba, swing, tango, vals, jive"
                 },
                 "leisure/dancing_school": {
-                    "name": "Escuela de baile"
+                    "name": "Escuela de baile",
+                    "terms": "escuela de baile, escuela de danza, academia de danza, baile, danza, escuela, taller, academia"
                 },
                 "leisure/dog_park": {
                     "name": "Parque canino",
@@ -4501,9 +4648,13 @@
                     "name": "Reserva natural",
                     "terms": "reserva natural, reserva ecológica, área protegida, conservación, preservación, natural"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "Área de asientos al exterior",
+                    "terms": "al aire libre, jardín de cerveza, comedor, cafetería, restaurante, pub, bar, patio"
+                },
                 "leisure/park": {
-                    "name": "Parque",
-                    "terms": "parque, plaza, plazuela, parque ecoturístico, área de recreación"
+                    "name": "Parque / Plaza verde",
+                    "terms": "parque, plaza, plazuela, parque ecoturístico, área de recreación, bosque, jardín, jardin, hierba, pasto, verde, césped, cesped, prado, zonas verdes, juegos infantiles, jardín de recreo, arbolado"
                 },
                 "leisure/picnic_table": {
                     "name": "Mesa de picnic",
@@ -4629,6 +4780,10 @@
                     "name": "Socavón",
                     "terms": "socavón, entrada, mina"
                 },
+                "man_made/antenna": {
+                    "name": "Antena",
+                    "terms": "antena, cable, alambre, parabólica, satelital"
+                },
                 "man_made/breakwater": {
                     "name": "Rompeolas",
                     "terms": "cortaolas, rompeolas, malecón"
@@ -4680,6 +4835,10 @@
                     "name": "Torre de Observación",
                     "terms": "Torre de observación, torre de vigilancia"
                 },
+                "man_made/observatory": {
+                    "name": "Observatorio",
+                    "terms": "observatorio, mirador, observador, astronomía, telescopio"
+                },
                 "man_made/petroleum_well": {
                     "name": "Pozo de petróleo",
                     "terms": "pozo, petróleo, plataforma de perforación, torre de perforación, perforación de petróleo, plataforma petrolera"
@@ -4804,6 +4963,10 @@
                     "name": "Brezal / Landa",
                     "terms": "brezal, landa, jaral, matorral, llanura, páramo, meseta, arenal, estepa, planicie, descampado, escajo, tojo"
                 },
+                "natural/mud": {
+                    "name": "Lodo",
+                    "terms": "lodo, barro, charco, pantano"
+                },
                 "natural/peak": {
                     "name": "Pico",
                     "terms": "pico, montaña, cresta, cima, cúspide, cumbre, picacho, aguja, alpes, corona, colina, monte"
@@ -5075,7 +5238,7 @@
                     "terms": "submunicipio, subdistrito, sector, cuadrante, delegación, localidad, barrio, vecindario, quarter"
                 },
                 "place/square": {
-                    "name": "Plaza",
+                    "name": "Plaza cívica",
                     "terms": "plaza"
                 },
                 "place/suburb": {
@@ -5840,6 +6003,10 @@
                     "name": "Tienda de mascotas",
                     "terms": "mascota, animal, tienda de animales"
                 },
+                "shop/pet_grooming": {
+                    "name": "Tienda de aseo para mascotas",
+                    "terms": "Tienda de aseo para mascotas, perro"
+                },
                 "shop/photo": {
                     "name": "Tienda de fotografía",
                     "terms": "fotografía, fotógrafo, cámara, retratista, revelado, film, rollo, impresión, fotos"
@@ -6004,8 +6171,8 @@
                     "terms": "caravana, remolque, autocaravana, roulotte"
                 },
                 "tourism/chalet": {
-                    "name": "Cabaña de vacaciones",
-                    "terms": "chalet, bungalow, bungaló, bungalo, turismo, cabaña, complejo de cabañas, vacacional, turístico, turistico, turismo"
+                    "name": "Alojamiento rural vacacional",
+                    "terms": "casa rural, bungalow, bungaló, bungalo, turismo, cabaña, complejo de cabañas, vacacional, turístico, turistico, turismo, cabaña de vacaciones, posada, casa de labranza, casa de campo"
                 },
                 "tourism/gallery": {
                     "name": "Galería de arte",
@@ -6143,16 +6310,20 @@
                     "terms": "giro en U, cambio de sentido, vuelta en U, no girar en U, prohibido girar en U"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "Sólo girar a la izquierda",
-                    "terms": "giro, izquierda"
+                    "name": "Solo giro a la izquierda",
+                    "terms": "Solo giro a la izquierda, giro, izquierda"
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "Sólo girar a la derecha",
-                    "terms": "giro, derecha"
+                    "name": "Solo giro a la derecha",
+                    "terms": "Solo giro a la derecha, giro, derecha"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "No girar",
-                    "terms": "prohibición, giro, no girar, prohibido girar"
+                    "name": "Solo seguir derecho",
+                    "terms": "Solo seguir derecho, derecho, recto"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Solo giro en U",
+                    "terms": "Solo giro en U, giro, U, vuelta en U, cambio de sentido"
                 },
                 "type/route": {
                     "name": "Ruta",
@@ -6447,7 +6618,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Mapa base de Austria, basado en datos del gobierno.",
+                "description": "Mapa base de Austria, basado en datos gubernamentales.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6509,7 +6680,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Teselas del mapa por Stamen Design, bajo CC BY 3.0"
+                    "text": "Teselas del mapa de Stamen Design, bajo CC BY 3.0. Datos de OpenStreetMap, bajo ODbL"
                 },
                 "name": "Stamen Terrain"
             },
@@ -6525,6 +6696,164 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap India - Mapeo participativo del barrio",
+                "description": "Mejora OpenStreetMap en India",
+                "extendedDescription": "¿Mapeando en India? ¿Tienes preguntas, quieres contactar con la comunidad local? Únete a nosotros en {Url}. ¡Todos son bienvenidos!"
+            },
+            "OSM-japan-facebook": {
+                "name": "Comunidad OpenStreetMap Japón",
+                "description": "Mapeadores y usuarios de OpenStreetMap en Japón"
+            },
+            "OSM-japan-mailinglist": {
+                "name": "Lista de correo de OpenStreetMap Japón",
+                "description": "Talk-ja es una lista de correo oficial para la Comunidad Japonesa"
+            },
+            "OSM-japan-twitter": {
+                "name": "Twitter de OpenStreetMap Japón",
+                "description": "Etiqueta en Twitter: {url}"
+            },
+            "OSM-PH-facebook": {
+                "description": "Bienvenido a OpenStreetMap Filipinas, donde animamos a los Filipinos a contribuir al proyecto OpenStreetMap"
+            },
+            "OSM-PH-slack": {
+                "description": "¡Todos son bienvenidos! Regístrate en {signupUrl}"
+            },
+            "OSM-PH-telegram": {
+                "name": "Telegram de OpenStreetMap PH",
+                "description": "Comunidad local no oficial de contribuidores y amigos de OpenStreetMap en Filipinas"
+            },
+            "OSM-RU-forum": {
+                "name": "Foro OpenStreetMap RU",
+                "description": "Foro web de OpenStreetMap Rusia"
+            },
+            "OSM-RU-telegram": {
+                "name": "Telegram de OpenStreetMap RU",
+                "description": "Chat de telegram de OpenStreetMap Rusia"
+            },
+            "OSM-TW-facebook": {
+                "name": "Comunidad de OpenStreetMap Taiwan"
+            },
+            "byosm": {
+                "name": "OpenStreetMap Bielorrusia",
+                "description": "Grupo OpenStreetMap Bielorrusia en Telegram"
+            },
+            "OSM-ES-telegram": {
+                "name": "@OSMes en Telegram",
+                "description": "Grupo OpenStreetMap España en Telegram"
+            },
+            "Bay-Area-OpenStreetMappers": {
+                "name": "OpenStreetMappers del área de la bahía",
+                "description": "Mejore OpenStreetMap en el área de la bahía",
+                "extendedDescription": "En este grupo se trata de hacer crecer la comunidad OpenStreetMap aquí en el Área de la Bahía. Nuestros eventos están abiertos a todos, desde entusiastas del código abierto, ciclistas, profesionales SIG, geocachers y más. Cualquier persona y todos los que estén interesados en mapas, creación de mapas y datos de mapa gratuitos pueden unirse a nuestro grupo y asistir a nuestros eventos."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "OSM Pensilvania Central",
+                "description": "Comunidad de mapeo en línea con sede en State College, PA"
+            },
+            "Code-for-San-Jose-Slack": {
+                "name": "Slack de Code for San Jose",
+                "description": "¡Todos son bienvenidos! Regístrese en {signupUrl}, luego únase al canal #osm channel."
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM",
+                "description": "El grupo de usuarios de OpenStreetMap para Dallas-Fort Worth",
+                "extendedDescription": "Dallas, Fort Worth y todas las ciudades en el medio están repletas de gente creativa y conocedora de la tecnología. La visión de este grupo de usuarios es encontrar nuevas formas de utilizar el increíble recurso de OSM."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Encuentro para entusiastas del mapa en el área de Filadelfia",
+                "extendedDescription": "GeoPhilly une desarrolladores, geógrafos, geeks de datos, entusiastas del código abierto, hackers cívicos y adictos al mapa en nuestro amor compartido por los mapas y las historias que cuentan. Si usa mapas como parte de su trabajo o simplemente quiere aprender más, este es lugar de encuentro para usted. Nuestros eventos apuntan a ser abiertos, amigables, educativos y sociales, y abarcan desde happy hours hasta lightning talk -charla relámpago- o incluso talleres. ¡Ven a crear una comunidad geoespacial diversa e inspiradora en Filadelfia con nosotros!"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapeando DC",
+                "description": "Mejore OpenStreetMap en el área de DC",
+                "extendedDescription": "Somos un grupo de cartógrafos voluntarios que buscan mejorar OpenStreetMap en el área de DC. También pretendemos enseñar a otros sobre el ecosistema OSM, análisis de datos, cartografía y SIG. Nos reunimos cada dos meses para enfocarnos en un área de nuestra ciudad."
+            },
+            "OSM-Boston": {
+                "name": "OpenStreetMap Boston",
+                "description": "Editores y usuarios de OpenStreetMap en el área de Boston",
+                "extendedDescription": "OpenStreetMap es el mapa del mundo gratuito y abierto al estilo wiki, con cientos de miles de contribuciones diarias de personas como usted. ¡Editar el mapa es simple y divertido! ¡Únete a nosotros tanto en el interior como en el exterior en nuestro esfuerzo por crear el mejor mapa del área de Boston y el resto del mundo!"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "El grupo de usuarios de OpenStreetMap para Chattanooga"
+            },
+            "OSM-Colorado": {
+                "name": "OpenStreetMap Colorado",
+                "description": "Editores y usuarios de OpenStreetMap en el Estado de Colorado, EE.UU.",
+                "extendedDescription": "OpenStreetMap (OSM) Colorado es una colaboración local de personas interesadas en contribuir con sus esfuerzos para crear mapas gratuitos. Alentamos a todos nuestros cartógrafos a organizar o sugerir eventos de mapeo en todo el estado. Los encuentros pueden ser simples reuniones sociales, entrenamiento básico a avanzado de OSM o actividades de mapeo comunitario."
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap NYC",
+                "description": "Mapeadores y usuarios de OpenStreetMap, desarrolladores y entusiastas en el área Metropolitana de Nueva York"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland",
+                "description": "Mapeadores y usuarios de OpenStreetMap en el área de Portland",
+                "extendedDescription": "OpenStreetMap (OSM) es un mapa del mundo creado por personas como tú. Es un mapa que tú creas, que se regala gratis como wikipedia. Visita osm.org para obtener más información, ¡y únete a nosotros en un encuentro para hablar de mapas, contribuir con OSM y divertirse!"
+            },
+            "OSM-Seattle": {
+                "name": "OpenStreetMap Seattle",
+                "description": "Editores y usuarios de OpenStreetMap en el área de Seattle"
+            },
+            "OSM-South-Bay": {
+                "name": "OSM South Bay",
+                "description": "Noches de mapeo organizadas por Code for San Jose",
+                "extendedDescription": "Code for San Jose, la brigada local del Code for America, organiza noches de mapeo mensuales los jueves por la noche en el centro de San José. Conozca a otros mapeadores de South Bay, ayude con proyectos de mapeo locales y escuche sobre otros proyectos de tecnología cívica. No se requieren habilidades de programación ni GIS."
+            },
+            "OSM-Tampa-Bay": {
+                "name": "OpenStreetMap Tampa Bay",
+                "description": "Editores y usuarios de OpenStreetMap en el área de Tampa Bay",
+                "extendedDescription": "El grupo OSM de residentes locales de Tampa Bay para reunirnos y construir el mapa definitivo de Tampa Bay con OpenStreetMap, el mapa libre y editable del mundo.  Si te van los mapas, el código abierto, GPS, senderismo, ciclismo, etcetera, te encantará trabajar con OpenStreetMap -- ¡así que únete! Nos juntaremos y haremos mapas y hablaremos de nuevos temas una vez al mes o así."
+            },
+            "OSM-US-Slack": {
+                "name": "Slack de OpenStreetMap US",
+                "description": "¡Todos son bienvenidos! Regístrate en {signupUrl}"
+            },
+            "OSM-US": {
+                "name": "OpenStreetMap US",
+                "description": "Ayudamos a crecer y mejorar OpenStreetMap en los Estados Unidos.",
+                "extendedDescription": "Apoyamos OpenStreetMap celebrando conferencias anuales, proporcionando recursos comunitarios, creando alianzas y dando a conocer. Únase a OpenStreetMap US aquí: {signupUrl}"
+            },
+            "OSM-Utah": {
+                "name": "OpenStreetMap Utah",
+                "description": "Editores y usuarios de OpenStreetMap en el área de Salt Lake City",
+                "extendedDescription": "Las actividades pueden incluir cosas como talleres para Aprender a Hacer Mapas, actividades de mapeo y recolección de datos al aire libre. Los eventos tendrán lugar en el área de SLC, al menos inicialmente. Estamos buscando mapeadores experimentados, así como personas nuevas en OSM. ¡Únase y mapeemos juntos!"
+            },
+            "OSM-Wyoming": {
+                "name": "OpenStreetMap Wyoming",
+                "description": "Editores y usuarios de OpenStreetMap en el área de Wyoming",
+                "extendedDescription": "OpenStreetMap (OSM) Wyoming es una colaboración local de personas interesadas en contribuir con sus esfuerzos para crear mapas gratuitos. Alentamos a todos nuestros cartógrafos a organizar o sugerir eventos de mapeo en todo el estado. Las actividades de reunión pueden ser simples reuniones sociales, entrenamiento básico a avanzado de OSM o fiestas de mapeo de la comunidad."
+            },
+            "PHXGeo-meetup": {
+                "name": "Meetup de PHXGeo",
+                "description": "Editores y usuarios de OpenStreetMap en el área de Phoenix, AZ",
+                "extendedDescription": "Este es un grupo de encuentro para aquellos en el área de Phoenix que les gustan los mapas, GIS, OpenStreetMap, cartografía y cualquier cosa similar."
+            },
+            "PHXGeo-twitter": {
+                "name": "Twitter de PHXGeo",
+                "description": "Síguenos en Twitter en  {url}"
+            },
+            "Western-Slope-facebook": {
+                "name": "Facebook de Western Slope OSM",
+                "description": "Editores y usuarios de OpenStreetMap en Grand Junction, CO"
+            },
+            "Western-Slope-meetup": {
+                "name": "Meetup de Western Slope OSM",
+                "description": "Editores y usuarios de OpenStreetMap en Grand Junction, CO",
+                "extendedDescription": "El objetivo de este grupo es presentar OpenStreetMap a la comunidad, desarrollar una comunidad de mapeadores, crear datos geográficos lo más increíble posible utilizando cualquier método que podamos y, finalmente, crear una estrategia con el fin de obtener esta información de nuestra comunidad. ¡Imagine la señalización precisa del sendero! ¡Imagine un mayor desarrollo de las ciclovías! ¡Imagina lo que quieras, esa es la gracia de OpenStreetMap!"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Slack de Maptime Australia",
+                "description": "Regístrate en {signupUrl}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap en Reddit",
+                "description": "/r/openstreetmap/ es un gran lugar para aprender más sobre OpenStreetMap. ¡Pregúntenos cualquier cosa!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/et.json b/dist/locales/et.json
index a737a8c0b..26f459afd 100644
--- a/dist/locales/et.json
+++ b/dist/locales/et.json
@@ -894,6 +894,9 @@
                         "cycleway:right": "Paremas servas"
                     }
                 },
+                "dance/style": {
+                    "label": "Tantsustiilid"
+                },
                 "date": {
                     "label": "Kuupäev"
                 },
@@ -903,6 +906,46 @@
                 "denomination": {
                     "label": "Usulahk"
                 },
+                "direction": {
+                    "label": "Suund (kraade päripäeva)",
+                    "placeholder": "45, 90, 180, 270"
+                },
+                "direction_cardinal": {
+                    "label": "Suund",
+                    "options": {
+                        "E": "Ida",
+                        "ENE": "Idakirre",
+                        "ESE": "Idakagu",
+                        "N": "Põhi",
+                        "NE": "Kirre",
+                        "NNE": "Põhjakirre",
+                        "NNW": "Põhjaloe",
+                        "NW": "Loe",
+                        "S": "Lõuna",
+                        "SE": "Kagu",
+                        "SSE": "Lõunakagu",
+                        "SSW": "Lõunaedel",
+                        "SW": "Edel",
+                        "W": "Lääs",
+                        "WNW": "Lääneloe",
+                        "WSW": "Lääneedel"
+                    }
+                },
+                "direction_clock": {
+                    "label": "Suund",
+                    "options": {
+                        "anticlockwise": "Vastupäeva",
+                        "clockwise": "Päripäeva"
+                    }
+                },
+                "direction_vertex": {
+                    "label": "Suund",
+                    "options": {
+                        "backward": "Tagasi",
+                        "both": "Mõlemad / Kõik",
+                        "forward": "Edasi"
+                    }
+                },
                 "dock": {
                     "label": "Tüüp"
                 },
@@ -1009,6 +1052,10 @@
                 "maxspeed": {
                     "label": "Kiiruspiirang"
                 },
+                "maxspeed/advisory": {
+                    "label": "Soovitatav suurim kiirus",
+                    "placeholder": "30, 50, 70..."
+                },
                 "name": {
                     "label": "Nimi",
                     "placeholder": "Üldlevinud nimi (kui on)"
@@ -1061,7 +1108,9 @@
                 "oneway": {
                     "label": "Ühesuunaline",
                     "options": {
+                        "alternating": "Vahelduv",
                         "no": "Ei",
+                        "reversible": "Ümberpööratav",
                         "undefined": "Eeldatavasti mitte",
                         "yes": "Jah"
                     }
@@ -1069,7 +1118,9 @@
                 "oneway_yes": {
                     "label": "Ühesuunaline",
                     "options": {
+                        "alternating": "Vahelduv",
                         "no": "Ei",
+                        "reversible": "Ümberpööratav",
                         "undefined": "Eeldatavasti Jah",
                         "yes": "Jah"
                     }
@@ -1111,9 +1162,20 @@
                 "railway": {
                     "label": "Tüüp"
                 },
+                "railway/signal/direction": {
+                    "label": "Suund",
+                    "options": {
+                        "backward": "Tagasi",
+                        "both": "Mõlemad / Kõik",
+                        "forward": "Edasi"
+                    }
+                },
                 "recycling_accepts": {
                     "label": "Võtab vastu"
                 },
+                "ref/isil": {
+                    "label": "ISIL-kood"
+                },
                 "relation": {
                     "label": "Tüüp"
                 },
@@ -1260,6 +1322,14 @@
                 "traffic_signals": {
                     "label": "Tüüp"
                 },
+                "traffic_signals/direction": {
+                    "label": "Suund",
+                    "options": {
+                        "backward": "Tagasi",
+                        "both": "Mõlemad / Kõik",
+                        "forward": "Edasi"
+                    }
+                },
                 "trees": {
                     "label": "Puud"
                 },
@@ -1288,6 +1358,9 @@
                 "wheelchair": {
                     "label": "Pääs ratastooliga"
                 },
+                "wholesale": {
+                    "label": "Hulgikaubandus"
+                },
                 "width": {
                     "label": "Laius (meetrites)"
                 },
@@ -1322,6 +1395,9 @@
                     "name": "Lennuterminal",
                     "terms": "terminal,lennujaam"
                 },
+                "allotments/plot": {
+                    "name": "Ühisaia krunt"
+                },
                 "amenity": {
                     "name": "Hüve"
                 },
@@ -1499,6 +1575,9 @@
                     "name": "Turg",
                     "terms": "Turuplats"
                 },
+                "amenity/monastery": {
+                    "name": "Kloostriala"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Mootorratta parkla"
                 },
@@ -1590,6 +1669,9 @@
                     "name": "Varjualune",
                     "terms": "ulualune,räästaalune,peavari"
                 },
+                "amenity/smoking_area": {
+                    "name": "Suitsetamise koht"
+                },
                 "amenity/social_facility": {
                     "name": "Sotsiaalkeskus",
                     "terms": "Sotsiaalamet"
@@ -1706,6 +1788,10 @@
                 "barrier/hedge": {
                     "name": "Hekk"
                 },
+                "barrier/kerb": {
+                    "name": "Kiviääris",
+                    "terms": "ääris"
+                },
                 "barrier/kissing_gate": {
                     "name": "Karjavärav"
                 },
@@ -1741,6 +1827,10 @@
                     "name": "Küün",
                     "terms": "Tall, laut"
                 },
+                "building/bungalow": {
+                    "name": "Bangalo",
+                    "terms": "bungalo"
+                },
                 "building/bunker": {
                     "name": "Punker"
                 },
@@ -1757,6 +1847,10 @@
                 "building/church": {
                     "name": "Kirikuhoone"
                 },
+                "building/civic": {
+                    "name": "Kultuurihoone",
+                    "terms": "linna,keskus,seltsimaja,rahvamaja"
+                },
                 "building/college": {
                     "name": "Kolledžihoone"
                 },
@@ -1775,6 +1869,12 @@
                 "building/entrance": {
                     "name": "Sissepääs"
                 },
+                "building/farm": {
+                    "name": "Talumaja"
+                },
+                "building/farm_auxiliary": {
+                    "name": "Talu hoone"
+                },
                 "building/garage": {
                     "name": "Garaaž",
                     "terms": "Garaaz"
@@ -1819,6 +1919,10 @@
                 "building/roof": {
                     "name": "Katus"
                 },
+                "building/ruins": {
+                    "name": "Hoone varemed",
+                    "terms": "varemed,purunenud,maha jäätud"
+                },
                 "building/school": {
                     "name": "Koolihoone",
                     "terms": "õppehoone,algkool,keskkool"
@@ -1834,16 +1938,26 @@
                     "name": "Tall",
                     "terms": "Hobusetall"
                 },
+                "building/stadium": {
+                    "name": "Staadionihoone"
+                },
                 "building/static_caravan": {
                     "name": "Paikne haagismaja",
                     "terms": "Haagiselamu,haagismaja,teisaldatav maja"
                 },
+                "building/temple": {
+                    "name": "Templihoone",
+                    "terms": "tempel"
+                },
                 "building/terrace": {
                     "name": "Terrassmaja"
                 },
                 "building/train_station": {
                     "name": "Raudteejaam"
                 },
+                "building/transportation": {
+                    "name": "Transpordihoone"
+                },
                 "building/university": {
                     "name": "Ülikoolihoone"
                 },
@@ -1854,6 +1968,9 @@
                     "name": "Kämpingukoht",
                     "terms": "karavaniplats,kämpinguplats,telgiplats,telgikoht"
                 },
+                "circular": {
+                    "name": "Liiklusring"
+                },
                 "club": {
                     "name": "Klubi"
                 },
@@ -2012,6 +2129,10 @@
                 "emergency/phone": {
                     "name": "Hädaabi telefon"
                 },
+                "emergency/water_tank": {
+                    "name": "Tuletõrjevee mahuti",
+                    "terms": "veevõtukoht,tuletõrjemahuti"
+                },
                 "entrance": {
                     "name": "Sisse- ja Väljapääs"
                 },
@@ -2112,6 +2233,9 @@
                 "highway/motorway_link": {
                     "name": "Kiirtee ühenduslõik"
                 },
+                "highway/passing_place": {
+                    "name": "Möödasõidukoht"
+                },
                 "highway/path": {
                     "name": "Rada"
                 },
@@ -2297,6 +2421,10 @@
                 "landuse/forest": {
                     "name": "Metsamaa"
                 },
+                "landuse/garages": {
+                    "name": "Maakasutus garaažidele",
+                    "terms": "garaažid"
+                },
                 "landuse/grass": {
                     "name": "Muru"
                 },
@@ -2376,6 +2504,10 @@
                 "leisure": {
                     "name": "Vaba aeg"
                 },
+                "leisure/amusement_arcade": {
+                    "name": "Videomängumasin",
+                    "terms": "telekamäng,mängukonsool"
+                },
                 "leisure/bowling_alley": {
                     "name": "Boolingusaal",
                     "terms": "bowling,keegel,keeglisaal,hobikeegel"
@@ -2384,6 +2516,9 @@
                     "name": "Tantsusaal",
                     "terms": "tantsuhall"
                 },
+                "leisure/dancing_school": {
+                    "name": "Tantsukool"
+                },
                 "leisure/dog_park": {
                     "name": "Koerapark"
                 },
@@ -2508,6 +2643,10 @@
                     "name": "Stoll",
                     "terms": "suue,kaevandus,sissepääs,horisontaalne,kaeveõõne,rõhtkaeve,koobas"
                 },
+                "man_made/antenna": {
+                    "name": "Antenn",
+                    "terms": "raadio,saatja,mast,side,televisiooni,edastus,levi,signaal"
+                },
                 "man_made/breakwater": {
                     "name": "Lainemurdja",
                     "terms": "sadamatamm,kaitsetamm,tamm"
@@ -2541,6 +2680,9 @@
                 "man_made/observation": {
                     "name": "Vaatlustorn"
                 },
+                "man_made/observatory": {
+                    "name": "Observatoorium"
+                },
                 "man_made/petroleum_well": {
                     "name": "Nafta puurkaev"
                 },
@@ -2620,6 +2762,10 @@
                 "natural/heath": {
                     "name": "Nõmm"
                 },
+                "natural/mud": {
+                    "name": "Muda",
+                    "terms": "märgala,soo"
+                },
                 "natural/peak": {
                     "name": "Mäetipp",
                     "terms": "tipp"
@@ -2682,6 +2828,10 @@
                 "office": {
                     "name": "Kontor"
                 },
+                "office/company": {
+                    "name": "Ettevõtte kontor",
+                    "terms": "kontor,firma,korporatiiv"
+                },
                 "office/government": {
                     "name": "Valitsuse kontor"
                 },
@@ -2815,6 +2965,10 @@
                     "name": "Pood",
                     "terms": "kauplus"
                 },
+                "shop/agrarian": {
+                    "name": "Põllumajandustarvete kauplus",
+                    "terms": "aiatarbed,talupidamistarbed,põllumasinad,seemned,masinad"
+                },
                 "shop/alcohol": {
                     "name": "Alkoholipood"
                 },
@@ -3026,6 +3180,10 @@
                     "name": "Rauakauplus",
                     "terms": "tööriistad,kinnitusvahendid"
                 },
+                "shop/health_food": {
+                    "name": "Tervisliku toidu kauplus",
+                    "terms": "vitamiinid,tervis,terviklikud,mahe,vegan,täistera,toidulisandid"
+                },
                 "shop/hearing_aids": {
                     "name": "Kuulmisabipood"
                 },
@@ -3238,6 +3396,10 @@
                 "shop/weapons": {
                     "name": "Relvapood"
                 },
+                "shop/wholesale": {
+                    "name": "Hulgikauplus",
+                    "terms": "hulgikaup"
+                },
                 "shop/window_blind": {
                     "name": "Aknakatete kauplus",
                     "terms": "rulood,ribikardinad,lamellkardinad"
@@ -3386,18 +3548,6 @@
                 "type/restriction/no_u_turn": {
                     "name": "Tagasipöörd keelatud"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Ainult vasakpöörd",
-                    "terms": "ainult vasakule,kohustuslik sõidusuund vasakule"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Ainult parempöörd",
-                    "terms": "ainult paremale,kohustuslik sõidusuund paremale"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Pööramine keelatud",
-                    "terms": "Kohustuslik sõidusuund otse,ainult otse"
-                },
                 "type/route": {
                     "name": "Marsruut"
                 },
diff --git a/dist/locales/fa.json b/dist/locales/fa.json
index 10d41c636..22b8e3159 100644
--- a/dist/locales/fa.json
+++ b/dist/locales/fa.json
@@ -1,5 +1,10 @@
 {
     "fa": {
+        "icons": {
+            "information": "اطلاعات",
+            "remove": "پاک کردن",
+            "undo": "بازگردانی"
+        },
         "modes": {
             "add_area": {
                 "title": "محدوده",
@@ -291,7 +296,8 @@
         },
         "restriction": {
             "controls": {
-                "distance": "مسافت"
+                "distance": "مسافت",
+                "via": "از طريق"
             }
         },
         "undo": {
@@ -340,7 +346,8 @@
             "created": "ساخته شد",
             "about_changeset_comments": "درباره توضیحات تغییرات",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
-            "google_warning": "شما در توضیحات خود از گوگل نام بردید. لطفا توجه داشته باشید که کپی کردن از نقشه‌های گوگل، ممنوع است."
+            "google_warning": "شما در توضیحات خود از گوگل نام بردید. لطفا توجه داشته باشید که کپی کردن از نقشه‌های گوگل، ممنوع است.",
+            "google_warning_link": "https://www.openstreetmap.org/copyright"
         },
         "contributors": {
             "list": "ویرایش توسط {users}",
@@ -792,6 +799,24 @@
                 }
             }
         },
+        "units": {
+            "feet": "{quantity} فوت",
+            "miles": "{quantity} مایل",
+            "square_feet": "{quantity} فوت مربع",
+            "square_miles": "{quantity} مایل مربع",
+            "meters": "{quantity} متر",
+            "kilometers": "{quantity} کیلومتر",
+            "area_pair": "{area1} ({area2})",
+            "arcdegrees": "{quantity}°",
+            "arcminutes": "{quantity}′",
+            "arcseconds": "{quantity}″",
+            "north": "N",
+            "south": "S",
+            "east": "E",
+            "west": "W",
+            "coordinate": "{coordinate}{direction}",
+            "coordinate_pair": "{latitude}, {longitude}"
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
@@ -1538,6 +1563,10 @@
                     "label": "محدودیت سرعت",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "label": "سرعت مجاز توصیه شده",
+                    "placeholder": "۴۰، ۵۰، ۶۰..."
+                },
                 "maxstay": {
                     "label": "حداکثر توقف"
                 },
@@ -2126,9 +2155,6 @@
                     "label": "نوع",
                     "placeholder": "پیش فرض"
                 },
-                "vending": {
-                    "label": "نوع محموله"
-                },
                 "visibility": {
                     "label": "دید",
                     "options": {
@@ -2284,7 +2310,8 @@
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'صحن'، با کاما جدا می‌شوند>"
                 },
                 "aeroway/gate": {
-                    "name": " دروازه فرودگاه "
+                    "name": " دروازه فرودگاه ",
+                    "terms": "<translate with synonyms or related terms for 'Airport Gate', separated by commas>"
                 },
                 "aeroway/hangar": {
                     "name": "آشیانه هواپیما",
@@ -2302,9 +2329,27 @@
                     "name": "راه فرود به پارکینگ",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'فرود به پارک'، با کاما جدا می‌شوند>"
                 },
+                "aeroway/terminal": {
+                    "name": "پایانه فرودگاه",
+                    "terms": "<translate with synonyms or related terms for 'Airport Terminal', separated by commas>"
+                },
+                "allotments/plot": {
+                    "terms": "<translate with synonyms or related terms for 'Community Garden Plot', separated by commas>"
+                },
                 "amenity": {
                     "name": "کاربری"
                 },
+                "amenity/animal_boarding": {
+                    "terms": "<translate with synonyms or related terms for 'Animal Boarding Facility', separated by commas>"
+                },
+                "amenity/animal_breeding": {
+                    "name": "امکانات پرورش حیوانات",
+                    "terms": "<translate with synonyms or related terms for 'Animal Breeding Facility', separated by commas>"
+                },
+                "amenity/animal_shelter": {
+                    "name": "پناهگاه حیوانات",
+                    "terms": "<translate with synonyms or related terms for 'Animal Shelter', separated by commas>"
+                },
                 "amenity/arts_centre": {
                     "name": "مرکز هنری",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مرکز هنری'، با کاما جدا می‌شوند>"
@@ -2353,10 +2398,16 @@
                     "name": "تبدیل ارز / صرافی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تبدیل ارز / صرافی'، با کاما جدا می‌شوند>"
                 },
+                "amenity/bus_station": {
+                    "name": "ایستگاه اتوبوس / ترمینال"
+                },
                 "amenity/cafe": {
                     "name": "کافه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کافه'، با کاما جدا می‌شوند>"
                 },
+                "amenity/car_pooling": {
+                    "terms": "<translate with synonyms or related terms for 'Car Pooling', separated by commas>"
+                },
                 "amenity/car_rental": {
                     "name": "کرایه ماشین",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کرایه خودرو'، با کاما جدا می‌شوند>"
@@ -2389,6 +2440,12 @@
                     "name": "کلینیک",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'درمانگاه'، با کاما جدا می‌شوند>"
                 },
+                "amenity/clinic/abortion": {
+                    "terms": "<translate with synonyms or related terms for 'Abortion Clinic', separated by commas>"
+                },
+                "amenity/clinic/fertility": {
+                    "terms": "<translate with synonyms or related terms for 'Fertility Clinic', separated by commas>"
+                },
                 "amenity/clock": {
                     "name": "ساعت",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساعت'، با کاما جدا می‌شوند>"
@@ -2432,6 +2489,10 @@
                     "name": "آب آشامیدنی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'آب آشامیدنی'، با کاما جدا می‌شوند>"
                 },
+                "amenity/driving_school": {
+                    "name": "آموزشگاه رانندگی",
+                    "terms": "<translate with synonyms or related terms for 'Driving School', separated by commas>"
+                },
                 "amenity/embassy": {
                     "name": "سفارت خانه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'سفارت'، با کاما جدا می‌شوند>"
@@ -2488,18 +2549,32 @@
                     "name": "کتابخانه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کتابخانه'، با کاما جدا می‌شوند>"
                 },
+                "amenity/love_hotel": {
+                    "name": "هتل عشق",
+                    "terms": "<translate with synonyms or related terms for 'Love Hotel', separated by commas>"
+                },
                 "amenity/marketplace": {
                     "name": "بازار",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بازار'، با کاما جدا می‌شوند>"
                 },
+                "amenity/monastery": {
+                    "terms": "<translate with synonyms or related terms for 'Monastery Grounds', separated by commas>"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "پارکینگ موتور سیکلت",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پارکینگ موتور سیکلت'، با کاما جدا می‌شوند>"
                 },
+                "amenity/music_school": {
+                    "name": "آموزشگاه موسیقی",
+                    "terms": "<translate with synonyms or related terms for 'Music School', separated by commas>"
+                },
                 "amenity/nightclub": {
                     "name": "کلوپ شبانه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کلوپ شبانه'، با کاما جدا می‌شوند>"
                 },
+                "amenity/nursing_home": {
+                    "name": "خانه سالمندان"
+                },
                 "amenity/parking": {
                     "name": "پارکینگ خودرو",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پارکینگ خودرو'، با کاما جدا می‌شوند>"
@@ -2512,6 +2587,9 @@
                     "name": "جای پارک",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای'جای پارک'، با کاما جدا می‌شوند>"
                 },
+                "amenity/pavilion": {
+                    "terms": "<translate with synonyms or related terms for 'Pavilion', separated by commas>"
+                },
                 "amenity/pharmacy": {
                     "name": "داروخانه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'داروخانه'، با کاما جدا می‌شوند>"
@@ -2528,6 +2606,10 @@
                     "name": "کلیسا",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کلیسا'، با کاما جدا می‌شوند>"
                 },
+                "amenity/place_of_worship/hindu": {
+                    "name": "معبد هندو",
+                    "terms": "<translate with synonyms or related terms for 'Hindu Temple', separated by commas>"
+                },
                 "amenity/place_of_worship/jewish": {
                     "name": "کنیسه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کنیسه'، با کاما جدا می‌شوند>"
@@ -2536,6 +2618,17 @@
                     "name": "مسجد",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسجد'، با کاما جدا می‌شوند>"
                 },
+                "amenity/place_of_worship/shinto": {
+                    "name": "معبد شینتویی",
+                    "terms": "<translate with synonyms or related terms for 'Shinto Shrine', separated by commas>"
+                },
+                "amenity/place_of_worship/sikh": {
+                    "terms": "<translate with synonyms or related terms for 'Sikh Temple', separated by commas>"
+                },
+                "amenity/place_of_worship/taoist": {
+                    "name": "معبد تائو",
+                    "terms": "<translate with synonyms or related terms for 'Taoist Temple', separated by commas>"
+                },
                 "amenity/planetarium": {
                     "name": "آسمان نما",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای   'آسمان نما'، با کاما جدا میشوند>"
@@ -2572,6 +2665,9 @@
                     "name": "ایستگاه جنگلبانی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ایستگاه جنگلبانی'، با کاما جدا می‌شوند>"
                 },
+                "amenity/recycling": {
+                    "terms": "<translate with synonyms or related terms for 'Recycling Container', separated by commas>"
+                },
                 "amenity/recycling_centre": {
                     "name": "مرکز بازیافت",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مرکز بازیافت'، با کاما جدا می‌شوند>"
@@ -2595,6 +2691,14 @@
                     "name": "پناه گاه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پناهگاه'، با کاما جدا می‌شوند>"
                 },
+                "amenity/shower": {
+                    "name": "دوش",
+                    "terms": "<translate with synonyms or related terms for 'Shower', separated by commas>"
+                },
+                "amenity/smoking_area": {
+                    "name": "منطقه سیگار کشیدن",
+                    "terms": "<translate with synonyms or related terms for 'Smoking Area', separated by commas>"
+                },
                 "amenity/social_facility": {
                     "name": "امکانات اجتماعی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'امکانات اجتماعی'، با کاما جدا می‌شوند>"
@@ -2611,6 +2715,10 @@
                     "name": "پناهگاه بی خانمان‌ها",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پناهگاه بی‌خانمان‌ها'، با کاما جدا می‌شوند>"
                 },
+                "amenity/social_facility/nursing_home": {
+                    "name": "خانه سالمندان",
+                    "terms": "<translate with synonyms or related terms for 'Nursing Home', separated by commas>"
+                },
                 "amenity/studio": {
                     "name": "استدیو",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'استودیو'، با کاما جدا می‌شوند>"
@@ -2642,6 +2750,10 @@
                     "name": "محیط دانشگاهی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'محیط دانشگاه'، با کاما جدا می‌شوند>"
                 },
+                "amenity/vending_machine": {
+                    "name": "دستگاه فروش خودکار",
+                    "terms": "<translate with synonyms or related terms for 'Vending Machine', separated by commas>"
+                },
                 "amenity/vending_machine/cigarettes": {
                     "name": "دستگاه فروش سیگار",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای   'دستگاه فروش سیگار'، با کاما جدا می‌شوند>"
@@ -2658,9 +2770,16 @@
                     "name": "دستگاه خود توزیع کیسه پسماند",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دستگاه خود توزیع کیسه پسماند'، با کاما جدا می‌شوند>"
                 },
+                "amenity/vending_machine/feminine_hygiene": {
+                    "terms": "<translate with synonyms or related terms for 'Feminine Hygiene Vending Machine', separated by commas>"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "دستگاه خود فروش روزنامه"
                 },
+                "amenity/vending_machine/newspapers": {
+                    "name": "دستگاه فروش خودکار روزنامه",
+                    "terms": "<translate with synonyms or related terms for 'Newspaper Vending Machine', separated by commas>"
+                },
                 "amenity/vending_machine/parcel_pickup_dropoff": {
                     "name": "سرویس دریافت مرسولات پستی، دستگاه دریافت مرسولات پستی",
                     "terms": "سرویس دریافت امانات پستی، دستگاه دریافت کننده مرسولات پستی "
@@ -2681,6 +2800,10 @@
                     "name": "دامپزشکی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دامپزشکی'، با کاما جدا می‌شوند>"
                 },
+                "amenity/waste/dog_excrement": {
+                    "name": "سطل زباله سگ",
+                    "terms": "<translate with synonyms or related terms for 'Dog Excrement Bin', separated by commas>"
+                },
                 "amenity/waste_basket": {
                     "name": "سطل زباله",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'سطل زباله'، با کاما جدا می‌شوند>"
@@ -2697,6 +2820,9 @@
                     "name": "آب قابل شرب RV",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای'آب قابل شرب RV'، با کاما جدا می‌شوند>"
                 },
+                "amenity/watering_place": {
+                    "terms": "<translate with synonyms or related terms for 'Animal Watering Place', separated by commas>"
+                },
                 "area": {
                     "name": "فضا",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'فضا'، با کاما جدا می‌شوند>"
@@ -2705,6 +2831,49 @@
                     "name": "سطح جاده",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'سطح جاده'، با کاما جدا می‌شوند>"
                 },
+                "attraction/amusement_ride": {
+                    "terms": "<translate with synonyms or related terms for 'Amusement Ride', separated by commas>"
+                },
+                "attraction/animal": {
+                    "terms": "<translate with synonyms or related terms for 'Animal', separated by commas>"
+                },
+                "attraction/big_wheel": {
+                    "terms": "<translate with synonyms or related terms for 'Big Wheel', separated by commas>"
+                },
+                "attraction/bumper_car": {
+                    "terms": "<translate with synonyms or related terms for 'Bumper Car', separated by commas>"
+                },
+                "attraction/bungee_jumping": {
+                    "name": "بانجی جامپینگ",
+                    "terms": "<translate with synonyms or related terms for 'Bungee Jumping', separated by commas>"
+                },
+                "attraction/carousel": {
+                    "name": "چرخ فلک",
+                    "terms": "<translate with synonyms or related terms for 'Carousel', separated by commas>"
+                },
+                "attraction/dark_ride": {
+                    "terms": "<translate with synonyms or related terms for 'Dark Ride', separated by commas>"
+                },
+                "attraction/drop_tower": {
+                    "terms": "<translate with synonyms or related terms for 'Drop Tower', separated by commas>"
+                },
+                "attraction/pirate_ship": {
+                    "name": "کشتی دزدان دریایی",
+                    "terms": "<translate with synonyms or related terms for 'Pirate Ship', separated by commas>"
+                },
+                "attraction/river_rafting": {
+                    "terms": "<translate with synonyms or related terms for 'River Rafting', separated by commas>"
+                },
+                "attraction/roller_coaster": {
+                    "name": "ترن هوایی",
+                    "terms": "<translate with synonyms or related terms for 'Roller Coaster', separated by commas>"
+                },
+                "attraction/train": {
+                    "terms": "<translate with synonyms or related terms for 'Tourist Train', separated by commas>"
+                },
+                "attraction/water_slide": {
+                    "terms": "<translate with synonyms or related terms for 'Water Slide', separated by commas>"
+                },
                 "barrier": {
                     "name": "مانع",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مانع'، با کاما جدا می‌شوند>"
@@ -2718,7 +2887,8 @@
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بولارد'، با کاما جدا می‌شوند>"
                 },
                 "barrier/border_control": {
-                    "name": "مرزبانی"
+                    "name": "مرزبانی",
+                    "terms": "<translate with synonyms or related terms for 'Border Control', separated by commas>"
                 },
                 "barrier/cattle_grid": {
                     "name": "شبکه آهنی",
@@ -2751,6 +2921,9 @@
                     "name": "پرچین",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Hedge'، با کاما جدا می‌شوند>"
                 },
+                "barrier/kerb": {
+                    "terms": "<translate with synonyms or related terms for 'Kerb', separated by commas>"
+                },
                 "barrier/kissing_gate": {
                     "name": "دروازه مخصوص انسان",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'Kissing Gate'، با کاما جدا می‌شوند>"
@@ -2791,6 +2964,13 @@
                     "name": "انبار غله",
                     "terms": "انبار کاه"
                 },
+                "building/boathouse": {
+                    "terms": "<translate with synonyms or related terms for 'Boathouse', separated by commas>"
+                },
+                "building/bungalow": {
+                    "name": "بانگالو",
+                    "terms": "<translate with synonyms or related terms for 'Bungalow', separated by commas>"
+                },
                 "building/bunker": {
                     "name": "انباربزرگ"
                 },
@@ -2810,6 +2990,9 @@
                     "name": "ساختمان کلیسا",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان کلیسا'، با کاما جدا می‌شوند>"
                 },
+                "building/civic": {
+                    "terms": "<translate with synonyms or related terms for 'Civic Building', separated by commas>"
+                },
                 "building/college": {
                     "name": "ساختمان دانشکده",
                     "terms": "ساختمان کالج"
@@ -2833,6 +3016,12 @@
                 "building/entrance": {
                     "name": "ورود/خروج"
                 },
+                "building/farm": {
+                    "terms": "<translate with synonyms or related terms for 'Farm House', separated by commas>"
+                },
+                "building/farm_auxiliary": {
+                    "terms": "<translate with synonyms or related terms for 'Farm Building', separated by commas>"
+                },
                 "building/garage": {
                     "name": "گاراژ",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'گاراژ'، با کاما جدا می‌شوند>"
@@ -2869,6 +3058,9 @@
                     "name": "پیش دبستانی /ساختمان کودکستان",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیش دبستانی / ساختمان کودکستان'، با کاما جدا می‌شوند>"
                 },
+                "building/mosque": {
+                    "terms": "<translate with synonyms or related terms for 'Mosque Building', separated by commas>"
+                },
                 "building/public": {
                     "name": "ساختمان عمومی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان عمومی'، با کاما جدا می‌شوند>"
@@ -2885,6 +3077,9 @@
                     "name": "سقف",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'سقف'، با کاما جدا می‌شوند>"
                 },
+                "building/ruins": {
+                    "terms": "<translate with synonyms or related terms for 'Building Ruins', separated by commas>"
+                },
                 "building/school": {
                     "name": "ساختمان مدرسه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان مدرسه'، با کاما جدا می‌شوند>"
@@ -2893,6 +3088,9 @@
                     "name": "خانه شبه ویلایی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'خانه شبه ویلایی'، با کاما جدا می‌شوند>"
                 },
+                "building/service": {
+                    "terms": "<translate with synonyms or related terms for 'Service Building', separated by commas>"
+                },
                 "building/shed": {
                     "name": "سایبان",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کپر'، با کاما جدا می‌شوند>"
@@ -2901,10 +3099,16 @@
                     "name": "اصطبل",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'اصطبل'، با کاما جدا می‌شوند>"
                 },
+                "building/stadium": {
+                    "terms": "<translate with synonyms or related terms for 'Stadium Building', separated by commas>"
+                },
                 "building/static_caravan": {
                     "name": "خانه از پیش ساخته متحرک",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'خانه از پیش ساخته متحرک'، با کاما جدا می‌شوند>"
                 },
+                "building/temple": {
+                    "terms": "<translate with synonyms or related terms for 'Temple Building', separated by commas>"
+                },
                 "building/terrace": {
                     "name": "خانه های ردیفی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'خانه های ردیفی'، با کاما جدا می‌شوند>"
@@ -2912,6 +3116,9 @@
                 "building/train_station": {
                     "name": "ایستگاه قطار"
                 },
+                "building/transportation": {
+                    "terms": "<translate with synonyms or related terms for 'Transportation Building', separated by commas>"
+                },
                 "building/university": {
                     "name": "ساختمان دانشگاه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان دانشگاه'، با کاما جدا می‌شوند>"
@@ -2924,6 +3131,9 @@
                     "name": "مکان برقراری چادر",
                     "terms": "مکان برقراری چادر، مکان قرار دادن خودرو کاروان"
                 },
+                "club": {
+                    "terms": "<translate with synonyms or related terms for 'Club', separated by commas>"
+                },
                 "craft": {
                     "name": "پیشه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیشه'، با کاما جدا می‌شوند>"
@@ -2964,10 +3174,19 @@
                     "name": "آذوقه رسان",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'آذوقه رسان'، با کاما جدا می‌شوند>"
                 },
+                "craft/chimney_sweeper": {
+                    "terms": "<translate with synonyms or related terms for 'Chimney Sweeper', separated by commas>"
+                },
                 "craft/clockmaker": {
                     "name": "ساعت سازی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساعت‌ساز'، با کاما جدا می‌شوند>"
                 },
+                "craft/confectionery": {
+                    "terms": "<translate with synonyms or related terms for 'Candy Maker', separated by commas>"
+                },
+                "craft/distillery": {
+                    "terms": "<translate with synonyms or related terms for 'Distillery', separated by commas>"
+                },
                 "craft/dressmaker": {
                     "name": "خیاطی زنانه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'خیاط زنانه'، با کاما جدا می‌شوند>"
@@ -2976,6 +3195,10 @@
                     "name": "متخصص برق",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'برقکار'، با کاما جدا می‌شوند>"
                 },
+                "craft/electronics_repair": {
+                    "name": "فروشگاه تعمیرات الکترونیک",
+                    "terms": "<translate with synonyms or related terms for 'Electronics Repair Shop', separated by commas>"
+                },
                 "craft/gardener": {
                     "name": "باغبان",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'باغبان'، با کاما جدا می‌شوند>"
@@ -3061,6 +3284,9 @@
                     "name": "داربستی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'داربست'، با کاما جدا می‌شوند>"
                 },
+                "craft/sculptor": {
+                    "terms": "<translate with synonyms or related terms for 'Sculptor', separated by commas>"
+                },
                 "craft/shoemaker": {
                     "name": "کفاش",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کفاش'، با کاما جدا می‌شوند>"
@@ -3118,6 +3344,9 @@
                     "name": "آتش نشانی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'شیر آتش‌نشانی'، با کاما جدا می‌شوند>"
                 },
+                "emergency/life_ring": {
+                    "terms": "<translate with synonyms or related terms for 'Life Ring', separated by commas>"
+                },
                 "emergency/no": {
                     "name": "دسترسی اظطراری خیر"
                 },
@@ -3131,6 +3360,10 @@
                 "emergency/private": {
                     "name": "دسترسی اضطراری شخصی"
                 },
+                "emergency/water_tank": {
+                    "name": "مخزن آب اضطراری",
+                    "terms": "<translate with synonyms or related terms for 'Emergency Water Tank', separated by commas>"
+                },
                 "emergency/yes": {
                     "name": "دسترسی اظطراری بله"
                 },
@@ -3142,10 +3375,16 @@
                     "name": "تقاطع خیابانی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تقاطع خیابان'، با کاما جدا می‌شوند>"
                 },
+                "footway/crossing-raised": {
+                    "terms": "<translate with synonyms or related terms for 'Raised Street Crossing', separated by commas>"
+                },
                 "footway/crosswalk": {
                     "name": "محل عبور عابر پیاده",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'محل عبور عابر پیاده'، با کاما جدا می‌شوند>"
                 },
+                "footway/crosswalk-raised": {
+                    "terms": "<translate with synonyms or related terms for 'Raised Pedestrian Crosswalk', separated by commas>"
+                },
                 "footway/sidewalk": {
                     "name": "پیاده رو",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیاده‌رو'، با کاما جدا می‌شوند>"
@@ -3194,10 +3433,53 @@
                     "name": "خطر آب",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'خطر آب'، با کاما جدا می‌شوند>"
                 },
+                "healthcare": {
+                    "terms": "<translate with synonyms or related terms for 'Healthcare Facility', separated by commas>"
+                },
+                "healthcare/alternative": {
+                    "terms": "<translate with synonyms or related terms for 'Alternative Medicine', separated by commas>"
+                },
+                "healthcare/alternative/chiropractic": {
+                    "terms": "<translate with synonyms or related terms for 'Chiropractor', separated by commas>"
+                },
+                "healthcare/audiologist": {
+                    "terms": "<translate with synonyms or related terms for 'Audiologist', separated by commas>"
+                },
+                "healthcare/birthing_center": {
+                    "terms": "<translate with synonyms or related terms for 'Birthing Center', separated by commas>"
+                },
                 "healthcare/blood_donation": {
                     "name": "مرکز اهدای خون",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مرکز اهدای خون'، با کاما جدا می‌شوند>"
                 },
+                "healthcare/hospice": {
+                    "terms": "<translate with synonyms or related terms for 'Hospice', separated by commas>"
+                },
+                "healthcare/midwife": {
+                    "name": "ماما",
+                    "terms": "<translate with synonyms or related terms for 'Midwife', separated by commas>"
+                },
+                "healthcare/occupational_therapist": {
+                    "terms": "<translate with synonyms or related terms for 'Occupational Therapist', separated by commas>"
+                },
+                "healthcare/optometrist": {
+                    "terms": "<translate with synonyms or related terms for 'Optometrist', separated by commas>"
+                },
+                "healthcare/physiotherapist": {
+                    "terms": "<translate with synonyms or related terms for 'Physiotherapist', separated by commas>"
+                },
+                "healthcare/podiatrist": {
+                    "terms": "<translate with synonyms or related terms for 'Podiatrist', separated by commas>"
+                },
+                "healthcare/psychotherapist": {
+                    "terms": "<translate with synonyms or related terms for 'Psychotherapist', separated by commas>"
+                },
+                "healthcare/rehabilitation": {
+                    "terms": "<translate with synonyms or related terms for 'Rehabilitation Facility', separated by commas>"
+                },
+                "healthcare/speech_therapist": {
+                    "terms": "<translate with synonyms or related terms for 'Speech Therapist', separated by commas>"
+                },
                 "highway": {
                     "name": "بزرگراه"
                 },
@@ -3205,6 +3487,9 @@
                     "name": "مسیر حیوانات اهلی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای   'Bridle Path'، با کاما جدا می‌شوند>"
                 },
+                "highway/bus_guideway": {
+                    "terms": "<translate with synonyms or related terms for 'Bus Guideway', separated by commas>"
+                },
                 "highway/corridor": {
                     "name": "راهروی داخلی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'راهرو داخلی'، با کاما جدا می‌شوند>"
@@ -3213,14 +3498,24 @@
                     "name": "تقاطع خیابانی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تقاطع خیابان'، با کاما جدا می‌شوند>"
                 },
+                "highway/crossing-raised": {
+                    "terms": "<translate with synonyms or related terms for 'Raised Street Crossing', separated by commas>"
+                },
                 "highway/crosswalk": {
                     "name": "محل عبور عابر پیاده",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'محل عبور عابر پیاده'، با کاما جدا می‌شوند>"
                 },
+                "highway/crosswalk-raised": {
+                    "terms": "<translate with synonyms or related terms for 'Raised Pedestrian Crosswalk', separated by commas>"
+                },
                 "highway/cycleway": {
                     "name": "مسیر دوچرخه سواری",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسیر دوچرخه'، با کاما جدا می‌شوند>"
                 },
+                "highway/elevator": {
+                    "name": "آسانسور",
+                    "terms": "<translate with synonyms or related terms for 'Elevator', separated by commas>"
+                },
                 "highway/footway": {
                     "name": "مسیر پیاده روی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسیر پیاده'، با کاما جدا می‌شوند>"
@@ -3249,10 +3544,19 @@
                     "name": "اتصال بزرگراه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیوستن بزرگراه'، با کاما جدا می‌شوند>"
                 },
+                "highway/passing_place": {
+                    "terms": "<translate with synonyms or related terms for 'Passing Place', separated by commas>"
+                },
                 "highway/path": {
                     "name": "مسیر",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسیر'، با کاما جدا می‌شوند>"
                 },
+                "highway/pedestrian_area": {
+                    "terms": "<translate with synonyms or related terms for 'Pedestrian Area', separated by commas>"
+                },
+                "highway/pedestrian_line": {
+                    "terms": "<translate with synonyms or related terms for 'Pedestrian Street', separated by commas>"
+                },
                 "highway/primary": {
                     "name": "جاده اصلی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'راه اصلی'، با کاما جدا می‌شوند>"
@@ -3261,6 +3565,9 @@
                     "name": "اتصال اصلی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیوستن راه اصلی'، با کاما جدا می‌شوند>"
                 },
+                "highway/raceway": {
+                    "terms": "<translate with synonyms or related terms for 'Racetrack (Motorsport)', separated by commas>"
+                },
                 "highway/residential": {
                     "name": "جاده ی مسکونی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'جاده مسکونی'، با کاما جدا می‌شوند>"
@@ -3309,6 +3616,9 @@
                     "name": "فضای خدماتی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'جایگاه خدماتی'، با کاما جدا می‌شوند>"
                 },
+                "highway/speed_camera": {
+                    "terms": "<translate with synonyms or related terms for 'Speed Camera', separated by commas>"
+                },
                 "highway/steps": {
                     "name": "پله",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پله'، با کاما جدا می‌شوند>"
@@ -3389,6 +3699,10 @@
                     "name": "ویرانه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ویرانه'، با کاما جدا می‌شوند>"
                 },
+                "historic/tomb": {
+                    "name": "آرامگاه",
+                    "terms": "<translate with synonyms or related terms for 'Tomb', separated by commas>"
+                },
                 "historic/wayside_cross": {
                     "name": "صلیب کنار جاده",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'صلیب کنار جاده'، با کاما جدا می‌شوند>"
@@ -3409,10 +3723,17 @@
                     "name": "باغچه عمومی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'باغچه عمومی'، با کاما جدا می‌شوند>"
                 },
+                "landuse/aquaculture": {
+                    "name": "آبزی‌پروری",
+                    "terms": "<translate with synonyms or related terms for 'Aquaculture', separated by commas>"
+                },
                 "landuse/basin": {
                     "name": "حوزه رودخانه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'حوضه'، با کاما جدا می‌شوند>"
                 },
+                "landuse/brownfield": {
+                    "terms": "<translate with synonyms or related terms for 'Brownfield', separated by commas>"
+                },
                 "landuse/cemetery": {
                     "name": "قبرستان",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'قبرستان - آرامگاه'، با کاما جدا می‌شوند>"
@@ -3444,14 +3765,34 @@
                     "name": "جنگل",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'جنگل'، با کاما جدا می‌شوند>"
                 },
+                "landuse/garages": {
+                    "terms": "<translate with synonyms or related terms for 'Garage Landuse', separated by commas>"
+                },
                 "landuse/grass": {
                     "name": "علف زار",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'چمن'، با کاما جدا می‌شوند>"
                 },
+                "landuse/greenfield": {
+                    "terms": "<translate with synonyms or related terms for 'Greenfield', separated by commas>"
+                },
+                "landuse/greenhouse_horticulture": {
+                    "terms": "<translate with synonyms or related terms for 'Greenhouse Horticulture', separated by commas>"
+                },
+                "landuse/harbour": {
+                    "name": "بندرگاه",
+                    "terms": "<translate with synonyms or related terms for 'Harbor', separated by commas>"
+                },
                 "landuse/industrial": {
                     "name": "محیط صنعتی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'منطقه صنعتی'، با کاما جدا می‌شوند>"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "terms": "<translate with synonyms or related terms for 'Scrap Yard', separated by commas>"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "کشتارگاه",
+                    "terms": "<translate with synonyms or related terms for 'Slaughterhouse', separated by commas>"
+                },
                 "landuse/landfill": {
                     "name": "محل دفن مواد (زباله)",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'محل دفن زباله'، با کاما جدا می‌شوند>"
@@ -3465,37 +3806,48 @@
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'منطقه نظامی'، با کاما جدا می‌شوند>"
                 },
                 "landuse/military/airfield": {
-                    "name": "پایگاه هوایی نظامی"
+                    "name": "پایگاه هوایی نظامی",
+                    "terms": "<translate with synonyms or related terms for 'Military Airfield', separated by commas>"
                 },
                 "landuse/military/barracks": {
-                    "name": "پادگان"
+                    "name": "پادگان",
+                    "terms": "<translate with synonyms or related terms for 'Barracks', separated by commas>"
                 },
                 "landuse/military/bunker": {
-                    "name": "محدوده نظامی"
+                    "name": "محدوده نظامی",
+                    "terms": "<translate with synonyms or related terms for 'Military Bunker', separated by commas>"
                 },
                 "landuse/military/checkpoint": {
-                    "name": "ایست بازرسی"
+                    "name": "ایست بازرسی",
+                    "terms": "<translate with synonyms or related terms for 'Checkpoint', separated by commas>"
                 },
                 "landuse/military/danger_area": {
-                    "name": "محدوده خطرناک"
+                    "name": "محدوده خطرناک",
+                    "terms": "<translate with synonyms or related terms for 'Danger Area', separated by commas>"
                 },
                 "landuse/military/naval_base": {
-                    "name": "پایگاه نیروی دریایی"
+                    "name": "پایگاه نیروی دریایی",
+                    "terms": "<translate with synonyms or related terms for 'Naval Base', separated by commas>"
                 },
                 "landuse/military/nuclear_explosion_site": {
-                    "name": "محدوده انفجار اتمی"
+                    "name": "محدوده انفجار اتمی",
+                    "terms": "<translate with synonyms or related terms for 'Nuclear Explosion Site', separated by commas>"
                 },
                 "landuse/military/obstacle_course": {
-                    "name": "ميدان موانع"
+                    "name": "ميدان موانع",
+                    "terms": "<translate with synonyms or related terms for 'Obstacle Course', separated by commas>"
                 },
                 "landuse/military/office": {
-                    "name": "دفتر نظامی"
+                    "name": "دفتر نظامی",
+                    "terms": "<translate with synonyms or related terms for 'Military Office', separated by commas>"
                 },
                 "landuse/military/range": {
-                    "name": "محدوده نظامی"
+                    "name": "محدوده نظامی",
+                    "terms": "<translate with synonyms or related terms for 'Military Range', separated by commas>"
                 },
                 "landuse/military/training_area": {
-                    "name": "منطقه آموزشی"
+                    "name": "منطقه آموزشی",
+                    "terms": "<translate with synonyms or related terms for 'Training Area', separated by commas>"
                 },
                 "landuse/orchard": {
                     "name": "باغ میوه",
@@ -3509,10 +3861,16 @@
                     "name": "معدن سنگ",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'معدن'، با کاما جدا می‌شوند>"
                 },
+                "landuse/railway": {
+                    "terms": "<translate with synonyms or related terms for 'Railway Corridor', separated by commas>"
+                },
                 "landuse/recreation_ground": {
                     "name": "محوطه تفریحی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'محوطه تفریحی'، با کاما جدا می‌شوند>"
                 },
+                "landuse/religious": {
+                    "terms": "<translate with synonyms or related terms for 'Religious Area', separated by commas>"
+                },
                 "landuse/residential": {
                     "name": "منطقه مسکونی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'منطقه مسکونی'، با کاما جدا می‌شوند>"
@@ -3533,6 +3891,9 @@
                     "name": "مرکز بازی بزرگسالان",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مرکز بازی بزرگسالان'، با کاما جدا می‌شوند>"
                 },
+                "leisure/amusement_arcade": {
+                    "terms": "<translate with synonyms or related terms for 'Amusement Arcade', separated by commas>"
+                },
                 "leisure/bird_hide": {
                     "name": "مکان تماشای پرندگان",
                     "terms": "مخفیگاه تماشای پرندگان"
@@ -3549,6 +3910,10 @@
                     "name": "سالن رقص",
                     "terms": "تالار رقص"
                 },
+                "leisure/dancing_school": {
+                    "name": "مدرسه رقص",
+                    "terms": "<translate with synonyms or related terms for 'Dance School', separated by commas>"
+                },
                 "leisure/dog_park": {
                     "name": "پارک سگ",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پارک سگ‌ها'، با کاما جدا می‌شوند>"
@@ -3569,6 +3934,39 @@
                     "name": "ایستگاه ورزشی در فضای باز",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ایستگاه ورزشی در فضای باز'، با کاما جدا می‌شوند>"
                 },
+                "leisure/fitness_station/balance_beam": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Balance Beam', separated by commas>"
+                },
+                "leisure/fitness_station/box": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Box', separated by commas>"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Horizontal Bar', separated by commas>"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Monkey Bars', separated by commas>"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "terms": "<translate with synonyms or related terms for 'Hyperextension Station', separated by commas>"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "terms": "<translate with synonyms or related terms for 'Parallel Bars', separated by commas>"
+                },
+                "leisure/fitness_station/push-up": {
+                    "terms": "<translate with synonyms or related terms for 'Push-Up Station', separated by commas>"
+                },
+                "leisure/fitness_station/rings": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Rings', separated by commas>"
+                },
+                "leisure/fitness_station/sign": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Instruction Sign', separated by commas>"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "terms": "<translate with synonyms or related terms for 'Sit-Up Station', separated by commas>"
+                },
+                "leisure/fitness_station/stairs": {
+                    "terms": "<translate with synonyms or related terms for 'Exercise Stairs', separated by commas>"
+                },
                 "leisure/garden": {
                     "name": "باغ",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'باغ'، با کاما جدا می‌شوند>"
@@ -3577,8 +3975,13 @@
                     "name": "زمین گلف",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'زمین گلف'، با کاما جدا می‌شوند>"
                 },
+                "leisure/hackerspace": {
+                    "name": "هکراسپیس",
+                    "terms": "<translate with synonyms or related terms for 'Hackerspace', separated by commas>"
+                },
                 "leisure/horse_riding": {
-                    "name": "باشگاه اسب سواری"
+                    "name": "باشگاه اسب سواری",
+                    "terms": "<translate with synonyms or related terms for 'Horseback Riding Facility', separated by commas>"
                 },
                 "leisure/ice_rink": {
                     "name": "یخ بازی",
@@ -3596,6 +3999,9 @@
                     "name": "ذخیره‌گاه طبیعی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ذخیره‌گاه طبیعی'، با کاما جدا می‌شوند>"
                 },
+                "leisure/outdoor_seating": {
+                    "terms": "<translate with synonyms or related terms for 'Outdoor Seating Area', separated by commas>"
+                },
                 "leisure/park": {
                     "name": "پارک",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پارک'، با کاما جدا می‌شوند>"
@@ -3620,10 +4026,22 @@
                     "name": "محوطه بسکتبال",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'زمین بسکتبال'، با کاما جدا می‌شوند>"
                 },
+                "leisure/pitch/beachvolleyball": {
+                    "terms": "<translate with synonyms or related terms for 'Beach Volleyball Court', separated by commas>"
+                },
+                "leisure/pitch/boules": {
+                    "terms": "<translate with synonyms or related terms for 'Boules/Bocce Court', separated by commas>"
+                },
                 "leisure/pitch/bowls": {
                     "name": "چمن مخصوص بولینگ",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'چمن مخصوص بولینگ'، با کاما جدا می‌شوند>"
                 },
+                "leisure/pitch/cricket": {
+                    "terms": "<translate with synonyms or related terms for 'Cricket Field', separated by commas>"
+                },
+                "leisure/pitch/equestrian": {
+                    "terms": "<translate with synonyms or related terms for 'Riding Arena', separated by commas>"
+                },
                 "leisure/pitch/rugby_league": {
                     "name": "زمین راگبی ۱۳ نفره",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'زمین راگبی ۱۳ نفره'، با کاما جدا می‌شوند>"
@@ -3640,6 +4058,9 @@
                     "name": "میدان فوتبال",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'زمین فوتبال'، با کاما جدا می‌شوند>"
                 },
+                "leisure/pitch/table_tennis": {
+                    "terms": "<translate with synonyms or related terms for 'Ping Pong Table', separated by commas>"
+                },
                 "leisure/pitch/tennis": {
                     "name": "محوطه تنیس",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'زمین تنیس'، با کاما جدا می‌شوند>"
@@ -3656,6 +4077,13 @@
                     "name": "پر رفت‌آمد",
                     "terms": "مکان پررفت‌آمد, اماکن پر رفت آمد,مکان‌های مطرح"
                 },
+                "leisure/running_track": {
+                    "terms": "<translate with synonyms or related terms for 'Racetrack (Running)', separated by commas>"
+                },
+                "leisure/sauna": {
+                    "name": "سونا",
+                    "terms": "<translate with synonyms or related terms for 'Sauna', separated by commas>"
+                },
                 "leisure/slipway": {
                     "name": "قایق ساکن",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسیر لغزشی کشتی'، با کاما جدا می‌شوند>"
@@ -3676,6 +4104,9 @@
                     "name": "استخر شنا",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'استخر شنا'، با کاما جدا می‌شوند>"
                 },
+                "leisure/track": {
+                    "terms": "<translate with synonyms or related terms for 'Racetrack (Non-Motorsport)', separated by commas>"
+                },
                 "leisure/water_park": {
                     "name": "پارک آبی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پارک آبی'، با کاما جدا می‌شوند>"
@@ -3692,6 +4123,10 @@
                     "name": "گذرگاه افقی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'گذرگاه افقی'، با کاما جدا می‌شوند>"
                 },
+                "man_made/antenna": {
+                    "name": "آنتن",
+                    "terms": "<translate with synonyms or related terms for 'Antenna', separated by commas>"
+                },
                 "man_made/breakwater": {
                     "name": "موج شکن",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'موج شکن'، با کاما جدا می‌شوند>"
@@ -3704,6 +4139,10 @@
                     "name": "دودکش",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دودکش'، با کاما جدا می‌شوند>"
                 },
+                "man_made/crane": {
+                    "name": "جرثقیل",
+                    "terms": "<translate with synonyms or related terms for 'Crane', separated by commas>"
+                },
                 "man_made/cutline": {
                     "name": "خط برش",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسیر جنگلی'، با کاما جدا می‌شوند>"
@@ -3727,10 +4166,19 @@
                     "name": "فانوس دریایی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'فانوس دریایی'، با کاما جدا می‌شوند>"
                 },
+                "man_made/mast": {
+                    "terms": "<translate with synonyms or related terms for 'Mast', separated by commas>"
+                },
+                "man_made/monitoring_station": {
+                    "terms": "<translate with synonyms or related terms for 'Monitoring Station', separated by commas>"
+                },
                 "man_made/observation": {
                     "name": "برج رصد",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دکل دیده‌بانی'، با کاما جدا می‌شوند>"
                 },
+                "man_made/observatory": {
+                    "terms": "<translate with synonyms or related terms for 'Observatory', separated by commas>"
+                },
                 "man_made/petroleum_well": {
                     "name": "چاه نفت",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'چاه نفت'، با کاما جدا می‌شوند>"
@@ -3787,15 +4235,34 @@
                     "name": "امور آب",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تأسیسات آبرسانی'، با کاما جدا می‌شوند>"
                 },
+                "man_made/watermill": {
+                    "name": "آسیاب آبی",
+                    "terms": "<translate with synonyms or related terms for 'Watermill', separated by commas>"
+                },
+                "man_made/windmill": {
+                    "name": "آسیاب بادی",
+                    "terms": "<translate with synonyms or related terms for 'Windmill', separated by commas>"
+                },
                 "man_made/works": {
-                    "name": "کارخانه"
+                    "name": "کارخانه",
+                    "terms": "<translate with synonyms or related terms for 'Factory', separated by commas>"
+                },
+                "manhole": {
+                    "terms": "<translate with synonyms or related terms for 'Manhole', separated by commas>"
+                },
+                "manhole/drain": {
+                    "terms": "<translate with synonyms or related terms for 'Storm Drain', separated by commas>"
+                },
+                "manhole/telecom": {
+                    "terms": "<translate with synonyms or related terms for 'Telecom Manhole', separated by commas>"
                 },
                 "natural": {
                     "name": "طبیعی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'طبیعت'، با کاما جدا می‌شوند>"
                 },
                 "natural/bare_rock": {
-                    "name": "صخره"
+                    "name": "صخره",
+                    "terms": "<translate with synonyms or related terms for 'Bare Rock', separated by commas>"
                 },
                 "natural/bay": {
                     "name": "خلیج کوچک",
@@ -3833,19 +4300,24 @@
                     "name": "بوته زار",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بوته زار'، با کاما جدا می‌شوند>"
                 },
+                "natural/mud": {
+                    "terms": "<translate with synonyms or related terms for 'Mud', separated by commas>"
+                },
                 "natural/peak": {
                     "name": "قله",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'قله'، با کاما جدا می‌شوند>"
                 },
                 "natural/ridge": {
-                    "name": "پرتگاه"
+                    "name": "پرتگاه",
+                    "terms": "<translate with synonyms or related terms for 'Ridge', separated by commas>"
                 },
                 "natural/saddle": {
                     "name": "گردنه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'گردنه'، با کاما جدا می‌شوند>"
                 },
                 "natural/sand": {
-                    "name": "شن"
+                    "name": "شن",
+                    "terms": "<translate with synonyms or related terms for 'Sand', separated by commas>"
                 },
                 "natural/scree": {
                     "name": "سنگ ریزه",
@@ -3895,15 +4367,44 @@
                     "name": "چوب",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'چوب'، با کاما جدا می‌شوند>"
                 },
+                "noexit/yes": {
+                    "terms": "<translate with synonyms or related terms for 'No Exit', separated by commas>"
+                },
                 "office": {
                     "name": "اداره",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'اداره'، با کاما جدا می‌شوند>"
                 },
+                "office/accountant": {
+                    "terms": "<translate with synonyms or related terms for 'Accountant Office', separated by commas>"
+                },
                 "office/administrative": {
                     "name": "دفتر اداری"
                 },
+                "office/adoption_agency": {
+                    "terms": "<translate with synonyms or related terms for 'Adoption Agency', separated by commas>"
+                },
+                "office/advertising_agency": {
+                    "name": "آژانس تبلیغاتی",
+                    "terms": "<translate with synonyms or related terms for 'Advertising Agency', separated by commas>"
+                },
+                "office/architect": {
+                    "name": "دفتر معماری",
+                    "terms": "<translate with synonyms or related terms for 'Architect Office', separated by commas>"
+                },
+                "office/association": {
+                    "name": "دفتر سازمان غیر انتفاعی",
+                    "terms": "<translate with synonyms or related terms for 'Nonprofit Organization Office', separated by commas>"
+                },
+                "office/charity": {
+                    "name": "دفتر خیریه",
+                    "terms": "<translate with synonyms or related terms for 'Charity Office', separated by commas>"
+                },
+                "office/company": {
+                    "terms": "<translate with synonyms or related terms for 'Corporate Office', separated by commas>"
+                },
                 "office/coworking": {
-                    "name": "فضای کاری مشارکتی"
+                    "name": "فضای کاری مشارکتی",
+                    "terms": "<translate with synonyms or related terms for 'Coworking Space', separated by commas>"
                 },
                 "office/educational_institution": {
                     "name": "مؤسسه آموزشی",
@@ -3913,6 +4414,9 @@
                     "name": "آژانس کاریابی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'آژانس کاریابی'، با کاما جدا می‌شوند>"
                 },
+                "office/energy_supplier": {
+                    "terms": "<translate with synonyms or related terms for 'Energy Supplier Office', separated by commas>"
+                },
                 "office/estate_agent": {
                     "name": "دفتر املاک",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر املاک و مستغلات'، با کاما جدا می‌شوند>"
@@ -3921,6 +4425,12 @@
                     "name": "اداره مالی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر مالی'، با کاما جدا می‌شوند>"
                 },
+                "office/forestry": {
+                    "terms": "<translate with synonyms or related terms for 'Forestry Office', separated by commas>"
+                },
+                "office/foundation": {
+                    "terms": "<translate with synonyms or related terms for 'Foundation Office', separated by commas>"
+                },
                 "office/government": {
                     "name": "اداره دولتی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'اداره دولتی'، با کاما جدا می‌شوند>"
@@ -3929,18 +4439,44 @@
                     "name": "اداره ثبت",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'اداره ثبت'، با کاما جدا می‌شوند>"
                 },
+                "office/government/tax": {
+                    "name": "اداره مالیات و درآمد",
+                    "terms": "<translate with synonyms or related terms for 'Tax and Revenue Office', separated by commas>"
+                },
+                "office/guide": {
+                    "name": "دفتر راهنمای تور",
+                    "terms": "<translate with synonyms or related terms for 'Tour Guide Office', separated by commas>"
+                },
                 "office/insurance": {
                     "name": "دفتر بیمه",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'اداره بیمه'، با کاما جدا می‌شوند>"
                 },
+                "office/it": {
+                    "name": "دفتر فناوری اطلاعات",
+                    "terms": "<translate with synonyms or related terms for 'Information Technology Office', separated by commas>"
+                },
                 "office/lawyer": {
                     "name": "دفتر حقوقی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر حقوقی'، با کاما جدا می‌شوند>"
                 },
+                "office/lawyer/notary": {
+                    "name": "دفتر اسناد رسمی"
+                },
+                "office/moving_company": {
+                    "terms": "<translate with synonyms or related terms for 'Moving Company Office', separated by commas>"
+                },
+                "office/newspaper": {
+                    "name": "دفتر روزنامه",
+                    "terms": "<translate with synonyms or related terms for 'Newspaper Office', separated by commas>"
+                },
                 "office/ngo": {
                     "name": "سازمان غیر دولتی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر سازمان غیر دولتی NGO'، با کاما جدا می‌شوند>"
                 },
+                "office/notary": {
+                    "name": "دفتر اسناد رسمی",
+                    "terms": "<translate with synonyms or related terms for 'Notary Office', separated by commas>"
+                },
                 "office/physician": {
                     "name": "پزشک"
                 },
@@ -3948,10 +4484,24 @@
                     "name": "حزب سیاسی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'حزب سیاسی'، با کاما جدا می‌شوند>"
                 },
+                "office/private_investigator": {
+                    "name": "دفتر تحقیقات خصوصی",
+                    "terms": "<translate with synonyms or related terms for 'Private Investigator Office', separated by commas>"
+                },
+                "office/quango": {
+                    "terms": "<translate with synonyms or related terms for 'Quasi-NGO Office', separated by commas>"
+                },
                 "office/research": {
                     "name": "سازمان تحقیقاتی و پژوهشی",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر تحقیقاتی'، با کاما جدا می‌شوند>"
                 },
+                "office/surveyor": {
+                    "terms": "<translate with synonyms or related terms for 'Surveyor Office', separated by commas>"
+                },
+                "office/tax_advisor": {
+                    "name": "دفتر مشاور مالیاتی",
+                    "terms": "<translate with synonyms or related terms for 'Tax Advisor Office', separated by commas>"
+                },
                 "office/telecommunication": {
                     "name": "اداره مخابرات",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دفتر مخابراتی '، با کاما جدا می‌شوند>"
@@ -4723,18 +5273,6 @@
                     "name": "دور زدن ممنوع",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای   'دور زدن ممنوع'، با کاما جدا می‌شوند>"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "تنها امکان گردش به چپ",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'تنها امکان گردش به چپ'، با کاما جدا می‌شوند>"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "تنها امکان گردش به راست",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تنها امکان گردش به راست'، با کاما جدا می‌شوند>"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "گردش ممنوع",
-                    "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'گردش ممنوع'، با کاما جدا می‌شوند>"
-                },
                 "type/route": {
                     "name": "مسیر",
                     "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مسیر'، با کاما جدا می‌شوند>"
@@ -5008,7 +5546,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "نقشه اصلی استرالیا، نقشه ثبت شده دولتی",
+                "description": "نقشه اصلی اتریش، بر اساس اطلاعات دولت می‌باشد.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -5065,12 +5603,10 @@
             "skobbler": {
                 "attribution": {
                     "text": "© Tiles: skobbler Map data: OpenStreetMap contributors"
-                }
+                },
+                "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Map tiles by Stamen Design, under CC BY 3.0"
-                },
                 "name": "لجن زار"
             },
             "tf-cycle": {
@@ -5085,6 +5621,40 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "Central-Pennsylvania-OSM": {
+                "name": "پنسیلوانیا مرکزی OSM",
+                "description": "جامعه نقشه برداری آنلاین بر اساس کالج ایالتی، پنسیلوانیا"
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "دالاس‌فورت وورث OSM",
+                "description": "گروه کاربران OpenStreetMap برای دالاس‌فورت وورث"
+            },
+            "GeoPhilly": {
+                "name": "ژئوفیلی",
+                "description": "Meetup برای علاقمندان به نقشه در منطقه فیلادلفیا"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM چاتانوگا",
+                "description": "گروه کاربران OpenStreetMap برای چاتانوگا"
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap نیویورک"
+            },
+            "OSM-Portland": {
+                "name": "پورتلند OpenStreetMap"
+            },
+            "OSM-US-Slack": {
+                "description": "همگی خوش آمدید! ثبت نام کنید در {signupUrl}"
+            },
+            "Maptime-Australia-Slack": {
+                "description": "ثبت نام کنید در {signupUrl}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap در ردیت",
+                "description": "/r/openstreetmap/ یک مکان عالی برای کسب اطلاعات بیشتر در مورد OpenStreetMap است. از ما چیزی بپرسید!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/fi.json b/dist/locales/fi.json
index a8bef8e0a..e5c5b820e 100644
--- a/dist/locales/fi.json
+++ b/dist/locales/fi.json
@@ -1,5 +1,10 @@
 {
     "fi": {
+        "icons": {
+            "information": "Tietoa",
+            "remove": "Poista",
+            "undo": "Peru"
+        },
         "modes": {
             "add_area": {
                 "title": "Alue",
@@ -291,6 +296,42 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Etäisyys",
+                "distance_up_to": "Enintään {distance}",
+                "via": "Kautta",
+                "via_node_only": "Vain yksi viivapiste",
+                "via_up_to_one": "Enintään yksi viiva",
+                "via_up_to_two": "Enintään kaksi viivaa"
+            },
+            "help": {
+                "indirect": "(epäsuora)",
+                "turn": {
+                    "no_left_turn": "EI vasemmalle (epäsuora)",
+                    "no_right_turn": "EI oikealle (epäsuora)",
+                    "no_u_turn": "EI U-käännöstä (epäsuora)",
+                    "no_straight_on": "EI suoraan (epäsuora)",
+                    "only_left_turn": "VAIN vasemmalle (epäsuora)",
+                    "only_right_turn": "VAIN oikealle (epäsuora)",
+                    "only_u_turn": "VAIN U-käännös (epäsuora)",
+                    "only_straight_on": "VAIN suoraan (epäsuora)",
+                    "allowed_left_turn": "SALLITTU vasemmalle (epäsuora)",
+                    "allowed_right_turn": "SALLITTU oikealle (epäsuora)",
+                    "allowed_u_turn": "SALLITTU U-käännös (epäsuora)",
+                    "allowed_straight_on": "SALLITTU suoraan (epäsuora)"
+                },
+                "from": "MISTÄ",
+                "via": "KAUTTA",
+                "to": "MIHIN",
+                "from_name": "{from} {fromName}",
+                "from_name_to_name": "{from} {fromName} {to} {toName}",
+                "via_names": "{via} {viaNames}",
+                "select_from": "Valitse {from}-väylä napsauttamalla sitä",
+                "select_from_name": "Valitse {from}-väyläksi {fromName} napsauttamalla",
+                "toggle": "Aseta \"{turn}\" napsauttamalla"
+            }
+        },
         "undo": {
             "tooltip": "Kumoa: {action}",
             "nothing": "Ei muokkaushistoriaa."
@@ -574,7 +615,7 @@
             "status_code": "Palvelimen virhekoodi {code}",
             "unknown_error_details": "Varmista, että Internet-yhteys on käytössä.",
             "uploading": "Tallennetaan muutoksia OpenStreetMapiin...",
-            "conflict_progress": "Tarkista ristiriita: {num}/{total}",
+            "conflict_progress": "Tarkistetaan ristiriita {num}/{total}",
             "unsaved_changes": "Kaikkia muutoksia ei ole tallennettu",
             "conflict": {
                 "header": "Ratkaise muokkausristiriidat",
@@ -726,11 +767,115 @@
             "feature_editor": {
                 "title": "Kohdemuokkain",
                 "intro": "*Kohdemuokkain* näkyy muokkausnäkymän vasemmassa laidassa. Sitä käytetään karttakohteen ominaisuuksien tarkasteluun ja muokkaamiseen.",
-                "type_h": "Ominisuustyyppi",
+                "definitions": "Yläosassa näkyy karttakohteen tyyppi. Keskiosa sisältää *kenttiä*, jotka kuvaavat kohteen ominaisuuksia, kuten nimen ja osoitteen. ",
+                "type_h": "Ominaisuustyyppi",
+                "type": "Voit klikata karttakohteen tyyppiä vaihtaaksesi kohteen eri tyyppiseksi. Kaikki, mikä on olemassa, voidaan lisätä OpenStreetMapiin, joten on olemassa tuhansia kohdetyyppejä joista valita.",
+                "type_picker": "Kohdemuokkain näyttää kaikkein tavallisimmat kohdetyypit kuten puistot, sairaalat, ravintolat, tiet ja rakennukset. Voit hakea mitä tyyppiä tahansa kirjoittamalla hakulaatikkoon, mitä olet etsimässä. Voit myös klikata {inspect} **Tietoa** -ikonia kohteen tyypin vieressä saadaksesi kohdetyypistä lisätietoa.",
+                "fields_h": "Kentät",
+                "fields_all_fields": "\"Kaikki kentät\" -osa sisältää kaikki karttakohteen tiedot, joita voit muokata. OpenStreetMapissa kaikkien kenttien täyttäminen on vapaavalintaista, ja voit jättää kentän tyhjäksi jos olet epävarma.",
+                "fields_example": "Eri tyyppisille karttakohteille näkyy erilaiset kentät. Esimerkiksi tien kohdalla näkyy kentät tien päällysteelle ja nopeusrajoitukselle, kun taas ravintolan kohdalla näkyy kentät aukioloajoille ja sille, millaista ruokaa ravintola tarjoaa.",
+                "fields_add_field": "Voit klikata myös \"Lisää kenttä\" -pudotusvalikkoa lisätäksesi uusia kenttiä, kuten kuvauksen, Wikipedia-linkin, esteettömyyden pyörätuolin käyttäjille ja niin edelleen. ",
+                "tags_h": "Tägit eli ominaisuustiedot",
+                "tags_all_tags": "Voit laajentaa kenttien alapuolella olevan \"Kaikki ominaisuustiedot\" -osan lisätäksesi karttakohteelle mitä tahansa OpenStreetMapin *tägejä* ja muokataksesi niitä. Jokainen tägi sisältää *avaimen* ja *arvon*, tietotyypit jotka määrittävät kaikki OpenStreetMapiin tallennetut karttakohteet.",
                 "tags_resources": "Karttakohteiden muokkaaminen edellyttää perustason osaamista OpenStreetMapin ominaisuuksista. Lisätietoa erilaisista ominaisuuksista ja karttakohteista on saatavilla esimerkiksi [OpenStreetMapin Wikistä](https://wiki.openstreetmap.org/wiki/Fi:Main_Page) tai [Taginfo-sivustolla](https://taginfo.openstreetmap.org/)."
             },
+            "points": {
+                "title": "Paikkapisteet",
+                "intro": "*Paikkapisteillä* voidaan merkitä kauppojen, ravintoloiden ja patsaiden kaltaisia karttakohteita. Niillä on yksittäinen sijainti ja ne kertovat, mitä siellä on.",
+                "add_point_h": "Paikkapisteiden lisääminen",
+                "add_point": "Lisätäksesi paikkapisteen, klikkaa {point} **Paikkapiste** -painiketta työkalupalkissa kartan yläpuolella, tai paina pikanäppäintä `1`. Tämä muuttaa hiiren osoittimen ristimäiseksi.",
+                "add_point_finish": "Sijoittaaksesi uuden paikkapisteen kartalle, vie hiiri sinne, mihin haluat paikkapisteen, ja paina {leftclick} hiiren vasenta painiketta tai `Välilyönti` -näppäintä.",
+                "move_point_h": "Paikkapisteiden liikuttaminen",
+                "move_point": "Liikuttaaksesi paikkapistettä, aseta hiiren osoitin pisteen päälle ja paina {leftclick} hiiren vasenta painiketta. Pidä painike pohjassa ja raahaa paikkapiste uuteen sijaintiin.",
+                "delete_point_h": "Paikkapisteiden poistaminen",
+                "delete_point": "Voit poistaa kohteita, joita ei ole oikeasti olemassa. Kohteen poistaminen poistaa sen muidenkin kartalta, joten varmista ennen poistamista, että kohdetta ei todella ole.",
+                "delete_point_command": "Poistaaksesi pisteen, klikkaa pistettä {rightclick} hiiren oikealla näppäimellä ja valitse avautuvasta pikavalikosta {delete} **Poista**."
+            },
+            "lines": {
+                "title": "Viivat",
+                "intro": "*Viivoilla* merkitään esimerkiksi katuja, rautateitä ja jokia. Viivat pitäisi piirtää niiden esittämän kohteen keskilinjaa pitkin.",
+                "add_line_h": "Viivojen lisääminen",
+                "add_line": "Lisätäksesi viivan, klikkaa {line} **Viiva** -painiketta työkalupalkissa kartan yläpuolella, tai paina pikanäppäintä `2`. Tämä muuttaa hiiren osoittimen ristimäiseksi.",
+                "add_line_draw": "Seuraavaksi siirrä hiiren osoitin sinne, mistä haluat viivan alkavan, ja paina {leftclick} hiiren vasenta painiketta tai `Välilyönti` -näppäintä. Lisää viivan loput pisteet klikkaamalla tai `Välilyönti` -näppäimellä. Voit lähentää, loitontaa tai raahata karttaa piirtäessäsi.",
+                "add_line_finish": "Lopettaaksesi viivan piirtämisen, paina `{Enter}` tai klikkaa viivan viimeistä pistettä uudestaan.",
+                "modify_line_h": "Viivojen muokkaaminen",
+                "modify_line_dragnode": "Viivat eivät usein ole oikean muotoisia, esimerkiksi tie ei vastaa ilmakuvaa. Muokataksesi viivan muotoa, ensin valitse viiva {leftclick} hiiren vasemmalla painikkeella. Tämä saa viivan pisteet näkymään pieninä ympyröinä. Sitten voit raahata pisteet parempiin sijainteihin.",
+                "modify_line_addnode": "Voit myös luoda viivaan uusia pisteitä joko {leftclick}**x2** kaksoisklikkaamalla viivaa tai raahamalla viivan pisteiden välissä olevaa pikkukolmiota.",
+                "connect_line_h": "Viivojen yhdistäminen",
+                "connect_line": "Teiden yhdistyminen oikein on tärkeää kartalla ja välttämätöntä ajo-ohjeiden tarjoamisessa.",
+                "connect_line_display": "Teiden risteykset näkyvät harmaina ympyröinä. Jos viivojen päätepisteet eivät yhdisty mihinkään, ne näkyvät suurempina valkoisina ympyröinä.",
+                "connect_line_drag": "Yhdistääksesi viivan toiseen kohteeseen, raahaa yksi viivan pisteistä toisen kohteen päälle, kunnes kohteet tarttuvat yhteen. Vinkki: Voit estää karttakohteen yhdistymisen muihin kohteisiin pitämällä `{alt}`-painiketta pohjassa.",
+                "connect_line_tag": "Jos tiedät, että risteyksessä on liikennevalot tai suojatie, voit lisätä ne valitsemalla tiet yhdistävän pisteen ja käyttämällä kohdemuokkainta.",
+                "disconnect_line_h": "Viivojen erottaminen",
+                "disconnect_line_command": "Erottaaksesi tien toisesta kohteesta, klikkaa kohteet yhdistävää pistettä {rightclick} hiiren oikealla näppäimellä ja valitse avautuvasta pikavalikosta {disconnect} **Erota**.",
+                "move_line_h": "Viivojen liikuttaminen",
+                "move_line_command": "Liikuttaaksesi kokonaista viivaa, klikkaa viivaa {rightclick} hiiren oikealla näppäimellä ja valitse avautuvasta pikavalikosta {move} **Siirrä**. Sitten liikuta hiirtä ja paina {leftclick} hiiren vasenta painiketta asettaaksesi viivan uuteen paikkaan.",
+                "move_line_connected": "Viivat, jotka ovat yhdistyneinä toisiin kohteisiin, pysyvät yhdistyneinä, kun liikutat viivan uuteen paikkaan. iD estää sinua siirtämästä viivaa toisen yhdistetyn viivan yli.",
+                "delete_line_h": "Viivojen poistaminen",
+                "delete_line": "Voit poistaa viivan jos se on täysin virheellinen, esimerkiksi tien jota ei ole oikeasti olemassa. Ole varovainen poistaessasi kohteita: ilmakuva saattaa olla vanhentunut ja virheelliseltä näyttävä tie taas uusi.",
+                "delete_line_command": "Poistaaksesi viivan, klikkaa viivaa {rightclick} hiiren oikealla näppäimellä ja valitse avautuvasta pikavalikosta {delete} **Poista**."
+            },
+            "areas": {
+                "title": "Alueet",
+                "intro": "*Alueilla* kuvataan sellaisten kohteiden kuin järvien, rakennusten ja asuinalueiden rajoja. Alueet pitäisi piirtää kulkemaan niiden esittämän kohteen rajaa pitkin, esimerkiksi rakennuksen pohjan ympäri.",
+                "point_or_area_h": "Paikkapiste vai alue?",
+                "point_or_area": "Monet kohteet voi esittää niin paikkapisteinä kuin alueinakin. Sinun pitäisi kartoittaa esimerkiksi rakennukset ja maankäytölliset rajat alueiksi aina kun mahdollista. Voit sijoittaa paikkapisteitä rakennuksen alueen sisäpuolelle esittämään yrityksiä, palveluita ja muita rakennuksen sisällä olevia kohteita.",
+                "add_area_h": "Alueiden lisääminen",
+                "add_area_command": "Lisätäksesi alueen, klikkaa {area} **Alue** -painiketta työkalupalkissa kartan yläpuolella, tai paina pikanäppäintä `3`. Tämä muuttaa hiiren kursorin ristimäiseksi.",
+                "add_area_draw": "Seuraavaksi siirrä hiiren kursori yhteen alueen kulmista, ja paina {leftclick} hiiren vasenta painiketta tai `Välilyönti` -näppäintä. Lisää alueen rajan loput pisteet klikkaamalla tai `Välilyönti` -näppäimellä. Voit lähentää, loitontaa tai raahata karttaa piirtäessäsi.",
+                "add_area_finish": "Lopettaaksesi alueen piirtämisen, paina `{Enter}` tai klikkaa alueen rajan ensimmäistä tai viimeistä pistettä uudestaan.",
+                "square_area_h": "Muuttaminen suorakulmaiseksi",
+                "square_area_command": "Monilla aluemaisilla kohteilla kuten rakennuksilla on suorat kulmat. Muuttaaksesi alueen kulmat suoriksi, klikkaa alueen reunaa {rightclick} hiiren oikealla näppäimellä ja valitse avautuvasta pikavalikosta {orthogonalize} **Muuta suorakulmaiseksi**.",
+                "modify_area_h": "Alueiden muokkaaminen",
+                "modify_area_dragnode": "Alueet eivät usein ole oikean muotoisia, esimerkiksi rakennus ei vastaa ilmakuvaa. Muokataksesi alueen muotoa, ensin valitse alue {leftclick} hiiren vasemmalla painikkeella. Tämä saa alueen pisteet näkymään pieninä ympyröinä. Sitten voit raahata pisteet parempiin sijainteihin.",
+                "modify_area_addnode": "Voit myös luoda alueeseen uusia pisteitä joko {leftclick}**x2** kaksoisklikkaamalla alueen reunaa tai raahamalla alueen reunan pisteiden välissä olevia pikkukolmioita.",
+                "delete_area_h": "Alueiden poistaminen",
+                "delete_area": "Voit poistaa alueen jos se on täysin virheellinen, esimerkiksi rakennuksen jota ei ole oikeasti olemassa. Ole varovainen poistaessasi kohteita: ilmakuva saattaa olla vanhentunut ja virheelliseltä näyttävä rakennus taas uusi.",
+                "delete_area_command": "Poistaaksesi alueen, klikkaa aluetta {rightclick} hiiren oikealla näppäimellä ja valitse avautuvasta pikavalikosta {delete} **Poista**."
+            },
             "relations": {
-                "relation_types_h": "Relaatiot"
+                "relation_types_h": "Relaatiotyypit"
+            },
+            "gps": {
+                "title": "GPS-jäljet"
+            },
+            "field": {
+                "restrictions": {
+                    "title": "Kääntymisrajoitusten ohje",
+                    "about": {
+                        "title": "Yleistä",
+                        "about": "Toiminnon avulla voit muokata kääntymisrajoituksia. Se näyttää mallin valitusta risteyksestä ja siihen yhdistetyistä teistä.",
+                        "from_via_to": "Kääntymisrajoitus koostuu yhdestä \"MISTÄ-tiestä\", \"MIHIN-tiestä\" ja joko yhdestä \"KAUTTA-viivapisteestä\" tai yhdestä tai useammasta \"KAUTTA-tiestä\".",
+                        "maxdist": "\"{distField}\"-liukusäätimellä voit valita, kuinka kaukaa haluat hakea yhdistyviä teitä.",
+                        "maxvia": "\"{viaField}\"-liukusäätimellä voit valita, kuinka monta KAUTTA-väylää kääntymisrajoitukseen voi sisältyä (lähtökohtaisesti mahdollisimman vähän)."
+                    },
+                    "inspecting": {
+                        "title": "Tutkiminen",
+                        "about": "Tarkista jonkin **MISTÄ**-väylän kääntymisrajoitukset viemällä hiiri sen päälle. Kaikki mahdolliset **MIHIN**-väylät korostetaan eri väreillä kääntymisrajoitusten tyypistä riippuen.",
+                        "from_shadow": "{fromShadow} **MISTÄ-väylä**",
+                        "allow_shadow": "{allowShadow} **MIHIN Sallittu**",
+                        "restrict_shadow": "{restrictShadow} **MIHIN Rajoitettu**",
+                        "only_shadow": "{onlyShadow} **MIHIN Vain**",
+                        "restricted": "\"Rajoitettu\" tarkoittaa kääntymisrajoitusta, esimerkiksi \"Ei vasemmalle\".",
+                        "only": "\"Vain\" tarkoittaa ainoaa sallittua ajosuuntaa, esimerkiksi \"Vain suoraan\"."
+                    },
+                    "modifying": {
+                        "title": "Muokkaaminen",
+                        "about": "Aloita kääntymisrajoitusten muokkaaminen valitsemalla \"MISTÄ\"-väylä napsauttamalla sitä. Valittu väylä hehkuu sykkivästi ja mahdolliset **MIHIN**-kääntymissuunnat korostetaan nuolikuvakkeilla.",
+                        "indicators": "Valitse sitten vaihtoehtojen sallittu, rajoitettu ja vain välillä napsauttamalla nuolikuvaketta.",
+                        "allow_turn": "{allowTurn} **MIHIN Sallittu**",
+                        "restrict_turn": "{restrictTurn} **MIHIN Rajoitettu**",
+                        "only_turn": "{onlyTurn} **MIHIN Vain**"
+                    },
+                    "tips": {
+                        "title": "Vinkkejä",
+                        "simple": "**Suosi yksinkertaisia rajoituksia**",
+                        "simple_example": "Pyri välttämään monen väylän kautta kulkevia rajoituksia, jos sama rajoitus voidaan osoittaa pelkällä yhteen pisteeseen sidotulla rajoituksella.",
+                        "indirect": "**Osa rajoituksista näkyy haaleampina ja epäsuora-merkinnällä**",
+                        "indirect_example": "Rajoitukset johtuvat epäsuorasti toisesta rajoituksesta. Esimerkiksi \"Vain suoraan\" asettaa \"Ei käännöstä\" kaikkiin muihin suuntiin.",
+                        "indirect_noedit": "Epäsuoria rajoituksia ei voi muokata. Muokkaa sen sijaan sen aiheuttavaa rajoitusta."
+                    }
+                }
             }
         },
         "intro": {
@@ -785,6 +930,7 @@
                 "choose_cafe": "**Valitse {preset} listalta.**",
                 "feature_editor": "Piste on nyt merkitty kahvilaksi. Kohdemuokkaimella voi täydentää sen tietoja.",
                 "add_name": "OpenStreetMapissa minkään kentän täyttäminen ei ole pakollista, ja voit jättää kenttiä tyhjäksi.{br}Kuvitellaan, että tunnet tämän kahvilan paikallistuntemukselta ja muistat sen nimen. **Kirjoita kahvilalle nimi.**",
+                "add_close": "Kohdemuokkain tallentaa muutokset automaattisesti. **Kun olet kirjoittanut nimen, sulje kohdemuokkain painamalla Esc- tai Enter-näppäintä tai napsauttamalla {button}-painiketta.**",
                 "reselect": "Usein paikkapisteet on jo lisätty kartalle, mutta niiden tiedot voivat olla vanhentuneita tai puutteellisia. Näitä tietoja voi korjata tai täydentää. **Valitse äsken luomasi kahvila napsauttamalla sitä.**",
                 "update": "Lisätään kahvilalle tietoja. Voit vaihtaa nimen, lisätä keittiökulttuurin tai osoitteen. **Muuta kahvilan tietoja.**",
                 "rightclick": "Napsauttamalla karttakohdetta hiiren oikealla painikkeella näkyviin tulee pikavalikko, jossa näytetään käytettävissä olevat muokkaustoiminnot. **Avaa pikavalikko napsauttamalla paikkapistettä hiiren oikealla painikkeella.**",
@@ -955,6 +1101,12 @@
                 }
             }
         },
+        "units": {
+            "meters": "{quantity} m",
+            "kilometers": "{quantity} km",
+            "square_meters": "{quantity} m²",
+            "square_kilometers": "{quantity} km²"
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
@@ -1340,6 +1492,9 @@
                         "cycleway:right": "Oikealla puolella"
                     }
                 },
+                "dance/style": {
+                    "label": "Tanssityylit"
+                },
                 "date": {
                     "label": "Päivämäärä"
                 },
@@ -1520,6 +1675,9 @@
                 "government": {
                     "label": "Tyyppi"
                 },
+                "grape_variety": {
+                    "label": "Rypälelajikkeet"
+                },
                 "handicap": {
                     "label": "Tasoitussuositus (HCP)",
                     "placeholder": "1-18"
@@ -1533,6 +1691,9 @@
                 "healthcare": {
                     "label": "Tyyppi"
                 },
+                "healthcare/speciality": {
+                    "label": "Erikoisalat"
+                },
                 "height": {
                     "label": "Korkeus (metreinä)"
                 },
@@ -1571,6 +1732,12 @@
                 "information": {
                     "label": "Tyyppi"
                 },
+                "inscription": {
+                    "label": "Sisältyvä kaiverrus/kirjoitus"
+                },
+                "intermittent": {
+                    "label": "Kuivuminen ajoittain"
+                },
                 "internet_access": {
                     "label": "Internet-yhteys",
                     "options": {
@@ -1587,6 +1754,9 @@
                 "internet_access/ssid": {
                     "label": "SSID-verkkonimi"
                 },
+                "kerb": {
+                    "label": "Reunakiveyksen muoto"
+                },
                 "lamp_type": {
                     "label": "Tyyppi"
                 },
@@ -1773,6 +1943,7 @@
                     "label": "Yksisuuntaisuus",
                     "options": {
                         "no": "Ei",
+                        "reversible": "Epäsäännöllisesti vaihtuva",
                         "undefined": "Oletettavasti ei",
                         "yes": "Kyllä"
                     }
@@ -1780,7 +1951,9 @@
                 "oneway_yes": {
                     "label": "Yksisuuntaisuus",
                     "options": {
+                        "alternating": "Säännöllisesti vaihtuva",
                         "no": "Ei",
+                        "reversible": "Epäsäännöllisesti vaihtuva",
                         "undefined": "Oletettavasti kyllä",
                         "yes": "Kyllä"
                     }
@@ -1864,6 +2037,10 @@
                 "plant": {
                     "label": "Kasvi"
                 },
+                "plant/output/electricity": {
+                    "label": "Voiman ulostulo",
+                    "placeholder": "500 MW, 1000 MW, 2000 MW..."
+                },
                 "playground/max_age": {
                     "label": "Yläikäraja"
                 },
@@ -1902,6 +2079,9 @@
                 "recycling_accepts": {
                     "label": "Keräys"
                 },
+                "ref/isil": {
+                    "label": "ISIL-tunnus"
+                },
                 "ref_aeroway_gate": {
                     "label": "Porttinumero"
                 },
@@ -2047,6 +2227,18 @@
                 "source": {
                     "label": "Lähteet"
                 },
+                "sport": {
+                    "label": "Urheilulajit"
+                },
+                "sport_ice": {
+                    "label": "Urheilulajit"
+                },
+                "sport_racing_motor": {
+                    "label": "Urheilulajit"
+                },
+                "sport_racing_nonmotor": {
+                    "label": "Urheilulajit"
+                },
                 "stars": {
                     "label": "Tähdet"
                 },
@@ -2084,12 +2276,18 @@
                 "studio": {
                     "label": "Tyyppi"
                 },
+                "substance": {
+                    "label": "Sisältö"
+                },
                 "substation": {
                     "label": "Tyyppi"
                 },
                 "supervised": {
                     "label": "Valvonta"
                 },
+                "support": {
+                    "label": "Pidike"
+                },
                 "surface": {
                     "label": "Päällyste"
                 },
@@ -2108,7 +2306,13 @@
                     "label": "Valvontavyöhyke"
                 },
                 "switch": {
-                    "label": "Tyyppi"
+                    "label": "Tyyppi",
+                    "options": {
+                        "circuit_breaker": "Sulake",
+                        "disconnector": "Erotin",
+                        "earthing": "Maadoitus",
+                        "mechanical": "Mekaaninen kytkin"
+                    }
                 },
                 "tactile_paving": {
                     "label": "Huomioreuna näkövammaisille"
@@ -2125,6 +2329,7 @@
                 "toilets/disposal": {
                     "label": "Tyhjennystekniikka",
                     "options": {
+                        "bucket": "Ämpäri",
                         "chemical": "Kemikaalinen",
                         "flush": "Huuhtelu",
                         "pitlatrine": "Peittoaines"
@@ -2139,11 +2344,26 @@
                 "tourism": {
                     "label": "Tyyppi"
                 },
+                "tourism_attraction": {
+                    "label": "Tyyppi"
+                },
+                "tower/construction": {
+                    "label": "Rakenne",
+                    "placeholder": "Harusvaijerit, Ristikko..."
+                },
                 "tower/type": {
                     "label": "Tyyppi"
                 },
                 "tracktype": {
-                    "label": "Raidetyyppi"
+                    "label": "Raidetyyppi",
+                    "options": {
+                        "grade1": "Kiinteä: päällystetty tai voimakkaasti pakkaantunut, kova pinta",
+                        "grade2": "Enimmäkseen kiinteä: soraa/kiveä johon sekoittunut hieman pehmeää maa-ainesta",
+                        "grade3": "Sekoitus kovaa ja pehmeää maa-ainesta",
+                        "grade4": "Enimmäkseen pehmeä: multaa/hiekkaa/ruohoa johon sekoittunut hieman kovaa maa-ainesta",
+                        "grade5": "Pehmeä: multaa/hiekkaa/ruohoa"
+                    },
+                    "placeholder": "Kiinteä, Enimmäkseen kiinteä, Pehmeä..."
                 },
                 "trade": {
                     "label": "Tyyppi"
@@ -2183,9 +2403,6 @@
                 "tunnel": {
                     "label": "Tyyppi"
                 },
-                "vending": {
-                    "label": "Tavaroiden tyyppi"
-                },
                 "visibility": {
                     "label": "Näkyvyys",
                     "options": {
@@ -2205,6 +2422,7 @@
                 "volcano/type": {
                     "label": "Tulivuorilaji",
                     "options": {
+                        "scoria": "Tuhkakartio",
                         "shield": "Kilpitulivuori",
                         "stratovolcano": "Kerrostulivuori"
                     }
@@ -2364,7 +2582,8 @@
                     "name": "Eläinkatos"
                 },
                 "amenity/arts_centre": {
-                    "name": "Taidekeskus"
+                    "name": "Taidekeskus",
+                    "terms": "taidekeskus, taidetalo, taidekoulu, kulttuurikeskus, kulttuuritalo, esityspaikka, esiintymispaikka, näytöspaikka, poikkitaiteellinen, teatteri, live, stand-up, konsertti, galleria, näyttely, nykytaide"
                 },
                 "amenity/atm": {
                     "name": "Pankkiautomaatti",
@@ -2461,7 +2680,8 @@
                     "name": "Korkeakoulualue (college)"
                 },
                 "amenity/community_centre": {
-                    "name": "Yhteisökeskus"
+                    "name": "Yhteisökeskus",
+                    "terms": "yhteisökeskus, yhdistys, järjestö, kylätalo, kyläkeskus, seurantalo, seurojentalo, työväentalo, kerhotalo, kerhohuoneisto, kerhokeskus, klubi, monitoimitalo, nuorisotila, nuorisotalo, kokoontumispaikka, kokouspaikka, kokoustila, konferenssi, palaveri, neuvottelu, tapahtumapaikka, juhlatila, hääpaikka, sosiaalitila, avoin, julkinen"
                 },
                 "amenity/compressed_air": {
                     "name": "Ilmanpainepiste",
@@ -2490,7 +2710,8 @@
                     "terms": "taistelulaji, taistelu, itsepuolustus, laji, lajit, urheilu, kamppailu, kamppailulaji, itsepuolustuslaji, taekwondo, taekwon-do, judo, karate, taiji, jujutsu, aikido, kravmaga, krav maga, hapkido"
                 },
                 "amenity/drinking_water": {
-                    "name": "Juomavesipiste"
+                    "name": "Juomavesipiste",
+                    "terms": "juomavesi, juoma-automaatti, juomapaikka, vesipiste, vesiautomaatti, vedenjakelu, hana, kaivo"
                 },
                 "amenity/driving_school": {
                     "name": "Autokoulu",
@@ -2540,7 +2761,8 @@
                     "terms": "jäätelö, pehmis, jäätelön, pehmiksen, jäätelökioski, jätskikioski, jäätelöbaari, kioski, puoti, kauppa, liike, myymälä, putiikki, baari"
                 },
                 "amenity/internet_cafe": {
-                    "name": "Internetkahvila"
+                    "name": "Internetkahvila",
+                    "terms": "nettikahvila, wlan, wifi"
                 },
                 "amenity/kindergarten": {
                     "name": "Esikoulu",
@@ -2561,7 +2783,8 @@
                     "name": "Moottoripyöräpysäköinti"
                 },
                 "amenity/music_school": {
-                    "name": "Musiikkikoulu"
+                    "name": "Musiikkikoulu",
+                    "terms": "musiikkikoulu, musiikkileikkikoulu, musiikkiopetus, musiikkiopettaja, musiikkioppilaitos, musiikkiopisto, muskari, soitonopetus, laulunopetus, konservatorio, taideakatemia, kuoro, yhtye, bändi, orkesteri, kitara, piano"
                 },
                 "amenity/nightclub": {
                     "name": "Yökerho"
@@ -2578,7 +2801,8 @@
                     "terms": "pysäköinti, parkkipaikka, pysäköintipaikka, parkki, pysäköintitalo, parkkitalo, ulosajo, sisäänajo, ajo, ulos, sisään, ramppi"
                 },
                 "amenity/parking_space": {
-                    "name": "Pysäköintitila"
+                    "name": "Pysäköintitila",
+                    "terms": "pysäköinti, pysäköintipaikka, pysäköintiruutu, parkkipaikka, parkkeeraus, autopysäköinti, autopaikka"
                 },
                 "amenity/pavilion": {
                     "name": "Paviljonki"
@@ -2589,29 +2813,39 @@
                 },
                 "amenity/place_of_worship": {
                     "name": "Rukoilupaikka",
-                    "terms": "Uskonnollinen rakennus, Kirkkorakennus"
+                    "terms": "Uskonnollinen rakennus, Kirkkorakennus, seurakuntatalo, temppeli, luostari, munkki, nunna, katedraali, kappeli, uhrauspaikka, uhripaikka, kulttipaikka, pyhäkkö, pyhättö, pyhä, jumalanpalvelus, rukoushuone, valtakunnansali, loosi, seita, keskus"
                 },
                 "amenity/place_of_worship/buddhist": {
-                    "name": "Buddhalaistemppeli"
+                    "name": "Buddhalaistemppeli",
+                    "terms": "buddhalainen, stupa, pagoda, luostari, zendo, dojo, meditaatio"
                 },
                 "amenity/place_of_worship/christian": {
                     "name": "Kirkko",
-                    "terms": "Kirkko, Pyhäkkö, pyhättö, Rukoushuone, Stupa, Tsasouna, Moskeija, Temppeli"
+                    "terms": "Kirkko, kirkkosali, tuomiokirkko, kappeli, kotikirkko, leirikirkko, katedraali, Pyhäkkö, pyhättö, Rukoushuone, Tsasouna, Temppeli, seurakunta"
                 },
                 "amenity/place_of_worship/hindu": {
                     "name": "Hindutemppeli",
-                    "terms": "hindulaisuus, hindut, hindu, temppeli, uskonto, uskonnollinen, rukoilu, intia"
+                    "terms": "hindulaisuus, hindut, hindu, temppeli, uskonto, uskonnollinen, rukoilu, intia, jooga"
                 },
                 "amenity/place_of_worship/jewish": {
                     "name": "Synagoga",
-                    "terms": "synagooga"
+                    "terms": "synagooga, juutalainen"
                 },
                 "amenity/place_of_worship/muslim": {
                     "name": "Moskeija",
-                    "terms": "Moskeija"
+                    "terms": "minareetti, islam, islamilainen, muslimi"
                 },
                 "amenity/place_of_worship/shinto": {
-                    "name": "Šintolainen pyhäkkö"
+                    "name": "Šintolainen pyhäkkö",
+                    "terms": "Šintopyhäkkö, pyhättö, shintolainen, japanilainen, kami, asuinpaikka, jumala, henki, torii, honden, shinden, haiden, heiden, seremonia, uhrihalli"
+                },
+                "amenity/place_of_worship/sikh": {
+                    "name": "Sikhitemppeli",
+                    "terms": "sikhiläinen, gurdwara, gurudwara"
+                },
+                "amenity/place_of_worship/taoist": {
+                    "name": "Taolainen temppeli",
+                    "terms": "taolaistemppeli, kungfutselainen, kiinalainen, luostari"
                 },
                 "amenity/planetarium": {
                     "name": "Planetaario"
@@ -2632,7 +2866,8 @@
                     "name": "Vankila-alue"
                 },
                 "amenity/pub": {
-                    "name": "Pubi"
+                    "name": "Pubi",
+                    "terms": "pubi, pub, kapakka, saluuna, kievari, taverna, krouvi, yöravintola, olutravintola, oluttupa, kaljaravintola, alkoholi, baari"
                 },
                 "amenity/public_bath": {
                     "name": "Kylpylaitos"
@@ -2655,7 +2890,7 @@
                 },
                 "amenity/restaurant": {
                     "name": "Ravintola",
-                    "terms": "Ravintola, Ruokaravintola, Bistro, Krouvi, Pizzeria, Ruokala"
+                    "terms": "Ravintola, Ruokaravintola, Bistro, Krouvi, Pizzeria, Pitseria, Ruokala"
                 },
                 "amenity/sanitary_dump_station": {
                     "name": "Asuntoautojen jäteveden tyhjennyspiste"
@@ -2668,19 +2903,22 @@
                     "name": "Autonromuttamo"
                 },
                 "amenity/shelter": {
-                    "name": "Katos"
+                    "name": "Katos",
+                    "terms": "katos, katettu, kota, kotus, korsu, laavu, maja, koppi, suoja, tauko, taukopaikka, taukokatos, piknik, picnic, retki, lepo, lepääminen, pukukoppi, pukeutuminen, bussi, linja-auto, kalliolippa"
                 },
                 "amenity/shower": {
                     "name": "Suihku"
                 },
                 "amenity/smoking_area": {
-                    "name": "Tupakointialue"
+                    "name": "Tupakointialue",
+                    "terms": "tupakkapaikka"
                 },
                 "amenity/social_facility": {
                     "name": "Sosiaalipalvelu"
                 },
                 "amenity/social_facility/food_bank": {
-                    "name": "Ruokapankki"
+                    "name": "Ruokapankki",
+                    "terms": "ruokajako, ruokajakelu, leipäjono"
                 },
                 "amenity/social_facility/group_home": {
                     "name": "Vanhainkoti",
@@ -2723,7 +2961,8 @@
                     "name": "Yliopistoalue"
                 },
                 "amenity/vending_machine": {
-                    "name": "Myyntiautomaatti"
+                    "name": "Myyntiautomaatti",
+                    "terms": "automaatti, myyntiautomaatti, jakeluautomaatti, palautusautomaatti, pullonpalautus"
                 },
                 "amenity/vending_machine/cigarettes": {
                     "name": "Tupakka-automaatti",
@@ -2795,14 +3034,16 @@
                     "name": "Alue"
                 },
                 "area/highway": {
-                    "name": "Tien päällyste"
+                    "name": "Tien päällyste",
+                    "terms": "pinnoite, pinta"
                 },
                 "attraction/amusement_ride": {
                     "name": "Huvipuistolaite",
                     "terms": "huvipuisto, elämyspuisto, laite, härveli, vuoristorata, karuselli, vimpain, vitkutin, huvilaite"
                 },
                 "attraction/animal": {
-                    "name": "Eläin"
+                    "name": "Eläin",
+                    "terms": "eläintarha, eläinpuisto, teemapuisto, leijona, tiikeri, karhu"
                 },
                 "attraction/big_wheel": {
                     "name": "Maailmanpyörä",
@@ -2851,7 +3092,8 @@
                     "name": "Muuri"
                 },
                 "barrier/block": {
-                    "name": "Este"
+                    "name": "Este",
+                    "terms": "betoniporsas"
                 },
                 "barrier/bollard": {
                     "name": "Sulkutolppa",
@@ -2913,7 +3155,8 @@
                     "name": "Hallinnollinen raja"
                 },
                 "building": {
-                    "name": "Rakennus"
+                    "name": "Rakennus",
+                    "terms": "talo"
                 },
                 "building/apartments": {
                     "name": "Kerrostalo"
@@ -2936,6 +3179,9 @@
                 "building/church": {
                     "name": "Kirkkorakennus"
                 },
+                "building/civic": {
+                    "name": "Kunnallinen rakennus"
+                },
                 "building/college": {
                     "name": "Korkeakoulurakennus (college)"
                 },
@@ -2955,6 +3201,12 @@
                 "building/entrance": {
                     "name": "Sisään- tai uloskäynti"
                 },
+                "building/farm": {
+                    "name": "Maatilan asuinrakennus"
+                },
+                "building/farm_auxiliary": {
+                    "name": "Maatilarakennus"
+                },
                 "building/garage": {
                     "name": "Autotalli",
                     "terms": "autotalli, autonsäilytys, autohalli, autovarasto, auto"
@@ -2988,13 +3240,15 @@
                     "name": "Esikoulurakennus"
                 },
                 "building/mosque": {
-                    "name": "Moskeijarakennus"
+                    "name": "Moskeijarakennus",
+                    "terms": "islamilainen, muslimi"
                 },
                 "building/public": {
                     "name": "Julkinen rakennus"
                 },
                 "building/residential": {
-                    "name": "Asuinrakennus"
+                    "name": "Asuinrakennus",
+                    "terms": "asuintalo"
                 },
                 "building/retail": {
                     "name": "Liikerakennus"
@@ -3012,6 +3266,9 @@
                 "building/semidetached_house": {
                     "name": "Paritalo"
                 },
+                "building/service": {
+                    "name": "Palvelurakennus"
+                },
                 "building/shed": {
                     "name": "Vaja",
                     "terms": "vaja, mökki, liiteri"
@@ -3085,20 +3342,23 @@
                     "name": "Kelloseppä"
                 },
                 "craft/confectionery": {
-                    "name": "Makeiskonditoria"
+                    "name": "Makeiskonditoria",
+                    "terms": "karkkitehdas, karkki, karamelli"
                 },
                 "craft/distillery": {
-                    "name": "Tislaam",
+                    "name": "Tislaamo",
                     "terms": "viina, viini, alkoholi, polttaa, poltto, polttamo, tynnyri, juoma"
                 },
                 "craft/dressmaker": {
-                    "name": "ompelija"
+                    "name": "ompelija",
+                    "terms": "ompelimo"
                 },
                 "craft/electrician": {
                     "name": "Sähköasentaja"
                 },
                 "craft/gardener": {
-                    "name": "Puutarhuri"
+                    "name": "Puutarhuri",
+                    "terms": "puutarhan hoitaja, puutarha, hoitaja"
                 },
                 "craft/glaziery": {
                     "name": "Lasinpuhallus"
@@ -3132,7 +3392,8 @@
                     "name": "optikko"
                 },
                 "craft/painter": {
-                    "name": "Maalari"
+                    "name": "Maalari",
+                    "terms": "maalaaja"
                 },
                 "craft/photographer": {
                     "name": "Valokuvaaja"
@@ -3309,7 +3570,8 @@
                     "name": "Terveyspalvelu"
                 },
                 "healthcare/alternative": {
-                    "name": "Vaihtoehtolääketiede"
+                    "name": "Vaihtoehtolääketiede",
+                    "terms": "näennäishoito, vaihtoehto, vaihtoehtoinen, lääketiede, hoito"
                 },
                 "healthcare/alternative/chiropractic": {
                     "name": "Kiropraktikko"
@@ -3339,7 +3601,8 @@
                     "name": "Optometri"
                 },
                 "healthcare/physiotherapist": {
-                    "name": "Fysioterapeutti"
+                    "name": "Fysioterapeutti",
+                    "terms": "fysioterapia"
                 },
                 "healthcare/podiatrist": {
                     "name": "Jalkaterapeutti"
@@ -3488,7 +3751,8 @@
                     "name": "Yhdystien ramppi"
                 },
                 "highway/track": {
-                    "name": "Huoltamaton pikkutie"
+                    "name": "Huoltamaton pikkutie",
+                    "terms": "pikkutie, hiekkatie, metsätie, metsäkonetie, metsä, metsäkone, ura, ajoväylä"
                 },
                 "highway/traffic_mirror": {
                     "name": "Tiepeili",
@@ -3514,7 +3778,8 @@
                     "name": "Syrjätie/luokittelematon tie"
                 },
                 "historic": {
-                    "name": "Historiallinen paikka"
+                    "name": "Historiallinen paikka",
+                    "terms": "historia, historiallinen, muinainen, arkeologinen, vanha, raunio, rauniot, raunioitunut, hauta, hautapaikka, muinaishauta, asuinpaikka, löytöpaikka, rajakivi, kartano, tienvarsiristi, hylky, maanmittaus, monumentti, muistomerkki, kivikautinen, pronssikautinen, rautakautinen, keskiaikainen"
                 },
                 "historic/archaeological_site": {
                     "name": "Arkeologinen paikka"
@@ -3532,17 +3797,19 @@
                     "name": "Iso muistomerkki"
                 },
                 "historic/ruins": {
-                    "name": "Rauniot"
+                    "name": "Rauniot",
+                    "terms": "raunio, raunioitunut, käyttämätön, historiallinen"
                 },
                 "historic/tomb": {
                     "name": "Hautakammio"
                 },
                 "historic/wayside_cross": {
-                    "name": "Tienvarren risti"
+                    "name": "Tienvarsiristi",
+                    "terms": "tienvarren risti, tienvarren, risti, tienvarsi, piennar, kristillinen"
                 },
                 "historic/wayside_shrine": {
                     "name": "Tienvarsialttari",
-                    "terms": "tienvarsi, kadunvarsi, varsi, tie, katu, rukoilupaikka, pyhättö, uskonnot, uskonto, kirkko, pyhä, uhripaikka, uhrauspaikka, uhrilahja"
+                    "terms": "tienvarsi, kadunvarsi, varsi, tie, katu, rukoilupaikka, pyhättö, uskonnot, uskonto, kirkko, pyhä, uhripaikka, uhrauspaikka, uhrilahja, alttari"
                 },
                 "junction": {
                     "name": "Risteys"
@@ -3551,10 +3818,12 @@
                     "name": "Maankäyttö"
                 },
                 "landuse/allotments": {
-                    "name": "Yhteisöpuutarha"
+                    "name": "Yhteisöpuutarha",
+                    "terms": "siirtolapuutarha"
                 },
                 "landuse/aquaculture": {
-                    "name": "Vesiviljely"
+                    "name": "Vesiviljely",
+                    "terms": "akvakulttuuri"
                 },
                 "landuse/basin": {
                     "name": "Vesiallas"
@@ -3607,7 +3876,7 @@
                 },
                 "landuse/meadow": {
                     "name": "Niitty",
-                    "terms": "heinämaa, aukio"
+                    "terms": "heinämaa, aukio, keto, aho, kesanto, kukka, luonto, luonnon, luonnollinen"
                 },
                 "landuse/military": {
                     "name": "Sotilasalue"
@@ -3699,6 +3968,10 @@
                     "name": "Tanssipaikka",
                     "terms": "tanssilava, tanssilavat, lavatanssi, lavatanssiminen, tanssi, tanssit, tanssiminen"
                 },
+                "leisure/dancing_school": {
+                    "name": "Tanssikoulu",
+                    "terms": "tanssiopisto"
+                },
                 "leisure/dog_park": {
                     "name": "Koirapuisto",
                     "terms": "koira, koirat, koira-alue, koiranulkoilutusalue, koirahäkki, koirapuisto"
@@ -3726,7 +3999,8 @@
                     "name": "Golfkenttä"
                 },
                 "leisure/hackerspace": {
-                    "name": "Koodausnurkkaus"
+                    "name": "Koodausnurkkaus",
+                    "terms": "hackerspace, hackspace, makerspace, hacklab, häckläb, ohjelmointi, ohjelmoija, koodaus, koodaaja, teknologia, rakentelu, värkkäys, värkkäily, paja, työpaja, tila, julkinen, labra, verstas, kaupunkiverstas"
                 },
                 "leisure/horse_riding": {
                     "name": "Ratsastusalue",
@@ -3755,7 +4029,8 @@
                     "terms": "piknik, eväsretki, ulkoilu, ulkopöytä, pöytä, puupöytä, penkki, ruokailu, ulkoruokailu, ulkoruokailupöytä, ulkoruokapöytä"
                 },
                 "leisure/pitch": {
-                    "name": "Urheilukenttä"
+                    "name": "Urheilukenttä",
+                    "terms": "pallokenttä, palloilukenttä, hiekkakenttä, nurmikenttä"
                 },
                 "leisure/pitch/american_football": {
                     "name": "Amerikkalainen jalkapallo -kenttä"
@@ -3821,6 +4096,10 @@
                     "name": "Veneramppi",
                     "terms": "veneramppi, vesillelaskupaikka, veneenlaskupaikka, vene, järveenlaskupaikka, järviramppi"
                 },
+                "leisure/sports_centre": {
+                    "name": "Liikuntakeskus",
+                    "terms": "kuntokeskus, urheilukeskus, urheiluhalli, halli, kompleksi, kokonaisuus, monilajinen"
+                },
                 "leisure/sports_centre/swimming": {
                     "name": "Uimahalli",
                     "terms": "uimahalli, kylpylä, uima-allas, uintikeskus, uinti, uiminen, vesi, vesiurheilu, urheilu, vesiurheilukeskus, vesiurheiluhalli"
@@ -3836,13 +4115,15 @@
                     "name": "Kilparata (ei moottoriurheilu)"
                 },
                 "leisure/water_park": {
-                    "name": "Vesipuisto"
+                    "name": "Vesipuisto",
+                    "terms": "uinti, kylpylä"
                 },
                 "line": {
                     "name": "Viiva"
                 },
                 "man_made": {
-                    "name": "Ihmisen tekemä"
+                    "name": "Ihmisen tekemä",
+                    "terms": "keinotekoinen"
                 },
                 "man_made/adit": {
                     "name": "Vaakasuoran tunnelin suuaukko"
@@ -3860,7 +4141,8 @@
                     "name": "Nosturi"
                 },
                 "man_made/cutline": {
-                    "name": "Metsänraja"
+                    "name": "Metsänraja",
+                    "terms": "hakkuuraja"
                 },
                 "man_made/embankment": {
                     "name": "Penkere"
@@ -3882,6 +4164,9 @@
                 "man_made/mast": {
                     "name": "Masto"
                 },
+                "man_made/monitoring_station": {
+                    "name": "Havaintoasema"
+                },
                 "man_made/observation": {
                     "name": "Näkötorni",
                     "terms": "observatorio, näköalatasanne, näköala, maisema, maisematorni"
@@ -3961,7 +4246,8 @@
                     "name": "Luolan suuaukko"
                 },
                 "natural/cliff": {
-                    "name": "Kallionjyrkänne"
+                    "name": "Kallionjyrkänne",
+                    "terms": "kallio, jyrkänne, kallioseinämä, seinämä, pystyseinämä, jyrkkä rinne, rinne, pudotus, mäki, penger, törmä, töyräs"
                 },
                 "natural/coastline": {
                     "name": "Rannikko",
@@ -3984,7 +4270,8 @@
                     "terms": "Huippu, Vuorenhuippu, Korkein kohta, Vuoren huippu"
                 },
                 "natural/ridge": {
-                    "name": "Harju"
+                    "name": "Harju",
+                    "terms": "harju, reunamuodostuma, salpausselkä, harjanne, selänne, mäki"
                 },
                 "natural/saddle": {
                     "name": "Sola",
@@ -4036,7 +4323,8 @@
                     "name": "Ei uloskäyntiä"
                 },
                 "office": {
-                    "name": "Toimisto"
+                    "name": "Toimisto",
+                    "terms": "konttori, toimipaikka, liikehuoneisto, virasto"
                 },
                 "office/accountant": {
                     "name": "Tilintarkastustoimisto",
@@ -4064,7 +4352,8 @@
                     "name": "Hyväntekeväisyysjärjestö"
                 },
                 "office/company": {
-                    "name": "Yritystoimisto"
+                    "name": "Yritystoimisto",
+                    "terms": "yritys, yrittäjä, yhtiö, firma, oy, osakeyhtiö, kommandiittiyhtiö, tmi, toiminimi, analyytikko, edustusliike, finanssipalvelu, holdingyhtiö, henkilöstöyhtiö, isännöinti, isännöijä, jätehuoltoyhtiö, kahvipaahtamo, konsultti, konsultointi, koulutusyritys, kultaseppä, käännöstoimisto, liikenneyhtiö, taksiyritys, markkinatutkimus, meklari, muotoilu, musiikkistudio, pörssi, pörssiyhtiö, rakennusliike, rakentaja, treidaaja, yritysrahoitus, sijoitusyhtiö, sijoittaja, teollisuusyritys, uutistoimisto, vartiointiliike, viestintä, yritysviestintä, välittäjä"
                 },
                 "office/coworking": {
                     "name": "Yhteistyöskentelytila"
@@ -4129,7 +4418,10 @@
                 },
                 "office/ngo": {
                     "name": "Kansalaisjärjestö",
-                    "terms": "kansalaisjärjestö, järjestö, kansanliike, kansanjärjestö, kansalaisjärjestötoimisto, toimisto"
+                    "terms": "kansalaisjärjestö, järjestö, kansanliike, kansanjärjestö, kansalaisjärjestötoimisto, toimisto, kolmas sektori, kolmannen sektorin, vapaaehtois"
+                },
+                "office/notary": {
+                    "name": "Notaari"
                 },
                 "office/physician": {
                     "name": "Lääkäri"
@@ -4159,6 +4451,10 @@
                 "office/travel_agent": {
                     "name": "Matkatoimisto"
                 },
+                "office/water_utility": {
+                    "name": "Vesilaitos",
+                    "terms": "vesipalvelu, vesihuoltolaitos, vesihuolto, vedenjakelu, vesiosuuskunta, vesikunta, viemäröintilaitos, vesi, toimisto"
+                },
                 "piste": {
                     "name": "Laskettelurinne/hiihtolatu",
                     "terms": "laskettelu, alamäki, mäki, laskettelumäki, rinne, latu, hiihtolatu, urheilu, kuntoilu, liikunta, talvi, talviliikunta, talviurheilu, talvikuntoilu"
@@ -4174,7 +4470,8 @@
                     "name": "Maatila"
                 },
                 "place/hamlet": {
-                    "name": "Pikkukylä"
+                    "name": "Pikkukylä",
+                    "terms": "kulmakunta, pieni kylä, sivukylä, kylä, paikkakunta, paikannimi, takamaa, seutu, naapurusto, taloryhmä, taajama, haja-asutus"
                 },
                 "place/island": {
                     "name": "Saari",
@@ -4209,12 +4506,33 @@
                 "place/village": {
                     "name": "Kylä"
                 },
+                "playground/balance_beam": {
+                    "name": "Nuorallakävely"
+                },
+                "playground/basket_swing": {
+                    "name": "Korikeinu"
+                },
+                "playground/rocker": {
+                    "name": "Keinuhevonen"
+                },
+                "playground/roundabout": {
+                    "name": "Karuselli"
+                },
                 "playground/sandpit": {
                     "name": "Hiekkalaatikko"
                 },
+                "playground/seesaw": {
+                    "name": "Keinulauta"
+                },
                 "playground/slide": {
                     "name": "Liukumäki"
                 },
+                "playground/structure": {
+                    "name": "Kiipeilyteline"
+                },
+                "playground/swing": {
+                    "name": "Keinu"
+                },
                 "point": {
                     "name": "Paikkapiste"
                 },
@@ -4260,7 +4578,8 @@
                     "terms": "ilmarata, köysirata, gondoli, hissi, laituri, pysäkki, alue"
                 },
                 "public_transport/linear_platform_bus": {
-                    "name": "Linja-autopysäkki/-laituri"
+                    "name": "Linja-autopysäkki/-laituri",
+                    "terms": "linja-autopysäkki, bussipysäkki, pysäkki, pysähdyspaikka, odotuspaikka, linja-auto, bussi, dösis, dösäri, levennys, pysäkkimerkki, katos, pikavuoro, linja-autolaituri, bussilaituri, laituri, joukkoliikenne"
                 },
                 "public_transport/linear_platform_ferry": {
                     "name": "Laivapaikka/-matkustajalaituri"
@@ -4289,7 +4608,8 @@
                     "terms": "ilmarata, gondoli, hissi, laituri, pysäkki, alue"
                 },
                 "public_transport/platform_bus": {
-                    "name": "Linja-autopysäkki/-laituri"
+                    "name": "Linja-autopysäkki/-laituri",
+                    "terms": "linja-autopysäkki, bussipysäkki, pysäkki, pysähdyspaikka, odotuspaikka, linja-auto, bussi, dösis, dösäri, levennys, pysäkkimerkki, katos, pikavuoro, linja-autolaituri, bussilaituri, laituri, joukkoliikenne"
                 },
                 "public_transport/platform_ferry": {
                     "name": "Laivapaikka/-matkustajalaituri"
@@ -4456,10 +4776,12 @@
                     "name": "Lauttareitti"
                 },
                 "shop": {
-                    "name": "Kauppa"
+                    "name": "Kauppa",
+                    "terms": "myymälä, liike, market, marketti, puoti, putiikki, tavaratalo"
                 },
                 "shop/alcohol": {
-                    "name": "Alkoholimyymälä"
+                    "name": "Alkoholimyymälä",
+                    "terms": "viina, olut, viini, viinikellari, juoma"
                 },
                 "shop/anime": {
                     "name": "Anime-myymälä",
@@ -4519,7 +4841,8 @@
                     "name": "Kirjakauppa"
                 },
                 "shop/boutique": {
-                    "name": "Muotiliike"
+                    "name": "Muotiliike",
+                    "terms": "vaate, asuste"
                 },
                 "shop/butcher": {
                     "name": "Lihakauppias"
@@ -4548,7 +4871,8 @@
                     "name": "Juustopuoti"
                 },
                 "shop/chemist": {
-                    "name": "Apteekki-luontaistuotemyymälä"
+                    "name": "Apteekki-luontaistuotemyymälä",
+                    "terms": "lääke, luontaislääkintä, terveys"
                 },
                 "shop/chocolate": {
                     "name": "Suklaapuoti"
@@ -4675,7 +4999,8 @@
                     "name": "Hifi-myymälä"
                 },
                 "shop/interior_decoration": {
-                    "name": "Sisustusmyymälä"
+                    "name": "Sisustusmyymälä",
+                    "terms": "huonekalu, kalustus, kaluste, koriste, esine, kauppa, liike"
                 },
                 "shop/jewelry": {
                     "name": "Jalokiviliike"
@@ -4738,7 +5063,7 @@
                 },
                 "shop/organic": {
                     "name": "Luomumyymälä",
-                    "terms": "luomu, luomuruoka, ympäristö, ympäristöystävällisyys, ruoka, ruokakauppa"
+                    "terms": "luomu, luomuruoka, ympäristö, ympäristöystävällisyys, ruoka, ruokakauppa, luonnonmukainen"
                 },
                 "shop/outdoor": {
                     "name": "Ulkoilmamyymälä"
@@ -4772,7 +5097,8 @@
                     "terms": "radio, elektroniikka, komponentti, tekninen, tekniikka, osa, osat, varaosa"
                 },
                 "shop/religion": {
-                    "name": "Uskonnollinen myymälä"
+                    "name": "Uskonnollinen myymälä",
+                    "terms": "kristillinen, kauppa, hengellinen, henkinen"
                 },
                 "shop/scuba_diving": {
                     "name": "Sukellusliike",
@@ -4783,7 +5109,7 @@
                 },
                 "shop/second_hand": {
                     "name": "Käytetyn tavaran kauppa",
-                    "terms": "kirpputori, myymälä, liike, kauppa, second hand, käytetty, käytettyä, käytetyn, tavara, jälleenmyynti, vertaiskauppa"
+                    "terms": "kirpputori, myymälä, liike, kauppa, second hand, käytetty, käytettyä, käytetyn, tavara, jälleenmyynti, vertaiskauppa, osto- ja myyntiliike"
                 },
                 "shop/shoes": {
                     "name": "Kenkäkauppa"
@@ -4877,13 +5203,14 @@
                 },
                 "tourism/artwork": {
                     "name": "Taideteos",
-                    "terms": "taideteos, patsas, veistos, taide, taiteellinen, teos"
+                    "terms": "taideteos, patsas, veistos, taide, taiteellinen, teos, installaatio"
                 },
                 "tourism/attraction": {
                     "name": "Turistikohde"
                 },
                 "tourism/camp_site": {
-                    "name": "Leirintäalue"
+                    "name": "Leirintäalue",
+                    "terms": "leiripaikka, karavaanialue, caravan park, matkailuvaunualue, telttailualue, camping "
                 },
                 "tourism/caravan_site": {
                     "name": "Asuntoautopysäköinti"
@@ -4893,7 +5220,8 @@
                     "terms": "kesämökki, lomamökki, mökki, asunto, talo, kesä, vapaa-ajan, vapaa-aika"
                 },
                 "tourism/gallery": {
-                    "name": "Taidegalleria"
+                    "name": "Taidegalleria",
+                    "terms": "taidenäyttely, taide, näyttely, näyttelytila, galleria, galleriatila, kokoelma, maalaus, valokuva"
                 },
                 "tourism/guest_house": {
                     "name": "Majatalo"
@@ -4908,13 +5236,15 @@
                     "name": "Infopiste"
                 },
                 "tourism/information/board": {
-                    "name": "Opastaulu"
+                    "name": "Opastaulu",
+                    "terms": "opastaulu, opaskartta, opaste, kartta, ilmoitustaulu, kiinteistötaulu, nimikilpi, aikataulu, bussi, juna, historia, luonto, kuulutukset"
                 },
                 "tourism/information/guidepost": {
                     "name": "Tienviitta"
                 },
                 "tourism/information/map": {
-                    "name": "Kartta"
+                    "name": "Kartta",
+                    "terms": "opaskartta, maastokartta, topografia, katukartta, karttataulu, pohjapiirros, opastaulu, reittiohje, havainnekuva, kuva, grafiikka, taulu"
                 },
                 "tourism/information/office": {
                     "name": "Matkailuneuvonta",
@@ -4936,8 +5266,13 @@
                 "tourism/viewpoint": {
                     "name": "Näköalapaikka"
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Autiotupa",
+                    "terms": "tupa, kota, mökki, maja, kämppä, kammi, pirtti, autiotupa, vuokra, vuokraus, varaus, kota, erä, erämaa, eräkämppä, yö, yöpaikka, yöpymispaikka, leiripaikka, retki, vaellus, luonto, metsä"
+                },
                 "tourism/zoo": {
-                    "name": "Eläintarha"
+                    "name": "Eläintarha",
+                    "terms": "eläinpuisto, kotieläinpiha"
                 },
                 "traffic_calming": {
                     "name": "Hidaste",
@@ -4994,17 +5329,9 @@
                 "type/restriction/no_u_turn": {
                     "name": "Ei saa tehdä U-käännöstä"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Saa kääntyä vain vasemmalle"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Saa kääntyä vain oikealle"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Ei saa kääntyä lainkaan"
-                },
                 "type/route": {
-                    "name": "Reitti"
+                    "name": "Reitti",
+                    "terms": "matkareitti, rengasreitti, lenkki, kulkuohjeet, ohjaus, reititys, navigointi, kurssi, traili"
                 },
                 "type/route/bicycle": {
                     "name": "Pyöräilyreitti"
@@ -5023,7 +5350,8 @@
                     "name": "Kävelyreitti"
                 },
                 "type/route/hiking": {
-                    "name": "Vaellusreitti"
+                    "name": "Vaellusreitti",
+                    "terms": "vaellus, patikointi, patikka, maasto, retkeily, samoilu, reitti"
                 },
                 "type/route/horse": {
                     "name": "Ratsastusreitti"
@@ -5035,7 +5363,8 @@
                     "name": "Putkilinja"
                 },
                 "type/route/piste": {
-                    "name": "Hiihtoreitti"
+                    "name": "Hiihtoreitti",
+                    "terms": "latu, latureitti, talviurheilu, reitistö, hiihtolenkki, hiihtäminen"
                 },
                 "type/route/power": {
                     "name": "Voimalinja"
@@ -5260,7 +5589,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Taustakartta perustuu Itävallan hallinnon julkaisemaan aineistoon.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -5318,6 +5646,9 @@
                 }
             },
             "tf-cycle": {
+                "attribution": {
+                    "text": "Kartat © Thunderforest, Aineisto © OpenStreetMapin tekijät"
+                },
                 "name": "Thunderforest OpenCycleMap"
             },
             "tf-landscape": {
diff --git a/dist/locales/fr.json b/dist/locales/fr.json
index a212982ac..f9a376956 100644
--- a/dist/locales/fr.json
+++ b/dist/locales/fr.json
@@ -1,5 +1,8 @@
 {
     "fr": {
+        "icons": {
+            "undo": "annuler"
+        },
         "modes": {
             "add_area": {
                 "title": "Polygone",
@@ -760,7 +763,7 @@
                 "backups_h": "Sauvegarde automatique",
                 "backups": "Si vous ne pouvez pas terminer vos modifications tout de suite, par exemple si votre ordinateur s’éteint ou si vous fermez votre navigateur, votre travail est enregistré. Vous pouvez revenir plus tard (avec le même navigateur, sur la même ordinateur) et iD vous proposera de reprendre là où vous vous étiez arrêté.",
                 "keyboard_h": "Raccourcis clavier",
-                "keyboard": "Vous pouvez voir une liste de raccourcis clavier en pressant la touche `?`."
+                "keyboard": "Vous pouvez voir une liste de raccourcis clavier en appuyant sur la touche `?`."
             },
             "feature_editor": {
                 "title": "Éditeur d'élément",
@@ -779,7 +782,9 @@
             },
             "points": {
                 "title": "Points",
+                "intro": "Les *points* peuvent être utilisés pour représenter des éléments comme des magasins, restaurants ou monuments. Ils indiquent une position précise et décrivent ce qu'il y a à cet endroit. ",
                 "add_point_h": "Ajouter des Points",
+                "add_point_finish": "Pour placer un nouveau point sur la carte, placer le curseur de la souris où le point doit aller, puis effectuer un {leftclick} clic gauche ou un appui sur la barre d'Espace.",
                 "move_point_h": "Déplacer des Points",
                 "delete_point_h": "Supprimer des Points "
             },
@@ -787,10 +792,16 @@
                 "title": "Lignes",
                 "add_line_h": "Ajouter des Lignes",
                 "modify_line_h": "Modifier des Lignes",
+                "connect_line_h": "Connecter des lignes",
+                "disconnect_line_h": "Séparer des lignes",
                 "move_line_h": "Déplacer des Lignes",
                 "delete_line_h": "Supprimer des lignes"
             },
             "areas": {
+                "title": "Polygones",
+                "intro": "Les *polygones* sont utilisés pour montrer les délimitations d'éléments comme des lacs, des bâtiments et des zones résidentielles. Les polygones doivent être dessinés le long du bord des éléments qu'ils représentent, par exemple autour du pied d'un bâtiment.",
+                "point_or_area_h": "Des points ou un polygone ?",
+                "point_or_area": "De nombreux éléments peuvent être représentés par des points ou des polygones. Vous devriez cartographier les bâtiments et les contours de propriétés avec des polygones lorsque c'est possible. Placez des points à l'intérieur d'un bâtiment pour représenter des entreprises, des équipements et d'autres éléments se trouvant à l'intérieur.",
                 "add_area_h": "Ajouter des polygones",
                 "square_area_h": "Donner une forme orthogonale.",
                 "modify_area_h": "Modifier des polyognes",
@@ -1063,8 +1074,8 @@
             },
             "startediting": {
                 "title": "Sortir du tutoriel et contribuer",
-                "help": "Vous êtes maintenant prêt pour contribuer à OpenStreetMap !{br}Vous pouvez recommencer ce tutorial à tout moment ou lire plus de documentation en cliquant sur le {button} bouton Aide ou en pressant la touche '{key}'.",
-                "shortcuts": "Vous pouvez voir une liste des commandes avec leur raccourci clavier en pressant la touche '{key}'.",
+                "help": "Vous êtes maintenant prêt pour contribuer à OpenStreetMap !{br}Vous pouvez recommencer ce tutorial à tout moment ou lire plus de documentation en cliquant sur le bouton Aide {button} ou en appuyant sur la touche '{key}'.",
+                "shortcuts": "Vous pouvez voir une liste des commandes avec leurs raccourcis claviers en appuyant sur la touche '{key}'.",
                 "save": "N'oubliez pas de sauver régulièrement vos modifications !",
                 "start": "Commencer à cartographier !"
             }
@@ -1842,6 +1853,9 @@
                 "indoor": {
                     "label": "Intérieur"
                 },
+                "industrial": {
+                    "label": "Type"
+                },
                 "information": {
                     "label": "Type"
                 },
@@ -1962,6 +1976,10 @@
                     "label": "Vitesse maximale autorisée",
                     "placeholder": "30, 50, 70, 90, etc."
                 },
+                "maxspeed/advisory": {
+                    "label": "Vitesse conseillée",
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "Durée maximale"
                 },
@@ -2550,6 +2568,17 @@
                     "label": "Type",
                     "placeholder": "Défaut"
                 },
+                "usage_rail": {
+                    "label": "Utilisation",
+                    "options": {
+                        "branch": "Secondaire",
+                        "industrial": "Industrielle",
+                        "main": "Principale",
+                        "military": "Militaire",
+                        "test": " Voie de test pour les nouveaux trains",
+                        "tourism": "Touristique"
+                    }
+                },
                 "vending": {
                     "label": "Marchandise proposée"
                 },
@@ -2731,6 +2760,10 @@
                     "name": "Terminal d'aéroport",
                     "terms": "Terminal"
                 },
+                "allotments/plot": {
+                    "name": "Parcelle dans un jardin familial",
+                    "terms": "<translate with synonyms or related terms for 'Community Garden Plot', separated by commas>"
+                },
                 "amenity": {
                     "name": "Équipement"
                 },
@@ -2959,6 +2992,10 @@
                     "name": "Marché",
                     "terms": "Marché, Place de marché"
                 },
+                "amenity/monastery": {
+                    "name": "Terrain de monastère",
+                    "terms": "<translate with synonyms or related terms for 'Monastery Grounds', separated by commas>"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Parking pour motocyclettes",
                     "terms": "Parc à motos,Stationnement motos"
@@ -3163,6 +3200,10 @@
                     "name": "Distributeur de cigarettes",
                     "terms": "distributeur de cigarettes, distributeur à cigarettes, cigarettes, distributeur automatique de cigarettes, machine à cigarettes, vente automatique de cigarettes, vente de cigarettes, vente cigarettes, vending machine cigarettes"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "Distributeur de café",
+                    "terms": "Distributeur de café"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "Distributeur de préservatifs",
                     "terms": "distributeur de préservatifs, distributeur à préservatifs, préservatifs, distributeur automatique de préservatifs, machine à préservatifs, vente automatique de préservatifs, vente de préservatifs, vente préservatifs, vending machine condoms, capotes, condoms"
@@ -3171,6 +3212,13 @@
                     "name": "Distributeur de boissons",
                     "terms": "distributeur de boissons, distributeur à boissons, boissons, distributeur automatique de boissons, machine à boissons, machine à café, vente automatique de boissons, vente de boissons, vente boissons, eau, café, thé, soda, jus de fruit, vending machine drinks, drinks"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "Distributeur de matériel éléctronique",
+                    "terms": "<translate with synonyms or related terms for 'Electronics Vending Machine', separated by commas>"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "terms": "<translate with synonyms or related terms for 'Flat Coin Vending Machine', separated by commas>"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "Distributeur de sacs pour excréments d'animaux",
                     "terms": "distributeur de sacs pour excréments d'animaux, distributeur à sacs pour excréments d'animaux, sacs pour excréments d'animaux, sacs à excréments d'animaux, sacs à crottes, distributeur automatique de sacs pour excréments d'animaux, distributeur automatique de sacs à crottes, machine à sacs pour excréments d'animaux, machine à sacs à crottes, vente de sacs pour excréments d'animaux, vente de sacs à crottes, vente sacs pour excréments d'animaux, vente sacs à crottes, vending machine excrement bags, excrement bags"
@@ -3179,6 +3227,18 @@
                     "name": "Distributeur de produits d'hygiène féminine",
                     "terms": "machine distributrice de produits d'hygiène féminine, distributeur de serviettes hygiéniques, distributeur de tampons, distributeur de tampon, serviette, tampon, cup, distributeur de cup, menstruations"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "Distributeur d'aliments",
+                    "terms": "Distributeur d'aliments"
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "Pompe à essence",
+                    "terms": "Distributeur de carburant"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "Distributeur de glace",
+                    "terms": "Distributeur de glace"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Distributeur de journaux"
                 },
@@ -3198,6 +3258,10 @@
                     "name": "Distributeur de titres de transport",
                     "terms": "distributeur de titres de transport, distributeur à titres de transport, titres de transport, tickets de transport, distributeur automatique de titres de transport, guichet automatique, machine à titres de transport, vente automatique de titres de transport, vente de titres de transport, vente titres de transport, tickets de train, tickets de bus, tickets de métro, tickets de RER, tickets train, tickets bus, tickets métro, tickets RER, billets de train, billets de bus, billets de métro, billets de RER, billets train, billets bus, billets métro, billets RER, titres de train, titres de bus, titres de métro, titres de RER, vending machine public transport tickets, public transport tickets, tickets, billets, train, bus, métro, RER"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "Distributeur de timbres",
+                    "terms": "<translate with synonyms or related terms for 'Postage Vending Machine', separated by commas>"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "Distributeur de snacks",
                     "terms": "distributeur de snacks, distributeur à snacks, distributeur automatique de snacks, machine à snacks, vente automatique de snacks, vente de snacks, vente snacks, snacks, sucreries, bonbons, chips, cookie, chocolat, cracker, chewing-gum, vending machine sweets, sweets"
@@ -3525,7 +3589,7 @@
                 },
                 "building/stadium": {
                     "name": "Bâtiment du stade",
-                    "terms": "<translate with synonyms or related terms for 'Stadium Building', separated by commas>"
+                    "terms": "Stade, Tribune."
                 },
                 "building/static_caravan": {
                     "name": "Mobil home fixe",
@@ -4001,6 +4065,10 @@
                     "name": "Bretelle d'autoroute",
                     "terms": "Bretelle d'autoroute"
                 },
+                "highway/passing_place": {
+                    "name": "Aire de croisement",
+                    "terms": "Aire de croisement"
+                },
                 "highway/path": {
                     "name": "Chemin non carrossable",
                     "terms": "Chemin"
@@ -4360,6 +4428,10 @@
                     "name": "Salle de jeux",
                     "terms": "<translate with synonyms or related terms for 'Amusement Arcade', separated by commas>"
                 },
+                "leisure/beach_resort": {
+                    "name": "Station balnéaire",
+                    "terms": "Station balnéaire, plage."
+                },
                 "leisure/bird_hide": {
                     "name": "Observatoire ornithologique",
                     "terms": "Observatoire d'oiseaux"
@@ -4476,6 +4548,10 @@
                     "name": "Réserve naturelle",
                     "terms": "Zone protégée"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "Aire des places en terrasse",
+                    "terms": "<translate with synonyms or related terms for 'Outdoor Seating Area', separated by commas>"
+                },
                 "leisure/park": {
                     "name": "Parc",
                     "terms": "Parc"
@@ -4554,7 +4630,7 @@
                 },
                 "leisure/resort": {
                     "name": "Complexe touristique , Village de vacances",
-                    "terms": "Complexe hôtelier, Complexe touristique, Village de vacances, Spa, détente, Relaxation, Station thermale."
+                    "terms": "Complexe hôtelier, Complexe touristique, Village de vacances, Spa, détente, Relaxation, Station thermale, Lieu de séjour, Hôtel."
                 },
                 "leisure/running_track": {
                     "name": "Piste de course (à pieds)",
@@ -4604,6 +4680,10 @@
                     "name": "Entrée de mine",
                     "terms": "Entrée de galerie de mine,Entrée de galerie"
                 },
+                "man_made/antenna": {
+                    "name": "Antenne radioélectrique",
+                    "terms": "Antenne radioélectrique"
+                },
                 "man_made/breakwater": {
                     "name": "Brise-lames",
                     "terms": "Brise-lames"
@@ -4655,6 +4735,10 @@
                     "name": "Tour d'observation",
                     "terms": "Tour d'observation, Mirador"
                 },
+                "man_made/observatory": {
+                    "name": "Observatoire",
+                    "terms": "Observatoire"
+                },
                 "man_made/petroleum_well": {
                     "name": "Puits de pétrole",
                     "terms": "Puits de forage, derrick, chevalet de pompage, ..."
@@ -4779,6 +4863,10 @@
                     "name": "Lande",
                     "terms": "Bruyère"
                 },
+                "natural/mud": {
+                    "name": "Boue",
+                    "terms": "Boue"
+                },
                 "natural/peak": {
                     "name": "Sommet",
                     "terms": "Pic, Mont"
@@ -4880,7 +4968,7 @@
                 },
                 "office/company": {
                     "name": "Bureau d'entreprise",
-                    "terms": "<translate with synonyms or related terms for 'Corporate Office', separated by commas>"
+                    "terms": "Bureau d'entreprise, Entreprise"
                 },
                 "office/coworking": {
                     "name": "Espace de coworking",
@@ -4903,7 +4991,7 @@
                     "terms": "Agence immobilière"
                 },
                 "office/financial": {
-                    "name": "Bureau d'entreprise financière  ",
+                    "name": "Bureau d'entreprise financière",
                     "terms": "Bureau financier,Établissement financier"
                 },
                 "office/forestry": {
@@ -5192,7 +5280,7 @@
                     "terms": "<translate with synonyms or related terms for 'Ferry Stop / Platform', separated by commas>"
                 },
                 "public_transport/linear_platform_light_rail": {
-                    "name": "Station de tramway",
+                    "name": "Station de métro léger",
                     "terms": "<translate with synonyms or related terms for 'Light Rail Stop / Platform', separated by commas>"
                 },
                 "public_transport/linear_platform_monorail": {
@@ -5204,11 +5292,11 @@
                     "terms": "<translate with synonyms or related terms for 'Subway Stop / Platform', separated by commas>"
                 },
                 "public_transport/linear_platform_train": {
-                    "name": "Gare ferroviaire",
+                    "name": "Quai de gare ferroviaire",
                     "terms": "<translate with synonyms or related terms for 'Train Stop / Platform', separated by commas>"
                 },
                 "public_transport/linear_platform_tram": {
-                    "name": "Station de tramway",
+                    "name": "Quai pour tramway",
                     "terms": "<translate with synonyms or related terms for 'Tram Stop / Platform', separated by commas>"
                 },
                 "public_transport/linear_platform_trolleybus": {
@@ -5224,7 +5312,7 @@
                     "terms": "<translate with synonyms or related terms for 'Aerialway Stop / Platform', separated by commas>"
                 },
                 "public_transport/platform_bus": {
-                    "name": "Arrêt de bus",
+                    "name": "Quai d'arrêt de bus",
                     "terms": "<translate with synonyms or related terms for 'Bus Stop / Platform', separated by commas>"
                 },
                 "public_transport/platform_ferry": {
@@ -5232,7 +5320,7 @@
                     "terms": "<translate with synonyms or related terms for 'Ferry Stop / Platform', separated by commas>"
                 },
                 "public_transport/platform_light_rail": {
-                    "name": "Station de tramway",
+                    "name": "Station de métro léger",
                     "terms": "<translate with synonyms or related terms for 'Light Rail Stop / Platform', separated by commas>"
                 },
                 "public_transport/platform_monorail": {
@@ -5244,11 +5332,11 @@
                     "terms": "<translate with synonyms or related terms for 'Subway Stop / Platform', separated by commas>"
                 },
                 "public_transport/platform_train": {
-                    "name": "Gare ferroviaire",
+                    "name": "Quai de gare ferroviaire",
                     "terms": "<translate with synonyms or related terms for 'Train Stop / Platform', separated by commas>"
                 },
                 "public_transport/platform_tram": {
-                    "name": "Station de tramway",
+                    "name": "Quai pour tramway",
                     "terms": "<translate with synonyms or related terms for 'Tram Stop / Platform', separated by commas>"
                 },
                 "public_transport/platform_trolleybus": {
@@ -5398,7 +5486,7 @@
                     "terms": "Voie ferrée étroite"
                 },
                 "railway/platform": {
-                    "name": "Gare ferroviaire"
+                    "name": "Quai de gare ferroviaire"
                 },
                 "railway/rail": {
                     "name": "Voie ferrée",
@@ -5815,6 +5903,10 @@
                     "name": "Animalerie",
                     "terms": "Animalerie"
                 },
+                "shop/pet_grooming": {
+                    "name": "Salon de toilettage",
+                    "terms": "Salon de toilettage"
+                },
                 "shop/photo": {
                     "name": "Tirage de photos",
                     "terms": "Photographe, Tirage de photos"
@@ -6129,6 +6221,10 @@
                     "name": "Interdiction de bifurquer",
                     "terms": "Interdiction de bifurquer"
                 },
+                "type/restriction/only_u_turn": {
+                    "name": "Demi-tour obligatoire",
+                    "terms": "Demi-tour obligatoire"
+                },
                 "type/route": {
                     "name": "Itinéraire",
                     "terms": "Route, rue, chemin, sentier"
@@ -6484,7 +6580,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Map tiles par Stamen Design, sous CC BY 3.0"
+                    "text": "Tuiles par Stamen Design, sous CC-BY 3.0. Données par OpenStreetMap, sous ODbL"
                 },
                 "name": "Stamen Terrain"
             },
@@ -6500,6 +6596,67 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "Bay-Area-OpenStreetMappers": {
+                "name": "Bay Area OpenStreetMappers",
+                "description": "Améliorer OpenStreetMap dans la Bay Area",
+                "extendedDescription": "Ce groupe a pour objectif de développer la communauté OpenStreetMap dans le secteur de la Région de la baie de San Francisco. Nos événements sont ouverts à tout le monde, passionné.e.s de l'Open Source, cyclistes, professionnel.le.s de la géomatique, geocachers, ou d'autres encore. Quiconque est intéressé.e par les cartes, la cartographie et les données cartographiques libres est invité.e à rejoindre le groupe et à participer aux événements."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "Central Pennsylvania OSM",
+                "description": "Communauté de cartographie en ligne de State College, Pennsylvanie"
+            },
+            "Code-for-San-Jose-Slack": {
+                "description": "Tout le monde est la bienvenue! Inscrivez-vous sur {signupUrl} et rejoignez le canal #osm."
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM",
+                "description": "Groupe d'utilisateurs OpenStreetMap de Dallas-Fort Worth",
+                "extendedDescription": "Dallas, Fort Worth et les villes au milieu abondent de personnes créatives et douées en informatique. La volonté de ce groupe est de trouver de nouvelles manières d'utiliser les supers ressources d'OSM."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Réunion pour les passionnés de cartographie dans la région de Philadelphie",
+                "extendedDescription": "GeoPhilly unit les développeurs, les géographes, les passionnés de données et d'open source, les hackers civiques et les drogués de la carte dans l'amour partagé pour les cartes et les histoires qu'elles racontent. Que vous utilisiez des cartes dans votre travail ou que vous souhaitiez en savoir plus, c'est la bonne réunion ! Nos événements essayent d'être ouverts, amicaux, éducatifs et sociaux et vont des happy hours aux présentations rapides voire aux ateliers. Venez créer une communauté géospatiale diversifiée et inspirante à Philadelphie avec nous !"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapping DC",
+                "description": "Améliorer OpenStreetMap dans la région de DC",
+                "extendedDescription": "Nous sommes un groupe de cartographes volontaires qui cherchons à améliorer OpenStreetMap dans la région de DC. Nous essayons aussi de montrer aux autres ce qu'est l'écosystème OSM, l'analyse de données, la cartographie et les SIG. Nous nous réunissons tous les mois à des réunions pour nous concentrer sur une partie de notre ville."
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "Le groupe d'utilisateurs d'OSM de Chattanooga"
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap NYC",
+                "description": "Cartographes et utilisateurs d'OpenStreetMap, développeurs et passionnés dans la région métropolitaine de New York"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland",
+                "description": "Cartographes et utilisateurs d'OpenStreetMap dans la région de Portland",
+                "extendedDescription": "OpenStreetMap (OSM) est une carte du monde faite par des gens comme vous. C'est une carte que vous construisez et qui est libre comme wikipédia. Voyez osm.org pour plus d'informations et rejoignez-nous à une rencontre pour parler de cartes, contribuer à OSM et s'amuser !"
+            },
+            "OSM-US-Slack": {
+                "name": "Slack d'OpenStreetMap US",
+                "description": "Vous êtes tous les bienvenus ! Enregistrez-vous sur {signupUrl}"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Slack de Maptime Australia",
+                "description": "Enregistrez-vous sur {signupUrl}"
+            },
+            "OSM-AR-telegram": {
+                "extendedDescription": "Rejoignez la communauté pour apprendre davantage sur OpenStreetMap, poser des questions ou participer à nos réunions. Tout le monde est la bienvenue!"
+            },
+            "OSM-AR-twitter": {
+                "name": "Twitter d'OpenStreetMap Argentine",
+                "description": "Suivez-nous sur Twitter à {url}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap sur Reddit",
+                "description": "/r/openstreetmap/ est un super endroit pour en apprendre plus sur OpenStreetMap. Demandez-nous tout ce que vous voulez !"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/gl.json b/dist/locales/gl.json
index ce3d70b3a..f32c99e17 100644
--- a/dist/locales/gl.json
+++ b/dist/locales/gl.json
@@ -1,5 +1,10 @@
 {
     "gl": {
+        "icons": {
+            "information": "información",
+            "remove": "quitar",
+            "undo": "desfacer"
+        },
         "modes": {
             "add_area": {
                 "title": "Área",
@@ -291,6 +296,42 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Distancia",
+                "distance_up_to": "Ata {distance}",
+                "via": "A través de",
+                "via_node_only": "Só nodo",
+                "via_up_to_one": "Ata 1 vía",
+                "via_up_to_two": "Ata 2 vías"
+            },
+            "help": {
+                "indirect": "(indirecta)",
+                "turn": {
+                    "no_left_turn": "Prohibido xirar á esquerda {indirect}",
+                    "no_right_turn": "Prohibido xirar á dereita {indirect}",
+                    "no_u_turn": "Prohibido cambiar de sentido {indirect}",
+                    "no_straight_on": "Prohibido seguir recto {indirect}",
+                    "only_left_turn": "Obrigatorio xirar á esquerda {indirect}",
+                    "only_right_turn": "Obrigatorio xirar á dereita {indirect}",
+                    "only_u_turn": "Obrigatorio cambiar de sentido {indirect}",
+                    "only_straight_on": "Obrigatorio seguir recto {indirect}",
+                    "allowed_left_turn": "Permitido xirar á esquerda {indirect}",
+                    "allowed_right_turn": "Permitido xirar á dereita {indirect}",
+                    "allowed_u_turn": "Permitido cambiar de sentido {indirect}",
+                    "allowed_straight_on": "Permitido seguir recto {indirect}"
+                },
+                "from": "DESDE",
+                "via": "A TRAVÉS DE",
+                "to": "CARA A",
+                "from_name": "{from} {fromName}",
+                "from_name_to_name": "{from} {fromName} {to} {toName}",
+                "via_names": "{via} {viaNames}",
+                "select_from": "Fai clic para seleccionar un segmento {from}",
+                "select_from_name": "Fai clic para seleccionar {from} {fromName}",
+                "toggle": "Fai clic para \"{turn}\""
+            }
+        },
         "undo": {
             "tooltip": "Desfacer: {action}",
             "nothing": "Nada para desfacer."
@@ -689,6 +730,44 @@
             "help": {
                 "title": "Axuda",
                 "welcome": "Benvido ao editor iD para [OpenStreetMap] (https://www.openstreetmap.org/). Con este editor podes actualizar OpenStreetMap directamente desde o teu navegador."
+            },
+            "field": {
+                "restrictions": {
+                    "title": "Axuda das restricións de xiro",
+                    "about": {
+                        "title": "Acerca de",
+                        "about": "Este campo permíteche inspecionar e modificar restricións de xiro. Mostra un modelo da intersección seleccionada, incluíndo outras estradas conectadas próximas.",
+                        "from_via_to": "Unha restrición de xiro sempre contén: unha **vía DESDE**, unha **vía CARA A** e un **nodo A TRAVÉS DE** ou unha ou varias **vías A TRAVÉS DE**.",
+                        "maxdist": "A barra de desprazamento \"{distField}\" controla ata onde se vai buscar por máis estradas conectadas.",
+                        "maxvia": "A barra de desprazamento \"{viaField}\" axusta cántas vías intermedias poden ser incluídas na busca. (Consello: canto máis simple, mellor)"
+                    },
+                    "inspecting": {
+                        "title": "Inspecionar",
+                        "about": "Sitúate sobre calquera segmento **DESDE** para ver se ten restricións de xiro. Cada destino **CARA A** posible debuxarase cunha sombra coloreada indicando se existe algunha restrición de xiro.",
+                        "from_shadow": "{fromShadow} **segmento DESDE**",
+                        "allow_shadow": "{allowShadow} **CARA A permitido**",
+                        "restrict_shadow": "{restrictShadow} **CARA A prohibido**",
+                        "only_shadow": "{onlyShadow} **CARA A obrigatorio**",
+                        "restricted": "\"Prohibido\" significa que hai unha restrición de xiro, por exemplo \"Prohibido xirar á esquerda\".",
+                        "only": "\"Obrigatorio\" significa que un vehículo que entre na intersección só poderá ir por esa ruta, por exemplo \"Obrigatorio seguir recto\"."
+                    },
+                    "modifying": {
+                        "title": "Modificar",
+                        "about": "Para modificar restricións de xiro, primeiro fai clic en calquera segmento **DESDE** para selecionalo. O segmento selecionado parpadeará, e todos os destinos **CARA A** posibles mostraranse como símbolos de xiro.",
+                        "indicators": "Logo, fai clic nun símbolo de xiro para alternalo entre \"Permitido, \"Prohibido\" e \"Obrigatorio\".",
+                        "allow_turn": "{allowTurn} **CARA A permitido**",
+                        "restrict_turn": "{restrictTurn} **CARA A prohibido**",
+                        "only_turn": "{onlyTurn} **CARA A obrigatorio**"
+                    },
+                    "tips": {
+                        "title": "Consellos",
+                        "simple": "**Intenta usar restricións simples en lugar de restricións máis complexas.**",
+                        "simple_example": "Por exemplo, se podes establecer o elemento intermedio simplemente cun nodo, evita facelo cunha vía.",
+                        "indirect": "**Algunhas restricións mostran o texto \"(indirecta)\" e aparecen cunha cor máis tenue.**",
+                        "indirect_example": "Estas restricións existen debido a outra restrición cercana. Por exemplo, unha restrición de \"Obrigatorio seguir recto\" creará indirectamente restricións de \"Prohibido xirar\" para tódalas demáis rutas da intersección.",
+                        "indirect_noedit": "Non podes modificar restricións indirectas. En lugar diso, modifica a restrición directa cercana."
+                    }
+                }
             }
         },
         "intro": {
@@ -2308,9 +2387,6 @@
                     "label": "Tipo",
                     "placeholder": "Por defecto"
                 },
-                "vending": {
-                    "label": "Tipo de Bens"
-                },
                 "visibility": {
                     "label": "Visibilidade",
                     "options": {
@@ -4754,15 +4830,6 @@
                 "type/restriction/no_u_turn": {
                     "name": "Prohibido o cambio de sentido"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Obrigatorio xirar á esquerda"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Obrigatorio xirar á dereita"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Obrigatorio continuar recto"
-                },
                 "type/route": {
                     "name": "Ruta"
                 },
@@ -4961,7 +5028,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Mapa base para Austria, baseado en datos do goberno.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -5022,9 +5088,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Tiles do mapa por Stamen Design, baixo CC BY 3.0"
-                },
                 "name": "Terreo Stamen"
             },
             "tf-cycle": {
@@ -5039,6 +5102,16 @@
                 },
                 "name": "Paisaxe Thunderforest"
             }
+        },
+        "community": {
+            "OSM-ES-telegram": {
+                "name": "@OSMes no Telegram",
+                "description": "Chat de Telegram de OpenStreetMap España"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap en Reddit",
+                "description": "/r/openstreetmap/ é un bo sitio para aprender máis sobre OpenStreetMap. Pregúntanos calquera cousa!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/he.json b/dist/locales/he.json
index bb895bab1..74d47ee11 100644
--- a/dist/locales/he.json
+++ b/dist/locales/he.json
@@ -1,5 +1,10 @@
 {
     "he": {
+        "icons": {
+            "information": "מידע",
+            "remove": "הסר",
+            "undo": "בטל"
+        },
         "modes": {
             "add_area": {
                 "title": "שטח",
@@ -70,7 +75,7 @@
                     "line": "להפוך קו זה למעגלי.",
                     "area": "להפוך איזור זה למעגלי."
                 },
-                "key": "ע",
+                "key": "O",
                 "annotation": {
                     "line": "הקו עוגל",
                     "area": "האיזור עוגל."
@@ -85,7 +90,7 @@
                     "line": "ריבוע פינות בקו זה",
                     "area": "ריבוע פינות באיזור זה"
                 },
-                "key": "ר",
+                "key": "S",
                 "annotation": {
                     "line": "הפיכת הקצוות של קו לריבוע.",
                     "area": "הפיכת הקצוות של שטח לריבוע."
@@ -97,7 +102,7 @@
             "straighten": {
                 "title": "יישור",
                 "description": "יישור הקו הזה.",
-                "key": "ש",
+                "key": "S",
                 "annotation": "יישור קו.",
                 "too_bendy": "אי אפשר ליישר את הקו הזה כיוון שהוא יותר מדי מכופף.",
                 "connected_to_hidden": "אי אפשר ליישר את הקו הזה כי הוא מחובר לתכונה נסתרת."
@@ -150,7 +155,7 @@
             "disconnect": {
                 "title": "ניתוק",
                 "description": "ניתוק הקווים/השטחים האלה זה מזה.",
-                "key": "נ",
+                "key": "D",
                 "annotation": "קווים/שטחים מנותקים.",
                 "not_connected": "אין כאן מספיק קווים/שטחים לניתוק.",
                 "connected_to_hidden": "אי אפשר לנתק את זה עקב החיבור לתכונה נסתרת.",
@@ -159,7 +164,7 @@
             "merge": {
                 "title": "מיזוג",
                 "description": "מיזוג התכונות האלה.",
-                "key": "ז",
+                "key": "C",
                 "annotation": "{n} תכונות מוזגו.",
                 "not_eligible": "אי אפשר למזג תכונות אלו.",
                 "not_adjacent": "אי אפשר למזג את התכונות האלו כיוון שנקודות הקצה שלהן אינן מחוברות.",
@@ -173,7 +178,7 @@
                     "single": "העברת התכונה הזאת למיקום שונה.",
                     "multiple": "העברת התכונות האלו למיקום שונה."
                 },
-                "key": "ע",
+                "key": "M",
                 "annotation": {
                     "point": "העברת נקודה.",
                     "vertex": "העברת מפרק בדרך.",
@@ -196,8 +201,8 @@
             },
             "reflect": {
                 "title": {
-                    "long": "שקף לאורך",
-                    "short": "שקף לרוחב"
+                    "long": "שקף את הארוך",
+                    "short": "שקף את הקצר"
                 },
                 "description": {
                     "long": {
@@ -220,7 +225,7 @@
                     "single": "הטיית התכונה הזאת מסביב לנקודת המרכז שלה.",
                     "multiple": "הטיית התכונות האלו סביב נקודות המרכז שלהן."
                 },
-                "key": "ט",
+                "key": "R",
                 "annotation": {
                     "line": "הטיית קו.",
                     "area": "הטיית שטח.",
@@ -242,7 +247,7 @@
             "reverse": {
                 "title": "היפוך",
                 "description": "הפיכת הכיוון של הקו הזה.",
-                "key": "פ",
+                "key": "V",
                 "annotation": "קו התהפך."
             },
             "split": {
@@ -252,7 +257,7 @@
                     "area": "פיצול הגבול של השטח הזה לשניים.",
                     "multiple": "פיצול הקווים/שטח של המפרק הזה לשניים."
                 },
-                "key": "צ",
+                "key": "X",
                 "annotation": {
                     "line": "פיצול קו.",
                     "area": "פיצול גבול שטח.",
@@ -275,7 +280,7 @@
                 "distance_up_to": "עד {distance}",
                 "via": "דרך",
                 "via_node_only": "מפרק בלבד",
-                "via_up_to_one": "עד דרך אחת",
+                "via_up_to_one": "עד דרך 1",
                 "via_up_to_two": "עד 2 דרכים"
             },
             "help": {
@@ -357,9 +362,9 @@
             "truncated_list": "עריכות מאת {users} ו־{count} נוספים"
         },
         "info_panels": {
-            "key": "ח",
+            "key": "I",
             "background": {
-                "key": "ר",
+                "key": "B",
                 "title": "רקע",
                 "zoom": "תקריב",
                 "vintage": "סגנון מיושן",
@@ -374,7 +379,7 @@
                 "hide_vintage": "הסתרת סגנון מיושן"
             },
             "history": {
-                "key": "ה",
+                "key": "H",
                 "title": "היסטוריה",
                 "selected": "{n} נבחרו",
                 "version": "גרסה",
@@ -385,12 +390,12 @@
                 "link_text": "היסטוריה ב־openstreetmap.org"
             },
             "location": {
-                "key": "ק",
+                "key": "L",
                 "title": "מיקום",
                 "unknown_location": "מיקום לא ידוע"
             },
             "measurement": {
-                "key": "ד",
+                "key": "M",
                 "title": "מדידה",
                 "selected": "{n} נבחרו",
                 "geometry": "צורה",
@@ -469,7 +474,7 @@
         "background": {
             "title": "רקע",
             "description": "הגדרות רקע",
-            "key": "ר",
+            "key": "B",
             "backgrounds": "רקעים",
             "none": "אין",
             "best_imagery": "מקור התמונה המוכר והטוב ביותר למיקום זה",
@@ -495,7 +500,7 @@
         "map_data": {
             "title": "נתוני מפה",
             "description": "נתוני מפה",
-            "key": "נ",
+            "key": "F",
             "data_layers": "שכבות נתונים",
             "layers": {
                 "osm": {
@@ -562,7 +567,7 @@
             "wireframe": {
                 "description": "ללא מילוי (מסגרת דקיקה)",
                 "tooltip": "הפעלת מצב מסגרת דקיקה מאפשר לך לראות בקלות את התמונה ברקע.",
-                "key": "ד"
+                "key": "W"
             },
             "partial": {
                 "description": "מילוי חלקי",
@@ -620,7 +625,8 @@
             "twitter": "שיתוף בטוויטר",
             "google": "שיתוף ב־Google+‎",
             "help_html": "השינויים שלך אמורים להופיע בשכבה ה„תקנית” בעוד מספר דקות. שכבות אחרות ותכונות מסוימות עשויות לארוך זמן רב יותר.",
-            "help_link_text": "פרטים"
+            "help_link_text": "פרטים",
+            "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
         },
         "confirm": {
             "okay": "אישור",
@@ -722,11 +728,16 @@
                 "select_right_click": "יש ללחוץ {rightclick} לחיצה ימנית על תכונה כדי להציג את תפריט העריכה, שמציג את הפקודות הזמינות, כגון הטיה, הזזה ומחיקה.",
                 "multiselect_h": "בחירה במגוון",
                 "multiselect_shift_click": "`{shift}`+{leftclick} לחיצה שמאלית כדי לבחור כמה תכונות יחדיו.  אפשרות זו מקלה על העברה או מחיקה של מגוון פריטים.",
+                "multiselect_lasso": "דרך נוספת לבחור מספר תכונות היא להחזיק את המקש `{shift}` ואז ללחוץ להחזיק את כפתור העכבר השמאלי ולגרור את העכבר כדי לצייר בחירה בצורת פלצור. כל הנקודות בתוך אזור הפלצור תיבחרנה.",
                 "undo_redo_h": "ביטול ושחזור ביטול",
+                "undo_redo": "העריכות שלך נשמרות מקומית בדפדפן שלך עד לבחירתך בשמירתן לשרת של OpenStreetMap. ניתן לבטל עריכות על ידי לחיצה על הכפתור {undo} **ביטול** וניתן ",
                 "save_h": "שמירה",
                 "save": "יש ללחוץ על {save} **שמירה** כדי לסיים את העריכות שלך ולשלוח אותן ל־OpenStreetMap. מומלץ לזכור לשמור את עבודתך לעתים תכופות!",
+                "save_validation": "במסך השמירה תהיה לך אפשרות לסקור את מה שעשית. iD יבצע בדיקות בסיסיות לאיתור מידע וחסר ועשוי גם להציג הצעות ואזהרות מועילות אם משהו לא נראה כשורה.",
                 "upload_h": "העלאה",
+                "upload": "בטרם העלאת השינויים שלך עליך לכתוב [הערה לערכת השינויים](https://wiki.openstreetmap.org/wiki/Good_changeset_comments). לאחר מכן יש ללחוץ על **העלאה** כדי לשלוח את השינויים שלך ל־OpenStreetMap, שם הם ימוזגו למפה ויהיו גלויים לעיני כל.",
                 "backups_h": "גיבויים אוטומטיים",
+                "backups": "אם אין לך אפשרות לסיים את העריכות שלך בבת אחת, למשל: המחשב קרס או שלשונית הדפדפן שלך נסגרה, העריכות שלך עדיין נשמרות באזור האחסון שבדפדפן שלך. ניתן לחזור בהמשך (באותו הדפדפן והמחשב) ו־iD יציע לך לשחזר את עבודתך.",
                 "keyboard_h": "קיצורי מקלדת",
                 "keyboard": "ניתן לצפות ברשימה של קיצורי המקלדת על ידי לחיצה על המקש ‚?’."
             },
@@ -765,16 +776,24 @@
                 "add_line_draw": "עכשיו, עליך להציב את סמן העכבר על מיקום תחילת הקו המיועד {leftclick} וללחוץ עם המקש השמאלי או ללחוץ על המקש ‚רווח’ כדי להתחיל להציב מפרקים לאורך הקו. ניתן להמשיך ולהוסיף עוד מפרקים על ידי לחיצה עם העכבר או על מקש ה‚רווח’. בעת הציור, ניתן להתקרב או לגרור את המפה כדי להוסיף עוד פרטים.",
                 "add_line_finish": "כדי לסיים ציור קו, יש ללחוץ על `{return}` או ללחוץ שוב על המפרק האחרון.",
                 "modify_line_h": "עריכת קווים",
+                "modify_line_addnode": "ניתן גם ליצור מפרקים חדשים לאורכו של קו בין אם על ידי {leftclick}**x2** לחיצה כפולה על הקו כולו או על ידי גרירת המשולשים הקטנים בנקודות האמצע שבין המפרקים.",
                 "connect_line_h": "חיבור קווים",
                 "connect_line": "חיבור כבישים כראוי חשוב לתפעול המפה וגם כדי לספק הנחיות לנהיגה בעזרת המפה.",
                 "connect_line_display": "החיבורים בין כבישים מסומנים בעיגול אפור. נקודות הקצה של הקווים מסומנים בעיגולים לבנים גדולים יותר אם הם לא מחוברים לשום דבר.",
+                "connect_line_drag": "כדי לחבר קו לתכונה אחרת, יש לגרור את אחד ממפרקי הקו לתכונה האחרת עד שהתכונות נצמדות זו לזו. עצה: ניתן להחזיק את המקש `{alt}` כדי למנוע מהמפרקים להתחבר לתכונות אחרות.",
                 "connect_line_tag": "אם ידוע לך שבנקודת החיבור יש רמזורים או מעברי חציה, ניתן להוסיף אותם על ידי בחירת הצומת המחבר ובחירת סוג התכונה המתאים באמצעות עורך התכונות.",
                 "disconnect_line_h": "ניתוק קווים",
+                "disconnect_line_command": "כדי לנתק דרך מתכונה אחרת, יש ללחוץ עם {rightclick} מקש ימני על המפגש ביניהם ולבחור בפקודה {disconnect} **ניתוק** מתפריט העריכה.",
                 "move_line_h": "הזזת קווים",
-                "delete_line_h": "מחיקת קווים"
+                "move_line_command": "כדי להעביר קו שלם, יש ללחוץ עם {rightclick} כפתור ימני על הקו ולבחור בפקודה **העברה** מתפריט העריכה. לאחר מכן יש להעביר את העכבר וללחוץ {leftclick} לחיצה שמאלית כדי להציב את הקו במיקום חדש.",
+                "move_line_connected": "קווים שמחוברים לתכונות אחרות יוסיפו להיות מחוברים גם עם העברת הקו למיקום החדש. יתכן ש־iD ימנע ממך להעביר קו דרך קו מחובר אחר.",
+                "delete_line_h": "מחיקת קווים",
+                "delete_line": "אם קיים קו שגוי לחלוטין, למשל דרך שאינה קיימת במציאות, אין שום מניעה למחוק אותה. כדאי לנקוט משנה זהירות בעת מחיקת תכונות: צילומי הרקע המופיעים עשויים להיות בלתי עדכניים וכביש שנראה שגוי יכול להיות פשוט חדש.",
+                "delete_line_command": "כדי למחוק קו, יש ללחוץ עם {rightclick} מקש ימני על הקו כדי לבחור אותו ולהציג את תפריט העריכה, לאחר מכן יש להשתמש בפקודה {delete} **מחיקה**."
             },
             "areas": {
                 "title": "שטחים",
+                "intro": "*שטחים* משמשים להצגת גבולות של תכונות כגון אגמים, בניינים ואזורי מגורים. יש לסמן שטחים לאורך גבולות התכונה המיוצגת, למשל, מסביב לבסיס הבניין.",
                 "point_or_area_h": "נקודות או שטחים?",
                 "point_or_area": "תכונות רבות ניתנות לייצוג כנקודות או שטחים. עליך למפות מבנים וקווי מתאר של נכסים כשטחים ככל הניתן. יש להציב נקודות בתוך שטח בניין כדי לייצג עסקים, שירותים ותכונות נוספות שנמצאות בתוך הבניין.",
                 "add_area_h": "הוספת שטחים",
@@ -782,13 +801,17 @@
                 "add_area_draw": "עכשיו, עליך להציב את סמן העכבר על אחת מהפינות של התכונה {leftclick} וללחוץ עם המקש השמאלי או ללחוץ על המקש ‚רווח’ כדי להתחיל להציב מפרקים מסביב למסגרת החיצונית של האזור. ניתן להמשיך ולהוסיף עוד מפרקים על ידי לחיצה עם העכבר או על מקש ה‚רווח’. בעת הציור, ניתן להתקרב או לגרור את המפה כדי להוסיף עוד פרטים.",
                 "add_area_finish": "כדי לסיים ציור שטח, יש ללחוץ על `{return}` או ללחוץ שוב על המפרק הראשון או האחרון.",
                 "square_area_h": "ריבוע פינות",
+                "square_area_command": "לתכונות שטח רבות כגון בניינים יש פינות מרובעות. כדי לשנות פינות של שטח, יש ללחוץ עם {rightclick} כפתור ימני על קצה השטח ולבחור בפקודה {orthogonalize} **ריבוע** מתפריט העריכה.",
                 "modify_area_h": "שינוי שטחים",
-                "delete_area_h": "מחיקת שטחים"
+                "delete_area_h": "מחיקת שטחים",
+                "delete_area_command": "כדי למחוק שטח, יש ללחוץ עם {rightclick} כפתור ימני על השטח כדי לבחור אותו ולהציג את תפריט העריכה, לאחר מכן יש להשתמש בפקודה {delete} **מחיקה**."
             },
             "relations": {
                 "title": "יחסים",
                 "intro": "*יחס* הוא סוג מיוחד של תכונה ב־OpenStreetMap המקבצת תחתיה תכונות אחרות. התכונות ששייכות ליחס נקראות *חברות* ולכל חברה יכול להיות *תפקיד* ביחס.",
                 "edit_relation_h": "עריכת יחסים",
+                "edit_relation": "בתחתית עורך התכונות, ניתן להרחיב את האגף „כל היחסים” כדי לראות אם התכונה הנבחרת חברה בקשרים כלשהם. לאחר מגן ניתן ללחוץ על היחס כדי לבחור ולערוך אותו.",
+                "edit_relation_add": "כדי להוסיף תכונה ליחס, יש לבחור את התכונה ואז ללחוץ על הכפתור {add} הוספה באגף „כל היחסים” של עורך התכונות. ניתן לבחור מרשימה של יחסים קרובים או לבחור באפשרות „יחס חדש…”.",
                 "maintain_relation_h": "שימור יחסים",
                 "relation_types_h": "סוגי יחסים",
                 "multipolygon_h": "רבי־מצולעים",
@@ -797,7 +820,9 @@
                 "multipolygon_merge": "מיזוג מגוון קווים או שטחים יגרום ליצירת קשר רב־מצולע חדש שמכיל בתוכו את כל השטחים הנבחרים כחברים בו. iD יבחר את התפקידים הפנימיים והחיצוניים אוטומטית בהתחשב באילו תכונות כלולות בתוך תכונות אחרות.",
                 "turn_restriction_h": "הגבלות פנייה",
                 "route_h": "נתיבים",
-                "boundary_h": "גבולות"
+                "boundary_h": "גבולות",
+                "boundary": "יחס *גבול* הוא קבוצה של תכונה אחת או יותר מסוג קו שמייצרות גבול מנהלי יחד.",
+                "boundary_add": "כדי להוסיף תכונה ליחס גבול, יש לבחור את התכונה ולגלול לאגף „כל היחסים” בעורך התכונות ואז ללחוץ על {plus} כפתור ההוספה כדי להוסיף את התכונה הזאת ליחס קרוב נוכחי או ליחס חדש."
             },
             "imagery": {
                 "title": "תמונות רקע",
@@ -820,6 +845,7 @@
             },
             "field": {
                 "restrictions": {
+                    "title": "עזרה בהגבלת פניות",
                     "about": {
                         "title": "על אודות",
                         "about": "שדה זה מאפשר לך לחקור ולשנות את מגבלות הפנייה. השדה מציג את דגם הצומת הנבחר לרבות דרכים קרובות שמחוברות אליו."
@@ -827,6 +853,9 @@
                     "inspecting": {
                         "restricted": "משמעות הביטוי „מוגבלת” היא שיש מגבלת פנייה, למשל: „אסור לפנות שמאלה”.",
                         "only": "משמעות הביטוי „בלבד” היא שרכב שנוסע בנתיב הזה יכול לבצע בחירה אחת בלבד, למשל „להמשיך ישר בלבד”."
+                    },
+                    "tips": {
+                        "title": "עצות"
                     }
                 }
             }
@@ -1656,6 +1685,9 @@
                         "forward": "קדימה"
                     }
                 },
+                "dispensing": {
+                    "label": "מחלק מרשמים"
+                },
                 "display": {
                     "label": "הצגה"
                 },
@@ -1676,7 +1708,8 @@
                         "no": "אין",
                         "rail": "מסילה מחושמלת",
                         "yes": "יש (לא צוין)"
-                    }
+                    },
+                    "placeholder": "מסילה מחושמלת"
                 },
                 "elevation": {
                     "label": "גובה"
@@ -1720,6 +1753,7 @@
                 "fire_hydrant/type": {
                     "label": "סוג",
                     "options": {
+                        "pillar": "עמוד\\מעל האדמה",
                         "pond": "בריכת דגים\\נוי",
                         "underground": "תת־קרקעי",
                         "wall": "קיר"
@@ -1744,6 +1778,9 @@
                 "fuel_multi": {
                     "label": "סוגי דלק"
                 },
+                "gauge": {
+                    "label": "מדד"
+                },
                 "gender": {
                     "label": "מגדר",
                     "options": {
@@ -1780,6 +1817,7 @@
                     "label": "מעקה"
                 },
                 "hashtags": {
+                    "label": "Hashtag מומלץ",
                     "placeholder": "#דוגמא"
                 },
                 "healthcare": {
@@ -1826,6 +1864,12 @@
                 "information": {
                     "label": "סוג"
                 },
+                "inscription": {
+                    "label": "הקדשה"
+                },
+                "intermittent": {
+                    "label": "תקופתי"
+                },
                 "internet_access": {
                     "label": "גישה לאינטרנט",
                     "options": {
@@ -1862,22 +1906,40 @@
                     "label": "שכבה",
                     "placeholder": "0"
                 },
-                "leaf_cycle_singular": {
+                "leaf_cycle": {
+                    "label": "מחזו עלים",
                     "options": {
+                        "deciduous": "נשירים",
                         "evergreen": "ירוק-עד",
+                        "mixed": "מעורב",
+                        "semi_deciduous": "חצי נשירים",
+                        "semi_evergreen": "חצי ירוק-עד"
+                    }
+                },
+                "leaf_cycle_singular": {
+                    "label": "מחזו עלים",
+                    "options": {
+                        "deciduous": "נשירים",
+                        "evergreen": "ירוק-עד",
+                        "semi_deciduous": "חצי נשירים",
                         "semi_evergreen": "חצי ירוק-עד"
                     }
                 },
                 "leaf_type": {
+                    "label": "סוג עלה",
                     "options": {
+                        "broadleaved": "עלים רחבים",
                         "leafless": "ללא עלים",
-                        "mixed": "מעורב"
+                        "mixed": "מעורב",
+                        "needleleaved": "עלים מחטניים"
                     }
                 },
                 "leaf_type_singular": {
                     "label": "סוג עלה",
                     "options": {
-                        "leafless": "ללא עלה"
+                        "broadleaved": "עלים רחבים",
+                        "leafless": "ללא עלה",
+                        "needleleaved": "עלים מחטניים"
                     }
                 },
                 "leisure": {
@@ -2076,7 +2138,13 @@
                     "label": "סוג",
                     "options": {
                         "downhill": "מורד",
+                        "hike": "טיול רגל",
                         "ice_skate": "החלקרח",
+                        "nordic": "נורדי",
+                        "playground": "גן שעשועים",
+                        "skitour": "סיור סקי",
+                        "sled": "מזחלת",
+                        "sleigh": "מזחלת",
                         "snow_park": "פארק שלג"
                     }
                 },
@@ -2117,11 +2185,30 @@
                 "railway": {
                     "label": "סוג"
                 },
+                "railway/position": {
+                    "label": "אבן דרך",
+                    "placeholder": "מרחק עד עשרון (123.4)"
+                },
                 "railway/signal/direction": {
+                    "label": "כיוון",
                     "options": {
+                        "backward": "אחורה",
+                        "both": "שניהם \\ כולם",
                         "forward": "קדימה"
                     }
                 },
+                "rating": {
+                    "label": "דירוג חשמל"
+                },
+                "recycling_accepts": {
+                    "label": "מסכים"
+                },
+                "ref": {
+                    "label": "מספר הפניה"
+                },
+                "ref/isil": {
+                    "label": "קוד ISIL"
+                },
                 "ref_aeroway_gate": {
                     "label": "מספר שער"
                 },
@@ -2173,10 +2260,26 @@
                 "route_master": {
                     "label": "סוג"
                 },
+                "sac_scale": {
+                    "label": "דרגת קושי",
+                    "options": {
+                        "alpine_hiking": "T4: טיול אלפי",
+                        "demanding_alpine_hiking": "T5: טיול אלפי קשה",
+                        "demanding_mountain_hiking": "T3: טיול הרים  קשה",
+                        "difficult_alpine_hiking": "T6: טיול אלפי קשה מאוד",
+                        "hiking": "T1:  טיול רגל",
+                        "mountain_hiking": "T2: טיול הרים"
+                    },
+                    "placeholder": "טיול הרים, טיול אלפים"
+                },
+                "sanitary_dump_station": {
+                    "label": "תחנת סילוק"
+                },
                 "seasonal": {
                     "label": "עונתי"
                 },
                 "second_hand": {
+                    "label": "מכירת משומשים",
                     "options": {
                         "no": "אין",
                         "only": "בלבד",
@@ -2194,7 +2297,10 @@
                     "label": "שירותים"
                 },
                 "service_rail": {
-                    "label": "סוג שירות"
+                    "label": "סוג שירות",
+                    "options": {
+                        "yard": "גינה"
+                    }
                 },
                 "service_times": {
                     "label": "שעות השירות"
@@ -2225,6 +2331,9 @@
                 "social_facility": {
                     "label": "סוג"
                 },
+                "social_facility_for": {
+                    "label": "כמות אנשים ששורתו"
+                },
                 "source": {
                     "label": "מקורות"
                 },
@@ -2320,6 +2429,7 @@
                     "placeholder": "יש, אין, איסוף עצמי בלבד…"
                 },
                 "toilets/disposal": {
+                    "label": "סילוק",
                     "options": {
                         "bucket": "דלי",
                         "chemical": "כימיים",
@@ -2356,7 +2466,8 @@
                 "traffic_signals/direction": {
                     "label": "כיוון",
                     "options": {
-                        "backward": "אחורה"
+                        "backward": "אחורה",
+                        "forward": "קדימה"
                     }
                 },
                 "trail_visibility": {
@@ -2376,9 +2487,6 @@
                     "label": "סוג",
                     "placeholder": "בררת מחדל"
                 },
-                "vending": {
-                    "label": "סוגי הטובין"
-                },
                 "visibility": {
                     "label": "ראות",
                     "options": {
@@ -2452,6 +2560,7 @@
                 "windings/configuration": {
                     "options": {
                         "delta": "דלטא",
+                        "leblanc": "Leblanc",
                         "open": "פתוח",
                         "open-delta": "דלטא פתוח",
                         "zigzag": "זיגזג"
@@ -3138,6 +3247,14 @@
                 "building/entrance": {
                     "name": "כניסה\\יציאה"
                 },
+                "building/farm": {
+                    "name": "בית חווה",
+                    "terms": "בית חווה"
+                },
+                "building/farm_auxiliary": {
+                    "name": "חווה",
+                    "terms": "חווה"
+                },
                 "building/garage": {
                     "name": "מוסך",
                     "terms": "מוסך"
@@ -3182,14 +3299,34 @@
                     "name": "מבנה ציבור",
                     "terms": "בניין ציבורי"
                 },
+                "building/residential": {
+                    "name": "בניין מגורים",
+                    "terms": "בניין מגורים"
+                },
+                "building/retail": {
+                    "name": "בניין קמעוני",
+                    "terms": "בניין קמעוני"
+                },
                 "building/roof": {
                     "name": "גג",
                     "terms": "גג"
                 },
+                "building/ruins": {
+                    "name": "בניין הרוס",
+                    "terms": "בניין הרוס"
+                },
                 "building/school": {
                     "name": "בניין בית ספר",
                     "terms": "מבנה בית ספר, בניין ביצפר, מבנה ביצפר"
                 },
+                "building/service": {
+                    "name": "בניין שירות",
+                    "terms": "בניין שירות"
+                },
+                "building/shed": {
+                    "name": "צריף",
+                    "terms": "צריף"
+                },
                 "building/stable": {
                     "name": "אורווה",
                     "terms": "אורווה"
@@ -3198,6 +3335,14 @@
                     "name": "אצטדיון",
                     "terms": "אצטדיון"
                 },
+                "building/static_caravan": {
+                    "name": "RV סטטי",
+                    "terms": "RV סטטי"
+                },
+                "building/temple": {
+                    "name": "מקדש",
+                    "terms": "מקדש"
+                },
                 "building/train_station": {
                     "name": "תחנת רכבת"
                 },
@@ -3232,10 +3377,22 @@
                     "name": "בונה סירות",
                     "terms": "בונה סירות"
                 },
+                "craft/bookbinder": {
+                    "name": "כורך ספרים",
+                    "terms": "כורך ספרים"
+                },
                 "craft/brewery": {
                     "name": "מבשלת בירה",
                     "terms": "מבשלת בירה"
                 },
+                "craft/carpenter": {
+                    "name": "נגר",
+                    "terms": "נגר"
+                },
+                "craft/carpet_layer": {
+                    "name": "מתקין שטיחים",
+                    "terms": "מתקין שטיחים"
+                },
                 "craft/caterer": {
                     "name": "הסעדה",
                     "terms": "הסעדה"
@@ -3256,10 +3413,18 @@
                     "name": "מזקקה",
                     "terms": "מזקקה"
                 },
+                "craft/dressmaker": {
+                    "name": "תופרת",
+                    "terms": "תופרת"
+                },
                 "craft/electrician": {
                     "name": "חשמלאי",
                     "terms": "חשמלאי"
                 },
+                "craft/electronics_repair": {
+                    "name": "חנות תיקון אלקטרוניקה",
+                    "terms": "חנות תיקון אלקטרוניקה"
+                },
                 "craft/gardener": {
                     "name": "גנן",
                     "terms": "גנן"
@@ -3268,10 +3433,20 @@
                     "name": "שירות מיזוג מרכזי",
                     "terms": "שירות מיזוג מרכזי"
                 },
+                "craft/jeweler": {
+                    "name": "תכשיטן"
+                },
                 "craft/key_cutter": {
                     "name": "שכפול מפתחות",
                     "terms": "שכפול מפתחות"
                 },
+                "craft/locksmith": {
+                    "name": "מנעולן"
+                },
+                "craft/metal_construction": {
+                    "name": "נפח",
+                    "terms": "נפח"
+                },
                 "craft/optician": {
                     "name": "אופטיקאי"
                 },
@@ -3291,10 +3466,45 @@
                     "name": "שרברב",
                     "terms": "שרברב"
                 },
+                "craft/pottery": {
+                    "name": "כלי חרס",
+                    "terms": "כלי חרס"
+                },
+                "craft/roofer": {
+                    "name": "מתקין גגות",
+                    "terms": "מתקין גגות"
+                },
+                "craft/sawmill": {
+                    "name": "מנסרה",
+                    "terms": "מנסרה"
+                },
                 "craft/sculptor": {
                     "name": "פסל",
                     "terms": "פסל"
                 },
+                "craft/shoemaker": {
+                    "name": "סנדלר",
+                    "terms": "סנדלר"
+                },
+                "craft/tailor": {
+                    "name": "חיט"
+                },
+                "craft/tiler": {
+                    "name": "מתקין אריחים",
+                    "terms": "מתקין אריחים"
+                },
+                "craft/tinsmith": {
+                    "name": "פחח",
+                    "terms": "פחח"
+                },
+                "craft/upholsterer": {
+                    "name": "רפד",
+                    "terms": "רפד"
+                },
+                "craft/watchmaker": {
+                    "name": "שען",
+                    "terms": "שען"
+                },
                 "craft/winery": {
                     "name": "יקב",
                     "terms": "יקב"
@@ -3303,10 +3513,117 @@
                     "name": "תחנת אמבולנס",
                     "terms": "תחנת אמבולנס"
                 },
+                "emergency/defibrillator": {
+                    "name": "דפיברילטור",
+                    "terms": "דפיברילטור"
+                },
                 "emergency/fire_hydrant": {
                     "name": "ברז כיבוי אש",
                     "terms": "ברז כיבוי אש"
                 },
+                "emergency/phone": {
+                    "name": "טלפון חרום",
+                    "terms": "טלפון חרום"
+                },
+                "emergency/water_tank": {
+                    "name": "מיכל מים חרום",
+                    "terms": "מיכל מים חרום"
+                },
+                "emergency/yes": {
+                    "name": "כניסת חירום"
+                },
+                "entrance": {
+                    "name": "כניסה\\יציאה",
+                    "terms": "כניסה\\יציאה"
+                },
+                "footway/crossing": {
+                    "name": "מעבר חציה מוגבה",
+                    "terms": "מעבר חציה מוגבה"
+                },
+                "footway/crossing-raised": {
+                    "name": "מעבר חציה מוגבה",
+                    "terms": "מעבר חציה מוגבה"
+                },
+                "footway/crosswalk": {
+                    "name": "מעבר חציה",
+                    "terms": "מעבר חציה"
+                },
+                "footway/crosswalk-raised": {
+                    "name": "מעבר חציה מוגבה",
+                    "terms": "מעבר חציה מוגבה"
+                },
+                "footway/sidewalk": {
+                    "name": "מדרכה",
+                    "terms": "מדרכה"
+                },
+                "ford": {
+                    "name": "מקום צליחה",
+                    "terms": "מקום צליחה"
+                },
+                "golf/bunker": {
+                    "name": "מכשול חול",
+                    "terms": "מכשול חול"
+                },
+                "golf/fairway": {
+                    "name": "אזור פתוח בגולף",
+                    "terms": "אזור פתוח בגולף"
+                },
+                "golf/green": {
+                    "name": "דשא סביב חור גולף",
+                    "terms": "דשא סביב חור גולף"
+                },
+                "golf/hole": {
+                    "name": "חור גוף",
+                    "terms": "חור גוף"
+                },
+                "golf/lateral_water_hazard_area": {
+                    "name": "מכשול מים",
+                    "terms": "מכשול מים"
+                },
+                "golf/lateral_water_hazard_line": {
+                    "name": "מכשול מים",
+                    "terms": "מכשול מים"
+                },
+                "golf/rough": {
+                    "name": "שטח קשה בגולף",
+                    "terms": "שטח קשה בגולף"
+                },
+                "golf/tee": {
+                    "name": "עמדת חביטה בגולף",
+                    "terms": "עמדת חביטה בגולף"
+                },
+                "golf/water_hazard_area": {
+                    "name": "מכשול מים",
+                    "terms": "מכשול מים"
+                },
+                "golf/water_hazard_line": {
+                    "name": "מכשול מים",
+                    "terms": "מכשול מים"
+                },
+                "healthcare": {
+                    "name": "מוסד טיפול בריאותי",
+                    "terms": "מוסד טיפול בריאותי"
+                },
+                "healthcare/alternative": {
+                    "name": "בריאות אלטרנטיבי",
+                    "terms": "בריאות אלטרנטיבי"
+                },
+                "healthcare/alternative/chiropractic": {
+                    "name": "כירופרקט",
+                    "terms": "כירופרקט"
+                },
+                "healthcare/audiologist": {
+                    "name": "אודיולוג",
+                    "terms": "אודיולוג"
+                },
+                "healthcare/birthing_center": {
+                    "name": "מתקן לידה",
+                    "terms": "מתקן לידה"
+                },
+                "healthcare/blood_donation": {
+                    "name": "מרכז תרומת דם",
+                    "terms": "מרכז תרומת דם"
+                },
                 "healthcare/hospice": {
                     "name": "הוספיס",
                     "terms": "הוספיס"
@@ -3315,10 +3632,22 @@
                     "name": "מיילדת",
                     "terms": "מיילדת"
                 },
+                "healthcare/occupational_therapist": {
+                    "name": "מרפא בעיסוק",
+                    "terms": "מרפא בעיסוק"
+                },
+                "healthcare/optometrist": {
+                    "name": "אופטומטריסט",
+                    "terms": "אופטומטריסט"
+                },
                 "healthcare/physiotherapist": {
                     "name": "פזיווטרפיה",
                     "terms": "פזיווטרפיה"
                 },
+                "healthcare/podiatrist": {
+                    "name": "פודיאטר",
+                    "terms": "פודיאטר"
+                },
                 "healthcare/psychotherapist": {
                     "name": "פסיכוטרפיסט",
                     "terms": "פסיכוטרפיסט"
@@ -3327,21 +3656,141 @@
                     "name": "מוסד שיקומי",
                     "terms": "מוסד שיקומי"
                 },
+                "healthcare/speech_therapist": {
+                    "name": "קלינאית תקשורת",
+                    "terms": "קלינאית תקשורת"
+                },
                 "highway": {
                     "name": "כביש בין-עירוני"
                 },
+                "highway/crossing": {
+                    "name": "מעבר חציה",
+                    "terms": "מעבר חציה"
+                },
+                "highway/crossing-raised": {
+                    "name": "מעבר חציה מוגבה",
+                    "terms": "מעבר חציה מוגבה"
+                },
+                "highway/crosswalk": {
+                    "name": "מעבר חציה",
+                    "terms": "מעבר חציה"
+                },
+                "highway/crosswalk-raised": {
+                    "name": "מעבר חציה מוגבה",
+                    "terms": "מעבר חציה מוגבה"
+                },
+                "highway/cycleway": {
+                    "name": "מסלול אופניים",
+                    "terms": "מסלול אופניים"
+                },
+                "highway/elevator": {
+                    "name": "מעלית",
+                    "terms": "מעלית"
+                },
                 "highway/footway": {
                     "name": "דרך רגל",
                     "terms": "דרך רגל"
                 },
+                "highway/give_way": {
+                    "name": "תן זכות קדימה",
+                    "terms": "תן זכות קדימה"
+                },
+                "highway/mini_roundabout": {
+                    "name": "מעגל תנועה קטן",
+                    "terms": "מעגל תנועה קטן"
+                },
                 "highway/path": {
                     "name": "שביל",
                     "terms": "שביל"
                 },
+                "highway/pedestrian_area": {
+                    "name": "אזור רק עם תנועה רגלית",
+                    "terms": "אזור רק עם תנועה רגלית"
+                },
+                "highway/pedestrian_line": {
+                    "name": "רחוב רק עם תנועה רגלית",
+                    "terms": "רחוב רק עם תנועה רגלית"
+                },
+                "highway/primary": {
+                    "name": "כביש ראשי",
+                    "terms": "כביש ראשי"
+                },
+                "highway/primary_link": {
+                    "name": "חיבור ראשי",
+                    "terms": "חיבור ראשי"
+                },
+                "highway/raceway": {
+                    "name": "מסלול מרוצים (מונע)",
+                    "terms": "מסלול מרוצים (מונע)"
+                },
+                "highway/residential": {
+                    "name": "כביש באזור מגורים",
+                    "terms": "כביש באזור מגורים"
+                },
+                "highway/rest_area": {
+                    "name": "אזור מנוחה",
+                    "terms": "אזור מנוחה"
+                },
+                "highway/road": {
+                    "name": "כביש לא ידוע",
+                    "terms": "כביש לא ידוע"
+                },
+                "highway/secondary": {
+                    "name": "כביש משני",
+                    "terms": "כביש משני"
+                },
+                "highway/secondary_link": {
+                    "name": "חיבור משני",
+                    "terms": "חיבור משני"
+                },
+                "highway/service": {
+                    "name": "כבישי שירות",
+                    "terms": "כבישי שירות"
+                },
+                "highway/service/alley": {
+                    "name": "סמטה",
+                    "terms": "סמטה"
+                },
+                "highway/speed_camera": {
+                    "name": "מצלמת מהירות",
+                    "terms": "מצלמת מהירות"
+                },
+                "highway/stop": {
+                    "name": "תמרור עצור",
+                    "terms": "תמרור עצור"
+                },
+                "historic": {
+                    "name": "אתר היסטורי",
+                    "terms": "אתר היסטורי"
+                },
+                "historic/archaeological_site": {
+                    "name": "אתר ארכיאולוגי",
+                    "terms": "אתר ארכיאולוגי"
+                },
+                "historic/boundary_stone": {
+                    "name": "אבן גבול",
+                    "terms": "אבן גבול"
+                },
                 "historic/castle": {
                     "name": "טירה",
                     "terms": "טירה"
                 },
+                "historic/memorial": {
+                    "name": "אתר הנצחה",
+                    "terms": "אתר הנצחה"
+                },
+                "historic/monument": {
+                    "name": "מונומנט",
+                    "terms": "מונומנט"
+                },
+                "historic/ruins": {
+                    "name": "אתר חורבן",
+                    "terms": "אתר חורבן"
+                },
+                "historic/tomb": {
+                    "name": "קבר",
+                    "terms": "קבר"
+                },
                 "landuse/allotments": {
                     "name": "גינה קהילתית"
                 },
@@ -3349,6 +3798,82 @@
                     "name": "בית קברות",
                     "terms": "בית קברות"
                 },
+                "landuse/forest": {
+                    "name": "יער",
+                    "terms": "יער"
+                },
+                "landuse/grass": {
+                    "name": "דשא",
+                    "terms": "דשא"
+                },
+                "landuse/harbour": {
+                    "name": "מזח",
+                    "terms": "מזח"
+                },
+                "landuse/industrial": {
+                    "name": "אזור תעשיה",
+                    "terms": "אזור תעשיה"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "משחטה",
+                    "terms": "משחטה"
+                },
+                "landuse/landfill": {
+                    "name": "מטמנה",
+                    "terms": "מטמנה"
+                },
+                "landuse/meadow": {
+                    "name": "אחו",
+                    "terms": "אחו"
+                },
+                "landuse/military": {
+                    "name": "אזור צבאי",
+                    "terms": "אזור צבאי"
+                },
+                "landuse/military/airfield": {
+                    "name": "שדה תעופה צבאי",
+                    "terms": "שדה תעופה צבאי"
+                },
+                "landuse/military/barracks": {
+                    "name": "בסיס צבאי",
+                    "terms": "בסיס צבאי"
+                },
+                "landuse/military/bunker": {
+                    "name": "בונקר צבאי",
+                    "terms": "בונקר צבאי"
+                },
+                "landuse/military/checkpoint": {
+                    "name": "נקודת ביקורת",
+                    "terms": "נקודת ביקורת"
+                },
+                "landuse/military/danger_area": {
+                    "name": "אזור מסוכן",
+                    "terms": "אזור מסוכן"
+                },
+                "landuse/military/naval_base": {
+                    "name": "בסיס חיל ים",
+                    "terms": "בסיס חיל ים"
+                },
+                "landuse/military/nuclear_explosion_site": {
+                    "name": "אתר פיצוץ גרעיני",
+                    "terms": "אתר פיצוץ גרעיני"
+                },
+                "landuse/military/obstacle_course": {
+                    "name": "מסלול מכשולים",
+                    "terms": "מסלול מכשולים"
+                },
+                "landuse/military/office": {
+                    "name": "משרד צבאי",
+                    "terms": "משרד צבאי"
+                },
+                "landuse/military/range": {
+                    "name": "אזור ירי צבאי",
+                    "terms": "אזור ירי צבאי"
+                },
+                "landuse/military/training_area": {
+                    "name": "אזור אימונים",
+                    "terms": "אזור אימונים"
+                },
                 "landuse/orchard": {
                     "name": "פרדס",
                     "terms": "פרדס"
@@ -3357,6 +3882,22 @@
                     "name": "מחצבה",
                     "terms": "מחצבה"
                 },
+                "landuse/religious": {
+                    "name": "אזור דתי",
+                    "terms": "אזור דתי"
+                },
+                "landuse/residential": {
+                    "name": " אזור מגורים",
+                    "terms": " אזור מגורים"
+                },
+                "landuse/retail": {
+                    "name": "אזור מסחרי",
+                    "terms": "אזור מסחרי"
+                },
+                "landuse/vineyard": {
+                    "name": "כרם",
+                    "terms": "כרם"
+                },
                 "leisure/bowling_alley": {
                     "name": "אולם כדורת",
                     "terms": "אולם כדורת"
@@ -4745,18 +5286,6 @@
                     "name": "אין פניית פרסה",
                     "terms": "אין פניית פרסה"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "פנייה שמאלה בלבד",
-                    "terms": "פנייה שמאלה בלבד"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "פנייה ימינה בלבד",
-                    "terms": "פנייה ימינה בלבד"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "אין פניות",
-                    "terms": "אין פניות"
-                },
                 "type/route": {
                     "name": "נתיב",
                     "terms": "נתיב"
@@ -5050,7 +5579,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "מפת אוסטריה מבוסס על מידע ממשלתי",
+                "description": " מפת אוסטריה מבוסס על מידע ממשלתי",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -5111,9 +5640,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "אריחי מפה מאת Stamen Design, תחת הרשיון CC BY 3.0"
-                },
                 "name": "תווי שטח מסטודיו Stamen"
             },
             "tf-cycle": {
diff --git a/dist/locales/hr.json b/dist/locales/hr.json
index 5142b1822..eab544fc2 100644
--- a/dist/locales/hr.json
+++ b/dist/locales/hr.json
@@ -1134,6 +1134,9 @@
                 "bicycle_parking": {
                     "label": "Vrsta"
                 },
+                "bin": {
+                    "label": "Kanta za smeće"
+                },
                 "boundary": {
                     "label": "Vrsta"
                 },
@@ -1731,9 +1734,6 @@
                 "trees": {
                     "label": "Drveće"
                 },
-                "vending": {
-                    "label": "Vrsta robe"
-                },
                 "water": {
                     "label": "Vrsta"
                 },
@@ -2343,9 +2343,15 @@
                 "craft/caterer": {
                     "name": "Dostavljač"
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Dimnjačar"
+                },
                 "craft/clockmaker": {
                     "name": "Urar (ručni satovi)"
                 },
+                "craft/distillery": {
+                    "name": "Destilerija"
+                },
                 "craft/dressmaker": {
                     "name": "Krojač"
                 },
@@ -3165,6 +3171,9 @@
                     "name": "Kozmetički salon",
                     "terms": "kozmetički salon,solarij,salon ljepote,pediker,beauty centar"
                 },
+                "shop/beauty/nails": {
+                    "name": "Studio za nokte"
+                },
                 "shop/bed": {
                     "name": "Trgovina opreme za krevete",
                     "terms": "madrac, madraci, podnica, podnice, posteljina, jastuk, jastuci"
@@ -3177,6 +3186,9 @@
                     "name": "prodavaonica bicikala",
                     "terms": "trgovina biciklima"
                 },
+                "shop/bookmaker": {
+                    "name": "Kladioničar"
+                },
                 "shop/books": {
                     "name": "Knjižara"
                 },
@@ -3209,6 +3221,9 @@
                 "shop/cheese": {
                     "name": "Prodavaonica sira"
                 },
+                "shop/chemist": {
+                    "name": "Drogerija"
+                },
                 "shop/chocolate": {
                     "name": "Prodavaonica čokolade"
                 },
@@ -3328,6 +3343,9 @@
                     "name": "Zlatarnica",
                     "terms": "zlatarna,zlatara,zlatar"
                 },
+                "shop/kiosk": {
+                    "name": "Kiosk"
+                },
                 "shop/kitchen": {
                     "name": "Trgovina kuhinjskog namještaja",
                     "terms": "kuhinje, pećnice, hladnjak"
@@ -3397,6 +3415,9 @@
                 "shop/pawnbroker": {
                     "name": "Zalagaonica"
                 },
+                "shop/perfumery": {
+                    "name": "Parfimerija"
+                },
                 "shop/pet": {
                     "name": "Prodavaonica kućnim ljubimcima",
                     "terms": "dućan za kućne ljubimce,dućan s kućnim ljubimcima,pet store,pet shop,trgovina kućnim ljubimcima,trgovina za kućne ljubimce,prodavaonica kućnih ljubimaca,prodavaonica ljubimaca,prodavaonica za kućne ljubimce"
@@ -3483,6 +3504,9 @@
                     "name": "Prodavaonica video igara",
                     "terms": "računalne igre, igrice"
                 },
+                "shop/watches": {
+                    "name": "Trgovina Satovima"
+                },
                 "shop/water_sports": {
                     "name": "Trgovina za vodene sportove",
                     "terms": "plivanje, ronjenje"
@@ -3594,15 +3618,6 @@
                 "type/restriction/no_u_turn": {
                     "name": "Zabranjeno polukružno okretanje"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Obavezno lijevo skretanje"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Obavezno desno skretanje"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Zabranjena sva skretanja"
-                },
                 "type/route": {
                     "name": "Ruta",
                     "terms": "ruta,linija,pravac"
@@ -3795,7 +3810,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Osnovna karta Austrije, bazirano na vladinim podacima.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -3856,9 +3870,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Sličice karte od Stamen Design, pod CC BY 3.0"
-                },
                 "name": "Stamen Terrain"
             },
             "tf-cycle": {
diff --git a/dist/locales/hu.json b/dist/locales/hu.json
index b21bc7e14..eced68373 100644
--- a/dist/locales/hu.json
+++ b/dist/locales/hu.json
@@ -1,5 +1,10 @@
 {
     "hu": {
+        "icons": {
+            "information": "infó",
+            "remove": "eltávolítás",
+            "undo": "visszavonás"
+        },
         "modes": {
             "add_area": {
                 "title": "Terület",
@@ -291,6 +296,21 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Távolság",
+                "via_node_only": "Csak csomópont"
+            },
+            "help": {
+                "indirect": "(indirekt)",
+                "from": "INNEN",
+                "via": "EZEN ÁT",
+                "to": "IDE",
+                "from_name": "{from} {fromName}",
+                "from_name_to_name": "{from} {fromName} {to} {toName}",
+                "via_names": "{via} {viaNames}"
+            }
+        },
         "undo": {
             "tooltip": "Visszavonás: {action}",
             "nothing": "Nincs mit visszavonni."
@@ -759,6 +779,16 @@
             "gps": {
                 "title": "GPS nyomvonalok",
                 "using_h": "GPS nyomvonal használata"
+            },
+            "field": {
+                "restrictions": {
+                    "about": {
+                        "title": "Névjegy"
+                    },
+                    "modifying": {
+                        "title": "Módosítás"
+                    }
+                }
             }
         },
         "intro": {
@@ -1129,6 +1159,11 @@
             }
         },
         "units": {
+            "feet": "{quantity} láb",
+            "miles": "{quantity} mérföld",
+            "square_feet": "{quantity} négyzetláb",
+            "square_miles": "{quantity} négyzet mérföld",
+            "acres": "{quantity} hektár",
             "meters": "{quantity} m",
             "kilometers": "{quantity} km",
             "square_meters": "{quantity} m²",
@@ -1996,7 +2031,7 @@
                     }
                 },
                 "opening_hours": {
-                    "label": "Nyitva tartás"
+                    "label": "Nyitvatartás"
                 },
                 "operator": {
                     "label": "Üzemeltető"
@@ -2460,9 +2495,6 @@
                     "label": "Típus",
                     "placeholder": "Alapértelmezett"
                 },
-                "vending": {
-                    "label": "Termékek típusa"
-                },
                 "visibility": {
                     "label": "Láthatóság",
                     "options": {
@@ -5830,18 +5862,6 @@
                     "name": "Megfordulni tilos",
                     "terms": "Tilos megfordulni"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Kötelező haladási irány: balra",
-                    "terms": "Csak balra szabad fordulni"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Kötelező haladási irány: jobbra",
-                    "terms": "Csak jobbra kanyarodás"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Kötelező haladási irány: egyenesen tovább",
-                    "terms": "Tilos kanyarodni"
-                },
                 "type/route": {
                     "name": "Útvonal",
                     "terms": "útvonal, nyomvonal"
@@ -6126,7 +6146,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Osztrák Basemap, kormányzati adatok alapján.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6187,9 +6206,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Térképcsempék: Stamen Design, CC BY 3.0 szerint"
-                },
                 "name": "Stamen Terrain (terep)"
             },
             "tf-cycle": {
@@ -6204,6 +6220,26 @@
                 },
                 "name": "Thunderforest Landscape (táj)"
             }
+        },
+        "community": {
+            "Bay-Area-OpenStreetMappers": {
+                "name": "A San Francisco-öböl környéki (Bay Area) OpenStreetMap-szerkesztők",
+                "description": "Az OpenStreetMap tökéletesítése a San Francisco-öböl környékén",
+                "extendedDescription": "Ez a csoport az itteni, öbölkörnyéki OpenStreetMap-közösség gyarapításával foglalkozik. Rendezvényeink mindenki számára nyitottak a nyílt forráskódú szoftverek híveitől kezdve a kerékpárosokon, térinformatikusokon és geocaching-játékosokon át bárki másig. Örömmel látunk mindenkit, akit érdekelnek a térképek, a térképészet és a nyílt térképadatok, hogy csatlakozzék csoportunkhoz és részt vegyen a rendezvényeinken."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "Közép-Pennsylvania OSM",
+                "description": "A Pennsylvania State College főiskolából kinövő online térképészközösség"
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM",
+                "description": "A Dallas-Fort Worth-ban működő OpenStreetMap felhasználói csoport",
+                "extendedDescription": "Dallas, Fort Worth és a köztük lévő városok bővelkednek kreatív, műszakilag jártas emberekben. A felhasználói csoport jövőképe, hogy új utakat találjon az OSM lenyűgöző erőforrásainak kihasználásra."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Térképrajongók találkozója Philadelphia térségében"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/hy.json b/dist/locales/hy.json
index 7c4f39174..6d8dba430 100644
--- a/dist/locales/hy.json
+++ b/dist/locales/hy.json
@@ -844,9 +844,6 @@
                 "traffic_signals": {
                     "label": "Տեսակ"
                 },
-                "vending": {
-                    "label": "Գոյքի Տեսակ"
-                },
                 "water": {
                     "label": "Տեսակ"
                 },
diff --git a/dist/locales/id.json b/dist/locales/id.json
index d7f38b418..489c3f327 100644
--- a/dist/locales/id.json
+++ b/dist/locales/id.json
@@ -2556,15 +2556,6 @@
                 "type/restriction/no_u_turn": {
                     "name": "Dilarang Putar Balik"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Belok Kiri Saja"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Belok Kanan Saja"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Dilarang Berbelok"
-                },
                 "type/route": {
                     "name": "Rute"
                 },
diff --git a/dist/locales/is.json b/dist/locales/is.json
index b67cfcda1..d4a06f32d 100644
--- a/dist/locales/is.json
+++ b/dist/locales/is.json
@@ -1,5 +1,10 @@
 {
     "is": {
+        "icons": {
+            "information": "upplýsingar",
+            "remove": "fjarlægja",
+            "undo": "afturkalla"
+        },
         "modes": {
             "add_area": {
                 "title": "Svæði",
@@ -291,6 +296,42 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Fjarlægð",
+                "distance_up_to": "Allt að {distance}",
+                "via": "Í gegnum",
+                "via_node_only": "Einungis hnútur",
+                "via_up_to_one": "Allt að 1 leið",
+                "via_up_to_two": "Allt að 2 leiðum"
+            },
+            "help": {
+                "indirect": "(óbeint)",
+                "turn": {
+                    "no_left_turn": "EKKI vinstri beygja {indirect}",
+                    "no_right_turn": "EKKI hægri beygja {indirect}",
+                    "no_u_turn": "EKKI U-beygja {indirect}",
+                    "no_straight_on": "EKKI beint áfram {indirect}",
+                    "only_left_turn": "EINUNGIS vinstri beygja {indirect}",
+                    "only_right_turn": "EINUNGIS hægri beygja {indirect}",
+                    "only_u_turn": "EINUNGIS U-beygja {indirect}",
+                    "only_straight_on": "EINUNGIS beint áfram {indirect}",
+                    "allowed_left_turn": "Vinstri beygja leyfð {indirect}",
+                    "allowed_right_turn": "Hægri beygja leyfð {indirect}",
+                    "allowed_u_turn": "U-beygja leyfð {indirect}",
+                    "allowed_straight_on": "Beint áfram leyft {indirect}"
+                },
+                "from": "FRÁ",
+                "via": "Í GEGNUM",
+                "to": "TIL",
+                "from_name": "{from} {fromName}",
+                "from_name_to_name": "{from} {fromName} {to} {toName}",
+                "via_names": "{via} {viaNames}",
+                "select_from": "Smelltu til að velja {from} bút",
+                "select_from_name": "Smelltu til að velja {from} {fromName}",
+                "toggle": "Smelltu til að \"{turn}\""
+            }
+        },
         "undo": {
             "tooltip": "Afturkalla: {action}",
             "nothing": "Ekkert til að afturkalla."
@@ -846,6 +887,44 @@
                 "using": "Til að nota GPS-feril til kortagerðar, dragðu og slepptu gagnaskrána yfir í kortaritilinn. Ef hún er metin gild, verður ferillinn teiknaður á kortið með ljósfjólublárri línu. Smelltu á {data} **Kortagögn** spjaldið við hlið kortsins til að virkja, gera óvirkt eða renna inn að GPS-gögnunum þínum.",
                 "tracing": "GPS-ferillinn er ekki sendur til OpenStreetMap - besta leiðin til að nota hann er við teikningu á kortið, nota hann til stuðnungs við fitjur eða eigindi sem þú setur inn.",
                 "upload": "Þú getur líka [sent GPS-gögnin þín inn á OpenStreetMap](https://www.openstreetmap.org/trace/create) svo að aðrir notendur geti stuðst við þau."
+            },
+            "field": {
+                "restrictions": {
+                    "title": "Hjálp fyrir takmarkanir á beygjum",
+                    "about": {
+                        "title": "Um",
+                        "about": "Þessi reitur gerir þér kleift að yfirfara og breyta takmörkunum á beygjum. Hann birtir líkan af völdum gatnamótum ásamt nálægum tengdum vegum.",
+                        "from_via_to": "Takmörkun á beygju inniheldur alltaf: eina **FRÁ leið**, eina **TIL leið**, og annað hvort einn **Í GEGNUM hnút** eða eina eða fleiri **Í GEGNUM leiðir**.",
+                        "maxdist": "Sleðinn \"{distField}\" stýrir hve langt eigi að leita að tengdum vegum í viðbót.",
+                        "maxvia": "Sleðinn \"{viaField}\" stýrir hve margar gegnumstreymisleiðir eigi að hafa með í leitinni. (Ábending: einfalt er betra)"
+                    },
+                    "inspecting": {
+                        "title": "Yfirferð",
+                        "about": "Láttu bendilinn svífa yfir einhverjum **FRÁ** bút til að skoða hvort hann sé með nokkrar takmarkanir á beygjum. Allir mögulegir **TIL** úttakspunktar verða teiknaðir með litaðri skyggingu til að sýna hvort takmörkun sé fyrir hendi.",
+                        "from_shadow": "{fromShadow} **FRÁ bútur**",
+                        "allow_shadow": "{allowShadow} **TIL leyft**",
+                        "restrict_shadow": "{restrictShadow} **TIL takmarkað**",
+                        "only_shadow": "{onlyShadow} **TIL einungis**",
+                        "restricted": "\"Takmarkað\" þýðir að þar er takmörkun á beygjum, til dæmis \"Ekki vinstri beygja\".",
+                        "only": "\"Einungis\" þýðir að farartæki á þessari leið getur einungis valið þessa leið, til dæmis \"Einungis beint áfram\"."
+                    },
+                    "modifying": {
+                        "title": "Breytingar",
+                        "about": "Til að breyta takmörkunum á beygjum, smelltu þá fyrst á einhvern upphafs-**FRÁ** bút til að velja hann. Valdi búturinn mun sýnast slá í púls, og allir mögulegir **TIL** úttakspunktar munu birtast sem beygjutákn.",
+                        "indicators": "Síðan geturðu smellt á beygjutákn til að víxla því á milli \"Leyft\", \"Takmarkað\" og \"Einungis\".",
+                        "allow_turn": "{allowTurn} **TIL leyft**",
+                        "restrict_turn": "{restrictTurn} **TIL takmarkað**",
+                        "only_turn": "{onlyTurn} **TIL einungis**"
+                    },
+                    "tips": {
+                        "title": "Ábendingar",
+                        "simple": "**Kjóstu einfaldar takmarkanir fram yfir flóknar.**",
+                        "simple_example": "Sem dæmi, forðastu að útbúa gegnumstreymisleið ef hægt er að komast af með einfaldari takmörkun á beygju með 'í gegnum'-hnúti.",
+                        "indirect": "**Sumar takmarkanir eru birtar með textanum \"(óbeint)\" og eru teiknaðar ljósari.**",
+                        "indirect_example": "Slíkar takmarkanir eru til staðar vegna annarra takmarkana í grenndinni. Til dæmis mun \"Einungis beint áfram\" takmörkun útbúa óbeint aðrar \"Ekki beygja\" takmarkanir fyrir allar aðrar leiðir í gegnum gatnamótin.",
+                        "indirect_noedit": "Þú getur ekki breytt óbeinum takmörkunum. Í staðinn þarftu að breyta öðrum nálægum takmörkunum."
+                    }
+                }
             }
         },
         "intro": {
@@ -1629,6 +1708,9 @@
                         "cycleway:right": "Hægra megin"
                     }
                 },
+                "dance/style": {
+                    "label": "Dansstílar"
+                },
                 "date": {
                     "label": "Dagsetning"
                 },
@@ -1867,6 +1949,9 @@
                 "indoor": {
                     "label": "Innanhúss"
                 },
+                "industrial": {
+                    "label": "Tegund"
+                },
                 "information": {
                     "label": "Tegund"
                 },
@@ -1987,6 +2072,10 @@
                     "label": "Hraðatakmörkun",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "label": "Ráðlögð hraðatakmörkun",
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "Hámarksdvöl"
                 },
@@ -2573,8 +2662,19 @@
                     "label": "Tegund",
                     "placeholder": "Sjálfgefið"
                 },
+                "usage_rail": {
+                    "label": "Tegund notkunar",
+                    "options": {
+                        "branch": "Grein",
+                        "industrial": "Iðnaður",
+                        "main": "Aðal",
+                        "military": "Hernaður",
+                        "test": "Prófanir",
+                        "tourism": "Ferðaþjónusta"
+                    }
+                },
                 "vending": {
-                    "label": "Sýnileiki vöru"
+                    "label": "Vörutegundir"
                 },
                 "visibility": {
                     "label": "Sýnileiki",
@@ -2606,6 +2706,12 @@
                 "voltage/primary": {
                     "label": "Aðalspenna"
                 },
+                "voltage/secondary": {
+                    "label": "Eftirspenna"
+                },
+                "voltage/tertiary": {
+                    "label": "Aukaspenna"
+                },
                 "wall": {
                     "label": "Tegund"
                 },
@@ -2731,6 +2837,9 @@
                 "aeroway/terminal": {
                     "name": "Flugstöð"
                 },
+                "allotments/plot": {
+                    "name": "Samfélagsgarðskikar"
+                },
                 "amenity": {
                     "name": "Þjónusta"
                 },
@@ -2908,6 +3017,9 @@
                 "amenity/marketplace": {
                     "name": "Markaður"
                 },
+                "amenity/monastery": {
+                    "name": "Klausturlóð"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Mótorhjólastæði"
                 },
@@ -3067,18 +3179,36 @@
                 "amenity/vending_machine/cigarettes": {
                     "name": "Sígarettusjálfsali"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "Kaffisjálfsali"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "Smokkasjálfsali"
                 },
                 "amenity/vending_machine/drinks": {
                     "name": "Drykkjasjálfsali"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "Rafeindatækjasjálfsali"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "Sjálfsali fyrir flatta/stimplaða mynt"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "Sjálfsali með úrgangspokum"
                 },
                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "Sjálfsali með dömusnyrtivörum"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "Matarsjálfsali"
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "Eldsneytisdæla"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "Íssjálfsali"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Dagblaðasjálfsali"
                 },
@@ -3094,6 +3224,9 @@
                 "amenity/vending_machine/public_transport_tickets": {
                     "name": "Miðasjálfsali í almenningssamgöngur"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "Póstsjálfsali"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "Snakksjálfsali"
                 },
@@ -3275,6 +3408,12 @@
                 "building/entrance": {
                     "name": "Inngangur/Útgangur"
                 },
+                "building/farm": {
+                    "name": "Íbúðarhús á býli"
+                },
+                "building/farm_auxiliary": {
+                    "name": "Landbúnaðarbygging"
+                },
                 "building/garage": {
                     "name": "Bílskúr"
                 },
@@ -3705,6 +3844,9 @@
                 "highway/motorway_link": {
                     "name": "Hraðbrautarrein"
                 },
+                "highway/passing_place": {
+                    "name": "Framúrakstur"
+                },
                 "highway/path": {
                     "name": "Stígur"
                 },
@@ -3724,7 +3866,7 @@
                     "name": "Keppnisbraut (mótorsport)"
                 },
                 "highway/residential": {
-                    "name": "Íbúagata"
+                    "name": "Íbúðagata"
                 },
                 "highway/rest_area": {
                     "name": "Hvíldarsvæði"
@@ -3976,6 +4118,9 @@
                 "leisure/amusement_arcade": {
                     "name": "Spilasalur"
                 },
+                "leisure/beach_resort": {
+                    "name": "Strandbær"
+                },
                 "leisure/bird_hide": {
                     "name": "Fuglaskoðunarskýli"
                 },
@@ -3988,6 +4133,9 @@
                 "leisure/dance": {
                     "name": "Danssalur"
                 },
+                "leisure/dancing_school": {
+                    "name": "Dansskóli"
+                },
                 "leisure/dog_park": {
                     "name": "Hundagarður"
                 },
@@ -4060,6 +4208,9 @@
                 "leisure/nature_reserve": {
                     "name": "Friðland"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "Svæði fyrir sæti utandyra"
+                },
                 "leisure/park": {
                     "name": "Garður"
                 },
@@ -4156,6 +4307,9 @@
                 "man_made/adit": {
                     "name": "Námuinngangur"
                 },
+                "man_made/antenna": {
+                    "name": "Loftnet"
+                },
                 "man_made/breakwater": {
                     "name": "Sjóvarnargarður"
                 },
@@ -4195,6 +4349,9 @@
                 "man_made/observation": {
                     "name": "Varðturn"
                 },
+                "man_made/observatory": {
+                    "name": "Skoðunarstöð"
+                },
                 "man_made/petroleum_well": {
                     "name": "Olíulind"
                 },
@@ -4289,6 +4446,9 @@
                 "natural/heath": {
                     "name": "Mói"
                 },
+                "natural/mud": {
+                    "name": "Leðja"
+                },
                 "natural/peak": {
                     "name": "Tindur"
                 },
@@ -4415,6 +4575,9 @@
                 "office/lawyer/notary": {
                     "name": "Skrifstofa lögbókanda"
                 },
+                "office/moving_company": {
+                    "name": "Skrifstofa flutningafyrirtækis"
+                },
                 "office/newspaper": {
                     "name": "Skrifstofur fréttablaðs"
                 },
@@ -5079,6 +5242,9 @@
                 "shop/pet": {
                     "name": "Dýrabúð"
                 },
+                "shop/pet_grooming": {
+                    "name": "Dýrasnyrtiverslun"
+                },
                 "shop/photo": {
                     "name": "Ljósmyndavöruverslun"
                 },
@@ -5309,13 +5475,16 @@
                     "name": "Engin U-beygja"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "Einungis vinstri beygja"
+                    "name": "Aðeins vinstri beygja"
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "Einungis hægri beygja"
+                    "name": "Aðeins hægri beygja"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "Engar beygjur"
+                    "name": "Aðeins beint áfram"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Aðeins U-beygja"
                 },
                 "type/route": {
                     "name": "Leið"
@@ -5368,6 +5537,9 @@
                 "type/route_master": {
                     "name": "Leiðastjóri"
                 },
+                "type/site": {
+                    "name": "Stæði"
+                },
                 "type/waterway": {
                     "name": "Siglingaleið"
                 },
@@ -5634,7 +5806,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Kortaflísar frá Stamen Design, með CC BY 3.0 notkunarleyfi"
+                    "text": "Kortaflísar frá Stamen Design, með CC BY 3.0 notkunarleyfi. Gögn frá OpenStreetMap, með ODbL notkunarleyfi"
                 },
                 "name": "Stamen landsyfirborð"
             },
@@ -5650,6 +5822,205 @@
                 },
                 "name": "Thunderforest landslag"
             }
+        },
+        "community": {
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap India - Kortagerð með þáttöku nágranna",
+                "description": "Bætum OpenStreetMap-gögn á Indlandi",
+                "extendedDescription": "Kortlagning á Indlandi? Ertu með spurningar, viltu ná sambandi við aðra? Gakktu til liðs við okkur á {Url}. Allir eru velkomnir!"
+            },
+            "OSM-japan-facebook": {
+                "name": "OpenStreetMap Japan samfélagið",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap í Japan"
+            },
+            "OSM-japan-mailinglist": {
+                "name": "Póstlisti OpenStreetMap Japan",
+                "description": "Talk-ja er opinber póstlisti japanska OSM-hópsins"
+            },
+            "OSM-japan-twitter": {
+                "name": "Twitter-hópur OpenStreetMap Japan",
+                "description": "Myllumerki á Twitter á {url}"
+            },
+            "OSM-PH-facebook": {
+                "name": "Facebook-hópur OpenStreetMap PH",
+                "description": "Velkomin í filipeyska OpenStreetMap hópinn, þar sem við hvetjum alla aðra filipseyinga til að taka þátt í OpenStreetMap-verkefninu."
+            },
+            "OSM-PH-mailinglist": {
+                "name": "Talk-ph póstlistinn",
+                "description": "Póstlisti til að ræða OpenStreetMap á Filipseyjum"
+            },
+            "OSM-PH-slack": {
+                "name": "OpenStreetMap PH Slack",
+                "description": "Allir velkomnir! Skráðu þig á {signupUrl}"
+            },
+            "OSM-PH-telegram": {
+                "name": "Telegram-hópur OpenStreetMap PH",
+                "description": "Óopinber staðvær Telegram-hópur OpenStreetMap þátttakenda og vina á Filipseyjum"
+            },
+            "OSM-RU-forum": {
+                "name": "OpenStreetMap RU vefspjall",
+                "description": "Vefspjall (forum) OpenStreetMap Rússland"
+            },
+            "OSM-RU-telegram": {
+                "name": "Telegram-hópur OpenStreetMap RU",
+                "description": "Telegram-hópur OpenStreetMap Rússland"
+            },
+            "OSM-TW-facebook": {
+                "name": "OpenStreetMap Tævan samfélagið",
+                "description": "Facebook-hópur fyrir kortagerðarfólk og notendur OpenStreetMap í Tævan"
+            },
+            "OSM-TW-mailinglist": {
+                "name": "Póstlisti OpenStreetMap Tævan",
+                "description": "Talk-ja er opinber póstlisti tævanska OSM-hópsins"
+            },
+            "byosm": {
+                "name": "OpenStreetMap Hvítarússland",
+                "description": "Telegram-hópur OpenStreetMap Hvítarússlands"
+            },
+            "talk-cz-mailinglist": {
+                "name": "Talk-cz póstlistinn",
+                "description": "Talk-ja er opinber póstlisti tékkneska OSM-hópsins"
+            },
+            "OSM-ES-telegram": {
+                "name": "@OSMes á Telegram",
+                "description": "Telegram-hópur OpenStreetMap Spánn"
+            },
+            "OSM-Vancouver-meetup": {
+                "name": "OpenStreetMap Vancouver",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap í Vancouver, BC-svæðinu"
+            },
+            "Bay-Area-OpenStreetMappers": {
+                "name": "Bay Area OpenStreetMappers",
+                "description": "Bætum OpenStreetMap-gögn á Bay Area"
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "Central Pennsylvania OSM"
+            },
+            "Code-for-San-Jose-Slack": {
+                "description": "Allir eru velkomnir! Skráðu þig á {signupUrl}, taktu síðan þátt á #osm IRC-rásinni"
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM",
+                "description": "Notendahópur OpenStreetMap í Dallas-Fort Worth"
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapping DC",
+                "description": "Bætum OpenStreetMap-gögn á DC-svæðinu"
+            },
+            "Maptime-ME-meetup": {
+                "name": "MaptimeME",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap í kringum Portland, ME"
+            },
+            "OpenCleveland-meetup": {
+                "name": "Open Cleveland",
+                "description": "Bætum OpenStreetMap-gögn á Cleveland-svæðinu"
+            },
+            "OSM-Boston": {
+                "name": "OpenStreetMap Boston",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap á Boston-svæðinu"
+            },
+            "OSM-Central-Salish-Sea": {
+                "name": "OpenStreetMap Central Salish Sea",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap í kringum Mount Vernon, WA",
+                "extendedDescription": "OpenStreetMap er landakort af heiminum gert af fólki eins og þér. Kort sem þú byggir upp, sem er öllum frjálst, rétt eins og Wikipedia. Skoðaðu osm.org til að sjá nánari upplýsingar. Við hittumst mjög oft til að tala um kort, gera kort, og skemmta okkur!"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "Notendur OpenStreetMap í Chattanooga"
+            },
+            "OSM-Colorado": {
+                "name": "OpenStreetMap Colorado",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap í Colorado-fylki, BNA"
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap NYC",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap, forritarar og áhugafólk á New York Metropolitan-svæðinu"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap á Portland-svæðinu",
+                "extendedDescription": "OpenStreetMap (OSM) er landakort af heiminum gert af fólki eins og þér. Kort sem þú byggir upp, sem er öllum frjálst, rétt eins og Wikipedia. Skoðaðu osm.org til að sjá nánari upplýsingar, og kíktu við á fundum til að tala um kort, gera OSM-kort, og skemmta þér!"
+            },
+            "OSM-Seattle": {
+                "name": "OpenStreetMap Seattle",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap á Seattle-svæðinu"
+            },
+            "OSM-SoCal": {
+                "name": "OpenStreetMap Southern California",
+                "description": "Skemmtum okkur, gerum eitthvað fyrir Los Angeles, og lærum í leiðinni um kortagerð!"
+            },
+            "OSM-South-Bay": {
+                "name": "OSM South Bay"
+            },
+            "OSM-Tampa-Bay": {
+                "name": "OpenStreetMap Tampa Bay",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap á Tampa Bay-svæðinu"
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap US Slack",
+                "description": "Allir velkomnir! Skráðu þig á {signupUrl}"
+            },
+            "OSM-US": {
+                "name": "OpenStreetMap US",
+                "description": "Við hjálpum til við að auka og bæta OpenStreetMap-gögn í Bandaríkjunum"
+            },
+            "OSM-Utah": {
+                "name": "OpenStreetMap Utah",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap á Salt Lake City-svæðinu"
+            },
+            "OSM-Wyoming": {
+                "name": "OpenStreetMap Wyoming",
+                "description": "Kortagerðarfólk og notendur OpenStreetMap í Wyoming-fylki, BNA"
+            },
+            "PHXGeo-meetup": {
+                "description": "Kortagerðarfólk og notendur OpenStreetMap á Phoenix, AZ-svæðinu"
+            },
+            "PHXGeo-twitter": {
+                "description": "Fylgstu með okkur á Twitter á {url}"
+            },
+            "Western-Slope-facebook": {
+                "description": "Kortagerðarfólk og notendur OpenStreetMap í kringum Grand Junction, CO"
+            },
+            "Western-Slope-meetup": {
+                "description": "Kortagerðarfólk og notendur OpenStreetMap í kringum Grand Junction, CO"
+            },
+            "Maptime-Australia-Slack": {
+                "description": "Skráðu þig á {signupUrl}"
+            },
+            "OSM-AR-facebook": {
+                "name": "Facebook-hópur OpenStreetMap Argentína",
+                "description": "Gakktu til liðs við OpenStreetMap Argentína hópinn á Facebook",
+                "extendedDescription": "Gakktu til liðs við teymið til að læra meira um OpenStreetMap, spyrja spurninga eða taka þátt í fundum. Allir eru velkomnir!"
+            },
+            "OSM-AR-forum": {
+                "name": "Vefspjall (forum) OpenStreetMap Argentína",
+                "description": "Gakktu til liðs við OpenStreetMap Argentína vefspjallið",
+                "extendedDescription": "Gakktu til liðs við teymið til að læra meira um OpenStreetMap, spyrja spurninga eða taka þátt í fundum. Allir eru velkomnir!"
+            },
+            "OSM-AR-irc": {
+                "name": "IRC-rás OpenStreetMap Argentína",
+                "description": "Taktu þátt á #osm-ar á irc.oftc.net (gátt 6667)"
+            },
+            "OSM-AR-mailinglist": {
+                "name": "Talk-ar póstlistinn",
+                "description": "Póstlisti til að ræða OpenStreetMap í Argentínu"
+            },
+            "OSM-AR-telegram": {
+                "name": "Telegram-hópur OpenStreetMap Argentína",
+                "description": "Gakktu til liðs við OpenStreetMap Argentína hópinn á Telegram",
+                "extendedDescription": "Gakktu til liðs við teymið til að læra meira um OpenStreetMap, spyrja spurninga eða taka þátt í fundum. Allir eru velkomnir!"
+            },
+            "OSM-AR-twitter": {
+                "name": "Twitter-hópur OpenStreetMap Argentína",
+                "description": "Fylgstu með okkur á Twitter á {url}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap á Reddit",
+                "description": "/r/openstreetmap/ er góður staður til að læra meira um OpenStreetMap.  Spurðu okkur um allt milli himins og jarðar!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/it.json b/dist/locales/it.json
index b82c93dc5..20cf5a86f 100644
--- a/dist/locales/it.json
+++ b/dist/locales/it.json
@@ -1,5 +1,10 @@
 {
     "it": {
+        "icons": {
+            "information": "info",
+            "remove": "rimuovi",
+            "undo": "annulla"
+        },
         "modes": {
             "add_area": {
                 "title": "Area",
@@ -730,7 +735,7 @@
                 "before_start_h": "Prima di iniziare",
                 "before_start": "Prima di iniziare ad effettuare modifiche dovresti essere a conoscenza delle funzioni principali di questo editor e di come funziona OpenstreetMap. In iD è stata integrata una guida interattiva, con lo scopo di insegnare le funzioni indispensabili per la mappatura. Clicca \"Avvia il tutorial\" su questa schermata per iniziare - richiede circa 15 minuti.",
                 "open_source_h": "Open Source",
-                "open_source": "L'editor iD è un progetto collaborativo open source, tu ora stai usando la versione {versione}. Il codice sorgente è disponibile [su GitHub](https://github.com/openstreetmap/iD).",
+                "open_source": "L'editor iD è un progetto collaborativo open source, ora stai usando la versione {version}. Il codice sorgente è disponibile [su GitHub](https://github.com/openstreetmap/iD).",
                 "open_source_help": "Puoi contribuire nella [traduzione](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) di iD oppure [segnalare problemi](https://github.com/openstreetmap/iD/issues)."
             },
             "overview": {
@@ -915,7 +920,7 @@
                         "title": "Suggerimenti",
                         "simple": "**Preferisci obblighi di svolta semplici invece di altri più complessi.**",
                         "simple_example": "Ad esempio, evita di creare un obbligo di svolta che utilizza un percorso di topo VIA se basta usare un nodo per lo stesso ruolo.",
-                        "indirect": "**Alcuni obblighi di svolta sono segnati con il testo \"{indirect}\" e sono colorati più chiari.**",
+                        "indirect": "**Alcuni obblighi di svolta sono segnati con il testo \"(indiretto)\" e sono colorati più chiari.**",
                         "indirect_example": "Questi obblighi di svolta esistono come conseguenza di un altro obbligo nei dintorni. Ad esempio, un \"obbligo di direzione obbligatoria\" genererà automaticamente un \"divieto di inversione di marcia\" per tutti gli altri percorsi che attraversano l'intersezione.",
                         "indirect_noedit": "Non puoi modificare gli obblighi di svolta indiretti. Al loro posto, modifica i normali obblighi di svolta vicini."
                     }
@@ -1814,6 +1819,9 @@
                 "except": {
                     "label": "Eccezioni"
                 },
+                "faces": {
+                    "label": "facciate"
+                },
                 "fax": {
                     "label": "Fax",
                     "placeholder": "+39 01 123 456"
@@ -1944,6 +1952,9 @@
                 "indoor": {
                     "label": "Al chiuso"
                 },
+                "industrial": {
+                    "label": "Tipo"
+                },
                 "information": {
                     "label": "Tipo"
                 },
@@ -2064,6 +2075,10 @@
                     "label": "Limite di velocità",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "label": "Limite di velocità consigliata",
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "Limite orario"
                 },
@@ -2296,6 +2311,7 @@
                     "label": "Tipo"
                 },
                 "railway/position": {
+                    "label": "Posizione della pietra miliare",
                     "placeholder": "Distanza ad una cifra decimale (123.4)"
                 },
                 "railway/signal/direction": {
@@ -2545,6 +2561,9 @@
                 "switch": {
                     "label": "Tipo",
                     "options": {
+                        "circuit_breaker": "Interruttore automatico",
+                        "disconnector": "Sezionatore",
+                        "earthing": "Sezionatore di terra",
                         "mechanical": "Meccanico"
                     }
                 },
@@ -2648,8 +2667,19 @@
                     "label": "Tipo",
                     "placeholder": "Default"
                 },
+                "usage_rail": {
+                    "label": "Tipo di utilizzo",
+                    "options": {
+                        "branch": "Secondario",
+                        "industrial": "Industriale",
+                        "main": "Principale",
+                        "military": "Militare",
+                        "test": "Per collaudi",
+                        "tourism": "Turismo"
+                    }
+                },
                 "vending": {
-                    "label": "Beni venduti"
+                    "label": "Tipi di prodotti"
                 },
                 "visibility": {
                     "label": "Visibilità",
@@ -2709,6 +2739,9 @@
                 "wheelchair": {
                     "label": "Accesso in carrozzina"
                 },
+                "wholesale": {
+                    "label": "Vendita all’ingrosso"
+                },
                 "width": {
                     "label": "Larghezza (Metri)"
                 },
@@ -2826,20 +2859,24 @@
                     "name": "Terminal aeroportuale",
                     "terms": "aeroporto,aerodromo,terminale"
                 },
+                "allotments/plot": {
+                    "name": "Orto pubblico",
+                    "terms": "orto pubblico,anziano,anziani,orti urbani,orto,orti,orto per anziani"
+                },
                 "amenity": {
                     "name": "Servizi"
                 },
                 "amenity/animal_boarding": {
                     "name": "Pensione per animali",
-                    "terms": "pet,resort,hotel,rifugio,can*,gatt*,cavall*,cucciol*,rettil*"
+                    "terms": "pet,resort,hotel,rifugio,pensione,cane,cani,gatto,gatti,cavallo,cavalli,cucciolo,cuccioli,rettile,rettili"
                 },
                 "amenity/animal_breeding": {
                     "name": "Allevamento",
-                    "terms": "tor*,gatt*,vivaio,can*,mucc*,cavall*,cucciol*,rettil*,allevatore"
+                    "terms": "toro,tori,gatto,gatti,vivaio,cane,cani,mucca,mucche,cavallo,cavalli,cavalle,cucciolo,cuccioli,rettile,rettili,allevatore"
                 },
                 "amenity/animal_shelter": {
                     "name": "Rifugio per animali",
-                    "terms": "adozion*,gatt*,can*,cucciol*,rettil*,ricovero,riparo"
+                    "terms": "adozione,adozioni,gatto,gatti,micio,cane,cani,cucciolo,cuccioli,rettile,rettili,ricovero,riparo"
                 },
                 "amenity/arts_centre": {
                     "name": "Centro Culturale",
@@ -2871,7 +2908,7 @@
                 },
                 "amenity/bicycle_rental": {
                     "name": "Stazione del Bike Sharing",
-                    "terms": "<translate with synonyms or related terms for 'Bicycle Rental', separated by commas>"
+                    "terms": "noleggio bici,noleggio biciclette,nolo bici,nolo biciclette,noleggio velocipedi,prestito biciclette,bike sharing"
                 },
                 "amenity/bicycle_repair_station": {
                     "name": "Stazione di riparazione biciclette",
@@ -2890,7 +2927,7 @@
                     "terms": "cambi,ufficio cambi,cambio,valuta,cambiovaluta"
                 },
                 "amenity/bus_station": {
-                    "name": "Stazione autobus"
+                    "name": "Stazione /Terminal degli autobus"
                 },
                 "amenity/cafe": {
                     "name": "Caffè",
@@ -2898,7 +2935,7 @@
                 },
                 "amenity/car_pooling": {
                     "name": "Condivisione automobile",
-                    "terms": "<translate with synonyms or related terms for 'Car Pooling', separated by commas>"
+                    "terms": "car pooling,auto di gruppo,concarreggio,condivisione auto"
                 },
                 "amenity/car_rental": {
                     "name": "Noleggio auto",
@@ -2934,11 +2971,11 @@
                 },
                 "amenity/clinic/abortion": {
                     "name": "Clinica per aborti",
-                    "terms": "<translate with synonyms or related terms for 'Abortion Clinic', separated by commas>"
+                    "terms": "clinica abortiva,clinica per l’aborto,ospedale per l’aborto,centro per l’aborto,centro abortivo"
                 },
                 "amenity/clinic/fertility": {
                     "name": "Centro fecondazione assistita",
-                    "terms": "<translate with synonyms or related terms for 'Fertility Clinic', separated by commas>"
+                    "terms": "clinica fertilità,clinica della fertilità,centro fertilità,centro fecondazione assistita,centro della fecondazione assistita,clinica della fecondazione assistita,clinica fecondazione assistita,centro di procreazione assistita,clinica di procreazione assistita"
                 },
                 "amenity/clock": {
                     "name": "Orologio",
@@ -2985,7 +3022,7 @@
                 },
                 "amenity/driving_school": {
                     "name": "Scuola guida",
-                    "terms": "autoscuola,auto*,macchina,guida,scuola"
+                    "terms": "autoscuola,auto,macchina,guida,scuola,scuolaguida,autobus,ambulanze,camion"
                 },
                 "amenity/embassy": {
                     "name": "Ambasciata",
@@ -2996,7 +3033,7 @@
                     "terms": "Fast Food"
                 },
                 "amenity/ferry_terminal": {
-                    "name": "Stazione battelli"
+                    "name": "Stazione / Terminal dei battelli"
                 },
                 "amenity/fire_station": {
                     "name": "Caserma dei pompieri",
@@ -3004,7 +3041,7 @@
                 },
                 "amenity/food_court": {
                     "name": "Zona ristorazione",
-                    "terms": "<translate with synonyms or related terms for 'Food Court', separated by commas>"
+                    "terms": "food court,zona ristorazione,area cibo,ristoranti,cibo"
                 },
                 "amenity/fountain": {
                     "name": "Fontana",
@@ -3032,7 +3069,7 @@
                 },
                 "amenity/ice_cream": {
                     "name": "Gelateria",
-                    "terms": "gelat*,semifredd*,yogurt,sorbett*,ghiacciol*"
+                    "terms": "gelato,gelati,gelataio,semifreddo,semifreddi,yogurt,sorbetto,sorbetti,ghiacciolo,ghiaccoli,grattachecca,sorbetteria,gelateria"
                 },
                 "amenity/internet_cafe": {
                     "name": "Internet Cafe",
@@ -3048,19 +3085,23 @@
                 },
                 "amenity/love_hotel": {
                     "name": "Love Hotel",
-                    "terms": "<translate with synonyms or related terms for 'Love Hotel', separated by commas>"
+                    "terms": "hotel per coppie,motel per coppie,hotel a ore,sexy motel"
                 },
                 "amenity/marketplace": {
                     "name": "Mercato",
                     "terms": "Mercato"
                 },
+                "amenity/monastery": {
+                    "name": "Montastero",
+                    "terms": "monastero,abbazia,badia"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Parcheggio moto",
                     "terms": "parcheggio scooter,moto,scooter"
                 },
                 "amenity/music_school": {
                     "name": "Scuola di musica",
-                    "terms": "<translate with synonyms or related terms for 'Music School', separated by commas>"
+                    "terms": "scuola di musica,lezioni di musica,scuola di piano,scuola di violino,scuola di batteria,educazione musicale,lezioni di musica"
                 },
                 "amenity/nightclub": {
                     "name": "Discoteca",
@@ -3083,7 +3124,7 @@
                 },
                 "amenity/pavilion": {
                     "name": "Tendone",
-                    "terms": "padiglione,tend*"
+                    "terms": "padiglione,tenda,tende"
                 },
                 "amenity/pharmacy": {
                     "name": "Farmacia",
@@ -3103,7 +3144,7 @@
                 },
                 "amenity/place_of_worship/hindu": {
                     "name": "Tempio Hindu",
-                    "terms": "<translate with synonyms or related terms for 'Hindu Temple', separated by commas>"
+                    "terms": "tempio indiano,tempio indù,tempio induista,mandir"
                 },
                 "amenity/place_of_worship/jewish": {
                     "name": "Sinagoga",
@@ -3115,15 +3156,15 @@
                 },
                 "amenity/place_of_worship/shinto": {
                     "name": "Tempio Shintoista",
-                    "terms": "<translate with synonyms or related terms for 'Shinto Shrine', separated by commas>"
+                    "terms": "jinja,tempio giapponese,tempio shintoista,santuario shintoista"
                 },
                 "amenity/place_of_worship/sikh": {
                     "name": "Tempio Sikh",
-                    "terms": "<translate with synonyms or related terms for 'Sikh Temple', separated by commas>"
+                    "terms": "tempio indiano,tempio sikh"
                 },
                 "amenity/place_of_worship/taoist": {
                     "name": "Tempio Taoista",
-                    "terms": "<translate with synonyms or related terms for 'Taoist Temple', separated by commas>"
+                    "terms": "tempio taoista,tempio daoista,tempio cinese,dàoguàn"
                 },
                 "amenity/planetarium": {
                     "name": "Planetario",
@@ -3151,7 +3192,7 @@
                 },
                 "amenity/public_bath": {
                     "name": "Bagni Pubblici",
-                    "terms": "<translate with synonyms or related terms for 'Public Bath', separated by commas>"
+                    "terms": "bagni,bagno,bagno turco,sorgenti calde,terme,bagni termali,onsen,hammam,vasca delle abluzioni,lavacro"
                 },
                 "amenity/public_bookcase": {
                     "name": "Libreria pubblica",
@@ -3163,7 +3204,7 @@
                 },
                 "amenity/recycling": {
                     "name": "Cassonetto per raccolta differenziata",
-                    "terms": "<translate with synonyms or related terms for 'Recycling Container', separated by commas>"
+                    "terms": "contenitore del riciclaggio,riciclaggio,vetro,plastica,bottiglie,alluminio"
                 },
                 "amenity/recycling_centre": {
                     "name": "Centro di riciclaggio",
@@ -3193,11 +3234,11 @@
                 },
                 "amenity/shower": {
                     "name": "Doccia",
-                    "terms": "<translate with synonyms or related terms for 'Shower', separated by commas>"
+                    "terms": "docce,doccia,doccia calda,doccia fredda, doccia pubblica"
                 },
                 "amenity/smoking_area": {
                     "name": "Area fumatori",
-                    "terms": "<translate with synonyms or related terms for 'Smoking Area', separated by commas>"
+                    "terms": "area per fumatori,fumare,fumatori,fumatore,sigarette"
                 },
                 "amenity/social_facility": {
                     "name": "Centro socio-assistenziale",
@@ -3258,6 +3299,10 @@
                     "name": "Distributore automatico di sigarette",
                     "terms": "distributore automatico,macchinetta,sigarette,tabacco,cartine,accendini"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "Macchinetta del caffè",
+                    "terms": "caffè,cafe,coffee,moka,cappuccino,latte,espresso,tazzina,macchiato"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "Distributore automatico di preservativi",
                     "terms": "distributore automatico,macchinetta,preservativi"
@@ -3266,6 +3311,14 @@
                     "name": "Distributore automatico di bevande",
                     "terms": "distributore automatico,macchinetta,bevande,bottiglie,bottigliette"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "Macchinetta accessori elettrici",
+                    "terms": "cavi,caricabatterie,cuffie,cuffiette,telefono,smartphone,tablet,usb"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "Macchinetta di monete da souvenir",
+                    "terms": "moneta,monete,appiatita,appiattite,schiacciata,schiacciate,allungata,allungate,penny,souvenir,turismo,ricordo,commemorativa,commemorative"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "Distributore automatico di sacchetti per escrementi",
                     "terms": "distributore automatico,macchinetta,cacca,cane"
@@ -3274,6 +3327,18 @@
                     "name": "Distributore automatico di prodotti per l'igiene femminile",
                     "terms": "<translate with synonyms or related terms for 'Feminine Hygiene Vending Machine', separated by commas>"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "Macchinetta del cibo",
+                    "terms": "cibo,barrette,sandwich,panini,cioccolata,tramezzini"
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "Pompa della benzina",
+                    "terms": "benzina,petrolio,propano,diesel,benzene,ottani,verde,senza piombo,gpl,metano,bioetanolo,biodiesel,"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "Macchinetta del gelato",
+                    "terms": "gelato,cioccolata,ghiaccoli,ghiacciato,vaniglia,grattachecca,gelati,panna,fragola,pistacchio"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Distributore automatico di giornali"
                 },
@@ -3293,6 +3358,10 @@
                     "name": "Distributore automatico di biglietti per trasporto pubblico",
                     "terms": "distributore automatico,macchinetta,biglietti,bus,metro,tram"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "Macchinetta dei francobolli",
+                    "terms": "posta,spedizione,invio,francobollo,francobolli,marca da bollo"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "Distributore automatico di snack",
                     "terms": "distributore automatico,macchinetta,snack,cibo"
@@ -3303,7 +3372,7 @@
                 },
                 "amenity/waste/dog_excrement": {
                     "name": "Cestino per escrementi animali",
-                    "terms": "<translate with synonyms or related terms for 'Dog Excrement Bin', separated by commas>"
+                    "terms": "cestino deiezioni canine,cacca,popò,cane,cani,deiezioni,sacchetti"
                 },
                 "amenity/waste_basket": {
                     "name": "Cestino della spazzatura",
@@ -3323,7 +3392,7 @@
                 },
                 "amenity/watering_place": {
                     "name": "Abbeveratoio",
-                    "terms": "acqua,fontan*,abbever*,animal*"
+                    "terms": "acqua,fontana,fontanella,abbeveratoio,animale,animali"
                 },
                 "area": {
                     "name": "Area",
@@ -3362,6 +3431,7 @@
                     "terms": "<translate with synonyms or related terms for 'Dark Ride', separated by commas>"
                 },
                 "attraction/drop_tower": {
+                    "name": "Torre a caduta libera",
                     "terms": "<translate with synonyms or related terms for 'Drop Tower', separated by commas>"
                 },
                 "attraction/pirate_ship": {
@@ -3529,6 +3599,14 @@
                 "building/entrance": {
                     "name": "Entrata/Uscita"
                 },
+                "building/farm": {
+                    "name": "Residenza della fattoria",
+                    "terms": "fattoria,casa del fattore,casa del contadino,residenza del contadino,residenza del fattore,dimora del contadino,dimora del fattore,casa colonica"
+                },
+                "building/farm_auxiliary": {
+                    "name": "Edificio della fattoria non abitato",
+                    "terms": "fattoria,casa di campagna,rudere,cascinale,casale,casolare,rustico,casa rurale,capanno,magazzino"
+                },
                 "building/garage": {
                     "name": "Garage",
                     "terms": "Garage"
@@ -3644,9 +3722,12 @@
                     "name": "Piazzola",
                     "terms": "Piazzola,lotto"
                 },
+                "circular": {
+                    "name": "Strada rotonda senza precedenza"
+                },
                 "club": {
                     "name": "Club",
-                    "terms": "social*,centr*"
+                    "terms": "sociale,centro,centro sociale,centro aggregazione,centro culturale"
                 },
                 "craft": {
                     "name": "Mestiere",
@@ -3956,7 +4037,7 @@
                 },
                 "healthcare": {
                     "name": "Clinica",
-                    "terms": "<translate with synonyms or related terms for 'Healthcare Facility', separated by commas>"
+                    "terms": "clinica,ospedale,clinica ospedaliera,dottori,studio dottori,medicina,aiuto medico,guardia medica,centro igiene mentale,pediatra,medico,oftalmologo,dentista,ginecologo,andrologo,geriatra,medico dello sport"
                 },
                 "healthcare/alternative": {
                     "name": "Medicina alternativa",
@@ -3987,6 +4068,7 @@
                     "terms": "<translate with synonyms or related terms for 'Midwife', separated by commas>"
                 },
                 "healthcare/occupational_therapist": {
+                    "name": "Medico del lavoro",
                     "terms": "<translate with synonyms or related terms for 'Occupational Therapist', separated by commas>"
                 },
                 "healthcare/optometrist": {
@@ -4083,6 +4165,10 @@
                     "name": "Svincolo autostradale",
                     "terms": "Svincolo autostradale"
                 },
+                "highway/passing_place": {
+                    "name": "Slargo per passaggio",
+                    "terms": "slargo,sorpasso,zona,incrocio,area di sorpasso,area di incrocio,slargo di sorpasso,slargo di incrocio"
+                },
                 "highway/path": {
                     "name": "Sentiero",
                     "terms": "Sentiero"
@@ -4105,7 +4191,7 @@
                 },
                 "highway/raceway": {
                     "name": "Circuito (Motoristico)",
-                    "terms": "pista,autodromo,pista automobilistica,pista motoristica,auto*,moto*"
+                    "terms": "pista,autodromo,pista automobilistica,pista motoristica,auto,moto,motori,nascar,corsa,formula uno"
                 },
                 "highway/residential": {
                     "name": "Residenziale",
@@ -4265,7 +4351,7 @@
                 },
                 "landuse/aquaculture": {
                     "name": "Acquacoltura",
-                    "terms": "pesci,crostacei,alghe,gamber*,maricoltura,algacoltura"
+                    "terms": "pesci,crostacei,alghe,gambero,gamberi,gamberetti,aragoste,maricoltura,algacoltura,allevamento,molluschi,cozze,ostriche,orate"
                 },
                 "landuse/basin": {
                     "name": "Bacino",
@@ -4336,7 +4422,7 @@
                 },
                 "landuse/industrial/slaughterhouse": {
                     "name": "Macello",
-                    "terms": "macello,mattatoio,abbattimento,macelleria,macellaio,gallin*,mucc*,carne,suin*,maial*,animali"
+                    "terms": "macello,mattatoio,abbattimento,macelleria,macellaio,galline,gallina,mucca,mucche,carne,suino,suini,maiale,maiali,tacchino,tacchini,animali"
                 },
                 "landuse/landfill": {
                     "name": "Discarica",
@@ -4376,7 +4462,7 @@
                 },
                 "landuse/military/nuclear_explosion_site": {
                     "name": "Sito per esplosioni nucleari",
-                    "terms": "bomba,atomica,poligono,tiro,lancio,missil*,test,nucleare"
+                    "terms": "bomba,atomica,poligono,tiro,lancio,missile,missili,nucleare,test,nucleare"
                 },
                 "landuse/military/obstacle_course": {
                     "name": "Percorso ad ostacoli",
@@ -4388,7 +4474,7 @@
                 },
                 "landuse/military/range": {
                     "name": "Poligono di tiro militare",
-                    "terms": "poligono,militare,tiro,lancio,bombe,missil*"
+                    "terms": "poligono,militare,militari,tiro,lancio,bombe,missile,missili,forze militari,forza aerea,forza,guardia,armi,fuoco,marina,fucile,cecchino,cecchini,truppe,truppa,addestramento,guerra,battaglia,battaglione"
                 },
                 "landuse/military/training_area": {
                     "name": "Area di addestramento",
@@ -4442,6 +4528,10 @@
                     "name": "Sala giochi",
                     "terms": "Videogiochi"
                 },
+                "leisure/beach_resort": {
+                    "name": "Stabilimento balnerare",
+                    "terms": "spiaggia,spiaggia attrezzata,bagni,bagno,stabilimento balneare"
+                },
                 "leisure/bird_hide": {
                     "name": "osservazione uccelli",
                     "terms": "Capanno di osservazione"
@@ -4459,7 +4549,8 @@
                     "terms": "ballo,danza,jive,swing,tango,valzer,balera"
                 },
                 "leisure/dancing_school": {
-                    "name": "Scuola di danza"
+                    "name": "Scuola di danza",
+                    "terms": "scuola di danza,danza,lezioni di danza,imparare a danzare,danzare,maestro di danza"
                 },
                 "leisure/dog_park": {
                     "name": "Area per cani",
@@ -4494,6 +4585,7 @@
                     "terms": "<translate with synonyms or related terms for 'Exercise Horizontal Bar', separated by commas>"
                 },
                 "leisure/fitness_station/horizontal_ladder": {
+                    "name": "Scala orizzontale",
                     "terms": "<translate with synonyms or related terms for 'Exercise Monkey Bars', separated by commas>"
                 },
                 "leisure/fitness_station/hyperextension": {
@@ -4502,7 +4594,7 @@
                 },
                 "leisure/fitness_station/parallel_bars": {
                     "name": "Barre Parallele",
-                    "terms": "barr*,esercizi,fitness,palestra,percorso"
+                    "terms": "barra,trazioni,barre,esercizi,fitness,palestra,percorso"
                 },
                 "leisure/fitness_station/push-up": {
                     "name": "Stazione per piegamenti sulle braccia",
@@ -4533,11 +4625,12 @@
                     "terms": "Campo da golf"
                 },
                 "leisure/hackerspace": {
+                    "name": "Spazio hacker",
                     "terms": "<translate with synonyms or related terms for 'Hackerspace', separated by commas>"
                 },
                 "leisure/horse_riding": {
                     "name": "Centro equestre",
-                    "terms": "cavall*,equestre,circolo,ippica,club"
+                    "terms": "cavallo,cavalli,equestre,circolo,ippica,club,destrieri,stalla,stalle"
                 },
                 "leisure/ice_rink": {
                     "name": "Pista di Ghiaccio",
@@ -4555,6 +4648,10 @@
                     "name": "Riserva naturale",
                     "terms": "riserva,natura,parco,naturale"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "Posti a sedere all’esterno",
+                    "terms": "giardino,patio,esterno,aperto,all’aperto,cena,caffè,merenda,pub,ristorante,bar,veranda,dehors"
+                },
                 "leisure/park": {
                     "name": "Parco",
                     "terms": "lungomare,tenuta,foresta,giardino,prato,verde,terreni,lotto,pascolo,parco,parco giochi,area ricreativa,piazza,giardino pubblico,bosco"
@@ -4597,7 +4694,7 @@
                 },
                 "leisure/pitch/equestrian": {
                     "name": "Maneggio",
-                    "terms": "dressage,equestre,cavall*,cavalcat*"
+                    "terms": "dressage,equestre,cavallo,cavalli,cavalcata,cavalcate"
                 },
                 "leisure/pitch/rugby_league": {
                     "name": "Campo di rugby a 13",
@@ -4683,6 +4780,10 @@
                     "name": "Cunicolo",
                     "terms": "adito,miniera,ingresso"
                 },
+                "man_made/antenna": {
+                    "name": "Antenna",
+                    "terms": "cella,stazione,trasmissione,trasmissioni,comunicazione,comunicazioni,telecomunicazione,cellulare,cellulari,smartphone,gsm,telefono,telefoni,telefonia,telefonica,radio,televisione,tv,etere"
+                },
                 "man_made/breakwater": {
                     "name": "Frangiflutti",
                     "terms": "Frangifrutti"
@@ -4734,6 +4835,10 @@
                     "name": "Torre di osservazione",
                     "terms": "torre,osservazione,osservatorio,piattaforma,osservativa,antincendio,panorama"
                 },
+                "man_made/observatory": {
+                    "name": "Osservatorio",
+                    "terms": "osservatorio,astronomico,meteorologico,vulcanologico,osservatorio meteorologico,osservatorio astronomico,radiotelescopio"
+                },
                 "man_made/petroleum_well": {
                     "name": "Pozzo petrolifero",
                     "terms": "petrolio,bitume,pozzo"
@@ -4858,6 +4963,10 @@
                     "name": "Brughiera",
                     "terms": "Brughiera"
                 },
+                "natural/mud": {
+                    "name": "Fango",
+                    "terms": "fango,fangoso,umido,bagnato,terra bagnata,melmoso,paludoso,palude"
+                },
                 "natural/peak": {
                     "name": "Picco",
                     "terms": "culmine,guglia,alpe,apice,cresta,sommità,cima,cocuzzolo,collina,monte,montagna,pinnacolo,estremità,vertice,vetta,piz"
@@ -4924,7 +5033,7 @@
                 },
                 "noexit/yes": {
                     "name": "Senza uscita",
-                    "terms": "strada,senza,uscita,fine,punto,mort*"
+                    "terms": "strada,senza,uscita,fine,punto,morto,strada senza uscita"
                 },
                 "office": {
                     "name": "Uffici",
@@ -4986,6 +5095,7 @@
                     "terms": "finanza,finanziaria,fiduciaria,mag"
                 },
                 "office/forestry": {
+                    "name": "Ufficio forestale",
                     "terms": "<translate with synonyms or related terms for 'Forestry Office', separated by commas>"
                 },
                 "office/foundation": {
@@ -5051,6 +5161,7 @@
                     "terms": "<translate with synonyms or related terms for 'Private Investigator Office', separated by commas>"
                 },
                 "office/quango": {
+                    "name": "Ufficio di una simil ONG",
                     "terms": "<translate with synonyms or related terms for 'Quasi-NGO Office', separated by commas>"
                 },
                 "office/research": {
@@ -5119,6 +5230,7 @@
                     "terms": "Quartiere,Zona"
                 },
                 "place/plot": {
+                    "name": "Particella catastale",
                     "terms": "<translate with synonyms or related terms for 'Plot', separated by commas>"
                 },
                 "place/quarter": {
@@ -5127,7 +5239,7 @@
                 },
                 "place/square": {
                     "name": "Piazza",
-                    "terms": "piazz*,spiazzo,slargo"
+                    "terms": "piazza,piazze,piazzale,spiazzo,slargo,largo"
                 },
                 "place/suburb": {
                     "name": "Sobborgo",
@@ -5162,6 +5274,7 @@
                     "terms": "<translate with synonyms or related terms for 'Bouncy Cushion', separated by commas>"
                 },
                 "playground/horizontal_bar": {
+                    "name": "Barra per trazioni",
                     "terms": "<translate with synonyms or related terms for 'Play Horizontal Bar', separated by commas>"
                 },
                 "playground/rocker": {
@@ -5225,7 +5338,7 @@
                 },
                 "power/plant": {
                     "name": "Area della Centrale elettrica",
-                    "terms": "carbone,gas,generatore,idroelettrico,nucleare,energia,elettric*,centrale"
+                    "terms": "carbone,gas,generatore,idroelettrico,nucleare,energia,elettrica,elittricità,elettrico,centrale,produzione"
                 },
                 "power/pole": {
                     "name": "Palo della luce",
@@ -5251,6 +5364,7 @@
                     "terms": "Trasformatore"
                 },
                 "public_transport/linear_platform": {
+                    "name": "Fermata / Banchina del trasporto pubblico",
                     "terms": "<translate with synonyms or related terms for 'Transit Stop / Platform', separated by commas>"
                 },
                 "public_transport/linear_platform_aerialway": {
@@ -5286,9 +5400,11 @@
                     "terms": "<translate with synonyms or related terms for 'Tram Stop / Platform', separated by commas>"
                 },
                 "public_transport/linear_platform_trolleybus": {
+                    "name": "Fermata / Banchina del filobus",
                     "terms": "<translate with synonyms or related terms for 'Trolleybus Stop / Platform', separated by commas>"
                 },
                 "public_transport/platform": {
+                    "name": "Fermata / Banchina del trasporto pubblico",
                     "terms": "<translate with synonyms or related terms for 'Transit Stop / Platform', separated by commas>"
                 },
                 "public_transport/platform_aerialway": {
@@ -5324,9 +5440,11 @@
                     "terms": "<translate with synonyms or related terms for 'Tram Stop / Platform', separated by commas>"
                 },
                 "public_transport/platform_trolleybus": {
+                    "name": "Fermata / Banchina del filobus",
                     "terms": "<translate with synonyms or related terms for 'Trolleybus Stop / Platform', separated by commas>"
                 },
                 "public_transport/station": {
+                    "name": "Stazione del trasporto pubblico",
                     "terms": "<translate with synonyms or related terms for 'Transit Station', separated by commas>"
                 },
                 "public_transport/station_aerialway": {
@@ -5342,7 +5460,7 @@
                     "terms": "<translate with synonyms or related terms for 'Ferry Station / Terminal', separated by commas>"
                 },
                 "public_transport/station_light_rail": {
-                    "name": "Stazione del tram",
+                    "name": "Stazione della metropolitana di superficie",
                     "terms": "<translate with synonyms or related terms for 'Light Rail Station', separated by commas>"
                 },
                 "public_transport/station_monorail": {
@@ -5366,15 +5484,19 @@
                     "terms": "<translate with synonyms or related terms for 'Tram Station', separated by commas>"
                 },
                 "public_transport/station_trolleybus": {
+                    "name": "Stazione / Terminal dei filobus",
                     "terms": "<translate with synonyms or related terms for 'Trolleybus Station / Terminal', separated by commas>"
                 },
                 "public_transport/stop_area": {
+                    "name": "Area della fermata del trasporto pubblico",
                     "terms": "<translate with synonyms or related terms for 'Transit Stop Area', separated by commas>"
                 },
                 "public_transport/stop_position": {
+                    "name": "Punto di stop del trasporto pubblico",
                     "terms": "<translate with synonyms or related terms for 'Transit Stopping Location', separated by commas>"
                 },
                 "public_transport/stop_position_aerialway": {
+                    "name": "Punto di stop del trasporto a fune",
                     "terms": "<translate with synonyms or related terms for 'Aerialway Stopping Location', separated by commas>"
                 },
                 "public_transport/stop_position_bus": {
@@ -5386,12 +5508,15 @@
                     "terms": "<translate with synonyms or related terms for 'Ferry Stopping Location', separated by commas>"
                 },
                 "public_transport/stop_position_light_rail": {
+                    "name": "Punto di stop della metropolitana di superficie",
                     "terms": "<translate with synonyms or related terms for 'Light Rail Stopping Location', separated by commas>"
                 },
                 "public_transport/stop_position_monorail": {
+                    "name": "Punto di stop della monorotaia",
                     "terms": "<translate with synonyms or related terms for 'Monorail Stopping Location', separated by commas>"
                 },
                 "public_transport/stop_position_subway": {
+                    "name": "Punto di stop della metropolitana",
                     "terms": "<translate with synonyms or related terms for 'Subway Stopping Location', separated by commas>"
                 },
                 "public_transport/stop_position_train": {
@@ -5399,9 +5524,11 @@
                     "terms": "<translate with synonyms or related terms for 'Train Stopping Location', separated by commas>"
                 },
                 "public_transport/stop_position_tram": {
+                    "name": "Punto di stop del tram",
                     "terms": "<translate with synonyms or related terms for 'Tram Stopping Location', separated by commas>"
                 },
                 "public_transport/stop_position_trolleybus": {
+                    "name": "Punto di stop del filobus",
                     "terms": "<translate with synonyms or related terms for 'Trolleybus Stopping Location', separated by commas>"
                 },
                 "railway": {
@@ -5412,7 +5539,8 @@
                     "terms": "Ferrovia abbandonata"
                 },
                 "railway/buffer_stop": {
-                    "terms": "<translate with synonyms or related terms for 'Buffer Stop', separated by commas>"
+                    "name": "Respingente",
+                    "terms": "respingente,stop,ammortizzatore,fine linea"
                 },
                 "railway/crossing": {
                     "name": "Passaggio a livello (sentiero)",
@@ -5438,8 +5566,8 @@
                     "terms": "passaggio a livello,incrocio ferroviario,attraversamento"
                 },
                 "railway/light_rail": {
-                    "name": "Tram",
-                    "terms": "<translate with synonyms or related terms for 'Light Rail', separated by commas>"
+                    "name": "Metropolitana di superficie",
+                    "terms": "tranvia,metrotranvia,metropolitana,metropolitana di superficie"
                 },
                 "railway/milestone": {
                     "name": "Pietra miliare ferroviaria",
@@ -5447,7 +5575,7 @@
                 },
                 "railway/miniature": {
                     "name": "Ferrovia in miniatura",
-                    "terms": "<translate with synonyms or related terms for 'Miniature Railway', separated by commas>"
+                    "terms": "trenino,treno in miniatura,scartamento ridotto,scartamento minimo,ferrovia,binario"
                 },
                 "railway/monorail": {
                     "name": "Monorotaia",
@@ -5485,7 +5613,7 @@
                 },
                 "railway/train_wash": {
                     "name": "Lavaggio treni",
-                    "terms": "<translate with synonyms or related terms for 'Train Wash', separated by commas>"
+                    "terms": "lavaggio,pulizia,treni,treno"
                 },
                 "railway/tram": {
                     "name": "Tram",
@@ -5531,7 +5659,7 @@
                 },
                 "shop/art": {
                     "name": "Negozio di opere d'arte",
-                    "terms": "opere d'arte,quadri,sculture,galleria,art*"
+                    "terms": "opere d'arte,quadri,sculture,galleria,arte,esibizione,mostra"
                 },
                 "shop/baby_goods": {
                     "name": "Negozio di prodotti per l'infanzia",
@@ -5733,7 +5861,7 @@
                 },
                 "shop/gas": {
                     "name": "Bombolaio",
-                    "terms": "gas,bombol*,gpl,metano,lpg,cng,gas naturale,propano"
+                    "terms": "gas,bombole,bombola,gpl,metano,lpg,cng,gas naturale,propano,ricarica bombole,ricarica"
                 },
                 "shop/gift": {
                     "name": "Negozio souvenir",
@@ -5751,6 +5879,10 @@
                     "name": "Ferramenta",
                     "terms": "Negozio di Ferramenta"
                 },
+                "shop/health_food": {
+                    "name": "Prodotti per il benessere",
+                    "terms": "prodotti genuini,benessere,negozio di prodotti biologici,negozio di prodotti per la salute,prodotti per la salute"
+                },
                 "shop/hearing_aids": {
                     "name": "Negozio di apparecchi acustici",
                     "terms": "Apparecchi acustici,Negozio di apparecchi acustici"
@@ -5777,7 +5909,7 @@
                 },
                 "shop/kiosk": {
                     "name": "Chiosco",
-                    "terms": "<translate with synonyms or related terms for 'Kiosk', separated by commas>"
+                    "terms": "chiosco,edicola,tabacchi,dolciumi,snack"
                 },
                 "shop/kitchen": {
                     "name": "Negozio di cucine",
@@ -5793,7 +5925,7 @@
                 },
                 "shop/locksmith": {
                     "name": "Fabbro",
-                    "terms": "<tradurre con sinonimi o termini collegati alla parola 'fabbro, separati da virgole'>"
+                    "terms": "fabbro,ferraio,serrature,chiavi,ferro battuto"
                 },
                 "shop/lottery": {
                     "name": "Ricevitoria",
@@ -5865,12 +5997,16 @@
                 },
                 "shop/perfumery": {
                     "name": "Profumeria",
-                    "terms": "profum*"
+                    "terms": "profumi,profumo,profumeria"
                 },
                 "shop/pet": {
                     "name": "Negozio di animali",
                     "terms": "Negozio di animali"
                 },
+                "shop/pet_grooming": {
+                    "name": "Toelettatura per animali",
+                    "terms": "cane,gatto,cani,gatti,toilette,toletta,tolettatura,toelettatura,parrucchiere,unghie,shampoo,"
+                },
                 "shop/photo": {
                     "name": "Fotografo",
                     "terms": "fotografia,fotografico,fotografo,foto,diapositive,rullini,macchine fotografiche"
@@ -5937,7 +6073,7 @@
                 },
                 "shop/tiles": {
                     "name": "Negozio di piastrelle",
-                    "terms": "<translate with synonyms or related terms for 'Tile Shop', separated by commas>"
+                    "terms": "piastrelle,mattonelle,pavimento,pavimenti,ceramica,pietra"
                 },
                 "shop/tobacco": {
                     "name": "Tabacchino",
@@ -5948,7 +6084,8 @@
                     "terms": "Negozio giocattoli"
                 },
                 "shop/trade": {
-                    "terms": "<translate with synonyms or related terms for 'Trade Shop', separated by commas>"
+                    "name": "Materiali da edilizia",
+                    "terms": "materiali edilizi,edilizia,mattoni,cemento,stucco,gesso"
                 },
                 "shop/travel_agency": {
                     "name": "Agenzia di viaggi",
@@ -5979,7 +6116,7 @@
                 },
                 "shop/watches": {
                     "name": "Negozio di orologi",
-                    "terms": "orolog*"
+                    "terms": "orologio,orologi,negozio orologi,sveglia,sveglie,orologio a cipolla,cronografo,cronometro"
                 },
                 "shop/water_sports": {
                     "name": "Negozio per sport acquatici",
@@ -6039,10 +6176,10 @@
                 },
                 "tourism/gallery": {
                     "name": "Galleria d'arte",
-                    "terms": "opere d'arte,quadri,sculture,galleria,fotografie,dipinti,art*"
+                    "terms": "opere d'arte,quadri,sculture,galleria,foto,fotografia,fotografie,dipinti,arte,artistica,esibizione,mostra"
                 },
                 "tourism/guest_house": {
-                    "name": "Affittacamere/Bed & Breakfast",
+                    "name": "Bed & Breakfast",
                     "terms": "B&B,Bed & Breakfast,Bed and Breakfast"
                 },
                 "tourism/hostel": {
@@ -6095,7 +6232,7 @@
                 },
                 "tourism/wilderness_hut": {
                     "name": "Bivacco",
-                    "terms": "<translate with synonyms or related terms for 'Wilderness Hut', separated by commas>"
+                    "terms": "bivacco,baito,struttura incustodita,casetta,piccolo rifugio"
                 },
                 "tourism/zoo": {
                     "name": "Zoo",
@@ -6139,7 +6276,7 @@
                 },
                 "traffic_calming/table": {
                     "name": "Dosso",
-                    "terms": "<translate with synonyms or related terms for 'Speed Table', separated by commas>"
+                    "terms": "veloce,lento,piano,velocità,dosso,dossi,rallentatore,tabellone,tabella,cuscino sonoro,banda sonora,cuscini sonori,bande sonore"
                 },
                 "type/boundary": {
                     "name": "Confine",
@@ -6174,15 +6311,19 @@
                 },
                 "type/restriction/only_left_turn": {
                     "name": "Obbligo di svolta a sinistra",
-                    "terms": "obbligo,curva,sinistra"
+                    "terms": "svolta a sinistra,divieto di svolta a destra,divieto di andare diritto,obbligo"
                 },
                 "type/restriction/only_right_turn": {
                     "name": "Obbligo di svolta a destra",
-                    "terms": "obbligo,curva,destra"
+                    "terms": "svolta a destra,divieto di svolta sinistra,divieto di andare diritto,obbligo"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "Direzione obbligatoria dritto",
-                    "terms": "obbligo,dritto,diritto,divieto di svolta"
+                    "name": "Obbligo di andare diritto",
+                    "terms": "diritto,dritto,proseguire diritto,obbligo,divieto di svolta"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Obbligo di inversione di marcia",
+                    "terms": "Svolta a U,inversione,inversione di marcia,tornare indietro,torna indietro,curva a U"
                 },
                 "type/route": {
                     "name": "Percorso",
@@ -6217,8 +6358,8 @@
                     "terms": "cavallo,strada,ippica,sentiero,equitazione"
                 },
                 "type/route/light_rail": {
-                    "name": "Linea tramviaria",
-                    "terms": "<translate with synonyms or related terms for 'Light Rail Route', separated by commas>"
+                    "name": "Linea della metropolitana di superficie",
+                    "terms": "tranvia,metrotranvia,leggera,metro leggera,metropolitana leggera,linea tranvia,linea del tranvia"
                 },
                 "type/route/pipeline": {
                     "name": "Condotta",
@@ -6226,7 +6367,7 @@
                 },
                 "type/route/piste": {
                     "name": "Pista da sci",
-                    "terms": "<translate with synonyms or related terms for 'Piste/Ski Route', separated by commas>"
+                    "terms": "pista,piste,pista da sci,piste da sci,rossa,blu,nera,pista blu,pista rossa,pista nera,discesa"
                 },
                 "type/route/power": {
                     "name": "Linea elettrica",
@@ -6238,7 +6379,7 @@
                 },
                 "type/route/subway": {
                     "name": "Linea metropolitana",
-                    "terms": "<translate with synonyms or related terms for 'Subway Route', separated by commas>"
+                    "terms": "metro,metropolitana,subway,linea,linea della metro"
                 },
                 "type/route/train": {
                     "name": "Linea ferroviaria",
@@ -6477,7 +6618,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Basemap of Austria, basati su dati governativi.",
+                "description": "mappa di base, ottenuta da dati del governo.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6539,7 +6680,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Map tiles by Stamen Design, under CC BY 3.0"
+                    "text": "Tasselli della mappa di Stamen Design con licenza CC-BY 3.0. Dati di OpenStreetMap com licenza ODbL"
                 },
                 "name": "Stamen Terrain"
             },
@@ -6555,6 +6696,328 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "osm-mg-facebook": {
+                "name": "Gruppo Facebook di OpenStreetMap del Madagascar",
+                "description": "Gruppo Facebook malgascio per persone interessate a OpenStreetMap"
+            },
+            "talk-mg": {
+                "name": "Mailinglist talk-mg",
+                "description": "Un posto dove i collaboratori, le comunità e gli utenti di OpenStreetMap del Madagascar possono condividere e discutere."
+            },
+            "OSM-BGD-facebook": {
+                "name": "OpenStreetMap del Bangladesh",
+                "description": "Migliora OpenStreetMap nel Bangladesh",
+                "extendedDescription": "Stai mappando nel Bangladesh? Hai domande o vuoi unirti alla comunità locale? Unisciti a noi su {Url}. Tutti sono i benvenuti!"
+            },
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap India - mappatura di quartiere partecipativa",
+                "description": "Miglioriamo OpenStreetMap in India",
+                "extendedDescription": "Mappi in India? Hai domande o vuoi unirti alla comunità locale? Unisciti a noi su {Url}. Tutti sono i benvenuti!"
+            },
+            "OSM-india-mailinglist": {
+                "name": "Mailinglist di OpenStreetMap dell’India",
+                "description": "Talk-in è la mailinglist ufficiale della comunità indiana"
+            },
+            "OSM-india-twitter": {
+                "name": "Twitter di OpenStreetMap dell’India",
+                "description": "Siamo solo ad un cinguettio di distanza: {url}"
+            },
+            "OSM-IDN-facebook": {
+                "name": "OpenStreetMap dell’Indonesia",
+                "description": "Migliora OpenStreetMap in Indonesia",
+                "extendedDescription": "Stai mappando in Indonesia? Hai domande o vuoi connetterti alla comunità locale? Unisci a a noi su {Url}. Tutti sono i benvenuti!"
+            },
+            "OSM-japan-facebook": {
+                "name": "Comunità OpenStreetMap del Giappone",
+                "description": "Mappatori e utenti OpenStreetMap del Giappone"
+            },
+            "OSM-japan-mailinglist": {
+                "name": "Mailinglist di OpenStreetMap Giappone",
+                "description": "Talk-ja è la mailinglist ufficiale della comunità giapponese"
+            },
+            "OSM-japan-twitter": {
+                "name": "Twitter OpenStreetMap Giappone",
+                "description": "Hashtag su Twitter: {url}"
+            },
+            "OSM-MNG-facebook": {
+                "name": "OpenStreetMap della Mongolia",
+                "description": "Migliora OpenStreetMap in Mongolia",
+                "extendedDescription": "Stai mappando in Mongolia? Hai domande o vuoi connetterti alla comunità locale? Unisci a noi su {Url}. Tutti sono i benvenuti!"
+            },
+            "OSM-Nepal-facebook": {
+                "name": "OpenStreetMap del Nepal",
+                "description": "Migliora OpenStreetMap in Nepal",
+                "extendedDescription": "Stai mappando in Nepal? Hai domande o vuoi connetterti alla comunità locale? Unisciti a noi su {Url}. Tutti sono i benvenuti!"
+            },
+            "OSM-PH-facebook": {
+                "name": "Facebook di OpenStreetMap delle Filippine",
+                "description": "Benvenuta/o in OpenStreetMap delle Filippine, un posto dove i nostri amici filippini vengono incoraggiati a contribuire al progetto OpenStreetMap."
+            },
+            "OSM-PH-mailinglist": {
+                "name": "Mailing list Talk-ph",
+                "description": "Una mailinglist per discutere OpenStreetMap nelle Filippine"
+            },
+            "OSM-PH-slack": {
+                "name": "Slack di OpenStreetMap delle Filippine",
+                "description": "Tutti sono i benvenuti! Registrati su {signupUrl}"
+            },
+            "OSM-PH-telegram": {
+                "name": "Telegram di OpenStreetMap delle Filippine",
+                "description": "Non ufficiale, comunità locale su Telegram di utenti OpenStreetMap e amici nelle Filippine."
+            },
+            "OSM-RU-forum": {
+                "name": "Forum di OpenStreetMap della Russia",
+                "description": "Forum web di OpenStreetMap della Russia"
+            },
+            "OSM-RU-telegram": {
+                "name": "Telegram di OpenStreetMap della Russia",
+                "description": "Chat Telegram di OpenStreetMap della Russia"
+            },
+            "OSM-LKA-facebook": {
+                "name": "OpenStreetMap dello Sri Lanka",
+                "description": "Migliora OpenStreetMap nello Sri Lanka",
+                "extendedDescription": "Stai mappando lo Sri Lanka? Hai domande o vuoi connetterti alla comunità locale? Unisciti a noi su {Url}. Tutti sono i benvenuti!"
+            },
+            "OSM-TW-facebook": {
+                "name": "Comunità di OpenStreetMap di Taiwan",
+                "description": "Gruppo di Facebook per mappatori e utenti OpenStreetMap che vogliono discutere su argomenti inerenti Taiwan."
+            },
+            "OSM-TW-mailinglist": {
+                "name": "Mailinglist di OpenStreetMap di Taiwan",
+                "description": "Talk-tw è la mailinglist ufficiale delle comunità per discutere su argomenti inerenti Taiwan."
+            },
+            "be-facebook": {
+                "name": "Comunità belga di OpenStreetMap",
+                "description": "Facebook di mappatori e OpenStreetMap del Belgio"
+            },
+            "be-forum": {
+                "name": "Forum belga di OpenStreetMap",
+                "description": "Forum web belga di OpenStreetMap"
+            },
+            "be-irc": {
+                "name": "Canale IRC belga di OpenStreetMap",
+                "description": "Entra in #osmbe su irc.oftc.net (porta 6667)",
+                "extendedDescription": "Unisciti a #osmbe su irc.oftc.net (porta 6667), è collegato al canale di chat di matrix"
+            },
+            "be-mailinglist": {
+                "name": "Mailinglist talk-be",
+                "description": "Talk-be è la mailinglist ufficiale della comunità OSM belga"
+            },
+            "be-matrix": {
+                "name": "Canale Riot di OpenStreetMap belga",
+                "description": "Tutti i mappatori sono i benvenuti! Iscriviti su {signupUrl}",
+                "extendedDescription": "Esistono diversi canali, per principianti, canali a tema, per discutere di landuse e di problemi degli sviluppatori."
+            },
+            "be-twitter": {
+                "name": "Twitter di OpenStreetMap del Belgio",
+                "description": "OSM belga su Twitter: {url}"
+            },
+            "byosm": {
+                "name": "OpenStreetMap della Bielorussia",
+                "description": "Chat telegram di OpenStreetMap della Bielorussia"
+            },
+            "talk-cz-mailinglist": {
+                "name": "Mailinglist Talk-cz",
+                "description": "Talk-cz è la mailinglist ufficiale della comunità ceca"
+            },
+            "OSM-ES-telegram": {
+                "name": "@OSMes su Telegram",
+                "description": "Chat Telegram di OpenStreetMap della Spagna"
+            },
+            "OSM-CA-Slack": {
+                "name": "Slack di OSM-CA",
+                "description": "Tutti sono i benvenuti! Iscriviti su {signupUrl}."
+            },
+            "OSM-Vancouver-meetup": {
+                "name": "OpenStreetMap di Vancouver",
+                "description": "Mappatori e utenti OpenStreetMap di Vancouver, area Colombia Britannica"
+            },
+            "Bay-Area-OpenStreetMappers": {
+                "name": "OpenStreetMappers a Bay Area",
+                "description": "Migliora OpenStreetMap a Bay Area",
+                "extendedDescription": "Il nostro gruppo vuole far crescere la community OpenStreetMap qui nella zona di Bay Area. I nostri eventi sono aperti a chiunque, dall'appassionato di open source, al ciclista, al professionista GIS, al geocacher e oltre. Qualunque persona appassionata di mappe, cartografia o analisi geografica è la benvenuta a unirsi al nostro gruppo e partecipare ai nostri eventi. "
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "OSM Pennsylvania Centrale",
+                "description": "Community online di mapping con base presso State College, PA"
+            },
+            "Code-for-San-Jose-Slack": {
+                "name": "Slack di Programmare per San Jose",
+                "description": "Tutti sono benvenuti! Iscriviti su {signupUrl}, e dopo collegati al canale \"osm su IRC."
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "OSM Dallas-Fort Worth",
+                "description": "Gruppo OpenStreetMap di Dallas-Fort Worth",
+                "extendedDescription": "Dallas, Fort Work, e tutte le città limitrofe abbondano di persone creative ed esperte di tecnologia. La nostra vision è quella di cercare in questo gruppo nuove vie di utilizzare le fantastiche risorse offerte da OSM."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Meetup per appassionati di mappe nella zona di Philadelphia",
+                "extendedDescription": "Geophilly unisce sviluppatori, geografi, data geek, appassionati open source, civic hacker e drogati di mappe nella comune passione passione per le mappe e delle storie che possono raccontare. Se usate delle mappe nel vostro lavoro o se voltete soltanto saperne di più, questo è il meetup adatto per voi! I nostri eventi mirano a essere aperti, amichevoli, educativi e sociali, e spaziano dalle piacevoli chiacchierate agli incontri lampo e perfino agli workshop. Venite a creare una community geospaziale variegata e ispirativa con noi a Philadelphia!"
+            },
+            "MapMinnesota": {
+                "name": "MapMinnesota",
+                "description": "Mappatori e appassionati di OpenStreetMap nell’area delle Twin Cities.",
+                "extendedDescription": "Un punto di contatto per gli appassionati di OpenStreetMap del Minnesota e delle Twin Cities!"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mappando DC",
+                "description": "Migliora OpenStreetMap nell'area di DC",
+                "extendedDescription": "Siamo un gruppo di mappatori volontari con l'obiettivo di migliorare OpenStreetMap nell'area di DC. Puntiamo anche a insegnare agli altri l'ecosistema OSM, l'analisi dei dati, la cartografia e GIS. Ci raduniamo ogni altro mese ai meetup per concentrarci su una zona della nostra città."
+            },
+            "Maptime-ME-meetup": {
+                "name": "MaptimeME",
+                "description": "Mappatori e utenti OpenStreetMap nei dintorni di Portland, Maine",
+                "extendedDescription": "Maptime è letteralmente tempo per la mappatura. La nostra missione è quella di aprire le porte della cartografia a chiunque sia interessato, creando un posto e dei momenti per l’apprendimento collaborativo, l’esplorazione, la creazione di mappe usando strumenti e tecnologie per la mappatura."
+            },
+            "OpenCleveland-meetup": {
+                "name": "Open Cleveland",
+                "description": "Miglioriamo OpenStreetMap nell’area di Cleveland",
+                "extendedDescription": "Open Geo Cleveland mira a diventare una risorsa per le persone che vogliano discutere e condividere le proprie conoscenze su come utilizzare i dati geografici liberi, nella fattispecie OpenStreetMap, e di software geospaziale aperto che gestisce, modifica e mostra su schermo dati geografici, e spinge per il loro utilizzo nell’Ohio del nord-est. Siamo anche un chapter di maptime =)"
+            },
+            "OSM-Boston": {
+                "name": "OpenStreetMap di Boston",
+                "description": "Mappatori e utenti di OpenStreetMap che risiedono nell’area di Boston",
+                "extendedDescription": "OpenStreetMap è una mappa libera e aperta, simile ad una mappa del mondo in stile Wikipedia, con centinaia di migliaia di contributi ogni giorno da persone come te. Modificare la mappa è semplice e divertente! Unisciti a noi sia da casa che all’aperto, nel nostro obiettivo di creare la miglior mappa dell’area di Boston e del resto del mondo!"
+            },
+            "OSM-Central-Salish-Sea": {
+                "name": "OpenStreetMap, mar dei Salish centrale",
+                "description": "Mappatori e utenti di OpenStreetMap nei dintorni di Mount Vernon, nello stato di Washington",
+                "extendedDescription": "OpenStreetMap è la mappa del mondo creata da persone come te. È una mappa che tu puoi costruire e che è gratis come Wikipedia. Vai su osm.org per altre informazioni. Noi ci riuniamo sempre per parlare di mappe, mappare e divertirci!"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "Gruppo utenti OpenStreetMap di Chattanooga"
+            },
+            "OSM-Colorado": {
+                "name": "OpenStreetMap del Colorado",
+                "description": "Mappatori e utenti OpenStreetMap dello stato del Colorado, USA",
+                "extendedDescription": "OpenStreetMap (OSM) del Colorado è una collaborazione locale di persone interessate a usare le proprie forze per creare mappe libere. Noi incoraggiamo i nostri mappatori ad organizzare e suggerire eventi di mappatura ovunque nel nostro stato. Attività di incontro come per esempio semplici riunioni, lezioni di OSM dal principiante all’intermedio oppure feste di mappatura in compagnia."
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap NYC",
+                "description": "Mappatori e utenti OpenStreetMap, sviluppatori e appassionati nell'area Metropolitana di New York"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland",
+                "description": "Mappatori e utenti OpenStreetMap nell'area di Portland",
+                "extendedDescription": "OpenStreetMap (OSM) è una cartina del pianeta costruita da persone come te. È una mappa che puoi modificare, distribuita gratuitamente come Wikipedia. Vai su osm.org per saperne di più e vieni ai nostri meetup per discutere di mappe, contribuire a OSM e divertirti!"
+            },
+            "OSM-Seattle": {
+                "name": "OpenStreetMap di Seattle",
+                "description": "Mappatori e utenti OpenStreetMap nell’area di Seattle"
+            },
+            "OSM-SoCal": {
+                "name": "OpenStreetMap della California del sud",
+                "description": "Divertiamoci, contribuiamo con qualunque cosa a Los Angeles e impariamo a mappare!",
+                "extendedDescription": "OpenStreetMap (OSM) della California del sud è per chiunque sia interessato a mappare insieme agli altri lavorando con OpenStreetMap. OpenStreetMap, la Wikipedia delle mappe, è la mappa del mondo open-source libera creata da più di un milione di volontari per tutto il globo. Chiunque è ben accetto. Se non conosci OpenStreetMap, te la insegneremo noi. Se hai un’idea per un progetto di mappatura oppure una gita sul campo che il nostro gruppo può effettuare, perfetto!"
+            },
+            "OSM-South-Bay": {
+                "name": "OSM di South Bay",
+                "description": "Serate della mappa ospitate da \"Programmare per San Jose\"",
+                "extendedDescription": "Programmare per San Jose, la filiale locale della brigata di Programmare per l’America, ospita ogni mese di giovedì una serata per la mappa nei sobborghi di San José. Incontra altri mappatori della South Bay, aiutaci con i progetti di mappatura locale e vieni a conoscenza di altri progetti di tecnologia civica. Non è richiesto né saper programmare né sapere cosa sia un GIS."
+            },
+            "OSM-Tampa-Bay": {
+                "name": "OpenStreetMap di Tampa Bay",
+                "description": "Mappatori e utenti OpenStreetMap dell’area di Tampa Bay",
+                "extendedDescription": "Gruppo OSM di Tampa Bay per riunire residenti locali e riuscire a costruire la mappa definitiva di Tampa Bay con OpenStreetMap, la mappa del mondo libera e modificabile. Se ti interessano le mappe, i dati, l’open source, il GPS, le passeggiate, pedalare, etc., ti piacerà da impazzire lavorare con OpenStreetMap - perciò unisciti a noi! Ci incontreremo e mapperemo e discuteremo di nuovi argomenti più o meno una volta al mese."
+            },
+            "OSM-US-Slack": {
+                "name": "Slack Americano di OpenStreetMap",
+                "description": "Sono tutti i benvenuti! Registrati all'indirizzo {signupUrl}"
+            },
+            "OSM-US": {
+                "name": "OpenStreetMap degli Stati Uniti",
+                "description": "Aiutiamo a crescere e migliorare OpenStreetMap negli Stati Uniti.",
+                "extendedDescription": "Supportiamo OpenStreetMap organizzando conferenze annuali, producendo risorse per la comunità, costruendo relazioni e diffondendo la voce. Unisciti a OpenStreetMap degli Stati Uniti qui: {signupUrl}"
+            },
+            "OSM-Utah": {
+                "name": "OpenStreetMap dello Utah",
+                "description": "Mappaori e utenti OpenStreetMap dell’area di Salt Lake City",
+                "extendedDescription": "Le attività comprendono cose come lezioni per imparare a mappare, feste di mappatura e uscite all’aperto per la raccolta di dati. Gli eventi avverranno nell’area SLC, almemmo all’inizio. Stiamo cercando sia mappatori esperti che alle prime armi. Unisciti e andiamo a mappare!"
+            },
+            "OSM-Wyoming": {
+                "name": "OpenStreetMap del Wyoming",
+                "description": "Mappatori e utenti OpenStreetMap dello stato del Wyoming",
+                "extendedDescription": "OpenStreetMap (OSM) del Wyoming è una collaborazione local formata da perrsone interessate a unire i loro sforzi per creare mappe libere. Incoraggiamo tutti i nostri mappatori a organizzare o suggerire eventi di mappatura ovunque nello stato. Attività di gruppo sono per esempio incontri, lezioni di OSM dal principiante all’intrmedio, oppure feste di mappatura in compagnia."
+            },
+            "PHXGeo-meetup": {
+                "name": "Meetup PHXGeo",
+                "description": "Mappatori e utenti OpenStreetMap di Phoenix (area Arizona)",
+                "extendedDescription": "Questo è un gruppo meetup per i residenti nell’area di Phoenix a cui piacciono le mappe, GIS, OpenStreetMap e cartografia in tutte le loro combinazioni."
+            },
+            "PHXGeo-twitter": {
+                "name": "Twitter PHXGeo",
+                "description": "Seguici su Twitter all’indirizzo {url}"
+            },
+            "Western-Slope-facebook": {
+                "name": "Facebook di OSM Western Slope",
+                "description": "Mappatori e utenti OpenStreetMap attorno a Grand Junction (Colorado)"
+            },
+            "Western-Slope-meetup": {
+                "name": "Meetup di OSM di Western Slope",
+                "description": "Mappatori e utenti OpenStreetMap intorno a Grand Junction (Colorado)",
+                "extendedDescription": "L’obiettivo di questo gruppo è quello di introdurre la comunità a OpenStreetMap, sviluppare una gruppo di mappatori, creare i più strabilianti dati georiferiti utilizzando qualsiasi metodo possibile e infine studiare dei metodi che permettano a questi dati di ritornare nella nostra comunità. Immagina un segnale dei percorsi accurato! Immagine un’ulteriore sviluppo delle piste ciclabili! Immagina qualsiasi cosa, quello è il bello di OpenStreetMap!"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Slack di Australia Maptime",
+                "description": "Registrati all'indirizzo {signupUrl}"
+            },
+            "talk-au": {
+                "name": "Mailinglist talk-au",
+                "description": "Un posto dove i mappatori australiani possono conversare liberamente"
+            },
+            "OSM-AR-facebook": {
+                "name": "Facebook di OpenStreetMap dell’Argentina",
+                "description": "Unisciti alla comunità su Facebook di OpenStreetMap dell’Argentina",
+                "extendedDescription": "Unisciti alla comunità per saperne di più su OpenStreetMap, fare domande e partecipare alle nostre riunioni. Chiunque è benvenuto!"
+            },
+            "OSM-AR-forum": {
+                "name": "Forum web di OpenStreetMap dell’Argentina",
+                "description": "Unisciti al forum web di OpenStreetMap dell’Argentina",
+                "extendedDescription": "Unisciti alla comunità per saperne di più su OpenStreetMap, fare domande e partecipare alle nostre riunioni. Chiunque è benvenuto!"
+            },
+            "OSM-AR-irc": {
+                "name": "IRC di OpenStreetMap dell’Argentina",
+                "description": "Entra su #osm-ar nel server irc.oftc.net (porta 6667)"
+            },
+            "OSM-AR-mailinglist": {
+                "name": "Mailinglist talk-ar",
+                "description": "Una mailinglist per parlare di OpenStreetMap dell’Argentina"
+            },
+            "OSM-AR-telegram": {
+                "name": "Telegram di OpenStreetMap dell’Argentina",
+                "description": "Unisciti alla comunità su Telegram di OpenStreetMap dell’Argentina",
+                "extendedDescription": "Unisciti alla comunità per saperne di più su OpenStreetMap, fare domande e partecipare alle nostre riunioni. Chiunque è benvenuto!"
+            },
+            "OSM-AR-twitter": {
+                "name": "Twitter di OpenStreetMap dell’Argentina",
+                "description": "Seguici su Twitter all’url {url}"
+            },
+            "Bahia-telegram": {
+                "name": "Gruppo Telegram di OpenStreetMap di Bahia",
+                "description": "Unisciti alla comunità OpenStreetMap di Bahia su Telegram",
+                "extendedDescription": "Unisciti alla comunità per saperne di più su OpenStreetMap, fare domande e partecipare alle nostre riunioni. Chiunque è il benvenuto!"
+            },
+            "OSM-br-mailinglist": {
+                "name": "Mailinglist talk-br",
+                "description": "Una mailinglist per discutere di OpenStreetMap in Brasile"
+            },
+            "OSM-br-telegram": {
+                "name": "Telegram di OpenStreetMap del Brasile",
+                "description": "Unisciti alla comunità brasiliana di OpenStreetMap su Telegram",
+                "extendedDescription": "Unisciti alla comunità per saperne di più su OpenStreetMap, fare domande e partecipare alle nostre riunioni. Chiunque è il benvenuto!"
+            },
+            "OSM-br-twitter": {
+                "name": "Twitter di OpenStreetMap del Brasile",
+                "description": "Seguici su Twitter su {url}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap su Reddit",
+                "description": "/r/openstreetmap/ è il posto perfetto per imparare di più su OpenStreetMap. Chiedici di tutto!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/ja.json b/dist/locales/ja.json
index c453c1a77..4c19796d4 100644
--- a/dist/locales/ja.json
+++ b/dist/locales/ja.json
@@ -1,5 +1,10 @@
 {
     "ja": {
+        "icons": {
+            "information": "情報",
+            "remove": "削除",
+            "undo": "もとに戻す"
+        },
         "modes": {
             "add_area": {
                 "title": "エリア",
@@ -1802,7 +1807,7 @@
                     "placeholder": "example@example.com"
                 },
                 "embankment": {
-                    "label": "種別",
+                    "label": "種類",
                     "placeholder": "デフォルト"
                 },
                 "emergency": {
@@ -1814,6 +1819,9 @@
                 "except": {
                     "label": "例外"
                 },
+                "faces": {
+                    "label": "面数"
+                },
                 "fax": {
                     "label": "FAX",
                     "placeholder": "+31 42 123 4567"
@@ -1944,6 +1952,9 @@
                 "indoor": {
                     "label": "室内"
                 },
+                "industrial": {
+                    "label": "種類"
+                },
                 "information": {
                     "label": "種類"
                 },
@@ -2064,6 +2075,10 @@
                     "label": "最高速度",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "label": "安全速度",
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "最大利用時間"
                 },
@@ -2505,7 +2520,7 @@
                     "placeholder": "不明"
                 },
                 "structure_waterway": {
-                    "label": "トンネルの種別",
+                    "label": "トンネルの種類",
                     "options": {
                         "tunnel": "トンネル"
                     },
@@ -2652,8 +2667,19 @@
                     "label": "種類",
                     "placeholder": "デフォルト"
                 },
+                "usage_rail": {
+                    "label": "用途の種類",
+                    "options": {
+                        "branch": "支線",
+                        "industrial": "産業貨物用",
+                        "main": "幹線",
+                        "military": "軍事用",
+                        "test": "試験用",
+                        "tourism": "観光用"
+                    }
+                },
                 "vending": {
-                    "label": "販売商品の種類"
+                    "label": "商品の種類"
                 },
                 "visibility": {
                     "label": "見える範囲",
@@ -2833,6 +2859,10 @@
                     "name": "空港ターミナル",
                     "terms": "空港ターミナル"
                 },
+                "allotments/plot": {
+                    "name": "市民農園の区画",
+                    "terms": "区画, 市民農園, 市民農園の区画, 一画, 農園, 菜園, 市民菜園, 農業, 畑, 農園, コミュニティガーデン"
+                },
                 "amenity": {
                     "name": "施設"
                 },
@@ -3061,6 +3091,10 @@
                     "name": "市場",
                     "terms": "市場, マーケット, 朝市, マルシェ, 食品, 雑貨, 買い物, ショッピング, 食べ物"
                 },
+                "amenity/monastery": {
+                    "name": "修道院",
+                    "terms": "修道院, 宗教, 僧院, 信仰"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "オートバイの駐車場",
                     "terms": "バイクの駐車場, 二輪駐車場, 二輪駐輪場, 駐車場, 駐輪場"
@@ -3265,6 +3299,10 @@
                     "name": "たばこ自動販売機",
                     "terms": "たばこ, 自動販売機, 自販機, 嗜好品, タバコ"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "コーヒー自販機",
+                    "terms": "コーヒー, 珈琲, 自販機, 自動販売機"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "コンドーム自動販売機",
                     "terms": "コンドーム, 自動販売機, 自販機"
@@ -3273,6 +3311,14 @@
                     "name": "飲料自動販売機",
                     "terms": "飲料, ジュース, 酒, 飲み物, 自動販売機, 自販機"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "電子機器自販機",
+                    "terms": "電子機器, チャージャー, ケーブル, ヘッドフォン, 自販機, 自動販売機"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "記念コイン自販機",
+                    "terms": "記念コイン, 自販機, 自動販売機"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "犬の糞入れ自動販売機",
                     "terms": "犬の糞入れ, 自動販売機, 自販機"
@@ -3281,6 +3327,18 @@
                     "name": "生理用品自動販売機",
                     "terms": "生理用品自動販売機, 自販機, 自動販売機"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "食品自販機",
+                    "terms": "食品, 食べ物, 自販機, 自動販売機"
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "自動車用燃料自販機",
+                    "terms": "自動車用燃料, 燃料, 自販機, 自動販売機, ガソリン, プロパン, 液化ガス, 軽油"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "アイスクリーム自販機",
+                    "terms": "アイスクリーム, 自販機, 自動販売機"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "新聞自動販売機"
                 },
@@ -3300,6 +3358,10 @@
                     "name": "切符販売機",
                     "terms": "券売機, 自動券売機, 自動販売機, 自販機, 自動発券機, 発券機"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "切手自販機",
+                    "terms": "切手, 自販機, 自動販売機, 郵便"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "菓子販売機",
                     "terms": "菓子,お菓子, スナック, 自動販売機, 自販機"
@@ -4103,6 +4165,10 @@
                     "name": "自動車専用道路の接続路",
                     "terms": "自動車専用道路, 接続路, 車道, 幹線, 公道"
                 },
+                "highway/passing_place": {
+                    "name": "待避所",
+                    "terms": "待避所, 退避エリア"
+                },
                 "highway/path": {
                     "name": "小道（自動車通行不可）",
                     "terms": "小道, 歩道, 自転車道, バイク"
@@ -4462,6 +4528,10 @@
                     "name": "ゲームセンター",
                     "terms": "ゲームセンター, ゲーセン, 娯楽, レジャー, 遊技, ゲーム, 遊戯"
                 },
+                "leisure/beach_resort": {
+                    "name": "ビーチリゾート",
+                    "terms": "ビーチリゾート, 行楽地, 観光, 保養, レジャー, 娯楽, リゾート, 海辺, 砂浜"
+                },
                 "leisure/bird_hide": {
                     "name": "野鳥観察舎",
                     "terms": "ハイド, 野鳥観察小屋, アウトドア"
@@ -4578,6 +4648,10 @@
                     "name": "自然保護区",
                     "terms": "自然保護区"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "屋外食事席エリア",
+                    "terms": "屋外席エリア, 屋外席, テラス, 食事, 屋外食事席エリア"
+                },
                 "leisure/park": {
                     "name": "公園",
                     "terms": "公園, アウトドア, 広場, 運動公園"
@@ -4604,7 +4678,7 @@
                 },
                 "leisure/pitch/beachvolleyball": {
                     "name": "ビーチバレーコート",
-                    "terms": "ビーチバレーコート, スポーツ, 運動, 競技"
+                    "terms": "ビーチバレーコート, スポーツ, 運動, 競技, 砂浜"
                 },
                 "leisure/pitch/boules": {
                     "name": "ブールスポーツ",
@@ -4706,6 +4780,10 @@
                     "name": "坑口",
                     "terms": "坑口, 坑道"
                 },
+                "man_made/antenna": {
+                    "name": "アンテナ",
+                    "terms": "アンテナ, 通信, テレビ"
+                },
                 "man_made/breakwater": {
                     "name": "防波堤",
                     "terms": "防波堤"
@@ -4757,6 +4835,10 @@
                     "name": "監視塔",
                     "terms": "監視塔"
                 },
+                "man_made/observatory": {
+                    "name": "観測ドーム",
+                    "terms": "観測ドーム, 観測所"
+                },
                 "man_made/petroleum_well": {
                     "name": "油田",
                     "terms": "油田"
@@ -4881,6 +4963,10 @@
                     "name": "荒地",
                     "terms": "荒地, 植物"
                 },
+                "natural/mud": {
+                    "name": "泥地",
+                    "terms": "泥地, 泥"
+                },
                 "natural/peak": {
                     "name": "山頂",
                     "terms": "山頂, 頂"
@@ -5917,6 +6003,10 @@
                     "name": "ペットショップ",
                     "terms": "ペット売り場, ペット, 家禽, ペットショップ, 動物"
                 },
+                "shop/pet_grooming": {
+                    "name": "ペット美容室",
+                    "terms": "ペット美容室, 動物美容, ペット, 美容, 犬の美容室, 愛犬美容, 犬, 猫"
+                },
                 "shop/photo": {
                     "name": "写真店",
                     "terms": "写真屋, 写真店, 現像, ビデオ, デジカメ"
@@ -6228,8 +6318,12 @@
                     "terms": "右折専用, 右折のみ"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "直進のみ可",
-                    "terms": "直進のみ可"
+                    "name": "直進専用",
+                    "terms": "直進専用, 直進のみ"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Uターン専用",
+                    "terms": "Uターン専用, Uターンのみ"
                 },
                 "type/route": {
                     "name": "ルート",
@@ -6421,7 +6515,7 @@
                     "text": "規約 & フィードバック"
                 },
                 "description": "おそらくEsriデフォルトのレイヤより明瞭で正確、しかしやや古いEsriアーカイブ画像。（日本での違いは不明）",
-                "name": "Esri World Imagery(鮮明版)ベータ"
+                "name": "Esri World Imagery(精細版)ベータ"
             },
             "MAPNIK": {
                 "attribution": {
@@ -6524,7 +6618,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Basemap of Austria, based on goverment data.",
+                "description": "オーストリアのベースマップ、政府データに基づく。",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6586,7 +6680,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Map tiles by Stamen Design, under CC BY 3.0"
+                    "text": "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL"
                 },
                 "name": "Stamen 地形図"
             },
@@ -6602,6 +6696,234 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap India - Participatory neighborhood mapping",
+                "description": "Improve OpenStreetMap in India",
+                "extendedDescription": "Mapping in India? Have questions, want to connect with the community here? Join us at {Url}. All are welcome!"
+            },
+            "OSM-japan-facebook": {
+                "name": "OpenStreetMap 日本コミュニティ",
+                "description": "日本のマッパーとOpenStreetMap ユーザー"
+            },
+            "OSM-japan-mailinglist": {
+                "name": "OpenStreetMap 日本メーリングリスト",
+                "description": "Talk-ja は日本コミュニティ向けの公式メーリングリストです"
+            },
+            "OSM-japan-twitter": {
+                "name": "OpenStreetMap 日本のTwitter",
+                "description": "Twitterでのハッシュタグ: {url}"
+            },
+            "OSM-PH-facebook": {
+                "name": "OpenStreetMap PH Facebook",
+                "description": "Welcome to OpenStreetMap Philippines, where we encourage all fellow Filipinos to contribute to the OpenStreetMap project."
+            },
+            "OSM-PH-mailinglist": {
+                "name": "Talk-ph Mailing List",
+                "description": "A mailing list to discuss OpenStreetMap in the Philippines"
+            },
+            "OSM-PH-slack": {
+                "name": "OpenStreetMap PH Slack",
+                "description": "All are welcome! Sign up at {signupUrl}"
+            },
+            "OSM-PH-telegram": {
+                "name": "OpenStreetMap PH Telegram",
+                "description": "Un-official, Telegram local community of OpenStreetMap contributors and friends in the Philippines"
+            },
+            "OSM-RU-forum": {
+                "name": "OpenStreetMap RU forum",
+                "description": "OpenStreetMap Russia web forum"
+            },
+            "OSM-RU-telegram": {
+                "name": "OpenStreetMap RU telegram",
+                "description": "OpenStreetMap Russia telegram chat"
+            },
+            "OSM-TW-facebook": {
+                "name": "OpenStreetMap Taiwan Community",
+                "description": "Facebook Group for Mappers and OpenStreetMap users to discuss matters about Taiwan."
+            },
+            "OSM-TW-mailinglist": {
+                "name": "OpenStreetMap Taiwan Mailinglist",
+                "description": "Talk-tw is an Official Mailinglist for the Communities to dicuss matters about Taiwan"
+            },
+            "byosm": {
+                "name": "OpenStreetMap Belarus",
+                "description": "OpenStreetMap Belarus telegram chat"
+            },
+            "talk-cz-mailinglist": {
+                "name": "Talk-cz Mailing List",
+                "description": "Talk-cz is the official mailing list for Czech community"
+            },
+            "OSM-ES-telegram": {
+                "name": "@OSMes on Telegram",
+                "description": "OpenStreetMap Spain Telegram chat"
+            },
+            "OSM-Vancouver-meetup": {
+                "name": "OpenStreetMap Vancouver",
+                "description": "Mappers and OpenStreetMap users in the Vancouver, BC area"
+            },
+            "Bay-Area-OpenStreetMappers": {
+                "name": "Bay Area OpenStreetMappers",
+                "description": "Improve OpenStreetMap in the Bay Area",
+                "extendedDescription": "This group is about growing the OpenStreetMap community here in the Bay Area. Our events are open to everyone, from open source enthusiasts, cyclists, GIS professionals, geocachers, and beyond. Anyone and everyone who is interested in maps, map making and free map data is welcome to join our group as well as attend our events."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "Central Pennsylvania OSM",
+                "description": "Online mapping community based out of State College, PA"
+            },
+            "Code-for-San-Jose-Slack": {
+                "name": "Code for San Jose Slack",
+                "description": "All are welcome! Sign up at {signupUrl}, then join the #osm channel."
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM",
+                "description": "The OpenStreetMap user group for Dallas-Fort Worth",
+                "extendedDescription": "Dallas, Fort Worth, and all the cities in between are abounding with creative and tech-savvy people. The vision for this usergroup is to find new ways to use the amazing resource of OSM."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Meetup for map enthusiasts in the Philadelphia area",
+                "extendedDescription": "GeoPhilly unites developers, geographers, data geeks, open source enthusiasts, civic hackers and map addicts in our shared love of maps and the stories they tell. If you use maps as part of your work or just want to learn more, this is the meetup for you!  Our events aim to be open, friendly, educational and social and range from happy hours to lightning talks or even workshops. Come create a diverse, inspiring geospatial community in the Philadelphia with us!"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapping DC",
+                "description": "Improve OpenStreetMap in the DC area",
+                "extendedDescription": "We are a group of volunteer mappers who aim to improve the OpenStreetMap in the DC area. We also aim to teach others about the OSM ecosystem, data analytics, cartography, and GIS. We gather every other month at meetups to focus on one area of our city."
+            },
+            "Maptime-ME-meetup": {
+                "name": "MaptimeME",
+                "description": "Mappers and OpenStreetMap users, around Portland, ME",
+                "extendedDescription": "Maptime is, rather literally, time for mapmaking.  Our mission is to open the doors of cartographic possibility to anyone interested by creating a time and space for collaborative learning, exploration, and map creation using mapping tools and technologies."
+            },
+            "OpenCleveland-meetup": {
+                "name": "Open Cleveland",
+                "description": "Improve OpenStreetMap in the Cleveland area",
+                "extendedDescription": "Open Geo Cleveland aims to be a resource for people to discuss and share knowledge on utilizing free geographic data sets especially OpenStreetMap, and Open geo-spatial software that manages, edits, and displays geographic data, and advocate for its use in Northeast Ohio. We're also a maptime chapter =)"
+            },
+            "OSM-Boston": {
+                "name": "OpenStreetMap Boston",
+                "description": "Mappers and OpenStreetMap users in the Boston area",
+                "extendedDescription": "OpenStreetMap is the free and open, wiki-style map of the world, with hundreds of thousands of contributions every day from people like you. Editing the map is simple, and fun! Join us both indoors and outdoors in our effort to create the best map of the Boston area and the rest of the world!"
+            },
+            "OSM-Central-Salish-Sea": {
+                "name": "OpenStreetMap Central Salish Sea",
+                "description": "Mappers and OpenStreetMap users around Mount Vernon, WA",
+                "extendedDescription": "OpenStreetMap is an map of the world made by people like you. It's a map that you build, that's given away for free like wikipedia. Check out osm.org for more. We meet all the time to talk maps, make maps and have fun!"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "The OpenStreetMap user group for Chattanooga"
+            },
+            "OSM-Colorado": {
+                "name": "OpenStreetMap Colorado",
+                "description": "Mappers and OpenStreetMap users in the state of Colorado, USA",
+                "extendedDescription": "OpenStreetMap (OSM) Colorado is a local collaboration of people interested in contributing their efforts to create free maps. We encourage all of our mappers to organize or suggest mapping events throughout the state. Meetup activities can be simple social mixers, OSM basic to advanced training, or community mapping parties."
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap NYC",
+                "description": "Mappers and OpenStreetMap users, developers and enthusiasts in the New York Metropolitan area"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland",
+                "description": "Mappers and OpenStreetMap users in the Portland area",
+                "extendedDescription": "OpenStreetMap (OSM) is a map of the world made by people like you. It's a map that you build, that's given away for free like wikipedia. Check out osm.org for more, and come join us at a meetup to talk maps, contribute to OSM, and have fun!"
+            },
+            "OSM-Seattle": {
+                "name": "OpenStreetMap Seattle",
+                "description": "Mappers and OpenStreetMap users in the Seattle area"
+            },
+            "OSM-SoCal": {
+                "name": "OpenStreetMap Southern California",
+                "description": "Let's have some fun, contribute something to Los Angeles, and learn about mapping!",
+                "extendedDescription": "OpenStreetMap (OSM) Southern California is for anyone interested in mapping to get together to work with OpenStreetMap.  OpenStreetMap, the Wikipedia of maps, is a free open-source map of the world being created by more than 1,000,000 volunteers around the globe.  Everyone is welcome.  If you don't know OpenStreetMap, we'll teach you. If you have an idea for a mapping project or even a field trip that the group can do, great!"
+            },
+            "OSM-South-Bay": {
+                "name": "OSM South Bay",
+                "description": "Map Nights hosted by Code for San Jose",
+                "extendedDescription": "Code for San Jose, the local Code for America brigade, hosts monthly Map Nights on Thursday nights in downtown San José. Meet fellow South Bay mappers, help out with local mapping projects, and hear about other civic tech projects. Programming and GIS skills are not required."
+            },
+            "OSM-Tampa-Bay": {
+                "name": "OpenStreetMap Tampa Bay",
+                "description": "Mappers and OpenStreetMap users in the Tampa Bay area",
+                "extendedDescription": "OSM Tampa Bay group for local residents to get together and build out the definitive map of Tampa Bay with OpenStreetMap, the free and editable map of the world.  If you're into maps, data, open source, GPS, hiking, cycling, et cetera, you'll love working with OpenStreetMap -- so join in! We'll get together and map and talk about new topics once-a-month or so."
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap US Slack",
+                "description": "All are welcome! Sign up at {signupUrl}"
+            },
+            "OSM-US": {
+                "name": "OpenStreetMap US",
+                "description": "We help grow and improve OpenStreetMap in the United States.",
+                "extendedDescription": "We support OpenStreetMap by holding annual conferences, providing community resources, building partnerships, and by spreading the word. Join OpenStreetMap US here: {signupUrl}"
+            },
+            "OSM-Utah": {
+                "name": "OpenStreetMap Utah",
+                "description": "Mappers and OpenStreetMap users in the Salt Lake City area",
+                "extendedDescription": "Activities may include things like Learn To Map workshops, mapping parties and outdoor data collection. The events will take place in the SLC area, at least initially.  We are looking for seasoned mappers as well as people new to OSM. Join and let's do some mapping!"
+            },
+            "OSM-Wyoming": {
+                "name": "OpenStreetMap Wyoming",
+                "description": "Mappers and OpenStreetMap users in the state of Wyoming",
+                "extendedDescription": "OpenStreetMap (OSM) Wyoming is a local collaboration of people interested in contributing their efforts to create free maps. We encourage all of our mappers to organize or suggest mapping events throughout the state. Meetup activities can be simple social mixers, OSM basic to advanced training, or community mapping parties."
+            },
+            "PHXGeo-meetup": {
+                "name": "PHXGeo Meetup",
+                "description": "Mappers and OpenStreetMap users in the Phoenix, AZ area",
+                "extendedDescription": "This is a meetup group for those in the Phoenix area who like maps, GIS, OpenStreetMap, cartography and anything in between."
+            },
+            "PHXGeo-twitter": {
+                "name": "PHXGeo Twitter",
+                "description": "Follow us on Twitter at {url}"
+            },
+            "Western-Slope-facebook": {
+                "name": "Western Slope OSM Facebook",
+                "description": "Mappers and OpenStreetMap users around Grand Junction, CO"
+            },
+            "Western-Slope-meetup": {
+                "name": "Western Slope OSM Meetup",
+                "description": "Mappers and OpenStreetMap users around Grand Junction, CO",
+                "extendedDescription": "The goal of this group is to introduce OpenStreetMap to the community, develop a community of mappers, create the most amazing geodata possible using whatever method we can and finally strategize in order to get this data out into our community. Imagine accurate trail signage! Imagine further development of bike paths! Imagine anything you want, that's the joy of OpenStreetMap!"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Maptime Australia Slack",
+                "description": "Sign up at {signupUrl}"
+            },
+            "talk-au": {
+                "name": "Talk-au Mailing List",
+                "description": "Place for Aussie mappers to chat"
+            },
+            "OSM-AR-facebook": {
+                "name": "OpenStreetMap Argentina Facebook",
+                "description": "Join the OpenStreetMap Argentina community on Facebook",
+                "extendedDescription": "Join the community to learn more about OpenStreetMap, ask questions or participate in our meetings. Everyone is welcome!"
+            },
+            "OSM-AR-forum": {
+                "name": "OpenStreetMap Argentina web forum",
+                "description": "Join the OpenStreetMap Argentina web forum",
+                "extendedDescription": "Join the community to learn more about OpenStreetMap, ask questions or participate in our meetings. Everyone is welcome!"
+            },
+            "OSM-AR-irc": {
+                "name": "OpenStreetMap Argentina IRC",
+                "description": "Join #osm-ar on irc.oftc.net (port 6667)"
+            },
+            "OSM-AR-mailinglist": {
+                "name": "Talk-ar Mailing List",
+                "description": "A mailing list to discuss OpenStreetMap in Argentina"
+            },
+            "OSM-AR-telegram": {
+                "name": "OpenStreetMap Argentina Telegram",
+                "description": "Join the OpenStreetMap Argentina community on Telegram",
+                "extendedDescription": "Join the community to learn more about OpenStreetMap, ask questions or participate in our meetings. Everyone is welcome!"
+            },
+            "OSM-AR-twitter": {
+                "name": "OpenStreetMap Argentina Twitter",
+                "description": "Follow us on Twitter at {url}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap on Reddit",
+                "description": "/r/openstreetmap/ is a great place to learn more about OpenStreetMap.  Ask us anything!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/ko.json b/dist/locales/ko.json
index a44710b61..2646fd103 100644
--- a/dist/locales/ko.json
+++ b/dist/locales/ko.json
@@ -1,5 +1,10 @@
 {
     "ko": {
+        "icons": {
+            "information": "정보",
+            "remove": "제거",
+            "undo": "실행 취소"
+        },
         "modes": {
             "add_area": {
                 "title": "공간",
@@ -25,6 +30,9 @@
             },
             "draw_line": {
                 "tail": "선에 더 많은 노드를 추가하려면 클릭하세요. 다른 선을 노드로 연결하려면 다른 선을 클릭하고 선을 끝내려면 더블 클릭하세요."
+            },
+            "drag_node": {
+                "connected_to_hidden": "이것은 숨겨진 지뭃에 연결되어 있기 때문에 편집할 수 없습니다."
             }
         },
         "operations": {
@@ -288,6 +296,16 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "거리",
+                "via_node_only": "노드 전용"
+            },
+            "help": {
+                "select_from": "{from} 분절을 선택하려면 클릭하세요.",
+                "select_from_name": "{from}{fromName}을(를) 선택하려면 클릭하십시요"
+            }
+        },
         "undo": {
             "tooltip": "실행 취소: {action}",
             "nothing": "실행 취소할 것이 없습니다."
@@ -673,7 +691,8 @@
             "view_on_mapillary": "Mapillary에서 이 그림 보기"
         },
         "openstreetcam_images": {
-            "tooltip": "OpenStreetCam의 거리수준 사진"
+            "tooltip": "OpenStreetCam의 거리수준 사진",
+            "title": "사진 겹치기 (OpenStreetCam)"
         },
         "openstreetcam": {
             "view_on_openstreetcam": "OpenStreetCam에서 이 사진 보기"
@@ -704,7 +723,11 @@
             "editing": {
                 "title": "편집 & 저장하기",
                 "select_h": "선택",
+                "select_left_click": "{leftclick}마우스 왼쪽키는 지물을 선택할 때 사용합니다. 선택됬을경우, 지물이 강조처리되고, 이름이나 주소와 같은 지물에 대한 정보가 사이드바에 표시됩니다. ",
+                "select_right_click": "{rightclick} 마우스 오른쪽 키는 회전, 이동, 삭제와 같은 지물에 대한 편집 메뉴를 표시합니다. ",
                 "multiselect_h": "여러 선택",
+                "multiselect_shift_click": "`{shift}`+{leftclick} 여러 지물들을 같이 선택합니다. 여러 물체들을 쉽게 삭제하거나 옮길 수 있습니다.",
+                "multiselect_lasso": "여러 지물들을 선택할 수 있는 다른 방법은 `{shift}`키를 누른 상태로 {leftclick} 마우스 왼쪽 버튼으로 선택할 지물들을 묶는 것입니다. 이 경우, 올가미 내의 모든 점들이 선택됩니다.",
                 "undo_redo_h": "되돌리기 & 복구하기",
                 "save_h": "저장",
                 "upload_h": "업로드",
@@ -1782,6 +1805,9 @@
                     "label": "제한 속도",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "최대 투숙일수"
                 },
@@ -2328,6 +2354,7 @@
                     "label": "유형"
                 },
                 "traffic_signals/direction": {
+                    "label": "방향",
                     "options": {
                         "backward": "역방향",
                         "both": "둘 다 / 모두",
@@ -2366,6 +2393,9 @@
                     "label": "유형",
                     "placeholder": "기본값"
                 },
+                "usage_rail": {
+                    "label": "용도"
+                },
                 "vending": {
                     "label": "상품 종류"
                 },
@@ -2767,6 +2797,9 @@
                     "name": "시장",
                     "terms": "시장"
                 },
+                "amenity/monastery": {
+                    "name": "수도원 부지"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "오토바이 주차장",
                     "terms": "모터사이클 주차장"
@@ -2967,6 +3000,9 @@
                     "name": "담배 자판기",
                     "terms": "담배 자판기, 담배 자동 판매기"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "커피 자판기"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "콘돔 자판기",
                     "terms": "콘돔 자판기, 콘돔 자동 판매기"
@@ -2975,10 +3011,19 @@
                     "name": "음료 자판기",
                     "terms": "음료 자판기, 음료 자동 판매기"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "전자 제품 자판기"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "쓰레기 봉투 자판기",
                     "terms": "쓰레기 봉투 자판기, 쓰레기 봉투 자동 판매기"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "식품 자판기"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "아이스크림 자판기"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "신문 자동판매기"
                 },
@@ -2998,6 +3043,9 @@
                     "name": "1회용 교통카드·승차권 판매기",
                     "terms": "1회용 교통카드·승차권 판매기, 대중교통 티켓 발권기"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "우표 자판기"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "간식 자판기",
                     "terms": "간식 자판기, 과자 자판기"
@@ -4283,6 +4331,9 @@
                     "name": "수평갱",
                     "terms": "횡갱"
                 },
+                "man_made/antenna": {
+                    "name": "안테나"
+                },
                 "man_made/breakwater": {
                     "name": "방파제",
                     "terms": "방파제"
@@ -4334,6 +4385,10 @@
                     "name": "전망대",
                     "terms": "관찰탑, 감시탑"
                 },
+                "man_made/observatory": {
+                    "name": "관측소",
+                    "terms": "천문대,기상대"
+                },
                 "man_made/petroleum_well": {
                     "name": "유정",
                     "terms": "유정"
@@ -4458,6 +4513,9 @@
                     "name": "황무지",
                     "terms": "황무지"
                 },
+                "natural/mud": {
+                    "name": "진흙"
+                },
                 "natural/peak": {
                     "name": "정상",
                     "terms": "봉우리,산꼭대기,정점,첨봉,언덕,산"
@@ -5625,18 +5683,6 @@
                     "name": "유턴 금지",
                     "terms": "유턴 금지"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "좌회전 전용",
-                    "terms": "좌회전 전용"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "우회전 전용",
-                    "terms": "우회전 전용"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "회전 금지",
-                    "terms": "회전 금지"
-                },
                 "type/route": {
                     "name": "노선",
                     "terms": "경로, 노선"
@@ -5663,10 +5709,16 @@
                 "type/route/horse": {
                     "name": "승마 노선"
                 },
+                "type/route/light_rail": {
+                    "name": "경전철 노선"
+                },
                 "type/route/pipeline": {
                     "name": "파이프라인 노선",
                     "terms": "관로 노선,도관 노선"
                 },
+                "type/route/piste": {
+                    "name": "피스트/스키 노선"
+                },
                 "type/route/power": {
                     "name": "전력 노선"
                 },
@@ -5957,9 +6009,6 @@
                 }
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "맵 타일 by Stamen Design, CC BY 3.0 이하"
-                },
                 "name": "Stamen 지형"
             },
             "tf-cycle": {
diff --git a/dist/locales/ku.json b/dist/locales/ku.json
index cb12885d0..cfb02583f 100644
--- a/dist/locales/ku.json
+++ b/dist/locales/ku.json
@@ -2,7 +2,7 @@
     "ku": {
         "modes": {
             "add_area": {
-                "title": "Herêm"
+                "title": "Qad"
             },
             "add_line": {
                 "title": "Xêz"
@@ -23,31 +23,86 @@
                 "title": "Çarçik",
                 "key": "S"
             },
+            "straighten": {
+                "key": "S"
+            },
             "delete": {
                 "title": "Jê bibe"
+            },
+            "disconnect": {
+                "key": "D"
+            },
+            "merge": {
+                "key": "C"
+            },
+            "move": {
+                "key": "M"
+            },
+            "reflect": {
+                "key": {
+                    "long": "T",
+                    "short": "Y"
+                }
             }
         },
         "translate": {
             "localized_translation_name": "Nav"
         },
+        "zoom_in_edit": "Ji bo guherandinê nêzîk bike",
         "login": "têkeve",
         "logout": "derkeve",
         "commit": {
-            "save": "Bar bike",
-            "cancel": "Betal bike"
+            "save": "Bişîne",
+            "cancel": "Betal bike",
+            "deleted": "Hate jêbirin",
+            "created": "Hate afirandin"
+        },
+        "contributors": {
+            "list": "Guherînên {users}",
+            "truncated_list": "Guherînên {users} û {count} yên din"
         },
         "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "source": "Çavkanî",
+                "description": "Danasîn"
+            },
             "history": {
-                "title": "Dîrok"
+                "key": "H",
+                "title": "Dîrok",
+                "version": "Guherto",
+                "edited_by": "Hat guherîn ji alî"
+            },
+            "measurement": {
+                "area": "Qad"
             }
         },
+        "geometry": {
+            "area": "qad"
+        },
+        "geolocate": {
+            "title": "Cihê min nîşan bide"
+        },
         "inspector": {
             "search": "Lêbigere",
+            "feature_list": "Li bireseran bigere",
             "check": {
                 "yes": "Erê",
                 "no": "Na"
             }
         },
+        "map_data": {
+            "title": "Daneyên nexşeyê",
+            "description": "Daneyên nexşeyê"
+        },
+        "save": {
+            "title": "Qeyd bike"
+        },
+        "zoom": {
+            "in": "Nêzîk bike",
+            "out": "Dûr bike"
+        },
         "help": {
             "title": "Alîkarî",
             "help": {
@@ -60,6 +115,232 @@
             "points": {
                 "title": "Nuqte"
             }
+        },
+        "shortcuts": {
+            "key": {
+                "delete": "Jê bibe"
+            },
+            "editing": {
+                "commands": {
+                    "save": "Guherandinan qeyd bike"
+                }
+            }
+        },
+        "presets": {
+            "fields": {
+                "access": {
+                    "types": {
+                        "access": "Hemû"
+                    }
+                },
+                "address": {
+                    "label": "Adrês",
+                    "placeholders": {
+                        "city": "Bajar",
+                        "city!vn": "Bajar/Bajarok",
+                        "conscriptionnumber": "123",
+                        "country": "Welat",
+                        "county!jp": "Navçe",
+                        "district": "Navçe",
+                        "hamlet": "Mezra",
+                        "housenumber": "123",
+                        "province": "Parêzgeh",
+                        "state": "Dewlet",
+                        "street": "Kolan"
+                    }
+                },
+                "aerialway": {
+                    "label": "Cûre"
+                },
+                "aerialway/summer/access": {
+                    "options": {
+                        "exit": "Derkeve"
+                    }
+                },
+                "aeroway": {
+                    "label": "Cûre"
+                },
+                "amenity": {
+                    "label": "Cûre"
+                },
+                "area/highway": {
+                    "label": "Cûre"
+                },
+                "artwork_type": {
+                    "label": "Cûre"
+                },
+                "barrier": {
+                    "label": "Cûre"
+                },
+                "bicycle_parking": {
+                    "label": "Cûre"
+                },
+                "board_type": {
+                    "label": "Cûre"
+                },
+                "boules": {
+                    "label": "Cûre"
+                },
+                "boundary": {
+                    "label": "Cûre"
+                },
+                "bridge": {
+                    "label": "Cûre"
+                },
+                "bunker_type": {
+                    "label": "Cûre"
+                },
+                "castle_type": {
+                    "label": "Cûre"
+                },
+                "club": {
+                    "label": "Cûre"
+                },
+                "construction": {
+                    "label": "Cûre"
+                },
+                "country": {
+                    "label": "Welat"
+                },
+                "craft": {
+                    "label": "Cûre"
+                },
+                "crossing": {
+                    "label": "Cûre"
+                },
+                "cutting": {
+                    "label": "Cûre"
+                },
+                "direction_cardinal": {
+                    "options": {
+                        "E": "Rojhilat",
+                        "ENE": "Rojhilat-bakurê rojhilat",
+                        "ESE": "Rojhilat-başûrê rojhilat",
+                        "N": "Bakur",
+                        "NE": "Bakurê rojava",
+                        "NNE": "Bakur-bakurê rojhilat",
+                        "NNW": "Bakur-bakurê rojava",
+                        "NW": "Bakurê rojava",
+                        "S": "Başûr",
+                        "SE": "Başûrê rojhilat",
+                        "SSE": "Başûr-başûrê rojhilat",
+                        "SSW": "Başûr-başûrê rojava",
+                        "SW": "Başûrê rojava",
+                        "W": "Rojava",
+                        "WNW": "Rojava-bakurê rojava",
+                        "WSW": "Rojava-başûrê rojava"
+                    }
+                },
+                "electrified": {
+                    "options": {
+                        "no": "Na"
+                    }
+                },
+                "embankment": {
+                    "label": "Cûre"
+                },
+                "entrance": {
+                    "label": "Cûre"
+                },
+                "fax": {
+                    "label": "Faks"
+                },
+                "fire_hydrant/type": {
+                    "label": "Cûre",
+                    "options": {
+                        "wall": "Dîwar"
+                    }
+                },
+                "ford": {
+                    "label": "Cûre"
+                },
+                "generator/source": {
+                    "label": "Çavkanî"
+                },
+                "generator/type": {
+                    "label": "Cûre"
+                },
+                "government": {
+                    "label": "Cûre"
+                },
+                "highway": {
+                    "label": "Cûre"
+                },
+                "historic": {
+                    "label": "Cûre"
+                },
+                "information": {
+                    "label": "Cûre"
+                },
+                "internet_access": {
+                    "options": {
+                        "no": "Na",
+                        "yes": "Erê"
+                    }
+                },
+                "lamp_type": {
+                    "label": "Cûre"
+                },
+                "landuse": {
+                    "label": "Cûre"
+                },
+                "leisure": {
+                    "label": "Cûre"
+                },
+                "man_made": {
+                    "label": "Cûre"
+                },
+                "manhole": {
+                    "label": "Cûre"
+                },
+                "map_type": {
+                    "label": "Cûre"
+                },
+                "memorial": {
+                    "label": "Cûre"
+                },
+                "name": {
+                    "label": "Nav"
+                },
+                "oneway_yes": {
+                    "options": {
+                        "no": "Na",
+                        "yes": "Erê"
+                    }
+                },
+                "parking": {
+                    "label": "Cûre"
+                },
+                "place": {
+                    "label": "Cûre"
+                },
+                "power": {
+                    "label": "Cûre"
+                },
+                "second_hand": {
+                    "options": {
+                        "no": "Na",
+                        "yes": "Erê"
+                    }
+                },
+                "takeaway": {
+                    "options": {
+                        "no": "Na",
+                        "yes": "Erê"
+                    }
+                },
+                "trees": {
+                    "label": "Dar"
+                },
+                "wikipedia": {
+                    "label": "Wîkîpediya"
+                }
+            },
+            "presets": {
+                "landuse/forest": {
+                    "name": "Daristan"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/lt.json b/dist/locales/lt.json
index 954d40e7c..54e58143f 100644
--- a/dist/locales/lt.json
+++ b/dist/locales/lt.json
@@ -1538,9 +1538,6 @@
                 "trees": {
                     "label": "Medžiai"
                 },
-                "vending": {
-                    "label": "Prekių tipas"
-                },
                 "visibility": {
                     "label": "Matomumas"
                 },
@@ -3165,18 +3162,6 @@
                     "name": "Jokio apsisukimo",
                     "terms": "Negalima apsisukti"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Sukimas tik į kairę",
-                    "terms": "Tik į kairę"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Sukimas tik į dešinę",
-                    "terms": "Tik į dešinę"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Jokių posūkių",
-                    "terms": "Nėra posūkių"
-                },
                 "type/route": {
                     "name": "Maršrutas",
                     "terms": "Maršrutas"
diff --git a/dist/locales/mg.json b/dist/locales/mg.json
index 106a82ffd..920ca0ce3 100644
--- a/dist/locales/mg.json
+++ b/dist/locales/mg.json
@@ -17,7 +17,7 @@
             },
             "browse": {
                 "title": "Hisava.",
-                "description": "Akisaho ary hangezao ny sarintany."
+                "description": "Akisaho ary hakaikezo ny sarintany."
             },
             "draw_area": {
                 "tail": "Tsindrio raha hampiditra vona eo faritra misy anao. Tsindrio ilay teboka voalohany raha hamarana ny fanoritana faritra."
@@ -204,6 +204,20 @@
                 }
             }
         },
+        "zoom_in_edit": "Hakaikezo raha hanova",
+        "info_panels": {
+            "background": {
+                "zoom": "Hakaiky"
+            }
+        },
+        "zoom": {
+            "in": "Hanakaiky",
+            "out": "Hanalavitra"
+        },
+        "cannot_zoom": "Tsy afaka manalavitra noho izao intsony amin'ity maody ity.",
+        "gpx": {
+            "zoom": "Hanangeza araky ny sosona"
+        },
         "intro": {
             "graph": {
                 "block_number": "<value for addr:block_number>",
@@ -218,6 +232,13 @@
                 "suburb": "<value for addr:suburb>",
                 "countrycode": "mg"
             }
+        },
+        "shortcuts": {
+            "browsing": {
+                "navigation": {
+                    "zoom": "Hanakaiky / Hanalavitra"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/mk.json b/dist/locales/mk.json
index cd42f8143..e3ce0d7b9 100644
--- a/dist/locales/mk.json
+++ b/dist/locales/mk.json
@@ -1457,9 +1457,6 @@
                 "trees": {
                     "label": "Дрва"
                 },
-                "vending": {
-                    "label": "Вид стока"
-                },
                 "visibility": {
                     "label": "Видливост",
                     "options": {
@@ -3993,18 +3990,6 @@
                     "name": "Забранет пресврт",
                     "terms": "<преведете со истозначници или сродни поими на „Забранет пресврт“, одделени со запирки>"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Дозволено вртење само лево",
-                    "terms": "<преведете со истозначници или сродни поими на „Дозволено вртење само лево“, одделени со запирки>"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Дозволено вртење само десно",
-                    "terms": "<преведете со истозначници или сродни поими на „Дозволено вртење само десно“, одделени со запирки>"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Забрането вртење",
-                    "terms": "<преведете со истозначници или сродни поими на „Забрането вртење“, одделени со запирки>"
-                },
                 "type/route": {
                     "name": "Правец",
                     "terms": "<преведете со истозначници или сродни поими на „Правец“, одделени со запирки>"
diff --git a/dist/locales/ms.json b/dist/locales/ms.json
index 179c3192c..14c333830 100644
--- a/dist/locales/ms.json
+++ b/dist/locales/ms.json
@@ -2883,7 +2883,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Petaasas Austria, berdasarkan data kerajaan.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -2944,9 +2943,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Jubin peta oleh Stamen Design, di bawah CC BY 3.0"
-                },
                 "name": "Rupa Bumi Stamen"
             },
             "tf-cycle": {
@@ -2961,6 +2957,57 @@
                 },
                 "name": "Landskap Thunderforest"
             }
+        },
+        "community": {
+            "Bay-Area-OpenStreetMappers": {
+                "name": "OpenStreetMappers Kawasan Teluk",
+                "description": "Perbaiki OpenStreetMap di Kawasan Teluk",
+                "extendedDescription": "Kumpulan ini ialah mengenai memperkembangkan komuniti OpenStreetMap di Kawasan Teluk ini. Acara-acara kami adalah terbuka kepada sesiapa sahaja, dari peminat sumber terbuka, penunggang basikal, profesional GIS, pengcache geo, dan sebagainya. Sesiapa sahaja dan semua orang yang berminat dalam peta, membuat peta, dan data peta percuma adalah dialu-alukan untuk menyertai kumpulan kami serta menghadiri acara-acara kami."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "OSM Pennsylvania Pusat",
+                "description": "Komuniti pemetaan atas talian yang berpusat di luar State College, PA"
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "OSM Dallas-Fort Worth",
+                "description": "Kumpulan pengguna OpenStreetMap bagi Dallas-Fort Worth",
+                "extendedDescription": "Dallas, Fort Worth, dan kesemua bandar di antaranya adalah berlimpah dengan orang-orang yang kreatif dan celik teknologi. Visi kumpulan pengguna ini ialah untuk mencari cara-cara yang baru untuk menggunakan sumber OSM yang hebat."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Pertemuan untuk peminat-peminat peta di kawasan Philadelphia",
+                "extendedDescription": "GeoPhilly menyatukan pemaju, ahli geografi, gek data, peminat sumber terbuka, penggodam awam dan kaki peta dalam perkongsian minat kita tentang peta dan cerita-cerita yang dikongsi sama. Jika anda menggunakan peta sebagai sebahagian dari kerja anda atau hanya untuk mempelajari dengan lebih lanjut, ini ialah pertemuan untuk anda! Acara kami bertujuan untuk menjadi terbuka, mesra, berpendidikan dan bersosial dan berjulat dari jam gembira kepada ceramah kilat atau malah bengkel. Datanglah untuk mencipta komuniti yang berpelbagai, berinspirasi di Philadelphia dengan kami!"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Memeta DC",
+                "description": "Perbaiki OpenStreetMap di kawasan DC",
+                "extendedDescription": "Kami ialah sebuah kumpulan pemeta sukarela yang bertujuan untuk memperbaiki OpenStreetMap di kawasan DC. Kami juga berhasrat untuk mengajar yang lain tentang ekosistem OSM, penganalisaan data, kartografi, dan GIS. Kami berkumpul setiap bulan yang lain dalam pertemuan untuk memfokuskan pada satu kawasan bandar kami."
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "Kumpulan pengguna OpenStreetMap bagi Chattanooga"
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap NYC",
+                "description": "Pemeta dan pengguna OpenStreetMap, pemaju dan peminat di kawasan Metropolitan New York"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland",
+                "description": "Pemeta dan pengguna OpenStreetMap di kawasan Portland",
+                "extendedDescription": "OpenStreetMap (OSM) ialah sebuah peta dunia yang dibuat oleh orang-orang seperti anda. Ianya sebuah peta yang anda buat, diberi secara percuma seperti wikipedia. Lihat osm.org bagi yang lanjut, dan datang sertai kami pada pertemuan untuk berbincang tentang peta, menyumbang ke OSM, dan berseronok!"
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap US Slack",
+                "description": "Semua dialu-alukan hadir! Daftar di {signupUrl}"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Maptime Australia Slack",
+                "description": "Daftar di {signupUrl}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap di Reddit",
+                "description": "/r/openstreetmap/ ialah sebuah tempat yang hebat untuk mempelajari lebih lanjut tentang OpenStreetMap. Tanya apa sahaja kepada kami!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/nl.json b/dist/locales/nl.json
index b356713d1..5da7f3d71 100644
--- a/dist/locales/nl.json
+++ b/dist/locales/nl.json
@@ -2565,9 +2565,6 @@
                     "label": "Type",
                     "placeholder": "Standaard"
                 },
-                "vending": {
-                    "label": "Soort waren"
-                },
                 "visibility": {
                     "label": "Zichtbaarheid",
                     "options": {
@@ -6010,18 +6007,6 @@
                     "name": "Niet omkeren",
                     "terms": "geen U-bocht,U-bocht verboden,omkeren verboden,omdraaien verboden,verboden om te draaien,verboden om te keren,niet omdraaien,niet keren,verboden te keren,keren verboden"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Enkel links afslaan",
-                    "terms": "verplicht links afslaan,links afslaan verplicht,enkel links inslaan,verplicht links inslaan,links inslaan verplicht"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Enkel rechts afslaan",
-                    "terms": "verplicht rechts afslaan,rechts afslaan verplicht,enkel rechts inslaan,verplicht rechts inslaan,rechts inslaan verplicht"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Enkel rechtdoor",
-                    "terms": "rechtdoor,niet draaien,niet afslaan,niet inslaan,draaien verboden,afslaan verboden,draaien verboden"
-                },
                 "type/route": {
                     "name": "Route"
                 },
@@ -6313,7 +6298,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Basiskaart van Oostenrijk, gebaseerd op overheidsgegevens.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6374,9 +6358,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Kaarttegels door Stamen Design, onder CC BY 3.0"
-                },
                 "name": "Stamen Terrein"
             },
             "tf-cycle": {
diff --git a/dist/locales/no.json b/dist/locales/no.json
index 180409044..4b3e76996 100644
--- a/dist/locales/no.json
+++ b/dist/locales/no.json
@@ -2917,15 +2917,6 @@
                 "type/restriction/no_u_turn": {
                     "name": "Ingen U-sving"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Påbudt venstresving"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Påbudt høyresving"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Ikke tillatt å snu"
-                },
                 "type/route": {
                     "name": "Rute"
                 },
diff --git a/dist/locales/pl.json b/dist/locales/pl.json
index 1a315e533..3781b7f43 100644
--- a/dist/locales/pl.json
+++ b/dist/locales/pl.json
@@ -1,5 +1,8 @@
 {
     "pl": {
+        "icons": {
+            "undo": "Cofnij"
+        },
         "modes": {
             "add_area": {
                 "title": "Obszar",
@@ -288,6 +291,16 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "via": "Przez"
+            },
+            "help": {
+                "from": "Z",
+                "via": "PRZEZ",
+                "to": "DO"
+            }
+        },
         "undo": {
             "tooltip": "Cofnij: {action}",
             "nothing": "Nie ma nic do cofnięcia."
@@ -765,6 +778,13 @@
                 "using": "By użyć śladu GPS do mapowania, przeciągnij i upuść plik GPX na mapę edytora. Jeśli zostanie on rozpoznany, pojawi się na niej jako jasno-purpurowa linia. Kliknij na {data} **Dane mapy** po prawej stronie by włączyć, wyłączyć lub przybliżyć widok twojego śladu GPS.",
                 "tracing": "Ślad GPS nie jest bezpośrednio zapisywany na serwerach OpenStreetMap - najlepszym sposobem na wykorzystanie go jest rysowanie mapy na jego podstawie.",
                 "upload": "Możesz także wysłać [swój ślad GPS na serwery OpenStreetMap](https://www.openstreetmap.org/trace/create), pozwalając tym samym innym użytkownikom na korzystanie z niego."
+            },
+            "field": {
+                "restrictions": {
+                    "tips": {
+                        "title": "Wskazówki"
+                    }
+                }
             }
         },
         "intro": {
@@ -2493,9 +2513,6 @@
                     "label": "Rodzaj",
                     "placeholder": "Domyślny"
                 },
-                "vending": {
-                    "label": "Rodzaje towarów"
-                },
                 "visibility": {
                     "label": "Widoczność",
                     "options": {
@@ -5892,18 +5909,6 @@
                     "name": "Zakaz zawracania",
                     "terms": "zakaz,zawracanie"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Nakaz skrętu w lewo",
-                    "terms": "nakaz,lewoskręt"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Nakaz skrętu w prawo",
-                    "terms": "nakaz,prawoskręt"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Nakaz jazdy prosto",
-                    "terms": "zakaz,nakręcanie,wykręcanie,skręt"
-                },
                 "type/route": {
                     "name": "Trasa/linia",
                     "terms": "trasa,linia"
@@ -6189,7 +6194,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Mapa bazowa Austrii, oparta o dane rządowe.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6250,9 +6254,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Kafelki mapowe Stamen Design, licencja CC BY 3.0"
-                },
                 "name": "Stamen - Teren"
             },
             "tf-cycle": {
diff --git a/dist/locales/pt-BR.json b/dist/locales/pt-BR.json
index e650f5094..42b65fbac 100644
--- a/dist/locales/pt-BR.json
+++ b/dist/locales/pt-BR.json
@@ -1,5 +1,10 @@
 {
     "pt-BR": {
+        "icons": {
+            "information": "informações",
+            "remove": "remover",
+            "undo": "desfazer"
+        },
         "modes": {
             "add_area": {
                 "title": "Área",
@@ -291,6 +296,42 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Distância",
+                "distance_up_to": "Até {distance}",
+                "via": "Via",
+                "via_node_only": "Apenas nó",
+                "via_up_to_one": "Até 1 caminho",
+                "via_up_to_two": "Até 2 caminhos"
+            },
+            "help": {
+                "indirect": "(indireto)",
+                "turn": {
+                    "no_left_turn": "PROIBIDA conversão à esquerda {indirect}",
+                    "no_right_turn": "PROIBIDA conversão à direita {indirect}",
+                    "no_u_turn": "PROIBIDO retorno {indirect}",
+                    "no_straight_on": "PROIBIDO seguir em frente {indirect}",
+                    "only_left_turn": "SOMENTE conversão à esquerda {indirect}",
+                    "only_right_turn": "SOMENTE conversão à direita {indirect}",
+                    "only_u_turn": "SOMENTE retorno {indirect}",
+                    "only_straight_on": "SOMENTE seguir em frente {indirect}",
+                    "allowed_left_turn": "Permitida conversão à esquerda {indirect}",
+                    "allowed_right_turn": "Permitida conversão à direita {indirect}",
+                    "allowed_u_turn": "Permitido retorno {indirect}",
+                    "allowed_straight_on": "Permitido seguir em frente {indirect}"
+                },
+                "from": "A PARTIR DE",
+                "via": "VIA",
+                "to": "PARA",
+                "from_name": "{from} {fromName}",
+                "from_name_to_name": "{from} {fromName} {to} {toName}",
+                "via_names": "{via} {viaNames}",
+                "select_from": "Clique para escolher {from} que segmento",
+                "select_from_name": "Clique para selecionar {from} {fromName}",
+                "toggle": "Clique para \"{turn}\""
+            }
+        },
         "undo": {
             "tooltip": "Desfazer: {action}",
             "nothing": "Nada para desfazer."
@@ -648,6 +689,7 @@
             "untagged_area_tooltip": "Selecionar um tipo de elemento que descreva o que esta área é.",
             "untagged_relation": "Relação sem etiquetas",
             "untagged_relation_tooltip": "Selecionar um tipo de elemento que descreva o que esta relação é.",
+            "many_deletions": "Você está apagando {n} feições: {p} nós, {l} linhas, {a} áreas, {r} relações. Você ter certeza que quer executar esta ação? Ela irá apagar estes elementos para todas as pessoas que acessam o openstreetmap.org.",
             "tag_suggests_area": "A etiqueta {tag} sugere que seja utilizada numa área, mas essa linha não é uma área",
             "deprecated_tags": "Etiquetas obsoletas: {tags}"
         },
@@ -806,6 +848,29 @@
                 "using_h": "Usando Traçados de GPS",
                 "tracing": "A trilha GPX não está sendo enviada ao OpenStreetMap - a melhor maneira de usá-la é desenhar no mapa, usando-a como um guia para os novos elementos que você adicionar.",
                 "upload": "Você também pode [enviá-la ao OpenStreetMap](https://www.openstreetmap.org/trace/create) para que outros usuários possam utilizá-la."
+            },
+            "field": {
+                "restrictions": {
+                    "title": "Ajuda das Restrições de curva",
+                    "about": {
+                        "title": "Sobre",
+                        "about": "Este campo permite que você inspecione e modifique restrições de curva. Ele mostra um modelo da interseção selecionada, incluindo outras ruas próximas conectadas.",
+                        "from_via_to": "Uma restrição de curva sempre contém: um **A PARTIR DE caminho**, um **PARA caminho**, e um **VIA nó** ou um ou mais **VIA nós**.",
+                        "maxdist": "O controle deslizante \"{distField}\" define a distância que se deve procurar por ruas conectadas adicionais.",
+                        "maxvia": "O controle deslizante \"{viaField}\" ajusta quantos caminhos serão incluídos na busca. (Dica: quanto mais simples, melhor)"
+                    },
+                    "inspecting": {
+                        "title": "Inspecionar"
+                    },
+                    "modifying": {
+                        "title": "Modificar"
+                    },
+                    "tips": {
+                        "title": "Dicas",
+                        "simple": "**Prefira restrições simples ao invés de complexas**",
+                        "indirect_noedit": "Você não pode editar restrições indiretas. Ao invés disso, tente editar uma relação direta próxima."
+                    }
+                }
             }
         },
         "intro": {
@@ -1588,6 +1653,9 @@
                         "cycleway:right": "Lado direito"
                     }
                 },
+                "dance/style": {
+                    "label": "Estilos de Dança"
+                },
                 "date": {
                     "label": "Data"
                 },
@@ -1826,6 +1894,9 @@
                 "indoor": {
                     "label": "Interior"
                 },
+                "industrial": {
+                    "label": "Tipo"
+                },
                 "information": {
                     "label": "Tipo"
                 },
@@ -1946,6 +2017,9 @@
                     "label": "Limite de Velocidade",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "Permanência máxima"
                 },
@@ -2534,8 +2608,17 @@
                     "label": "Tipo",
                     "placeholder": "Padrão"
                 },
+                "usage_rail": {
+                    "label": "Tipo de Utilização",
+                    "options": {
+                        "industrial": "Industrial",
+                        "military": "Militar",
+                        "test": "Teste",
+                        "tourism": "Turismo"
+                    }
+                },
                 "vending": {
-                    "label": "Tipo de Produtos"
+                    "label": "Tipos de Produtos"
                 },
                 "visibility": {
                     "label": "Visibilidade",
@@ -2613,6 +2696,8 @@
                     "options": {
                         "delta": "Delta",
                         "open": "Aberta",
+                        "open-delta": "Delta Aberto",
+                        "star": "Estrela / Y",
                         "zigzag": "Zig Zag"
                     }
                 }
@@ -2939,6 +3024,9 @@
                     "name": "Mercado ou feira",
                     "terms": "Feira, mercado, mercado municipal, feirinha"
                 },
+                "amenity/monastery": {
+                    "name": "Jardins do mosteiro"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Estacionamento de motos",
                     "terms": "Estacionamento de motocicletas, estacionamento de motos, estacionamento"
@@ -3142,6 +3230,9 @@
                     "name": "Máquina de Venda de Cigarros",
                     "terms": "cigarro, venda de cigarro"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "Máquina de Venda de Café"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "Máquina de Venda de Preservativos",
                     "terms": "máquina de venda de camisinhas, preservativos, camisinha"
@@ -3150,6 +3241,12 @@
                     "name": "Máquina de Venda de Bebidas",
                     "terms": "Máquina de Venda de Bebidas, máquina de refrigerante, refrigerante, lata, latinha"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "Máquina de Venda de Eletrônicos"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "Máquina de Venda de Moedas Achatadas"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "Máquina de Vendas de Sacola de Excrementos",
                     "terms": "sacos de excremento, cocô, fezes, dejetos, animal, cachorro, animal de estimação, pet, sacola"
@@ -3158,6 +3255,15 @@
                     "name": "Máquina de Vendas - Higiene Feminina",
                     "terms": "produtos de higiene feminina, camisinha, preservativo, absorvente, tampão, cuidados pessoais, higiene, mulher"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "Máquina de Venda de Comida"
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "Bomba de Gasolina"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "Máquina de Venda de Sorvete"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Máquina de Venda de Jornais"
                 },
@@ -3177,6 +3283,9 @@
                     "name": "Máquina de Vendas de Bilhete de Transporte",
                     "terms": "Transporte público, ônibus, Trem, Metrô, Ticket, Bilhete"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "Máquina de Venda de Selos"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "Máquina de Venda de Lanches",
                     "terms": "salgados, doces, petiscos, salgadinhos, snacks, chicletes, biscoitos, balas"
@@ -3755,6 +3864,9 @@
                 "emergency/private": {
                     "name": "Acesso de Emergência Privado"
                 },
+                "emergency/water_tank": {
+                    "name": "Tanque de água de emergência"
+                },
                 "emergency/yes": {
                     "name": "Acesso de Emergência"
                 },
@@ -3763,11 +3875,11 @@
                     "terms": "Entrada/Saída, Porta, "
                 },
                 "footway/crossing": {
-                    "name": "Travessia em Rua",
+                    "name": "Faixa para travessia de pedestres",
                     "terms": "Faixa de cruzamento"
                 },
                 "footway/crossing-raised": {
-                    "name": "Travessia em via elevada",
+                    "name": "Faixa elevada para travessia de pedestres",
                     "terms": "quebra mola, quebra-molas, redutor de velocidade, faixa de pedestres"
                 },
                 "footway/crosswalk": {
@@ -4025,7 +4137,7 @@
                     "terms": "Área de Serviço, Posto de combustíveis, posto de gasolina, combustíveis, borracharia, lava jato, serviços, loja de conveniências"
                 },
                 "highway/speed_camera": {
-                    "name": "Sensor de Velocidade",
+                    "name": "Câmera de Controle de Velocidade",
                     "terms": "câmera de velocidade, radar, pardal, foto-sensor, foto sensor, fotossensor, sinal de trânsito, fiscalização eletrônica de velocidade"
                 },
                 "highway/steps": {
@@ -4141,6 +4253,7 @@
                     "terms": "Bacia"
                 },
                 "landuse/brownfield": {
+                    "name": "Área contaminada",
                     "terms": "Terreno industrial abandonado, área em revitalização, área abandonada, terreno em revitalização, zona industrial abandonada, desenvolvimento"
                 },
                 "landuse/cemetery": {
@@ -4315,6 +4428,9 @@
                     "name": "Danceteria",
                     "terms": "salão de dança, balada, boate, clube de dança, salsa, tango"
                 },
+                "leisure/dancing_school": {
+                    "name": "Escola de Dança"
+                },
                 "leisure/dog_park": {
                     "name": "Cachorródromo",
                     "terms": "Canódromo, Cachorródromo, Parque Canino, Parque de Cachorros, cães, cão, cachorros"
@@ -4328,7 +4444,7 @@
                     "terms": "Academia de Musculação, Academia de Ginástica"
                 },
                 "leisure/fitness_centre/yoga": {
-                    "name": "Estúdio de Ioga",
+                    "name": "Estúdio de Yôga",
                     "terms": "Estúdio de Yoga, Academia de Ioga, Academia de Yoga, Yôga, Ioga, Yoga"
                 },
                 "leisure/fitness_station": {
@@ -4338,12 +4454,18 @@
                 "leisure/fitness_station/balance_beam": {
                     "name": "Trave de Equilíbrio"
                 },
+                "leisure/fitness_station/horizontal_bar": {
+                    "name": "Barra Fixa Horizontal"
+                },
                 "leisure/fitness_station/hyperextension": {
                     "name": "Estação de Hiperextensão"
                 },
                 "leisure/fitness_station/parallel_bars": {
                     "name": "Barras Paralelas"
                 },
+                "leisure/fitness_station/sit-up": {
+                    "name": "Prancha para Abdominais"
+                },
                 "leisure/fitness_station/stairs": {
                     "name": "Escadas de Exercício"
                 },
@@ -4507,6 +4629,9 @@
                     "name": "Ádito de Mineração",
                     "terms": "Entrada, Passagem, Mina, Acesso"
                 },
+                "man_made/antenna": {
+                    "name": "Antena"
+                },
                 "man_made/breakwater": {
                     "name": "Molhe/Quebra-Mar",
                     "terms": "Molhe, Quebra-Mar"
@@ -4557,6 +4682,9 @@
                     "name": "Torre de Observação",
                     "terms": "torre de observação, observação, ponto de observação, torre de incêndio, incêndio florestal"
                 },
+                "man_made/observatory": {
+                    "name": "Observatório"
+                },
                 "man_made/petroleum_well": {
                     "name": "Poço de Petróleo",
                     "terms": "Cavalo mecânico, Poço de extração de petróleo, petróleo, Óleo"
@@ -4681,6 +4809,9 @@
                     "name": "Urzal",
                     "terms": "Urzal"
                 },
+                "natural/mud": {
+                    "name": "Lama"
+                },
                 "natural/peak": {
                     "name": "Cume",
                     "terms": "Pico, Topo de Montanha, Serra, Montanha, Monte"
@@ -5485,6 +5616,10 @@
                     "name": "Loja de Material de Construção",
                     "terms": "Loja de Ferragens, Material de Construção, Loja de Tintas, Loja de Parafusos, Madeireira"
                 },
+                "shop/health_food": {
+                    "name": "Loja de Alimentos Saudáveis",
+                    "terms": "loja de produtos naturais, comida saudável, alimentação saudável, natureba"
+                },
                 "shop/hearing_aids": {
                     "name": "Loja de Aparelhos Auditivos",
                     "terms": "farmácia"
@@ -5724,6 +5859,10 @@
                     "name": "Loja de Armas",
                     "terms": "Loja de Tiro, Loja de Equipamentos de Tiro"
                 },
+                "shop/wholesale": {
+                    "name": "Atacadista",
+                    "terms": "atacadão, loja de atacados, "
+                },
                 "shop/window_blind": {
                     "name": "Loja de Persianas",
                     "terms": "Loja de Vidros Blindados, Cortinas"
@@ -5900,18 +6039,6 @@
                     "name": "Proibido Retornar",
                     "terms": "Proibido Retornar"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Obrigatório Virar à Esquerda",
-                    "terms": "Obrigatório Virar à Esquerda"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Obrigatório Virar à Direita",
-                    "terms": "Obrigatório Virar à Direita"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Obrigatório Seguir em Frente",
-                    "terms": "Obrigatório Seguir em Frente"
-                },
                 "type/route": {
                     "name": "Rota",
                     "terms": "Rota"
@@ -6205,7 +6332,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Mapa base da Áustria, baseado em dados governamentais.",
+                "description": "Dados de mapas da Áustria, com base em dados do governo.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6267,7 +6394,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Quadros do mapa de Stamen Design, sob CC BY 3.0"
+                    "text": "Quadros do mapa de Stamen Design, sob CC BY 3.0.   Dados por OpenStreetMap, sob ODbL"
                 },
                 "name": "Stamen, Terreno"
             },
@@ -6283,6 +6410,90 @@
                 },
                 "name": "Paisagens Thunderforest"
             }
+        },
+        "community": {
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap Índia - Mapeamento de vizinhança participativa",
+                "description": "Melhorar o OpenStreetMap na Índia",
+                "extendedDescription": "Mapeamento na Índia? Tem dúvidas, quer se conectar com a comunidade aqui? Junte-se a nós em {Url}. São todos bem-vindos!"
+            },
+            "OSM-japan-twitter": {
+                "description": "Hashtag no Twitter: {url}"
+            },
+            "Bay-Area-OpenStreetMappers": {
+                "name": "OpenStreetMappers da Bay Area",
+                "description": "Melhorar o OpenStreetMap na área da baía",
+                "extendedDescription": "Este grupo é sobre crescer a comunidade do OpenStreetMap aqui na Área da Baía de São Francisco. Nossos eventos são abertos para todos, desde entusiastas open-source, ciclistas, profissionais GIS, geocachers, e além. Todos e quaisquer pessoas interessadas em mapas, cartografia e dados de mapa livres são bem-vindas a se juntar ao nosso grupo e participar dos nossos eventos."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "Pensilvânia central OSM",
+                "description": "Comunidade de mapeamento on-line baseada no State College, PA"
+            },
+            "Code-for-San-Jose-Slack": {
+                "name": "Código para San Jose Slack",
+                "description": "São todos bem-vindos! Inscreva-se em {signupUrl}, então junte-se ao canal #osm."
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM",
+                "description": "O grupo de usuários do OpenStreetMap para Dallas-Fort Worth",
+                "extendedDescription": "Dallas, Fort Worth e todas as cidades estão repletas de pessoas criativas e conhecedoras de tecnologia. A visão deste grupo de usuários é encontrar novas maneiras de usar o incrível recurso do OSM."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Meetup para entusiastas do mapa na área de Filadélfia",
+                "extendedDescription": "A GeoPhilly une desenvolvedores, geógrafos, geeks de dados, entusiastas do código aberto, hackers cívicos e viciados em mapas em nosso amor compartilhado pelos mapas e pelas histórias que contam. Se você usa mapas como parte do seu trabalho ou apenas quer aprender mais, este é o encontro para você! Nossos eventos visam ser abertos, amigáveis, educacionais e sociais e vão desde happy hours até palestras relâmpago ou até workshops. Venha criar uma comunidade geoespacial diversificada e inspiradora na Filadélfia conosco!"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapeamneto de DC",
+                "description": "Melhore o OpenStreetMap na área de DC",
+                "extendedDescription": "Somos um grupo de mapeadores voluntários que visam melhorar o OpenStreetMap na área de DC. Também pretendemos ensinar aos outros sobre o ecossistema OSM, análise de dados, cartografia e GIS. Nós nos reunimos a cada dois meses nos encontros para nos concentrar em uma área da nossa cidade."
+            },
+            "OSM-Boston": {
+                "name": "OpenStreetMap Boston",
+                "description": "Mapeadores e usuários do OpenStreetMap na área de Boston",
+                "extendedDescription": "OpenStreetMap é o mapa gratuito e aberto do mundo, com centenas de milhares de contribuições diárias de pessoas como você. Editar o mapa é simples e divertido! Junte-se a nós em ambientes internos e externos em nosso esforço para criar o melhor mapa da área de Boston e do resto do mundo!"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "O grupo de usuários do OpenStreetMap para o Chattanooga"
+            },
+            "OSM-Colorado": {
+                "name": "OpenStreetMap Colorado",
+                "extendedDescription": "OpenStreetMap (OSM) Colorado é uma colaboração local de pessoas interessadas em contribuir com seus esforços para criar mapas gratuitos. Encorajamos todos os nossos mapeadores a organizar ou sugerir o mapeamento de eventos em todo o estado. As atividades do Meetup podem ser simples mixers sociais, treinamento básico e avançado do OSM ou partes de mapeamento da comunidade."
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap NYC",
+                "description": "Usuários e Mapeadores do OpenStreetMap, desenvolvedores e entusiastas da área metropolitana de Nova York"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland",
+                "description": "Mapeadores e usuários do OpenStreetMap na área de Portland",
+                "extendedDescription": "OpenStreetMap (OSM) é um mapa do mundo feito por pessoas como você. É um mapa que você constrói, que é dado de graça, como na Wikipédia. Confira osm.org para mais, e junte-se a nós em um meetup para conversar sobre mapas, contribuir para o OSM e se divertir!"
+            },
+            "OSM-Seattle": {
+                "name": "OpenStreetMap Seattle",
+                "description": "Mapeadores e usuários do OpenStreetMap na área de Seattle"
+            },
+            "OSM-South-Bay": {
+                "name": "OSM South Bay",
+                "description": "Noites do Mapa hospedado por Code for San Jose"
+            },
+            "OSM-US-Slack": {
+                "description": "Todos são bem-vindos! Se inscreva em {signupUrl}"
+            },
+            "PHXGeo-twitter": {
+                "description": "Siga-nos no Twitter em {url}"
+            },
+            "Maptime-Australia-Slack": {
+                "description": "Se inscreva em {signupUrl}"
+            },
+            "OSM-AR-twitter": {
+                "description": "Siga-nos no Twitter em {url}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap no Reddit",
+                "description": "/r/openstreetmap/ é um ótimo lugar para aprender mais sobre o OpenStreetMap.  Pergunte-nos qualquer coisa!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/pt.json b/dist/locales/pt.json
index 0ef0e047e..d504d6d77 100644
--- a/dist/locales/pt.json
+++ b/dist/locales/pt.json
@@ -1,5 +1,10 @@
 {
     "pt": {
+        "icons": {
+            "information": "info",
+            "remove": "remover",
+            "undo": "desfazer"
+        },
         "modes": {
             "add_area": {
                 "title": "Área",
@@ -897,7 +902,8 @@
                         "title": "Modificando"
                     },
                     "tips": {
-                        "title": "Dicas"
+                        "title": "Dicas",
+                        "indirect_noedit": "Não deverá editar restrições indiretas. Opte por editar a restrição direta mais próxima."
                     }
                 }
             }
@@ -1683,6 +1689,9 @@
                         "cycleway:right": "Lado direito"
                     }
                 },
+                "dance/style": {
+                    "label": "Estilos de Dança"
+                },
                 "date": {
                     "label": "Data"
                 },
@@ -1802,7 +1811,7 @@
                     "label": "Posição",
                     "options": {
                         "green": "Relvado",
-                        "lane": "Via de trânsito",
+                        "lane": "Faixa de rodagem",
                         "parking_lot": "Estacionamento",
                         "sidewalk": "Passeio"
                     }
@@ -1810,10 +1819,10 @@
                 "fire_hydrant/type": {
                     "label": "Tipo",
                     "options": {
-                        "pillar": "Superfície ",
+                        "pillar": "Marco de incêndio no solo",
                         "pond": "Poça de água",
-                        "underground": "Subterrâneo ",
-                        "wall": "Muro"
+                        "underground": "Boca de incêndio tradicional com portinholas",
+                        "wall": "Marco de incêndio na parede"
                     }
                 },
                 "fitness_station": {
@@ -1918,6 +1927,9 @@
                 "indoor": {
                     "label": "Interior"
                 },
+                "industrial": {
+                    "label": "Tipo"
+                },
                 "information": {
                     "label": "Tipo"
                 },
@@ -1956,7 +1968,7 @@
                     "label": "Tipo"
                 },
                 "lanes": {
-                    "label": "Número de vias de trânsito",
+                    "label": "Número de faixas de rodagem",
                     "placeholder": "1, 2, 3..."
                 },
                 "layer": {
@@ -2038,6 +2050,9 @@
                     "label": "Limite de velocidade",
                     "placeholder": "50, 90, 100, 120..."
                 },
+                "maxspeed/advisory": {
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "Tempo máximo"
                 },
@@ -2290,6 +2305,9 @@
                 "ref": {
                     "label": "Código de Referência"
                 },
+                "ref/isil": {
+                    "label": "Código ISIL"
+                },
                 "ref_aeroway_gate": {
                     "label": "Número da Porta"
                 },
@@ -2623,8 +2641,17 @@
                     "label": "Tipo",
                     "placeholder": "Padrão"
                 },
+                "usage_rail": {
+                    "label": "Tipo de Utilização",
+                    "options": {
+                        "industrial": "Industrial",
+                        "military": "Militar",
+                        "test": "Testes",
+                        "tourism": "Turismo"
+                    }
+                },
                 "vending": {
-                    "label": "Tipo de produtos"
+                    "label": "Tipos de Produtos"
                 },
                 "visibility": {
                     "label": "Visibilidade",
@@ -2684,6 +2711,9 @@
                 "wheelchair": {
                     "label": "Acesso cadeira rodas"
                 },
+                "wholesale": {
+                    "label": "Grossista"
+                },
                 "width": {
                     "label": "Largura (metros)"
                 },
@@ -3162,6 +3192,10 @@
                     "name": "Chuveiro",
                     "terms": "Shower, chuveiro público, shuveiro, xuveiro, chubeiro, xubeiro, shubeiro, banho"
                 },
+                "amenity/smoking_area": {
+                    "name": "Área para Fumadores",
+                    "terms": "fumadores, fumar"
+                },
                 "amenity/social_facility": {
                     "name": "Centro social",
                     "terms": "Social Facility, Casa do Povo"
@@ -3788,7 +3822,7 @@
                 },
                 "emergency/fire_hydrant": {
                     "name": "Boca de incêndio",
-                    "terms": "Fire Hydrant, Hidrante, Marco de Água, Marco de Incêndio"
+                    "terms": "Hidrate, Marco de Água, Marco de Incêndio, boca de incêndio"
                 },
                 "emergency/life_ring": {
                     "name": "Boia de Salvamento",
@@ -4336,7 +4370,7 @@
                     "terms": "<translate with synonyms or related terms for 'Religious Area', separated by commas>"
                 },
                 "landuse/residential": {
-                    "name": "Zona residencial",
+                    "name": "Área residencial",
                     "terms": "Residencial, Urbano, Antrópico, Residential"
                 },
                 "landuse/retail": {
@@ -4371,6 +4405,10 @@
                     "name": "Salão de dança",
                     "terms": "Dance Hall"
                 },
+                "leisure/dancing_school": {
+                    "name": "Escola de Dança",
+                    "terms": "dança, dançar, bailado, bailarina, bailarino"
+                },
                 "leisure/dog_park": {
                     "name": "Parque para cães",
                     "terms": "Parque para Cães, Dog Park"
@@ -4646,6 +4684,10 @@
                     "name": "Torre de observação",
                     "terms": "Observatório Tower, Miradouro"
                 },
+                "man_made/observatory": {
+                    "name": "Observatório",
+                    "terms": "Observatório Astronómico, Observação, Observações, Astronomia"
+                },
                 "man_made/petroleum_well": {
                     "name": "Poço de petróleo",
                     "terms": "Oil Well"
@@ -5166,6 +5208,42 @@
                     "name": "Paragem de autocarro / plataforma",
                     "terms": "Paragem, terminal, autocarro, bus stop, bus, abrigo paragem"
                 },
+                "public_transport/linear_platform_ferry": {
+                    "name": "Paragem de Ferry / Plataforma",
+                    "terms": "Ferry, Plataforma de Ferry"
+                },
+                "public_transport/linear_platform_train": {
+                    "name": "Paragem de Comboio / Plataforma",
+                    "terms": "Paragem de Comboio, Plataforma de Comboio"
+                },
+                "public_transport/platform_ferry": {
+                    "name": "Paragem de Ferry / Plataforma",
+                    "terms": "Ferry, Plataforma de Ferry"
+                },
+                "public_transport/platform_train": {
+                    "name": "Paragem de Comboio / Plataforma",
+                    "terms": "Paragem de Comboio, Plataforma de Comboio"
+                },
+                "public_transport/station_ferry": {
+                    "name": "Estação de Ferry / Terminal",
+                    "terms": "Ferry, Terminal de Ferry"
+                },
+                "public_transport/station_train": {
+                    "name": "Estação de Comboios",
+                    "terms": "Estação Ferroviária, Estação dos Caminhos de Ferro"
+                },
+                "public_transport/station_train_halt": {
+                    "name": "Apeadeiro Ferroviário",
+                    "terms": "Apeadeiro, Paragem de Comboio"
+                },
+                "public_transport/stop_position_ferry": {
+                    "name": "Localização de Paragem do Ferry",
+                    "terms": "Ferry, Paragem do Ferry"
+                },
+                "public_transport/stop_position_train": {
+                    "name": "Localização de Paragem do Comboio",
+                    "terms": "Comboio, Paragem do Comboio"
+                },
                 "railway": {
                     "name": "Ferrovia"
                 },
@@ -5740,6 +5818,10 @@
                     "name": "Loja de armas",
                     "terms": "espingardaria, Loja de Armas, Caça"
                 },
+                "shop/wholesale": {
+                    "name": "Loja Grossista",
+                    "terms": "grossista, atacado, revendedor, revenda"
+                },
                 "shop/window_blind": {
                     "name": "Loja de estores",
                     "terms": "Estores, Estor"
@@ -5790,7 +5872,7 @@
                 },
                 "tourism/guest_house": {
                     "name": "Hospedagem Domiciliar/Casa de Hóspedes",
-                    "terms": "casa se hóspedes, Cama e Pequeno Almoço, Cama e Peq. Almoço, Cama e Almoço"
+                    "terms": "casa de hóspedes, Cama e Pequeno Almoço, Cama e Peq. Almoço, Cama e Almoço, albergaria, hospedaria, pensão"
                 },
                 "tourism/hostel": {
                     "name": "Pousada / Hostel",
@@ -5822,7 +5904,7 @@
                 },
                 "tourism/motel": {
                     "name": "Motel",
-                    "terms": "Albergaria "
+                    "terms": "quartos de motel, albergue, parador, paradores"
                 },
                 "tourism/museum": {
                     "name": "Museu",
@@ -5919,18 +6001,6 @@
                     "name": "Proibição de inversão de marcha",
                     "terms": "Não Inverter o Sentido, inversão de marcha proibida,  proibida a inversão de marcha, não fazer inversão de marcha"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Sentido obrigatório para a esquerda",
-                    "terms": "obrigatoriedade de virar à esquerda, virar para a esquerda,"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Sentido obrigatório para a direita",
-                    "terms": "obrigatoriedade de virar à direita, virar para a direita,"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Sentido obrigatório para a frente",
-                    "terms": "Proibido Virar, seguir em frente"
-                },
                 "type/route": {
                     "name": "Rota",
                     "terms": "Rota, Linha, circuito, percursos, percurso, circuitos"
@@ -6224,7 +6294,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Mapa base Áustria, baseado em informação govenamental ",
+                "description": "Mapa Base da Áustria, baseado em dados do governo",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6280,13 +6350,13 @@
             },
             "skobbler": {
                 "attribution": {
-                    "text": "© Telas: skobbler, dados do mapa © contribuidores OpenStreetMap"
+                    "text": "© Mosaico: skobbler, dados do mapa © contribuidores OpenStreetMap"
                 },
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Telas do mapa por Stamen Design, sob licença CC BY 3.0"
+                    "text": "Mosaico do mapa por Stamen Design, sob CC BY 3.0. Dados por OpenStreetMap, sob ODbL"
                 },
                 "name": "Terreno Stamen"
             },
@@ -6302,6 +6372,14 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "GeoPhilly": {
+                "name": "GeoPhilly"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapping DC"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/ro.json b/dist/locales/ro.json
index 12a296248..5f0a7c9ac 100644
--- a/dist/locales/ro.json
+++ b/dist/locales/ro.json
@@ -1,5 +1,9 @@
 {
     "ro": {
+        "icons": {
+            "information": "informaţii",
+            "remove": "Şterge"
+        },
         "modes": {
             "add_area": {
                 "title": "Suprafață",
@@ -197,6 +201,17 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Distanţă",
+                "via": "Prin"
+            },
+            "help": {
+                "from": "DIN",
+                "via": "PRIN",
+                "to": "LA"
+            }
+        },
         "undo": {
             "tooltip": "Înapoi: {action}",
             "nothing": "Nu există nimic de refăcut."
@@ -601,7 +616,14 @@
                 }
             },
             "welcome": {
-                "title": "Bun Venit"
+                "title": "Bun Venit",
+                "welcome": "Bine ați venit! Acest ghid vă va învăța elementele de bază ale editării pe OpenStreetMap.",
+                "practice": "Toate datele din acest ghid sunt doar pentru practicare, și orice modificări pe care le faceți în ghid nu vor fi salvate.",
+                "words": "Acest ghid va introduce câteva cuvinte și concepte noi. Când introducem un cuvânt nou, vom folosi *italics*.",
+                "mouse": "Puteți utiliza orice dispozitiv de intrare pentru a edita harta, însă acest ghid presupune că aveți un mouse cu butoane stânga și dreapta. ** Dacă doriți să atașați un mouse, faceți acest lucru acum, apoi apăsați pe OK. **",
+                "leftclick": "Când acest tutorial vă solicită să apăsați odată sau să apăsați de două ori, înseamnă cu butonul din stânga. Pe un trackpad este posibil să fie o atingere cu o singură apăsare sau cu un singur deget. ** Apăsați pe stânga de {num} ori. **",
+                "rightclick": "Uneori vă vom cere să apăsați dreapta. Acest lucru ar putea fi același lucru cu clic-control sau atingeți cu două degete pe un trackpad. Tastatura poate avea chiar și o tastă de \"meniu\" care funcționează ca și apăsat dreapta. ** Apăsați dreapta de {num} ori. **",
+                "chapters": "Până acum, este bine! Puteți utiliza butoanele de mai jos pentru a trece peste capitole în orice moment sau pentru a reporni un capitol dacă rămâneți blocat. Să începem! ** Apăsați pe '{next}' pentru a continua. **"
             },
             "navigation": {
                 "title": "Navigare"
@@ -1530,9 +1552,6 @@
                 "trees": {
                     "label": "Copaci"
                 },
-                "vending": {
-                    "label": "Tip de Bunuri"
-                },
                 "visibility": {
                     "label": "Vizibilitate"
                 },
@@ -4057,18 +4076,6 @@
                     "name": "Fără Întoarcere",
                     "terms": "<translate with synonyms or related terms for 'No U-turn', separated by commas>"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Întoarcere doar la Stânga",
-                    "terms": "<translate with synonyms or related terms for 'Left Turn Only', separated by commas>"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Întoarcere doar la Dreapta",
-                    "terms": "<translate with synonyms or related terms for 'Right Turn Only', separated by commas>"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Fără Întoarcere",
-                    "terms": "<translate with synonyms or related terms for 'No Turns', separated by commas>"
-                },
                 "type/route": {
                     "name": "Rută",
                     "terms": "<translate with synonyms or related terms for 'Route', separated by commas>"
@@ -4203,6 +4210,11 @@
                 "description": "Imagini de satelit DigitalGlobe standard.",
                 "name": "Imagini DigitalGlobe Standard"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Termeni & Feedback"
+                }
+            },
             "MAPNIK": {
                 "attribution": {
                     "text": "© Contribuitori OpenStreetMap, CC-BY-SA"
@@ -4278,7 +4290,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Basemap de Austria, bazat pe date ale guvernamentului.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -4339,9 +4350,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Plăci de hartă de Stamen Design, sub CC BY 3.0"
-                },
                 "name": "Teren Stamen"
             },
             "tf-cycle": {
@@ -4356,6 +4364,11 @@
                 },
                 "name": "Peisaj Thunderforest "
             }
+        },
+        "community": {
+            "Bay-Area-OpenStreetMappers": {
+                "description": "Îmbunătățește OpenStreetMap în Bay Area"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/ru.json b/dist/locales/ru.json
index 2630a4b89..f7e0a83ac 100644
--- a/dist/locales/ru.json
+++ b/dist/locales/ru.json
@@ -1,5 +1,10 @@
 {
     "ru": {
+        "icons": {
+            "information": "инфо",
+            "remove": "удалить",
+            "undo": "отмена"
+        },
         "modes": {
             "add_area": {
                 "title": "Полигон",
@@ -1318,7 +1323,7 @@
                     "name": "Здания"
                 },
                 "category-golf": {
-                    "name": "Гольф объекты"
+                    "name": "Гольф-объекты"
                 },
                 "category-landuse": {
                     "name": "Объекты землепользования"
@@ -1629,7 +1634,7 @@
                     "label": "Страна"
                 },
                 "covered": {
-                    "label": "Крытое"
+                    "label": "Крытое(-ая)"
                 },
                 "craft": {
                     "label": "Тип мастерской"
@@ -1809,6 +1814,9 @@
                 "except": {
                     "label": "Не действует для"
                 },
+                "faces": {
+                    "label": "Количество сторон"
+                },
                 "fax": {
                     "label": "Факс",
                     "placeholder": "+7 495 1234567"
@@ -1939,6 +1947,9 @@
                 "indoor": {
                     "label": "План помещения"
                 },
+                "industrial": {
+                    "label": "Тип"
+                },
                 "information": {
                     "label": "Тип"
                 },
@@ -2059,6 +2070,10 @@
                     "label": "Ограничение скорости",
                     "placeholder": "40, 50, 60…"
                 },
+                "maxspeed/advisory": {
+                    "label": "Рекомендуемая скорость",
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "Максимальное время остановки"
                 },
@@ -2195,11 +2210,11 @@
                 "parking": {
                     "label": "Тип",
                     "options": {
-                        "carports": "Автомобильный навес",
+                        "carports": "Навес",
                         "garage_boxes": "Одноярусные гаражи",
-                        "lane": "Полоса вдоль дороги",
+                        "lane": "Уличная парковка",
                         "multi-storey": "Многоярусная",
-                        "sheds": "Сараи рядом с домом",
+                        "sheds": "Козырёк",
                         "surface": "Наземная",
                         "underground": "Подземная"
                     }
@@ -2516,7 +2531,7 @@
                     "label": "Тип"
                 },
                 "supervised": {
-                    "label": "Наблюдение"
+                    "label": "Охраняемая(-ый)"
                 },
                 "support": {
                     "label": "Находится на"
@@ -2647,8 +2662,19 @@
                     "label": "Тип тоннеля",
                     "placeholder": "По умолчанию"
                 },
+                "usage_rail": {
+                    "label": "Тип использования",
+                    "options": {
+                        "branch": "Ветка",
+                        "industrial": "Промышленное",
+                        "main": "Основное",
+                        "military": "Военное",
+                        "test": "Тестовое",
+                        "tourism": "Туризм"
+                    }
+                },
                 "vending": {
-                    "label": "Тип товаров"
+                    "label": "Тип автомата"
                 },
                 "visibility": {
                     "label": "Видимость",
@@ -2825,6 +2851,10 @@
                     "name": "Терминал аэропорта",
                     "terms": "Терминал аэропорта"
                 },
+                "allotments/plot": {
+                    "name": "Садовый участок",
+                    "terms": "огород, садовый участок"
+                },
                 "amenity": {
                     "name": "Инфраструктура"
                 },
@@ -2966,12 +2996,12 @@
                     "terms": "крематорий,захоронение,услуги,церемония,мертвец,покойник,кладбище,обряд,служба,прах,колумбарий"
                 },
                 "amenity/dentist": {
-                    "name": "Дантист",
-                    "terms": "стоматолог, дантист, зубной врач"
+                    "name": "Стоматология",
+                    "terms": "стоматолог, стоматология, дантист, зубной врач"
                 },
                 "amenity/doctors": {
                     "name": "Кабинет врача",
-                    "terms": "врач, доктор,фельдшер,медик, небольшая клиника, клиника"
+                    "terms": "врач, доктор,фельдшер,медик, небольшая клиника, клиника, медпункт, медицинский кабинет, здравпункт"
                 },
                 "amenity/dojo": {
                     "name": "Додзё / Школа боевых искусств",
@@ -3051,6 +3081,9 @@
                     "name": "Рынок",
                     "terms": "Рынок"
                 },
+                "amenity/monastery": {
+                    "name": "Монастырь"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Парковка для мотоциклов",
                     "terms": "мотопарковка, мотопаркинг, парковка для мотоциклов, паркинг для мотоциклов, мотостоянка"
@@ -3099,7 +3132,8 @@
                     "terms": "храм, часовня, молельня, дом божий, капелла, церковь, кафедрарий, место поклонения, культовое сооружение, святое место, мечеть, собор, синагога"
                 },
                 "amenity/place_of_worship/hindu": {
-                    "name": "Индуистский храм"
+                    "name": "Индуистский храм",
+                    "terms": "индуистский храм, мандир"
                 },
                 "amenity/place_of_worship/jewish": {
                     "name": "Синагога",
@@ -3113,7 +3147,8 @@
                     "name": "Дзиндзя"
                 },
                 "amenity/place_of_worship/sikh": {
-                    "name": "Гурдвара"
+                    "name": "Гурдвара",
+                    "terms": "сикхский храм, гурдвара"
                 },
                 "amenity/place_of_worship/taoist": {
                     "name": "Даосский храм",
@@ -3252,6 +3287,9 @@
                     "name": "Автомат по продаже сигарет",
                     "terms": "Автомат по продаже сигарет"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "Кофе"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "Автомат по продаже презервативов",
                     "terms": "Автомат по продаже презервативов"
@@ -3260,6 +3298,12 @@
                     "name": "Автомат по продаже напитков",
                     "terms": "газировка, напитки, вода"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "Электронные устройства"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "Удлинённая монета"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "Автомат по продаже мешков для экскрементов",
                     "terms": "экскременты, животные"
@@ -3267,6 +3311,16 @@
                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "Автомат для продажи средств женской гигиены"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "Продукты питания"
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "Заправка",
+                    "terms": "азс, бензин, дизель, автозаправка, газ, пропан, бутан"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "Мороженное"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Автомат по продаже газет (ошибочный тег)"
                 },
@@ -3285,6 +3339,10 @@
                 "amenity/vending_machine/public_transport_tickets": {
                     "name": "Автомат по продаже проездных билетов"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "Почтовый автомат",
+                    "terms": "письма, почта, марки"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "Автомат по продаже батончиков",
                     "terms": "Автомат по прожае снеков, торговый автомат"
@@ -3630,6 +3688,9 @@
                     "name": "Поляна для кемпинга",
                     "terms": "тент, палатка, кемпинг"
                 },
+                "circular": {
+                    "name": "Круговое движение со въездами разного приоритета"
+                },
                 "club": {
                     "name": "Клуб",
                     "terms": "Клуб по интересам, фан-клуб, кружок"
@@ -4042,6 +4103,10 @@
                     "name": "Съезд с автомагистрали",
                     "terms": "Съезд с автомагистрали, Съезд со скоростной автострады, Съезд со скоростного шоссе, Съезд с автобана, Съезд со скоростной автодороги, Съезд с хайвэя, Съезд со скоростной автотрассы"
                 },
+                "highway/passing_place": {
+                    "name": "Место разъезда",
+                    "terms": "разъезд, разъехаться, карман, узкая дорога, уширение"
+                },
                 "highway/path": {
                     "name": "Тропа",
                     "terms": "Тропа, Тропинка, Тропка, пешеходная дорога для немоторизованного траспорта"
@@ -4084,11 +4149,11 @@
                     "terms": "съезд, съезд с важной дороги"
                 },
                 "highway/service": {
-                    "name": "Проезд",
+                    "name": "Служебная дорога",
                     "terms": "Проезд, Автопроезд"
                 },
                 "highway/service/alley": {
-                    "name": "Служебный проезд",
+                    "name": "Дорога на задворках",
                     "terms": "Служебный проезд, Сервисный проезд, Второстепенный проезд"
                 },
                 "highway/service/drive-through": {
@@ -4096,7 +4161,7 @@
                     "terms": "Сервис не выходя из машины, Обслуживание не выходя из машины"
                 },
                 "highway/service/driveway": {
-                    "name": "Подъездная дорожка",
+                    "name": "Подъездная дорога",
                     "terms": "Подъездная дорога, Подъезд к чему-либо"
                 },
                 "highway/service/emergency_access": {
@@ -4104,7 +4169,7 @@
                     "terms": "Эвакуационный выход, Аварийный выход"
                 },
                 "highway/service/parking_aisle": {
-                    "name": "Парковочный проезд",
+                    "name": "Между рядами парковки",
                     "terms": "парковочный проезд, проезд на парковке"
                 },
                 "highway/services": {
@@ -4140,7 +4205,8 @@
                     "terms": "полевая, грунтовка, сельскохозяйственная"
                 },
                 "highway/traffic_mirror": {
-                    "name": "Дорожное зеркало"
+                    "name": "Дорожное зеркало",
+                    "terms": "зеркало, дорожный экран"
                 },
                 "highway/traffic_signals": {
                     "name": "Светофор",
@@ -4213,7 +4279,7 @@
                 },
                 "landuse/allotments": {
                     "name": "Садовые участки",
-                    "terms": "Участки садов и огородов, Сады и огороды, СОТ, СНТ, Дачи"
+                    "terms": "Участки садов и огородов, Сады и огороды, СОТ, СНТ, Дачи, огороды"
                 },
                 "landuse/aquaculture": {
                     "name": "Аквакультура",
@@ -4380,6 +4446,10 @@
                 "leisure/amusement_arcade": {
                     "name": "Игровые автоматы"
                 },
+                "leisure/beach_resort": {
+                    "name": "Пляжный курорт",
+                    "terms": "пляж, курорт"
+                },
                 "leisure/bird_hide": {
                     "name": "Пункт наблюдения за птицами"
                 },
@@ -4474,6 +4544,10 @@
                     "name": "Заповедник",
                     "terms": "заказник"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "Столики на улице (площадка)",
+                    "terms": "на улице, кафе на улице, стол, столики, уличное"
+                },
                 "leisure/park": {
                     "name": "Парк отдыха",
                     "terms": "парк, рекреация, место для отдыха"
@@ -4599,6 +4673,9 @@
                     "name": "Штольня",
                     "terms": "штольня"
                 },
+                "man_made/antenna": {
+                    "name": "Антенна"
+                },
                 "man_made/breakwater": {
                     "name": "Волнорез",
                     "terms": "Мол, Оградительное гидросооружение"
@@ -4649,6 +4726,10 @@
                     "name": "Смотровая башня",
                     "terms": "Смотровая башня, Обзорная башня"
                 },
+                "man_made/observatory": {
+                    "name": "Обсерватория",
+                    "terms": "астрономия, небо, звезды, наблюдение, телескоп"
+                },
                 "man_made/petroleum_well": {
                     "name": "Нефтяная скважина",
                     "terms": "скважина, нефть"
@@ -4767,6 +4848,10 @@
                     "name": "Вересковая пустошь",
                     "terms": "Вереск, пустошь"
                 },
+                "natural/mud": {
+                    "name": "Грязь",
+                    "terms": "вода с землей, земля"
+                },
                 "natural/peak": {
                     "name": "Вершина",
                     "terms": "пик, гора"
@@ -5728,6 +5813,10 @@
                     "name": "Зоомагазин",
                     "terms": "зоомагазин, для животных"
                 },
+                "shop/pet_grooming": {
+                    "name": "Парикмахерская для животных",
+                    "terms": "зоосалон, салон красоты для животных, собак, кошек, стрижка, уход, мытьё"
+                },
                 "shop/photo": {
                     "name": "Фототовары",
                     "terms": "Фототовары, Фототехника, фото на паспорт, паспорт, фото"
@@ -6004,7 +6093,7 @@
                 },
                 "type/restriction": {
                     "name": "Ограничение манёвра",
-                    "terms": "Ограничение, Ограничение направлений движения, Ограничение манёвра, Запрет на поворот, Запрет поворота, манёвра"
+                    "terms": "ограничение, ограничение направлений движения, ограничение манёвра, запрет на поворот, запрет поворота, манёвра"
                 },
                 "type/restriction/no_left_turn": {
                     "name": "Поворот налево запрещён (3.18.2)",
@@ -6016,23 +6105,23 @@
                 },
                 "type/restriction/no_straight_on": {
                     "name": "Движение направо или налево (4.1.4)",
-                    "terms": "Движение прямо запрещено, Движение налево или направо, 4.1.4"
+                    "terms": "движение прямо запрещено, движение налево или направо, 4.1.4"
                 },
                 "type/restriction/no_u_turn": {
                     "name": "Разворот запрещён (3.19)",
                     "terms": "Разворот запрещён, Без разворотов, Запрещён разворот"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "Движение налево (4.1.3)",
-                    "terms": "Только поворот налево, Движение налево, 4.1.3"
+                    "name": "Только поворот налево"
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "Движение направо (4.1.2)",
-                    "terms": "Только поворот направо, Движение направо, 4.1.2"
+                    "name": "Только поворот направо"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "Движение прямо (4.1.1)",
-                    "terms": "Движение прямо, повороты запрещены, только прямо, запрет поворотов, 4.1.1"
+                    "name": "Только прямо"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Только разворот"
                 },
                 "type/route": {
                     "name": "Маршрут",
@@ -6382,7 +6471,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Тайлы: Stamen Design, под CC BY 3.0"
+                    "text": "Тайлы: Stamen Design, под CC BY 3.0. Данные: OpenStreetMap, под ODbL"
                 },
                 "name": "Stamen Ландшафт"
             },
@@ -6398,6 +6487,38 @@
                 },
                 "name": "Thunderforest Ландшафт"
             }
+        },
+        "community": {
+            "OSM-RU-forum": {
+                "name": "Форум русскоязычного сообщества OSM",
+                "description": "Дискуссии, вопросы, голосования, проблемы и их решения — вам сюда."
+            },
+            "OSM-RU-telegram": {
+                "name": "Telegram-чат русскоязычного сообщества OSM",
+                "description": "Участники рады ответить на любой вопрос, связанный с использованием или рисованием карт, и готовы обсудить любую релевантную новость. Да, мы любим аниме и умеем устанавливать KDE на FreeBSD."
+            },
+            "Bay-Area-OpenStreetMappers": {
+                "description": "Улучшить перевод OpenStreetMap в Bay Area"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "Группа пользователей OpenStreetMap в Chattanooga"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland",
+                "description": "Мапперы и пользователи OpenStreetMap в Portland area"
+            },
+            "OSM-US-Slack": {
+                "name": "Slack OpenStreetMap US",
+                "description": "Приглашаются все! Регистрация на {signupUrl}"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Slack \"Maptime Australia\"",
+                "description": "Регистрация на {signupUrl}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap на Reddit"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/si.json b/dist/locales/si.json
index 2c6fa87bc..3c4fc73d2 100644
--- a/dist/locales/si.json
+++ b/dist/locales/si.json
@@ -525,9 +525,6 @@
                 "tracktype": {
                     "label": "වර්ගය"
                 },
-                "vending": {
-                    "label": "වර්ගය"
-                },
                 "water": {
                     "label": "වර්ගය"
                 },
diff --git a/dist/locales/sk.json b/dist/locales/sk.json
index 92c8e3860..c2e31221b 100644
--- a/dist/locales/sk.json
+++ b/dist/locales/sk.json
@@ -2182,9 +2182,6 @@
                     "label": "Typ",
                     "placeholder": "Prednastavené"
                 },
-                "vending": {
-                    "label": "Typ tovaru"
-                },
                 "visibility": {
                     "label": "Viditeľnosť",
                     "options": {
@@ -4612,18 +4609,6 @@
                     "name": "Zákaz otáčania",
                     "terms": "zakaz otacania"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Prikázaný smer jazdy vľavo",
-                    "terms": "Prikazany smer jazdy vlavo"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Prikázaný smer jazdy vpravo",
-                    "terms": "prikazany smer jazdy vpravo"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Prikázaný smer jazdy priamo",
-                    "terms": "prikazany smer jazdy priamo"
-                },
                 "type/route": {
                     "name": "Trasa",
                     "terms": "trasa,linka,trat,trať"
@@ -4838,7 +4823,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Základná mapa Rakúska, odvodená z vládnych dát.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -4899,9 +4883,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Mapové dlaždice od Stamen Design, pod CC BY 3.0"
-                },
                 "name": "Stamen terén"
             },
             "tf-cycle": {
diff --git a/dist/locales/sl.json b/dist/locales/sl.json
index 6290f19ed..4f0cd6769 100644
--- a/dist/locales/sl.json
+++ b/dist/locales/sl.json
@@ -2163,9 +2163,6 @@
                 "trees": {
                     "label": "Drevesa"
                 },
-                "vending": {
-                    "label": "Vrsta dobrin"
-                },
                 "visibility": {
                     "label": "Vidnost",
                     "options": {
@@ -4703,18 +4700,6 @@
                     "name": "Ni mogoče polkrožno obrniti",
                     "terms": "Polkrožno obračanje ni dovoljeno"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Možno je zaviti samo levo",
-                    "terms": "Dovoljeno je zaviti samo levo."
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Možno je zaviti samo desno",
-                    "terms": "Dovoljeno je zaviti samo desn"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Možno je samo nadaljevati naravnost",
-                    "terms": "Zavijanje ni dovoljeno."
-                },
                 "type/route": {
                     "name": "Proga",
                     "terms": "cesta,letalska linija,kolesarska pot,pohodniška pot,linija,pot"
@@ -4944,7 +4929,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Osnovni zemljevid Avstrije, ki temelji na uradnih podatkih",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
diff --git a/dist/locales/so.json b/dist/locales/so.json
index 52c4ba85a..6f9b6d0f5 100644
--- a/dist/locales/so.json
+++ b/dist/locales/so.json
@@ -20,6 +20,12 @@
                     "point": "Ku daray bar."
                 }
             },
+            "start": {
+                "annotation": {
+                    "line": "Bilaabay xariiq.",
+                    "area": "Bilaabay goob."
+                }
+            },
             "continue": {
                 "title": "Sii wad",
                 "description": "Sii wad khadkanan.",
@@ -36,7 +42,14 @@
                 "title": "Goobo geli",
                 "description": {
                     "line": "Ka dhig khadkan wareeg."
-                }
+                },
+                "not_closed": "Tani lagama dhigi karo wareeg maxaa yeelay ma aha duub"
+            },
+            "orthogonalize": {
+                "description": {
+                    "area": "Afar geesood ka dhig qararka goobtan."
+                },
+                "not_squarish": "Tani lagama dhigi karo afar gees, sababtoo ah ma aha mid afar gees ah"
             },
             "delete": {
                 "title": "Tirtir",
@@ -46,7 +59,8 @@
             },
             "disconnect": {
                 "title": "Jar Xiriirka",
-                "description": "Ka jar xiriirka khadadkan/goobahan midba midka kale."
+                "description": "Ka jar xiriirka khadadkan/goobahan midba midka kale.",
+                "not_connected": "Ma jiraan khadad/goobo ku filan halkan ku yaalo si loo joojiyo"
             },
             "move": {
                 "title": "Dhaqaaji",
@@ -96,16 +110,20 @@
         },
         "tooltip_keyhint": "Af-goys:",
         "translate": {
+            "translate": "Turjum",
             "localized_translation_label": "Magaca luqadaha badan",
             "localized_translation_language": "Dooro luuqada",
             "localized_translation_name": "Magaca"
         },
+        "zoom_in_edit": "Soo dhawee si aad u tifaftirto khariidada",
+        "help_translate": "Turjum",
         "commit": {
             "created": "Lagu suurtogeliyay"
         },
         "info_panels": {
             "background": {
                 "title": "Hagaajinta",
+                "zoom": "Soo dhawee",
                 "description": "Sharaxaad"
             },
             "history": {
@@ -126,14 +144,18 @@
             "title": "Muuji Goobtayda"
         },
         "inspector": {
+            "view_on_osm": "Ka eeg openstreetmap.org",
             "all_fields": "Dhammaan goobaha",
             "all_tags": "Dhammaan taxanbayaasha",
             "all_relations": "Dhammaan xiriirada",
             "choose": "Dooro nooca tilmaamaha",
+            "reference": "Ka eeg Wiki OpenStreetMap",
             "search": "Raadi",
             "feature_list": "Tilmaamaha Waydiimaha",
+            "edit": "Tifaftir tilmaamaha",
             "radio": {
                 "structure": {
+                    "type": "Nooca",
                     "layer": "Lakabka"
                 }
             },
@@ -169,13 +191,21 @@
             }
         },
         "success": {
+            "view_on_osm": "Ka eeg OSM",
             "facebook": "Faafi Facebook",
             "twitter": "Faafi Twitter",
             "google": "Faafi Google+"
         },
+        "splash": {
+            "welcome": "Ku soo dhowow id OpenStreetMap editor"
+        },
         "tag_reference": {
             "description": "Sharaxaad"
         },
+        "zoom": {
+            "in": "Soo dhawee",
+            "out": "Fogee"
+        },
         "help": {
             "title": "Caawin",
             "help": {
@@ -202,12 +232,23 @@
                 }
             }
         },
+        "intro": {
+            "welcome": {
+                "title": "Ku soo dhowow"
+            },
+            "startediting": {
+                "start": "Bilow Jihaynta!"
+            }
+        },
         "shortcuts": {
             "title": "Af-goys",
             "key": {
                 "delete": "Tirtir"
             },
             "browsing": {
+                "navigation": {
+                    "zoom": "Soo dhawee / Fogee"
+                },
                 "help": {
                     "title": "Caawin"
                 }
@@ -251,6 +292,12 @@
                 },
                 "category-road": {
                     "name": "Tilmaamaha Wadooyinka"
+                },
+                "category-water-area": {
+                    "name": "Tilmaamaha Biyaha"
+                },
+                "category-water-line": {
+                    "name": "Tilmaamaha Biyaha"
                 }
             },
             "fields": {
@@ -263,23 +310,80 @@
                     }
                 },
                 "address": {
+                    "label": "Cinwaanka",
                     "placeholders": {
                         "city": "Magaalo",
-                        "place": "Goob"
+                        "city!vn": "Magaalo",
+                        "place": "Goob",
+                        "street": "Wadada"
                     }
                 },
+                "aerialway": {
+                    "label": "Nooca"
+                },
+                "aeroway": {
+                    "label": "Nooca"
+                },
+                "amenity": {
+                    "label": "Nooca"
+                },
+                "area/highway": {
+                    "label": "Nooca"
+                },
+                "artwork_type": {
+                    "label": "Nooca"
+                },
+                "barrier": {
+                    "label": "Nooca"
+                },
+                "bicycle_parking": {
+                    "label": "Nooca"
+                },
+                "board_type": {
+                    "label": "Nooca"
+                },
+                "boules": {
+                    "label": "Nooca"
+                },
+                "boundary": {
+                    "label": "Nooca"
+                },
+                "bridge": {
+                    "label": "Nooca"
+                },
                 "building": {
                     "label": "Dhismo"
                 },
                 "building_area": {
                     "label": "Dhismo"
                 },
+                "bunker_type": {
+                    "label": "Nooca"
+                },
                 "capacity": {
                     "label": "Mug"
                 },
+                "castle_type": {
+                    "label": "Nooca"
+                },
+                "club": {
+                    "label": "Nooca"
+                },
+                "construction": {
+                    "label": "Nooca"
+                },
+                "craft": {
+                    "label": "Nooca"
+                },
+                "crossing": {
+                    "label": "Nooca"
+                },
                 "cuisine": {
                     "label": "Cunnada"
                 },
+                "cutting": {
+                    "label": "Nooca"
+                },
                 "cycleway": {
                     "label": "Dhabbaha Baaskiilada",
                     "types": {
@@ -296,32 +400,97 @@
                 "description": {
                     "label": "Sharaxaad"
                 },
+                "dock": {
+                    "label": "Nooca"
+                },
+                "electrified": {
+                    "options": {
+                        "no": "Maya",
+                        "yes": "Haa (unspecified)"
+                    }
+                },
+                "embankment": {
+                    "label": "Nooca"
+                },
+                "entrance": {
+                    "label": "Nooca"
+                },
+                "fence_type": {
+                    "label": "Nooca"
+                },
                 "fire_hydrant/type": {
+                    "label": "Nooca",
                     "options": {
                         "pond": "Balli"
                     }
                 },
+                "ford": {
+                    "label": "Nooca"
+                },
                 "generator/source": {
                     "label": "Bilowga xogta"
                 },
+                "generator/type": {
+                    "label": "Nooca"
+                },
+                "government": {
+                    "label": "Nooca"
+                },
+                "healthcare": {
+                    "label": "Nooca"
+                },
+                "highway": {
+                    "label": "Nooca"
+                },
+                "historic": {
+                    "label": "Nooca"
+                },
+                "information": {
+                    "label": "Nooca"
+                },
                 "internet_access": {
-                    "label": "Helitaanka Internet-ka"
+                    "label": "Helitaanka Internet-ka",
+                    "options": {
+                        "no": "Maya",
+                        "yes": "Haa"
+                    }
                 },
                 "internet_access/ssid": {
                     "label": "SSID (Magaca Network)"
                 },
+                "lamp_type": {
+                    "label": "Nooca"
+                },
+                "landuse": {
+                    "label": "Nooca"
+                },
                 "lanes": {
                     "label": "Tirada Dhabbooyinka"
                 },
+                "leisure": {
+                    "label": "Nooca"
+                },
                 "levels": {
                     "label": "Heerarka"
                 },
+                "man_made": {
+                    "label": "Nooca"
+                },
+                "manhole": {
+                    "label": "Nooca"
+                },
+                "map_type": {
+                    "label": "Nooca"
+                },
                 "maxheight": {
                     "label": "Dhererka ugu Sareeya"
                 },
                 "maxspeed": {
                     "label": "Xadka Xawaaraha"
                 },
+                "memorial": {
+                    "label": "Nooca"
+                },
                 "name": {
                     "label": "Magaca",
                     "placeholder": "Magaca guud (haddii uu jiro)"
@@ -329,11 +498,25 @@
                 "natural": {
                     "label": "Dabiiciga"
                 },
+                "note": {
+                    "label": "Qoraal"
+                },
+                "office": {
+                    "label": "Nooca"
+                },
                 "oneway": {
-                    "label": "Hal Wado"
+                    "label": "Hal Wado",
+                    "options": {
+                        "no": "Maya",
+                        "yes": "Haa"
+                    }
                 },
                 "oneway_yes": {
-                    "label": "Hal Wado"
+                    "label": "Hal Wado",
+                    "options": {
+                        "no": "Maya",
+                        "yes": "Haa"
+                    }
                 },
                 "opening_hours": {
                     "label": "Saacado"
@@ -344,23 +527,157 @@
                 "outdoor_seating": {
                     "label": "Fadhiga Banaanka"
                 },
+                "parking": {
+                    "label": "Nooca",
+                    "options": {
+                        "surface": "Sagxada"
+                    }
+                },
+                "piste/type": {
+                    "label": "Nooca"
+                },
+                "place": {
+                    "label": "Nooca"
+                },
+                "power": {
+                    "label": "Nooca"
+                },
+                "railway": {
+                    "label": "Nooca"
+                },
+                "relation": {
+                    "label": "Nooca"
+                },
+                "religion": {
+                    "label": "Diinta"
+                },
+                "restriction": {
+                    "label": "Nooca"
+                },
+                "route": {
+                    "label": "Nooca"
+                },
+                "route_master": {
+                    "label": "Nooca"
+                },
+                "second_hand": {
+                    "options": {
+                        "no": "Maya",
+                        "yes": "Haa"
+                    }
+                },
+                "service": {
+                    "label": "Nooca"
+                },
+                "shelter_type": {
+                    "label": "Nooca"
+                },
+                "shop": {
+                    "label": "Nooca"
+                },
+                "site": {
+                    "label": "Nooca"
+                },
                 "smoking": {
                     "label": "Sigaar-cabbista waa la oggolyahay"
                 },
+                "social_facility": {
+                    "label": "Nooca"
+                },
                 "source": {
                     "label": "Bilowga xogta"
                 },
                 "sport": {
                     "label": "Cayaaraha"
                 },
+                "sport_ice": {
+                    "label": "Cayaaraha"
+                },
+                "sport_racing_motor": {
+                    "label": "Cayaaraha"
+                },
+                "sport_racing_nonmotor": {
+                    "label": "Cayaaraha"
+                },
                 "structure": {
+                    "label": "Dhismo",
                     "options": {
                         "bridge": "Buundo",
-                        "ford": "Tog"
+                        "ford": "Tog",
+                        "tunnel": "Jid Dalool"
                     }
+                },
+                "structure_waterway": {
+                    "label": "Dhismo",
+                    "options": {
+                        "tunnel": "Jid Dalool"
+                    }
+                },
+                "studio": {
+                    "label": "Nooca"
+                },
+                "substation": {
+                    "label": "Nooca"
+                },
+                "surface": {
+                    "label": "Sagxada"
+                },
+                "switch": {
+                    "label": "Nooca"
+                },
+                "takeaway": {
+                    "label": "Qaadasho",
+                    "options": {
+                        "no": "Maya",
+                        "yes": "Haa"
+                    }
+                },
+                "toilets/disposal": {
+                    "options": {
+                        "pitlatrine": "Musqulo"
+                    }
+                },
+                "tomb": {
+                    "label": "Nooca"
+                },
+                "tourism": {
+                    "label": "Nooca"
+                },
+                "tower/type": {
+                    "label": "Nooca"
+                },
+                "trade": {
+                    "label": "Nooca"
+                },
+                "traffic_calming": {
+                    "label": "Nooca"
+                },
+                "traffic_signals": {
+                    "label": "Nooca"
+                },
+                "transformer": {
+                    "label": "Nooca"
+                },
+                "tunnel": {
+                    "label": "Nooca"
+                },
+                "wall": {
+                    "label": "Nooca"
+                },
+                "water": {
+                    "label": "Nooca"
+                },
+                "waterway": {
+                    "label": "Nooca"
+                },
+                "wetland": {
+                    "label": "Nooca"
                 }
             },
             "presets": {
+                "address": {
+                    "name": "Cinwaanka"
+                },
                 "aeroway/runway": {
                     "name": "Gegada diyaaradaha"
                 },
@@ -403,6 +720,12 @@
                 "amenity/school": {
                     "name": "Goobaha Dugsiyada"
                 },
+                "amenity/toilets": {
+                    "name": "Musqulo"
+                },
+                "area/highway": {
+                    "name": "Sagxada"
+                },
                 "barrier": {
                     "name": "Xannibaadaha"
                 },
@@ -433,6 +756,9 @@
                 "building/school": {
                     "name": "Dhismo Dugsiyada"
                 },
+                "building/stadium": {
+                    "name": "Dhismo Garoon"
+                },
                 "footway/crosswalk": {
                     "name": "Isgoyska Socotada"
                 },
@@ -460,6 +786,12 @@
                 "highway/service": {
                     "name": "Jidka Shaqaalaha"
                 },
+                "highway/tertiary": {
+                    "name": "Waddada Sarre"
+                },
+                "highway/track": {
+                    "name": "Jidka Jayga aan la Dayactirin"
+                },
                 "highway/unclassified": {
                     "name": "Waddo Yar/La cayimin"
                 },
@@ -514,6 +846,12 @@
                 "leisure/pitch/cricket": {
                     "name": "Garoon Kiriket"
                 },
+                "leisure/sports_centre": {
+                    "name": "Xarunta Cayaaraha"
+                },
+                "leisure/stadium": {
+                    "name": "Garoon"
+                },
                 "line": {
                     "name": "Khad"
                 },
@@ -535,15 +873,27 @@
                 "natural/coastline": {
                     "name": "Xeeb"
                 },
+                "natural/water": {
+                    "name": "Biyaha"
+                },
                 "natural/water/lake": {
                     "name": "Haro"
                 },
                 "natural/water/pond": {
                     "name": "Balli"
                 },
+                "natural/wetland": {
+                    "name": "Dhul biyo-fadhiyaan"
+                },
+                "natural/wood": {
+                    "name": "Duur"
+                },
                 "office/government": {
                     "name": "Xafiis Dowladeed"
                 },
+                "office/travel_agent": {
+                    "name": "Wakaalad Socdaal"
+                },
                 "place": {
                     "name": "Goob"
                 },
@@ -556,6 +906,9 @@
                 "place/locality": {
                     "name": "Deegaanka"
                 },
+                "place/town": {
+                    "name": "Magaalo"
+                },
                 "power/line": {
                     "name": "Khadka Korantada"
                 },
@@ -580,14 +933,29 @@
                 "shop/mobile_phone": {
                     "name": "Dukaanka Taleefoonka Gacanta"
                 },
+                "shop/supermarket": {
+                    "name": "Suuq-weyne"
+                },
+                "shop/travel_agency": {
+                    "name": "Wakaalad Socdaal"
+                },
                 "tourism/hotel": {
                     "name": "Huteel"
                 },
                 "type/route/ferry": {
                     "name": "Wadada Doonta"
                 },
+                "type/waterway": {
+                    "name": "Biyo Mareen"
+                },
+                "waterway": {
+                    "name": "Biyo Mareen"
+                },
                 "waterway/canal": {
                     "name": "Kanaal"
+                },
+                "waterway/dock": {
+                    "name": "Kaabi qoyan / Kaabi qallalan"
                 }
             }
         }
diff --git a/dist/locales/sr.json b/dist/locales/sr.json
index 63b076d67..f81bc4cff 100644
--- a/dist/locales/sr.json
+++ b/dist/locales/sr.json
@@ -1849,9 +1849,6 @@
                     "label": "Врста",
                     "placeholder": "Подразумевано"
                 },
-                "vending": {
-                    "label": "Врста добара"
-                },
                 "visibility": {
                     "label": "Видљивост",
                     "options": {
@@ -3662,15 +3659,6 @@
                 "type/restriction/no_u_turn": {
                     "name": "Забрана полукружног окретања"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Обавезан смер - лево"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Обавезан смер - десно"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Обавезан смер - право"
-                },
                 "type/route": {
                     "name": "Путања"
                 },
diff --git a/dist/locales/sv.json b/dist/locales/sv.json
index 50ac65fa7..66399339d 100644
--- a/dist/locales/sv.json
+++ b/dist/locales/sv.json
@@ -1,5 +1,10 @@
 {
     "sv": {
+        "icons": {
+            "information": "info",
+            "remove": "radera",
+            "undo": "ångra"
+        },
         "modes": {
             "add_area": {
                 "title": "Område",
@@ -287,10 +292,46 @@
             "restriction": {
                 "annotation": {
                     "create": "Lade till en svängrestriktion",
-                    "delete": "Tog bort en svängrestriktion"
+                    "delete": "Raderade en svängrestriktion"
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Distans",
+                "distance_up_to": "Upp till (distans)",
+                "via": "Via",
+                "via_node_only": "Enbart nod",
+                "via_up_to_one": "Upp till 1 väg",
+                "via_up_to_two": "Upp till 2 vägar"
+            },
+            "help": {
+                "indirect": "(indirekt)",
+                "turn": {
+                    "no_left_turn": "INGEN vänstersväng (indirekt)",
+                    "no_right_turn": "INGEN högersväng (indirekt)",
+                    "no_u_turn": "INGEN U-sväng (indirekt)",
+                    "no_straight_on": "INTE rakt fram (indirekt) ",
+                    "only_left_turn": "ENBART vänstersväng (indirekt)",
+                    "only_right_turn": "ENBART högersväng (indirekt)",
+                    "only_u_turn": "ENBART U-sväng (indirekt)",
+                    "only_straight_on": "ENBART rakt fram (indirekt)",
+                    "allowed_left_turn": "Vänstersväng tillåten (indirekt)",
+                    "allowed_right_turn": "Högersväng tillåten (indirekt)",
+                    "allowed_u_turn": "U-sväng tillåten (indirekt)",
+                    "allowed_straight_on": "Rakt fram tillåtet (indirekt)"
+                },
+                "from": "FRÅN",
+                "via": "VIA",
+                "to": "TILL",
+                "from_name": "{from} {fromName}",
+                "from_name_to_name": "{from} {fromName} {to} {toName}",
+                "via_names": "{via} {viaNames}",
+                "select_from": "Klicka för att välja ett {from}-segment",
+                "select_from_name": "Klicka för att välja {from} {fromName}",
+                "toggle": "Klicka för \"{turn}\""
+            }
+        },
         "undo": {
             "tooltip": "Ångra: {action}",
             "nothing": "Inget att ångra."
@@ -383,6 +424,8 @@
                 "title": "Mätning",
                 "selected": "{n} markerad(e)",
                 "geometry": "Geometri",
+                "closed_line": "Stängd linje",
+                "closed_area": "Stängt område",
                 "center": "Centrum",
                 "perimeter": "Omkrets",
                 "length": "Längd",
@@ -451,7 +494,7 @@
             "way": "Väg",
             "relation": "Relation",
             "location": "Plats",
-            "add_fields": "Lägg till fält:"
+            "add_fields": "Lägg till egenskap:"
         },
         "background": {
             "title": "Bakgrund",
@@ -463,6 +506,7 @@
             "switch": "Växla tillbaka till denna bakgrund",
             "custom": "Anpassa",
             "custom_button": "Ändra anpassad bakgrund",
+            "custom_prompt": "Ange en URL-mall för plattor. Giltiga nycklar är:\n  - {zoom} eller {z}, {x}, {y} enligt Z/X/Y-schema\n  - {-y} eller {ty} för Y-koordinat enligt omvänd TMS-stil\n  - {u} för QuadTile-scheman\n  - {switch:a,b,c} för multiplex mot DNS-server\n\nExempel:\n{example}",
             "overlays": "Bildlager",
             "imagery_source_faq": "Info om flygfotot / Rapportera ett problem",
             "reset": "ta bort",
@@ -574,6 +618,7 @@
             "status_code": "Servern returnerade statuskoden {code}",
             "unknown_error_details": "Kontrollera att du är ansluten till Internet.",
             "uploading": "Laddar upp ändringar till OpenStreetMap...",
+            "conflict_progress": "Söker efter konflikter: {num} av {total}",
             "unsaved_changes": "Du har osparade ändringar.",
             "conflict": {
                 "header": "Lös motstridiga ändringar",
@@ -645,6 +690,7 @@
             "untagged_area_tooltip": "Välj en typ som beskriver vad detta område är.",
             "untagged_relation": "Otaggad relation",
             "untagged_relation_tooltip": "Välj en typ som beskriver vad denna relation är.",
+            "many_deletions": "Du håller på att radera {n} objekt: {p} noder, {l} linjer, {a} områden, {r} relationer Är du helt säker på att du vill göra detta? Detta raderar dem från kartan som alla andra ser på openstreetmap.org.",
             "tag_suggests_area": "Taggen {tag} indikerar att detta borde vara ett område istället för en linje",
             "deprecated_tags": "Föråldrade taggar: {tags}"
         },
@@ -705,11 +751,180 @@
                 "title": "Redigera & spara",
                 "select_h": "Markera",
                 "select_left_click": "{leftclick} Vänsterklicka på ett objekt för att markera det. Markeringen kommer att synas med ett pulserande glöd, och sidopanelen kommer att visa detaljer om objektet, så som namn och adress.",
-                "select_right_click": "{rightclick} Högerklicka på ett objekt för att visa redigerarmenyn vilken innehåller kommandon som är tillgängliga, så som rotera, flytta och ta bort. ",
+                "select_right_click": "{rightclick} Högerklicka på ett objekt för att visa redigerarmenyn vilken innehåller kommandon som är tillgängliga, så som rotera, flytta och radera. ",
                 "multiselect_h": "Markera flera",
-                "multiselect_shift_click": "`{shift}`+{leftclick} Vänsterklicka för att markera flera objekt tillsammans. Detta gör det enkelt att flytta och ta bort flera objekt samtidigt.",
+                "multiselect_shift_click": "`{shift}`+{leftclick} Vänsterklicka för att markera flera objekt tillsammans. Detta gör det enkelt att flytta och radera flera objekt samtidigt.",
                 "multiselect_lasso": "Ett annat sätt att markera flera objekt är att hålla ned `{shift}`-tangenten, trycka och hålla ned {leftclick} vänster musknapp och sedan dra med musen för att rita ett markeringslasso. Alla punkter inuti lassot kommer att markeras.",
-                "undo_redo_h": "Ångra & gör om"
+                "undo_redo_h": "Ångra & gör om",
+                "undo_redo": "Dina ändringar lagras lokalt i din webbläsare tills dess att du väljer att spara dem på OpenStreetMaps server. Du kan ångra ändringar genom att klicka på  {undo} **Ångra**-knappen, och göra om dem genom att klicka på {redo} **Gör om**-knappen.",
+                "save_h": "Spara",
+                "save": "Klicka på {save} **Spara** för att slutföra dina redigeringar och skicka dem till OpenStreetMap. Du bör komma ihåg att spara ditt arbete regelbundet!",
+                "save_validation": "I sparapanelen har du möjlighet att granska vad du har gjort. iD kommer även att utföra några enkla kontroller av saknad data och kommer att ge hjälpsamma förslag och varningar om något inte verka rätt.",
+                "upload_h": "Ladda upp",
+                "upload": "Innan du kan ladda upp dina ändringar måste du ange en [ändringskommentar](https://wiki.openstreetmap.org/wiki/Good_changeset_comments). Klicka sedan på **Ladda upp** för att skicka dina ändringar till OpenStreetMap, där de kommer att införas i kartan och bli publikt synliga för alla.",
+                "backups_h": "Automatisk backup",
+                "backups": "Om du inte kan slutföra din redigering på en gång, t.ex. om din dator kraschar eller om du stänger fliken i webbläsaren, är dina ändringar ändå sparade i din webbläsare. Du kan komma tillbaka senare (med samma webbläsare och dator) och iD kommer då att erbjuda dig att återskapa ditt arbete. ",
+                "keyboard_h": "Kortokmmandon",
+                "keyboard": "Du kan visa en lista med kortokmmandon genom att trycka på tangenten `?`."
+            },
+            "feature_editor": {
+                "title": "Objektredigeraren",
+                "intro": "*Objektredigeraren* visas bredvid kartan, och låter dig se och ändra all information för valt objekt.",
+                "definitions": "Den översta sektionen visar objektets typ. Mittsektionen innehåller *egenskaper* som visar objektets attribut, så som namn och adress.",
+                "type_h": "Objekttyp",
+                "type": "Du kan klicka på objekttyp för att ändra objektet till en annan typ. Allt som finns i den verkliga världen kan läggas till i OpenStreetMap, så det finns tusentals objekttyper att välja bland.",
+                "type_picker": "Typväljaren visar de vanligaste objekttyperna, så som parker, sjukhus, restauranger, vägar och byggnader. Du kan söka efter vad som helst genom att skriva vad du söker efter i sökrutan. Du kan också klicka på {inspect} **Info**-ikonen bredvid en objekttyp för att lära dig mer om den.",
+                "fields_h": "Egenskaper",
+                "fields_all_fields": "Sektionen \"Alla egenskaper\" innehåller alla objektets detaljer som du kan redigera. I OpenStreetMap är alla egenskaper valfria, och det är ok att lämna en egenskap blank om du är osäker.",
+                "fields_example": "Varje objekttyp kommer att visa olika egenskaper. En väg t.ex. kan ha egenskaper om dess ytbeläggning och hastighetsbegränsning, medan en restaurang kan har egenskaper om vilken typ av mat de serverar och öppettider. ",
+                "fields_add_field": "Du kan även klicka på \"Lägg till egenskap\" för att lägga till fler egenskaper, så som beskrivning, Wikipedia-länk, handikappanpassning m.m.",
+                "tags_h": "Taggar",
+                "tags_all_tags": "Under sektionen egenskaper kan du trycka på \"Alla taggar\" för att redigera någon av OpenStreetMaps *taggar* för valt objekt. Varje tagg består av *nyckel* och *värde*, och är dataelement som definierar egenskaper för objektet lagrat på OpenStreetMap.",
+                "tags_resources": "Att redigera ett objekts taggar kräver viss kunskap om OpenStreetMap. Du bör ta en titt på sidor så som [OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Main_Page) eller [Taginfo](https://taginfo.openstreetmap.org/) för att lära dig mer om accepterade taggnings-principer på OpenStreetMap."
+            },
+            "points": {
+                "title": "Punkter",
+                "intro": "*Punkter* kan användas för att representera objekt så som affärer, restauranger och monument. De markerar en specifik plats och beskriver vad det är.",
+                "add_point_h": "Lägg till punkter",
+                "add_point": "För att lägga till en punkt, klicka på knappen {point} **Punkt** i verktygsraden ovanför kartan, eller tryck på kortkommandot `1`. Detta kommer att ändra muspekaren till ett kryss.",
+                "add_point_finish": "För att placera en ny punkt på kartan, placera muspekaren där den nya punkten ska vara och tryck på  {leftclick} vänster musknapp eller `mellanslag`.",
+                "move_point_h": "Flytta punkter",
+                "move_point": "För att flytta en punkt, placera muspekaren över punkten och håll ned  {leftclick} vänster musknapp medan du drar punkten till dess nya position.",
+                "delete_point_h": "Radera punkter",
+                "delete_point": "Det är ok att radera objekt som inte existerar i den verkliga världen. Genom att radera ett objekt från OpenStreetMap raderas det från kartan som alla användare ser, så du bör försäkra dig om att objektet verkligen inte finns i verkligheten innan du raderar det.",
+                "delete_point_command": "För att radera en punkt, {rightclick} högerklicka på punkten för att markera det och visa redigeramenyn. Använd sedan kommandot {delete} **Radera**."
+            },
+            "lines": {
+                "title": "Linjer",
+                "intro": "*Linjer* används för att representera objekt så som vägar, järnvägar och floder. Linjer bör ritas längst mitten av objektet de representerar.",
+                "add_line_h": "Lägg till linjer",
+                "add_line": "För att lägga till en linje, klicka på knappen {line} **Linje** i verktygsraden ovanför kartan, eller tryck på kortkommandot `2`. Detta kommer att ändra muspekaren till ett kryss.",
+                "add_line_draw": "Positionera sedan muspekaren där linjen ska starta och {leftclick} vänsterklicka eller tryck `mellanslag` för att börja placera noder längst linjen. Fortsätt placera noder genom att klicka eller trycka `mellanslag`. Medan du rita kan du zooma in eller flytta kartan för att lägg till fler detaljer. ",
+                "add_line_finish": "För att slutföra linjen, tryck `{return}` eller klicka igen på senaste noden.",
+                "modify_line_h": "Modifiera linjer",
+                "modify_line_dragnode": "Ofta ser du linjer som inte har korrekt form, t.ex. vägar som inte helt matchar med bakgrundsbilden. För att justera formen på en linje, {leftclick} vänsterklicka först på den för att markera den. Alla noder längst linjen kommer att visas som små cirklar. Du kan dra och flytta noderna till bättre platser.",
+                "modify_line_addnode": "Du kan även skapa nya noder längst en linje genom att {leftclick}**x2** dubbelklicka på linjen eller genom att dra i den lilla triangeln mellan noder.",
+                "connect_line_h": "Koppla ihop linjer",
+                "connect_line": "Att ha vägar sammankopplade korrekt är viktigt för kartan, och en förutsättning för att kunna ge navigeringsanvisningar.",
+                "connect_line_display": "Sammankopplade vägar visas med gråa cirklar. Ändpunkten av en linje ritas med en stor vit cirkel om den inte är ansluten till något.",
+                "connect_line_drag": "För att sammankoppla en linje till ett annat objekt, dra en av linjens noder över det andra objektet tills båda objekten kopplas ihop. Tips: Du kan hålla ned tangenten `{alt}` för att förhindra att noder kopplas ihop med andra objekt. ",
+                "connect_line_tag": "Om du vet att anslutningen har trafikljus eller övergångsställe kan du lägga till det genom att markera den anslutna noden och använda objektredigeraren för att välja objekttyp.",
+                "disconnect_line_h": "Koppla isär linjer",
+                "disconnect_line_command": "För att koppla isär vägar från andra objekt, {rightclick} högerklicka på den anslutna noden och välj kommandot {disconnect} **Koppla isär** i redigeringsmeny. ",
+                "move_line_h": "Flytta linjer",
+                "move_line_command": "För att flytta en hel linje, {rightclick} högerklicka på linjen och välj kommandot  {move} **Flytta** i redigeringsmeny. Flytta sedan musen och {leftclick} vänsterklicka för att placera linjen på dess nya placering. ",
+                "move_line_connected": "Linjer som är sammankopplade med andra objekt kommer att förbli sammankopplad när du flyttar linjen till dess nya placering. iD kan förhindra dig att flytta en linje förbi en annan sammankopplad linje.",
+                "delete_line_h": "Radera linjer",
+                "delete_line": "Om en linje är helt fel, t.ex. om en väg inte existerar i verkligheten, är det ok att radera den. Var försiktig när du radera objekt: bakgrundsbilden du använder kan vara föråldrad, och en väg som ser fel ut kan helt enkelt vara nybyggd.",
+                "delete_line_command": "För att radera en linje, {rightclick} högerklicka på linjen för att markera den och visa redigeramenyn. Använd sedan kommandot {delete} **Radera**."
+            },
+            "areas": {
+                "title": "Områden",
+                "intro": "*Områden* används för att visa utbredningen för objekt så som sjöar, byggnader och bostadsområden. Områden bör ritas längst kanten av objektet de representerar, t.ex. runt en byggnads bottenvåning.",
+                "point_or_area_h": "Punkter eller områden?",
+                "point_or_area": "Många objekt kan representeras både som punkter och som områden. Du bör rita konturen av byggnader och fastigheter som områden när det är möjligt. Placera punkter inuti en byggnads område för att representera företag, faciliteter och andra objekt lokaliserade inuti byggnaden.",
+                "add_area_h": "Lägg till områden",
+                "add_area_command": "För att lägga till ett område, klicka på knappen {area} **Område** i verktygsraden ovanför kartan, eller tryck på kortkommandot `3`. Detta kommer att ändra muspekaren till ett kryss.",
+                "add_area_draw": "Positionera sedan muspekaren i ett av hörnen för objektet och {leftclick} vänsterklicka eller tryck `mellanslag` för att börja placera noder runt den yttre kanten för området. Fortsätt placera noder genom att klicka eller trycka `mellanslag`. Medan du rita kan du zooma in eller flytta kartan för att lägg till fler detaljer. ",
+                "add_area_finish": "För att slutföra ett område, tryck `{return}` eller klicka igen på antingen första eller senaste noden.",
+                "square_area_h": "Räta upp hörn",
+                "square_area_command": "Många områdesobjekt så som byggnader har vinkelräta hörn. För att räta upp hörnen för ett område, {rightclick} högerklicka på kanten för området och välj kommandot {orthogonalize} **Räta upp** i redigeringsmenyn.",
+                "modify_area_h": "Modifiera områden",
+                "modify_area_dragnode": "Ofta ser du områden som inte har korrekt form, t.ex. en byggnad som inte helt matchar med bakgrundsbilden. För att justera formen på ett område, {leftclick} vänsterklicka först på den för att markera den. Alla noder längst området kommer att visas som små cirklar. Du kan dra och flytta noderna till bättre platser.",
+                "modify_area_addnode": "Du kan även skapa nya noder längst ett område genom att {leftclick}**x2** dubbelklicka på kanten till området eller genom att dra i den lilla triangeln mellan noder.",
+                "delete_area_h": "Radera områden",
+                "delete_area": "Om ett område är helt fel, t.ex. om en byggnad inte existerar i verkligheten, är det ok att radera den. Var försiktig när du radera objekt - bakgrundsbilden du använder kan vara föråldrad, och en byggnad som ser fel ut kan helt enkelt vara nybyggd.",
+                "delete_area_command": "För att radera ett område, {rightclick} högerklicka på området för att markera det och visa redigeramenyn. Använd sedan kommandot {delete} **Radera**."
+            },
+            "relations": {
+                "title": "Relationer",
+                "intro": "En *relation* är en speciell typ av objekt i OpenStreetMap som grupperar ihop andra objekt. Objekten som ingår i en relation kallas *medlemmar*, och varje medlem har en *roll* i relationen.",
+                "edit_relation_h": "Redigera relationer",
+                "edit_relation": "Längst ned i objektredigeraren kan du expandera sektionen \"Alla relationer\" för att se om valt objekt är medlem i någon relation. Du kan sedan klicka på en relation för att redigera den.",
+                "edit_relation_add": "För att lägga till ett objekt till en relation, markera objektet och klicka på  knappen {plus} **Lägg till** längst ned i sektionen \"Alla relationer\" i objektredigeraren. Du kan välja från en lista över närliggande relationer, eller välja \"Ny relation...\".",
+                "edit_relation_delete": "Du kan även klicka på knappen {delete} **Radera** för att radera valt objekt från relationen. Om du raderar alla medlemmar från en relation kommer relationen automatiskt att raderas. ",
+                "maintain_relation_h": "Hantera relationer",
+                "maintain_relation": "För det mesta hanterar iD relationerna automatiskt när du redigerar. Du bör vara försiktig när du ersätter objekt som kan vara medlemmar i relationer. Om du t.ex. raderar en sektion av en väg och ritar en ny sektion för att ersätta den, bör du lägga till den nya sektionen till samma relationer (rutter, svängrestriktioner, etc.) som den ursprungliga vägen.",
+                "relation_types_h": "Typer av relationer",
+                "multipolygon_h": "Multipolygoner",
+                "multipolygon": "En *multipolygon*-relation är en grupp av en eller flera *yttre* objekt och en eller flera *inre* objekt. De yttre objekten definierar den yttre kanten av av multipolygonen, och de inre objekten definierar delområden eller hål utklippta inuti multipolygonen.",
+                "multipolygon_create": "För att skapa en multipolygon, t.ex. en byggnad med hål i sig, rita den yttre gränsen som ett område och den inre gränsen som en linje eller annan typ av område. `{shift}`+{leftclick} vänsterklicka sedan för att markera båda objekten, {rightclick} högerklicka för att visa redigeringsmeny och välj kommandot {merge}&nbsp;**Sammanfoga**.",
+                "multipolygon_merge": "Sammanfogning av flera linjer eller områden skapar en ny multipolygon-relation med alla markerade områden som medlemmar. iD kommer automatiskt välja rollerna inre och yttre baserat på vilka objekt som finns inuti andra objekt.",
+                "turn_restriction_h": "Svängrestriktioner ",
+                "turn_restriction": "En *svängrestriktion*-relation är en grupp av flera vägsegment i en korsning. Svängrestriktioner består av en *från*-väg, en *via*-nod eller -vägar, och en *till*-väg.",
+                "turn_restriction_field": "För att redigera svängrestriktioner, markera en korsningsnod där två eller fler vägar möts. Objektredigeraren kommer att visa en speciell egenskap för svängrestriktioner med en visualisering av korsningen.",
+                "turn_restriction_editing": "I egenskapen \"Svängrestriktioner\", klicka på en \"från\"-väg för att se om det är tillåtet eller förbjudet att svänga in på någon av \"till\"-vägarna. Du kan klicka på sväng-ikonerna för att växla dem mellan tillåtet och förbjudet. iD kommer automatiskt skapa relationer och sätta rollerna \"från\", \"via\" och \"till\" baserat på dina val.",
+                "route_h": "Rutter",
+                "route": "En *rutt*-relation är en grupp av en eller flera linjer som tillsammans formar ett ruttnätverk, så som buss-rutter, tåg-rutter eller väg-rutt.",
+                "route_add": "För att lägga till ett objekt till en rutt-relation, välj objektet och bläddra ned till sektionen \"Alla relationer\" i objektredigeraren. Klicka sedan på knappen {plus} **Lägg till** för att lägga till detta objekt till en närliggande existerande relation eller en ny relation.",
+                "boundary_h": "Gränser",
+                "boundary": "En *gräns*-relation är en grupp av en eller flera linjer som tillsammans formar en administrativ gräns.",
+                "boundary_add": "För att lägga till ett objekt till en gräns-relation, välj objektet och bläddra ned till sektionen \"Alla relationer\" i objektredigeraren. Klicka sedan på knappen {plus} **Lägg till** för att lägga till detta objekt till en närliggande existerande relation eller en ny relation."
+            },
+            "imagery": {
+                "title": "Bakgrundsbilder",
+                "intro": "Bakgrundsbilderna som visas under kartdata är en viktig källa vid kartläggning. Dessa bilder kan vara flygfoton insamlade med satellit, flygplan eller drönare, eller så kan det vara inskannade historiska kartor eller andra fritt tillgängliga källor.",
+                "sources_h": "Bildkällor",
+                "choosing": "För att se vilka bildkällor som finns tillgängliga vid redigering, klicka på knappen {layers} **Bakgrundsinställningar** vid sidan av kartan.",
+                "sources": "Som standard är satellitelagret [Bing Maps](https://www.bing.com/maps/) valt som bakgrundsbild. Beroende på var du redigerar, finns andra bildkällor tillgängliga. Vissa kan vara nyare eller har bättre upplösning, så det är alltid klokt att kontrollera vilket lager som är bäst som referens vid kartering.",
+                "offsets_h": "Justera bildplacering",
+                "offset": "Bilder är ibland förskjutna lite i förhållande till korrekt kartdata. Om du ser att många vägar eller byggnader är förskjutna i förhållande till bakgrundsbilden kan det vara bakgrundsbilden som är felaktig, så flytta dem inte bara för att matcha bakgrunden. Justera istället bakgrunden så att den matchar med existerande data genom att expandera sektionen \"Justera bildplacering\" längst ned i panelen Bakgrundsinställningar.",
+                "offset_change": "Klicka på de små trianglarna för att justera bildplaceringen i små steg, eller håll ned vänster musknapp och dra i den grå rutan för att dra bilden till korrekt placering."
+            },
+            "streetlevel": {
+                "title": "Gatubilder",
+                "intro": "Gatubilder är användbart vid kartläggning av trafikmärken, företag och andra detaljer som du inte kan se från satellit- eller flygbilder. iD stöder gatubilder från [Mapillary](https://www.mapillary.com) och [OpenStreetCam](https://www.openstreetcam.org).",
+                "using_h": "Använda gatubilder",
+                "using": "För att använda gatubilder för kartläggning, klicka på panelen {data} **Kartdata** vid sidan av kartan för att aktivera eller avaktivera tillgängliga bildlager.",
+                "photos": "När aktiverad visar bildlagret en linje längst sekvensen av bilder. Vid högre inzoomning visas en cirkel för varje bild, och vid ännu högre zoom-nivå visar en kon riktningen kameran hade när bilden togs.",
+                "viewer": "När du klickar på en av bildernas placering visas en bildvisare i det nedre vänstra hörnet av kartan. Bildvisaren innehåller kontroller för att stega framåt eller bakåt i bildsekvensen. Den visar även användarnamn på personen som tog bilden, datum då den togs och en länk för att visa bilden på originalsidan."
+            },
+            "gps": {
+                "title": "GPS-spår",
+                "intro": "Insamlade GPS-spår är en värdefull datakälla för OpenStreetMap. Denna redigerare stöder filtyperna *.gpx*, *.geojson* och *.kml* på din lokala dator. Du kan samla in GPS-spår med en smartmobil, sportklocka eller andra GPS-enheter.",
+                "survey": "För information om hur du utför en GPS-uppmätning, läs [Kartlägg med en smartmobil, GPS eller papper](http://learnosm.org/en/mobile-mapping/).",
+                "using_h": "Använda GPS-spår",
+                "using": "För att använda ett GPS-spår vid kartläggning, dra och släpp datafilen på kartredigeraren. Om den har ett känt format kommer den att ritas på kartan med en ljus lila linje. Klicka på panelen {data} **Kartdata** vid sidan av kartan för att aktivera, avaktivera eller zooma din GPS-data.",
+                "tracing": "GPS-spåret skickas inte till OpenStreetMap - bästa sättet att använda den är att rita på kartan användandes den som guide för nya objekt du lägger till.",
+                "upload": "Du kan även [ladda upp dina GPS-data till OpenStreetMap](https://www.openstreetmap.org/trace/create) så att andra kan använda det."
+            },
+            "field": {
+                "restrictions": {
+                    "title": "Hjälp för svängrestriktioner ",
+                    "about": {
+                        "title": "Om",
+                        "about": "Denna egenskap låter dig inspektera och ändra svängrestriktioner. Den visar en modell över vald korsning inklusive närliggande anslutande vägar.",
+                        "from_via_to": "En svängrestriktion innehåller alltid: en **FRÅN-väg**, en **TILL-väg** och antingen en **VIA-nod** eller en eller flera **VIA-vägar**.",
+                        "maxdist": "\"{distField}\"-reglaget kontrollerar hur långt den ska söka för ytterligare anslutande vägar.",
+                        "maxvia": "\"{viaField}\"-reglaget justerar hur många vägar som kan ingå i sökningen. (Tips: enkelhet är bättre)"
+                    },
+                    "inspecting": {
+                        "title": "Inspektera",
+                        "about": "Håll musen över ett **FRÅN**-segment för att se om den har några svängrestriktioner. Varje möjlig **TILL**-destination kommer att visas med en färglagd skugga om restriktioner finns.",
+                        "from_shadow": "{fromShadow} **FRÅN-segment**",
+                        "allow_shadow": "{allowShadow} **TILL tillåten**",
+                        "restrict_shadow": "{restrictShadow} **TILL förbjuden**",
+                        "only_shadow": "{onlyShadow} **TILL enbart**",
+                        "restricted": "\"Förbjuden\" betyder att det finns en svängrestriktion, t.ex. \"Ingen vänstersväng\".",
+                        "only": "\"Enbart\" betyder att ett fordon som tar den vägen enbart kan göra det valet, t.ex. \"Enbart rakt fram\"."
+                    },
+                    "modifying": {
+                        "title": "Ändra",
+                        "about": "För att ändra svängrestriktioner, klicka först på ett **FRÅN**-segment att starta från. Det valda segmentet kommer att pulsera, och alla möjliga **TILL**-destinationer kommer att visas med svängsymboler.",
+                        "indicators": "Klicka sedan på en svängsymbol för att växla den mellan \"Tillåten\", \"Förbjuden\" och \"Enbart\"",
+                        "allow_turn": "{allowTurn} **TILL tillåten**",
+                        "restrict_turn": "{restrictTurn} **TILL förbjuden**",
+                        "only_turn": "{onlyTurn} **TILL enbart**"
+                    },
+                    "tips": {
+                        "title": "Tips",
+                        "simple": "**Föredra enkla restriktioner över komplexa.**",
+                        "simple_example": "Undvik t.ex. att skapa en \"via väg\"-restriktion om en simpel \"via nod\"-restriktion räcker.",
+                        "indirect": "**Vissa restriktioner visar texten \"(indirekt)\" och ritas lätt transparenta.**",
+                        "indirect_example": "Dessa restriktioner existerar tack vare en annan närliggande restriktion. T.ex. en \"Enbart rakt fram\"-restriktion kommer indirekt skapa \"Ingen sväng\"-restriktioner för alla andra vägar genom korsningen.",
+                        "indirect_noedit": "Du bör inte redigera indirekta restriktioner. Ändra istället den närliggande direkta restriktionen."
+                    }
+                }
             }
         },
         "intro": {
@@ -861,12 +1076,12 @@
                 "selected_townhall": "Vad bra! Punkten är nu markerad. Markerade objekt visas med en pulserande glödande ram.",
                 "editor_townhall": "När ett objekt är markerat visas *objektredigeraren* bredvid kartan.",
                 "preset_townhall": "Högst upp i objektredigeraren visas objekttyp. Denna punkt representerar ett {preset}.",
-                "fields_townhall": "Mittdelen av objektredigeraren innehåller *fält* som visar objektets attribut, såsom namn och adress. ",
+                "fields_townhall": "Mittdelen av objektredigeraren innehåller *egenskaper* som visar objektets attribut, såsom namn och adress. ",
                 "close_townhall": "**Stäng objektredigeraren genom att trycka på Escape på tangentbordet eller genom att trycka på knappen {button} i övre högra hörnet. ",
                 "search_street": "Du kan också söka efter objekt i aktuell vy eller globalt. **Sök efter '{name}'.**",
                 "choose_street": "**Välj {name} i listan för att markera den.**",
                 "selected_street": "Vad bra! {name} är nu markerad.",
-                "editor_street": "Fälten som visas för en väg är annorlunda mot fälten som visades för kommunhuset.{br}För markerad gata visar objektredigeraren fält som '{field1}' och '{field2}'. **Stäng objektredigeraren genom att trycka Escape eller trycka på knappen {button}.",
+                "editor_street": "Egenskaperna som visas för en väg är annorlunda mot egenskaperna som visades för kommunhuset.{br}För markerad gata visar objektredigeraren egenskaper som '{field1}' och '{field2}'. **Stäng objektredigeraren genom att trycka Escape eller trycka på knappen {button}.",
                 "play": "Prova att flytta runt på kartan och klicka på några andra objekt för att se vad för typ av saker som kan läggas till i OpenStreetMap. **När du är redo att fortsätta till nästa kapitel, tryck '{next}'.**"
             },
             "points": {
@@ -876,7 +1091,7 @@
                 "search_cafe": "Det finns många olika typer av objekt som kan representeras med punkter. Punkten du just lade till är ett café. **Sök efter '{preset}'.**",
                 "choose_cafe": "**Välj {preset} i listan.**",
                 "feature_editor": "Punkten är nu markerad som ett café. Med hjälp av objektredigeraren kan vi lägga till mer information om caféet. ",
-                "add_name": "På OpenStreetMap är alla fält valfria, och det är ok att lämna ett fält tomt om du är osäker.{br}Låt oss låtsas att du har lokalkännedom om caféet och vet dess namn. **Lägg till ett namn på caféet.**",
+                "add_name": "På OpenStreetMap är alla egenskaper valfria, och det är ok att lämna en egenskap tomt om du är osäker.{br}Låt oss låtsas att du har lokalkännedom om caféet och vet dess namn. **Lägg till ett namn på caféet.**",
                 "add_close": "Objektredigeraren kommer ihåg alla dina ändringar automatiskt. **När du är klar med att lägga till ett namn, tryck Escape, Enter eller klicka på knappen {button} för att stänga objektredigeraren.**",
                 "reselect": "Ofta existerar redan punkter men är felaktiga eller ofullständiga. Vi kan ändra redan existerande punkter. **Klicka för att markera caféet du just skapade.**",
                 "update": "Låt oss fylla i lite mer information om caféet. Du kan ändra dess namn, ange vad för typ av mat som serveras eller lägga till en adress. **Ändra information om caféet.**",
@@ -888,14 +1103,15 @@
             },
             "areas": {
                 "title": "Områden",
+                "add_playground": "*Områden* används för att visa avgränsningar för objekt så som sjöar, byggnader och bostadsområden.{br}De kan också användas för mer detaljerad kartläggning av många objekt som du kanske normalt skulle kartlägga som punkter. **Klicka på knappen {button} Område för att skapa ett nytt område.**",
                 "start_playground": "Låt oss lägga till denna lekplats på kartan genom att rita ett område. Områden ritas genom att placera *noder* längs yttre kanten av objektet. **Klicka eller tryck mellanslag för att placera en startnod på ett av hörnen av lekplatsen.**",
                 "continue_playground": "Fortsätt rita området genom att placera noder längs kanten på lekplatsen. Det är ok att ansluta området till existerande gångvägar.{br}Tips: Du kan hålla ned '{alt}'-tangenten för att förhindra att noder kopplas ihop med andra objekt. **Fortsätt att rita ett område runt lekplatsen.**",
                 "finish_playground": "Slutför området genom att trycka Enter eller genom att trycka igen på antingen första eller sista noden. **Rita färdigt området för lekplatsen.**",
                 "search_playground": "**Sök efter '{preset}'.**",
                 "choose_playground": "**Välj {preset} i listan.**",
-                "add_field": "Denna lekplats har inget officiellt namn, så vi anger inget i namnfältet.{br}Låt oss lägga till lite andra detaljer om lekplatsen i fältet Beskrivning. **Öppna listan för Lägg till fält.**",
+                "add_field": "Denna lekplats har inget officiellt namn, så vi anger inget för egenskapen namn.{br}Låt oss lägga till lite andra detaljer om lekplatsen i egenskapen Beskrivning. **Öppna listan för Lägg till egenskap.**",
                 "choose_field": "**Välj {field} i listan.**",
-                "retry_add_field": "Du valde inte fältet {field}. Låt oss försöka igen.",
+                "retry_add_field": "Du valde inte egenskapen {field}. Låt oss försöka igen.",
                 "describe_playground": "**Ange en beskrivning och klicka sedan på knappen {button} för att stänga objektredigeraren.**",
                 "play": "Bra jobbat! Prova att rita lite fler områden för att se vad för typ av områden du kan lägga till på OpenStreetMap. **När du är redo att fortsätta till nästa kapitel, klicka på '{next}'.**"
             },
@@ -1016,7 +1232,8 @@
                     "title": "Markera objekt",
                     "select_one": "Markera ett enskilt objekt",
                     "select_multi": "Markera flera objekt",
-                    "lasso": "Rita en markeringslasso runt objekt"
+                    "lasso": "Rita en markeringslasso runt objekt",
+                    "search": "Hitta objekt som matchar söktext"
                 },
                 "with_selected": {
                     "title": "Med objekt markerat",
@@ -1602,6 +1819,9 @@
                 "except": {
                     "label": "Undantag"
                 },
+                "faces": {
+                    "label": "sidor"
+                },
                 "fax": {
                     "label": "Fax",
                     "placeholder": "+46 31 123 4567"
@@ -1732,6 +1952,9 @@
                 "indoor": {
                     "label": "Inomhus"
                 },
+                "industrial": {
+                    "label": "Typ"
+                },
                 "information": {
                     "label": "Typ"
                 },
@@ -1852,6 +2075,10 @@
                     "label": "Hastighetsbegränsning",
                     "placeholder": "50, 70, 90..."
                 },
+                "maxspeed/advisory": {
+                    "label": "Rekommenderad lägre hastighet",
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "Maxtid"
                 },
@@ -2440,8 +2667,19 @@
                     "label": "Typ",
                     "placeholder": "Standard"
                 },
+                "usage_rail": {
+                    "label": "Användningsområde",
+                    "options": {
+                        "branch": "Sidospår",
+                        "industrial": "Industrispår",
+                        "main": "Huvudspår",
+                        "military": "Militärt spår",
+                        "test": "Testspår",
+                        "tourism": "Museijärnväg"
+                    }
+                },
                 "vending": {
-                    "label": "Typ av varor"
+                    "label": "Typ av gods"
                 },
                 "visibility": {
                     "label": "Synlighet",
@@ -3069,6 +3307,9 @@
                     "name": "Varumaskin för mensskydd",
                     "terms": "Varumaskin för mensskydd, mensskydd, kondom, tampong, bindor, binda, kvinna, kvinnor, mens, menstruation"
                 },
+                "amenity/vending_machine/fuel": {
+                    "name": "Bränslepump"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Tidningsautomat"
                 },
@@ -3307,11 +3548,11 @@
                     "terms": "Gymnasie, gymnasium, gymnasiebyggnad, universitet"
                 },
                 "building/commercial": {
-                    "name": "Kommersiell byggnad",
+                    "name": "Kontorsbyggnad",
                     "terms": "Kommersiell byggnad, kommersiellt, affärsbyggnad, handelsbyggnad"
                 },
                 "building/construction": {
-                    "name": "Byggnad under konstruktion",
+                    "name": "Byggnad under uppförande",
                     "terms": "Byggnad under konstruktion, Byggnad under uppförande, byggarbete, bygge, byggarbetsplats, byggnation, byggnadsplats"
                 },
                 "building/detached": {
@@ -3409,10 +3650,17 @@
                     "name": "Stall",
                     "terms": "Stall, hästar, häst, stallbyggnad, ridhus, ridhusanläggning"
                 },
+                "building/stadium": {
+                    "name": "Stadionbyggnad",
+                    "terms": "stadium, Stadion, arena, Stadionbyggnad, arenabyggnad, byggnad, stadion, friidrottsstadion"
+                },
                 "building/static_caravan": {
                     "name": "Villavagn",
                     "terms": "Villavagn, husvagn, campingvagn"
                 },
+                "building/temple": {
+                    "name": "Tempelbyggnad"
+                },
                 "building/terrace": {
                     "name": "Terrasshus",
                     "terms": "Terrasshus"
@@ -3864,6 +4112,9 @@
                     "name": "Anslutning, motorväg",
                     "terms": "Anslutning, motorvägsanslutning, påfart, avfart, trafikplats"
                 },
+                "highway/passing_place": {
+                    "name": "Mötesplats"
+                },
                 "highway/path": {
                     "name": "Stig",
                     "terms": "Stig, gång, led, spår, gångväg, vandringsled, vandra, vandring, promenad, löparbana, motionsspår"
@@ -4087,6 +4338,9 @@
                     "name": "Skog (brukad)",
                     "terms": "Skog, skogsvård, skogsområde, skogstrakt, träd, skogsdunge, dunge, lund, skogsplantering"
                 },
+                "landuse/garages": {
+                    "name": "Garageområde"
+                },
                 "landuse/grass": {
                     "name": "Gräs",
                     "terms": "Gräs, klippt gräs, refug, rondell, mittremsa"
@@ -4459,6 +4713,9 @@
                     "name": "Horisontell gruvgång (Stoll)",
                     "terms": "stoll, gruva, gruvgång, horisontell gruvgång, gruvgång, gruvingång, gruvhål, dagort, sidoort, Stollen, lichtloch"
                 },
+                "man_made/antenna": {
+                    "name": "Antenn"
+                },
                 "man_made/breakwater": {
                     "name": "Vågbrytare",
                     "terms": "Vågbrytare, pir, hamnarm, vågskydd, fördämning, hamnpir"
@@ -4510,6 +4767,9 @@
                     "name": "Utkikstorn",
                     "terms": "Utkikstorn, utsiktstorn, observationstorn, utsiktspost, observationspost, brandtorn"
                 },
+                "man_made/observatory": {
+                    "name": "Observatorium"
+                },
                 "man_made/petroleum_well": {
                     "name": "Oljeborr",
                     "terms": "Oljeborr, olja, petroleum, Oljeborrning, oljetorn, oljepump"
@@ -4634,6 +4894,9 @@
                     "name": "Hed",
                     "terms": "hed, äng, gräs, slättmark, slätt, tundra, stäpp, alvar, kalmark"
                 },
+                "natural/mud": {
+                    "name": "Lera"
+                },
                 "natural/peak": {
                     "name": "Bergstopp",
                     "terms": "Bergstopp, berg, alp, hjässa, kalott, klack, klint, klätt, kulle, höjdpunkt, höjd, topp"
@@ -5014,10 +5277,25 @@
                 "public_transport/linear_platform_aerialway": {
                     "name": "Hållplats / Plattform för linbana"
                 },
+                "public_transport/linear_platform_bus": {
+                    "name": "Bussplattform"
+                },
+                "public_transport/linear_platform_ferry": {
+                    "name": "Färjeplattform"
+                },
+                "public_transport/linear_platform_monorail": {
+                    "name": "Monorailplattform"
+                },
                 "public_transport/linear_platform_subway": {
                     "name": "Tunnelbanestopp / -plattform",
                     "terms": "Tunnelbanestopp, Tunnelbaneplattform, tunnelbana, metro, plattform, kollektivtrafik, järnväg, spår, transport, tunnelbana, underjordisk"
                 },
+                "public_transport/linear_platform_train": {
+                    "name": "Järnvägsplattform"
+                },
+                "public_transport/linear_platform_tram": {
+                    "name": "Spårvägsplattform"
+                },
                 "public_transport/platform_subway": {
                     "name": "Tunnelbanestopp / -plattform",
                     "terms": "Tunnelbanestopp, Tunnelbaneplattform, tunnelbana, metro, plattform, kollektivtrafik, järnväg, spår, transport, tunnelbana, underjordisk"
@@ -5026,6 +5304,22 @@
                     "name": "Tunnelbanestation",
                     "terms": "Tunnelbanestation,  tunnelbana, metro, , kollektivtrafik, järnväg, spår, transport, tunnelbana, underjordisk, station, terminal"
                 },
+                "public_transport/station_train": {
+                    "name": "Järnvägsstation",
+                    "terms": "Järnvägsstation, centralstation, central, huvudbangård, tågstation, järnvägshållplats, tåghållplats, trafikplats, hållställe, linjeplats, hållplats, "
+                },
+                "public_transport/station_train_halt": {
+                    "name": "Mindre järnvägshållplats",
+                    "terms": "Mindre järnvägshållplats, järnvägshållplats, hållplats, järnvägsstation, station, plattform, avstigning, påstigning, kollektivtrafik, järnväg, spår, tåg, transit, transport, hållställe"
+                },
+                "public_transport/station_tram": {
+                    "name": "Spårvagnsstation",
+                    "terms": "Spårvagnsstation, spårvagn, station, spårväg, spårvägshållplats, spårvagnsterminal"
+                },
+                "public_transport/station_trolleybus": {
+                    "name": "Station / Terminal för trådbuss",
+                    "terms": "Station / Terminal för trådbuss, station, terminal, trådbuss, buss, kollektivtrafik, linjetrafik, transport, hållplats, trådbusshållplats, trådbusstopp, trådbussterminal, busshållplats, busstopp, bussterminal"
+                },
                 "public_transport/stop_position": {
                     "name": "Stopposition för kollektivtrafik",
                     "terms": "Stopposition för kollektivtrafik, stopposition, kollektivtrafik, linjetrafik, transport, hållplats"
@@ -5093,14 +5387,25 @@
                     "name": "Bergbana ",
                     "terms": "Bergbana, linbana"
                 },
+                "railway/halt": {
+                    "name": "Mindre järnvägshållplats"
+                },
                 "railway/level_crossing": {
                     "name": "Järnvägskorsning (väg)",
                     "terms": "korsning, järnvägskorsning, järnvägsövergång, järnvägspassage, plankorsning, spårpassage, tågövergång, tågkorsning, tågpassage"
                 },
+                "railway/light_rail": {
+                    "name": "Smalspårig järnväg",
+                    "terms": "smalspårig järnväg, smalspår, järnväg"
+                },
                 "railway/milestone": {
                     "name": "Kilometerstolpe vid järnväg",
                     "terms": "Kilometerstolpe, kilometertavla, avståndsmärke, milsten, referenstavla, kilometerpåle"
                 },
+                "railway/miniature": {
+                    "name": "Miniatyrjärnväg",
+                    "terms": "Miniatyrjärnväg, Åkbar miniatyrjärnväg, smalspårig järnväg, smalspår, trädgårdsjärnväg"
+                },
                 "railway/monorail": {
                     "name": "Monorail",
                     "terms": "Monorail, enskensbana, balkbana"
@@ -5109,6 +5414,9 @@
                     "name": "Smalspårbana",
                     "terms": "Smalspårbana, smalspår"
                 },
+                "railway/platform": {
+                    "name": "Tågstopp / Perrong"
+                },
                 "railway/rail": {
                     "name": "Räls",
                     "terms": "Räls, järnvägsspår, spår, bana"
@@ -5117,6 +5425,9 @@
                     "name": "Järnvägssignal",
                     "terms": "järnvägssignal, signal, ljus, järnvägsljus, semafor, försignal,  huvudsignal, dvärgsignal"
                 },
+                "railway/station": {
+                    "name": "Järnvägsstation"
+                },
                 "railway/subway": {
                     "name": "Tunnelbana",
                     "terms": "Tunnelbana, T-bana, metro"
@@ -5137,6 +5448,9 @@
                     "name": "Spårvagn",
                     "terms": "Spårvagn, spårväg, motorvagn"
                 },
+                "railway/tram_stop": {
+                    "name": "Stopposition för spårvagn"
+                },
                 "relation": {
                     "name": "Relation",
                     "terms": "Relation, relaterat, förbindelse, förhållande, samband, anknytning, koppling, kontext"
@@ -5152,6 +5466,10 @@
                     "name": "Affär",
                     "terms": "Affär, shop, butik"
                 },
+                "shop/agrarian": {
+                    "name": "Jordbruksaffär",
+                    "terms": "Jordbruksaffär, Jordbruk, jordbruksmaskiner, frön, utsäde, bekämpningsmedel, gödningsmedel, gödsel, jordbruksverktyg, utsäde, djurmat, jordbruksutrustning, lantmannaföreningen"
+                },
                 "shop/alcohol": {
                     "name": "Vin-och-spritaffär",
                     "terms": "Vinaffär, spritaffär, vin- och sprit, vin- och spritaffär, systemet, systembolaget, bolaget, alkohol, öl, vin, sprit"
@@ -5390,6 +5708,10 @@
                     "name": "Järnaffär",
                     "terms": "Järnaffär, järnhandlare, skruv, skruvar, bult, bultar, spik, krokar, järnbeslag, järntillbehör, metallverktyg, verktyg, bygg, el, vvs, trädgårdsredskap, redskap, handverktyg, elverktyg, köksutrustning, badrum, kök, hushållsprodukter, lås, nycklar, nyckeltillverkning"
                 },
+                "shop/health_food": {
+                    "name": "Hälsokostbutik",
+                    "terms": "Hälsokostbutik, hälsokost, hälsomat, organisk, organist,  vitaminer, vegetarian, vegan, naturligt, kosttillskott, köttersättning, mjölkersättning"
+                },
                 "shop/hearing_aids": {
                     "name": "Hörapparater",
                     "terms": "Hörapparater, hörselskada, hörselskadade, hörhjälpmedel, hörsel"
@@ -5414,6 +5736,10 @@
                     "name": "Juvelerare",
                     "terms": "Juvelerare, smycken, halsband, ring, ringar, örhänge, örhängen, klocka, klockor, guld, silver, diamant, pärla, pärlor"
                 },
+                "shop/kiosk": {
+                    "name": "Kiosk",
+                    "terms": "Kiosk, gatukök, tidningar, godis, cigaretter, tobak, snus, dryck, läsk, butik, snabbmat, glass, korv"
+                },
                 "shop/kitchen": {
                     "name": "Köksinredning",
                     "terms": "Köksinredning, kök, bänkskivor, köksskåp, skåpluckor"
@@ -5506,6 +5832,10 @@
                     "name": "Djurbutik",
                     "terms": "Djuraffär, djur, husdjur, hund, hundar, katt, katter, djurmat, djurtillbehör, djurburar, akvarium, hund, fisk"
                 },
+                "shop/pet_grooming": {
+                    "name": "Pälsvård för husdjur",
+                    "terms": "Pälsvård för husdjur, pälsvård, husdjur, hund, Trimning, hundvård"
+                },
                 "shop/photo": {
                     "name": "Fotoaffär ",
                     "terms": "fotoaffär, bild, foto, video, fotografi, fotoredigering, framkallning, ram, kameratillbehör, kamera, kameror, filmkamera, fotokamera, konvertering, film"
@@ -5583,7 +5913,8 @@
                     "terms": "Leksaksaffär, leksaker, barnsaker"
                 },
                 "shop/trade": {
-                    "name": "Proffshandel"
+                    "name": "Proffshandel",
+                    "terms": "Proffshandel, proffsmarknad, proffs, byggnadsmaterial, byggmaterial, brädgård, brädor, Trähandel, trävaror, VVS-specialist, VVS, jordbruksprodukter, jordbruk, lantmannaföreningen, granngården, kakel, fönster"
                 },
                 "shop/travel_agency": {
                     "name": "Resebyrå",
@@ -5624,6 +5955,10 @@
                     "name": "Vapenaffär",
                     "terms": "Vapenaffär, vapen, ammunition, jakt, skjutvapen, kniv, knivar, pistol"
                 },
+                "shop/wholesale": {
+                    "name": "Grosistaffär",
+                    "terms": "grosist, Grosistaffär, Partihandel, grosshandel, grossistverksamhet, grosshandel, engros, mängdhandel, grossistlager, lagerklubb, grossistklubb"
+                },
                 "shop/window_blind": {
                     "name": "Persienner",
                     "terms": "Persienner, spjälgardin, jalusi, markis, rullgardin, spjäljalusi"
@@ -5665,7 +6000,8 @@
                     "terms": "Ställplats, campingplats, camping, husvagnscamping, husbilscamping, fricamping"
                 },
                 "tourism/chalet": {
-                    "name": "Stuga"
+                    "name": "Stuga",
+                    "terms": "Campingstuga, stuga, sommarstuga, ledighet, helg, helgboende, semester, semesterboende, semesterstuga, camping"
                 },
                 "tourism/gallery": {
                     "name": "Konstgalleri",
@@ -5724,7 +6060,8 @@
                     "terms": "Utsiktsplats, utsikt, vy"
                 },
                 "tourism/wilderness_hut": {
-                    "name": "Stuga (för vandrare o.d.)"
+                    "name": "Stuga (för vandrare o.d.)",
+                    "terms": "Stuga (för vandrare o.d.), stuga, fjällstuga, fjällstation, koja, skydd, hydda, kyffe, barack, vildmarksstuga, vandring, hajk, övernattning, Ödestuga"
                 },
                 "tourism/zoo": {
                     "name": "Zoo",
@@ -5767,7 +6104,8 @@
                     "terms": "Bullerräfflor, Pennsylvaniaräfflor"
                 },
                 "traffic_calming/table": {
-                    "name": "Fartgupp (långt)"
+                    "name": "Fartgupp (långt)",
+                    "terms": "Platågupp, gupp, farthinder, fartgupp, Fartgupp (långt), långt fartgupp"
                 },
                 "type/boundary": {
                     "name": "Gräns",
@@ -5802,15 +6140,19 @@
                 },
                 "type/restriction/only_left_turn": {
                     "name": "Enbart vänstersväng",
-                    "terms": "Enbart vänstersväng, bara vänstersväng, endast vänstersväng"
+                    "terms": "Enbart vänstersväng, vänstersväng, vänster"
                 },
                 "type/restriction/only_right_turn": {
                     "name": "Enbart högersväng",
-                    "terms": "enbart högersväng, endast högersväng, bara högersväng"
+                    "terms": "Enbart högersväng, högersväng, höger"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "Inga svängar",
-                    "terms": "Inga svängar, rakt fram, ingen sväng"
+                    "name": "Enbart rakt fram",
+                    "terms": "Enbart rakt fram, fortsätt framåt, får ej svänga"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Enbart U-sväng",
+                    "terms": "Enbart U-sväng, måste vända, U-sväng"
                 },
                 "type/route": {
                     "name": "Rutt",
@@ -5844,10 +6186,18 @@
                     "name": "Hästspår",
                     "terms": "Ridrutt, ridning, rida, häst, hästrutt, hästspår, ridspår"
                 },
+                "type/route/light_rail": {
+                    "name": "Rutt på smalspårig järnväg",
+                    "terms": "Rutt på smalspårig järnväg, smalspårig järnväg, smalspår, järnväg, järnvägsrutt, tågrutt, tågnät, järnvägsförbindelse"
+                },
                 "type/route/pipeline": {
                     "name": "Rörledningsrutt",
                     "terms": "Rörledningsrutt, rörledning, pipeline, oljeledning, vattenledning, avloppsledning"
                 },
+                "type/route/piste": {
+                    "name": "Pist/skidspår",
+                    "terms": "Pist, pistspår, skidor, skidspår, skidrutt, skidor, skidbacke, slalombacke, skidbana, utförsåkning, längdskidåkning, längdskidspår, skidtur, slädspår, skridskospår, skridskobana, skridskorutt, snöpark, slädspår"
+                },
                 "type/route/power": {
                     "name": "Kraftledningsrutt",
                     "terms": "Kraftledningsrutt, kraftledning, elförsörjning, elnät"
@@ -5877,7 +6227,8 @@
                     "terms": "Plats, ställe, läge, anläggning"
                 },
                 "type/waterway": {
-                    "name": "Vattendrag"
+                    "name": "Vattendrag",
+                    "terms": "Vattenväg, vattenflöde, vattendrag"
                 },
                 "vertex": {
                     "name": "Annat",
@@ -5931,7 +6282,8 @@
                     "terms": "vattendrag, bäck, dike, biflöde, flöde, ström, flod, flöde, rännil, biflod"
                 },
                 "waterway/stream_intermittent": {
-                    "name": "Tillfälligt vattendrag"
+                    "name": "Periodiskt vattendrag",
+                    "terms": "Periodiskt vattendrag, tillfälligt vattendrag, periodiskt, tillfälligt, Arroyo, bäck, avrinning, dränering, översvämning, rännil, biflöde, vattendrag, dike, dagvatten, dränering, avrinning"
                 },
                 "waterway/water_point": {
                     "name": "Dricksvatten för båt",
@@ -5987,6 +6339,13 @@
                 "description": "Esri världsflygfoto.",
                 "name": "Esri världsflygfoto"
             },
+            "EsriWorldImageryClarity": {
+                "attribution": {
+                    "text": "Villkor & återkoppling"
+                },
+                "description": "Arkivbilder från Esri som kan vara tydligare och mer korrekta än det normala lagret.",
+                "name": "Esri världsflygfoto (Clarity) Beta"
+            },
             "MAPNIK": {
                 "attribution": {
                     "text": "© OpenStreetMaps bidragsgivare, CC-BY-SA"
@@ -6055,18 +6414,33 @@
                 "name": "TIGER Roads 2017"
             },
             "Waymarked_Trails-Cycling": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMaps bidragsgivare, CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: Cykel"
             },
             "Waymarked_Trails-Hiking": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMaps bidragsgivare, CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: Vandring"
             },
             "Waymarked_Trails-MTB": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMaps bidragsgivare, CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: Mountainbike"
             },
             "Waymarked_Trails-Skating": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMaps bidragsgivare, CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: Inline skating"
             },
             "Waymarked_Trails-Winter_Sports": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMaps bidragsgivare, CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: Vintersport"
             },
             "basemap.at": {
@@ -6135,7 +6509,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Kartplattor av Stamen Design, under CC BY 3.0"
+                    "text": "Kartplattor av Stamen Design, under CC BY 3.0. Data från OpenStreetMap, under ODbL "
                 },
                 "name": "Stamen terräng"
             },
@@ -6151,6 +6525,90 @@
                 },
                 "name": "Thunderforest landskap"
             }
+        },
+        "community": {
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap Indien - Användarstödd kartläggning av grannskapet",
+                "description": "Förbättra OpenStreetMap i Indien",
+                "extendedDescription": "Kartlägger i Indien? Har du frågor, vill du ansluta till gemenskapen här? Gå med oss på {Url}. Alla är välkomna!"
+            },
+            "OSM-japan-facebook": {
+                "name": "OpenStreetMap Japan Community",
+                "description": "Kartläggare och OpenStreetMap-användare i Japan"
+            },
+            "OSM-japan-mailinglist": {
+                "name": "Epostlista för OpenStreetMap Japan",
+                "description": "Talk-ja är en officiell epostlista för den japanska gemenskapen"
+            },
+            "OSM-japan-twitter": {
+                "name": "OpenStreetMap Japan Twitter",
+                "description": "Hashtag på Twitter: {url}"
+            },
+            "OSM-PH-facebook": {
+                "name": "OpenStreetMap PH Facebook",
+                "description": "Välkommen till OpenStreetMap Filippinerna, där vi uppmuntrar alla filippiner att bidra till OpenStreetMap-projektet."
+            },
+            "OSM-PH-mailinglist": {
+                "name": "Talk-ph epostlista",
+                "description": "En epostlista för att diskutera OpenStreetMap på Filippinerna"
+            },
+            "OSM-PH-slack": {
+                "name": "OpenStreetMap PH Slack",
+                "description": "Alla är välkomna! Registrera dig på {signupUrl}"
+            },
+            "OSM-PH-telegram": {
+                "name": "OpenStreetMap PH Telegram",
+                "description": "Inofficiell, lokal gemenskap på Telegram för OpenStreetMaps bidragsgivare och vänner på Filippinerna"
+            },
+            "OSM-RU-forum": {
+                "name": "OpenStreetMap RU forum",
+                "description": "OpenStreetMap ryska webbforum"
+            },
+            "OSM-RU-telegram": {
+                "name": "OpenStreetMap RU telegram",
+                "description": "OpenStreetMap ryska telegram-chat"
+            },
+            "OSM-TW-facebook": {
+                "name": "OpenStreetMap Taiwan-gemenskap",
+                "description": "Facebook-grupp för kartläggare och OpenStreetMap-användare för att diskutera frågor rörande Taiwan."
+            },
+            "OSM-TW-mailinglist": {
+                "name": "OpenStreetMap Taiwan-epostlista",
+                "description": "Talk-tw är en officiell epostlista för att diskutera frågor som rör Taiwan"
+            },
+            "byosm": {
+                "name": "OpenStreetMap Vitryssland",
+                "description": "OpenStreetMap Vitrysslands telegram-chatt"
+            },
+            "talk-cz-mailinglist": {
+                "name": "Talk-cz epostlista",
+                "description": "Talk-cz är den officiella epostlistan för den tjeckiska gemenskapen"
+            },
+            "OSM-ES-telegram": {
+                "name": "@OSMes på Telegram",
+                "description": "OpenStreetMap spanska Telegram-chat"
+            },
+            "OSM-Vancouver-meetup": {
+                "name": "OpenStreetMap Vancouver",
+                "description": "Kartläggare och OpenStreetMap-användare i Vancouver, BC-området"
+            },
+            "Bay-Area-OpenStreetMappers": {
+                "name": "Bay Area OpenStreetMappers",
+                "description": "Förbättra OpenStreetMap i San Francisco Bay Area",
+                "extendedDescription": "Den här gruppen handlar om att odla OpenStreetMap-gemenskapen här i San Francisco Bay Area. Våra evenemang är öppna för alla, från open source-entusiaster, cyklister, GIS-proffs, geocachare m.m. Precis alla som är intresserade av kartor, kartläggning och gratis kartdata är välkomna att delta i vår grupp samt delta i våra evenemang."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "Central Pennsylvania OSM",
+                "description": "Online-kartläggningsgemenskap baserat på State College, PA"
+            },
+            "Code-for-San-Jose-Slack": {
+                "name": "Kod för San Jose Slack",
+                "description": "Alla är välkomna! Registrera dig på {signupUrl} och anslut sedan till #osm-kanalen."
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM",
+                "description": "OpenStreetMap-användargruppen för Dallas-Fort Worth"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/tl.json b/dist/locales/tl.json
index 3210ccac7..dea754f8f 100644
--- a/dist/locales/tl.json
+++ b/dist/locales/tl.json
@@ -1,5 +1,8 @@
 {
     "tl": {
+        "icons": {
+            "remove": "tanggalin"
+        },
         "modes": {
             "add_area": {
                 "title": "Poligon",
@@ -38,11 +41,11 @@
             "start": {
                 "annotation": {
                     "line": "Nagsimula ng isang linya.",
-                    "area": "Nagsimula sa isang area o polygon."
+                    "area": "Nagsimula ng isang area o polygon."
                 }
             },
             "continue": {
-                "key": "a",
+                "key": "A",
                 "title": "Ipagpatuloy",
                 "description": "Ipagpatuloy ang linyang ito.",
                 "not_eligible": "Walang linyang maaring ipagpatuloy dito.",
@@ -264,6 +267,14 @@
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Distansya"
+            },
+            "help": {
+                "from": "GALING"
+            }
+        },
         "undo": {
             "tooltip": "I-undo:{action}",
             "nothing": "Walang ma-undo"
@@ -313,6 +324,24 @@
             "list": "Edits nina {users}",
             "truncated_list": "Edits nina {users} at {count} iba pa"
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "source": "Pinagmulan",
+                "description": "Paglalarawan"
+            },
+            "history": {
+                "key": "H",
+                "title": "Bersyon"
+            },
+            "location": {
+                "title": "Lokasyon"
+            },
+            "measurement": {
+                "location": "Lokasyon"
+            }
+        },
         "geometry": {
             "point": "tuldok",
             "vertex": "tuluktok",
@@ -698,6 +727,15 @@
                 "amenity": {
                     "label": "Uri"
                 },
+                "animal_boarding": {
+                    "label": "Para sa hayop"
+                },
+                "animal_breeding": {
+                    "label": "Para sa hayop"
+                },
+                "animal_shelter": {
+                    "label": "Para sa hayop"
+                },
                 "area/highway": {
                     "label": "Uri"
                 },
@@ -754,12 +792,18 @@
                 "board_type": {
                     "label": "uri"
                 },
+                "boules": {
+                    "label": "Uri"
+                },
                 "boundary": {
                     "label": "Uri"
                 },
                 "brand": {
                     "label": "tatak"
                 },
+                "bridge": {
+                    "label": "Uri"
+                },
                 "building": {
                     "label": "Gusali"
                 },
@@ -769,6 +813,10 @@
                 "bunker_type": {
                     "label": "uri"
                 },
+                "cables": {
+                    "label": "Mga kable",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Direksyon (Paikot sa kanan)",
                     "placeholder": "45, 90, 180, 270"
@@ -791,9 +839,18 @@
                 "castle_type": {
                     "label": "uri"
                 },
+                "clothes": {
+                    "label": "Mga damit"
+                },
+                "club": {
+                    "label": "Uri"
+                },
                 "collection_times": {
                     "label": "Mga oras ng koleksyon"
                 },
+                "communication_multi": {
+                    "label": "Mga uri ng komunikasyon"
+                },
                 "construction": {
                     "label": "Uri"
                 },
@@ -801,6 +858,9 @@
                     "label": "URL ng webcam",
                     "placeholder": "http://example.com/"
                 },
+                "content": {
+                    "label": "Nilalaman"
+                },
                 "country": {
                     "label": "bansa"
                 },
@@ -816,6 +876,9 @@
                 "currency_multi": {
                     "label": "Uri ng pera"
                 },
+                "cutting": {
+                    "label": "Uri"
+                },
                 "cycle_network": {
                     "label": "Network"
                 },
@@ -861,12 +924,56 @@
                 "denotation": {
                     "label": "denotasyon"
                 },
+                "description": {
+                    "label": "Paglalarawan"
+                },
+                "devices": {
+                    "label": "Mga aparato",
+                    "placeholder": "1, 2, 3..."
+                },
+                "direction": {
+                    "label": "Direksyon (Degrees Clockwise)",
+                    "placeholder": "45, 90, 180, 270"
+                },
+                "direction_cardinal": {
+                    "label": "Direksyon",
+                    "options": {
+                        "E": "Silangan",
+                        "ENE": "Silangan-Hilagang-silangan",
+                        "ESE": "Silangan-Timog-silangan",
+                        "N": "Hilaga",
+                        "NE": "Hilagang-silangan",
+                        "NNE": "Hilaga-Hiligang-silangan",
+                        "NNW": "Hilaga-Hilagang-kanluran",
+                        "NW": "Hilagang-kanluran",
+                        "S": "Timog",
+                        "SE": "Timog-silangan",
+                        "SSE": "Timog-Timog-silangan",
+                        "SSW": "Timog-Timog-kanluran",
+                        "SW": "Timog-kanluran",
+                        "W": "Kanluran",
+                        "WNW": "Kanluran-Hilagang-kanluran",
+                        "WSW": "Kanluran-Timog-kanluran"
+                    }
+                },
+                "direction_clock": {
+                    "label": "Direksyon"
+                },
+                "direction_vertex": {
+                    "label": "Direksyon",
+                    "options": {
+                        "both": "Pareho / Lahat"
+                    }
+                },
                 "display": {
                     "label": "Ipakita"
                 },
                 "dock": {
                     "label": "uri"
                 },
+                "duration": {
+                    "placeholder": "00:00"
+                },
                 "electrified": {
                     "options": {
                         "no": "Hindi",
@@ -876,6 +983,9 @@
                 "email": {
                     "placeholder": "example@example.com"
                 },
+                "emergency": {
+                    "label": "Kagipitan"
+                },
                 "entrance": {
                     "label": "Uri"
                 },
@@ -896,28 +1006,86 @@
                     }
                 },
                 "fire_hydrant/type": {
+                    "label": "Uri",
+                    "options": {
+                        "wall": "Pader"
+                    }
+                },
+                "fixme": {
+                    "label": "Ayusin Mo Ako"
+                },
+                "ford": {
                     "label": "Uri"
                 },
+                "gender": {
+                    "label": "Kasarian",
+                    "options": {
+                        "female": "Babae",
+                        "male": "Lalaki"
+                    },
+                    "placeholder": "Hindi alam"
+                },
+                "generator/method": {
+                    "label": "Paraan"
+                },
+                "generator/source": {
+                    "label": "Pinagmulan"
+                },
                 "generator/type": {
                     "label": "Uri"
                 },
+                "government": {
+                    "label": "Uri"
+                },
+                "hashtags": {
+                    "placeholder": "#halimbawa"
+                },
+                "healthcare": {
+                    "label": "Uri"
+                },
                 "highway": {
                     "label": "Uri"
                 },
                 "historic": {
                     "label": "Uri"
                 },
+                "hoops": {
+                    "placeholder": "1, 2, 4..."
+                },
+                "iata": {
+                    "label": "IATA"
+                },
+                "icao": {
+                    "label": "ICAO"
+                },
+                "incline_steps": {
+                    "options": {
+                        "down": "Baba",
+                        "up": "Taas"
+                    }
+                },
+                "industrial": {
+                    "label": "Uri"
+                },
                 "information": {
                     "label": "Uri"
                 },
                 "internet_access": {
                     "options": {
-                        "wlan": "Wifi"
+                        "no": "Hindi",
+                        "wlan": "Wifi",
+                        "yes": "Oo"
                     }
                 },
                 "landuse": {
                     "label": "Uri"
                 },
+                "lanes": {
+                    "placeholder": "1, 2, 3..."
+                },
+                "layer": {
+                    "placeholder": "0"
+                },
                 "leisure": {
                     "label": "Uri"
                 },
diff --git a/dist/locales/tr.json b/dist/locales/tr.json
index 4dbdb85c9..6120aca40 100644
--- a/dist/locales/tr.json
+++ b/dist/locales/tr.json
@@ -2413,9 +2413,6 @@
                     "label": "Tür",
                     "placeholder": "Varsayılan"
                 },
-                "vending": {
-                    "label": "Ürün Çeşidi"
-                },
                 "visibility": {
                     "label": "Görüş",
                     "options": {
@@ -5705,18 +5702,6 @@
                     "name": "U-dönüşü Yasak",
                     "terms": "U-dönüşü Yasak"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "Sola Dönüş Zorunlu",
-                    "terms": "Sola Dönüş Zorunlu"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "Sağa Dönüş Zorunlu",
-                    "terms": "Sağa Dönüş Zorunlu"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "Dönüş Yasak",
-                    "terms": "Dönüş Yasak"
-                },
                 "type/route": {
                     "name": "Güzergah",
                     "terms": "Güzergah, Rota"
@@ -5996,7 +5981,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Hükümet verilerinden oluşturulmuş Avusturya haritası",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6057,9 +6041,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Harita Stamen Design, CC BY 3.0"
-                },
                 "name": "Stamen Arazi"
             },
             "tf-cycle": {
diff --git a/dist/locales/uk.json b/dist/locales/uk.json
index 2e33f1a75..bc3cbca25 100644
--- a/dist/locales/uk.json
+++ b/dist/locales/uk.json
@@ -1,5 +1,10 @@
 {
     "uk": {
+        "icons": {
+            "information": "інформація",
+            "remove": "вилучити",
+            "undo": "відмінити"
+        },
         "modes": {
             "add_area": {
                 "title": "Полігон",
@@ -1703,6 +1708,9 @@
                         "cycleway:right": "Праворуч"
                     }
                 },
+                "dance/style": {
+                    "label": "Види танців"
+                },
                 "date": {
                     "label": "Дата"
                 },
@@ -1941,6 +1949,9 @@
                 "indoor": {
                     "label": "План приміщення"
                 },
+                "industrial": {
+                    "label": "Тип"
+                },
                 "information": {
                     "label": "Тип"
                 },
@@ -2061,6 +2072,10 @@
                     "label": "Обмеження швидкості",
                     "placeholder": "40, 50, 60…"
                 },
+                "maxspeed/advisory": {
+                    "label": "Рекомендована швидкість",
+                    "placeholder": "40, 50, 60…"
+                },
                 "maxstay": {
                     "label": "Максимальний час"
                 },
@@ -2649,8 +2664,16 @@
                     "label": "Тип",
                     "placeholder": "Типово"
                 },
-                "vending": {
-                    "label": "Тип товарів"
+                "usage_rail": {
+                    "label": "Тіп колії",
+                    "options": {
+                        "branch": "Гілка",
+                        "industrial": "Промислова",
+                        "main": "Основний путь",
+                        "military": "Військова",
+                        "test": "Випробувальна",
+                        "tourism": "Туристична"
+                    }
                 },
                 "visibility": {
                     "label": "Видно з",
@@ -4100,6 +4123,10 @@
                     "name": "З’їзд з/на автомагістраль",
                     "terms": "Motorway Link, ppl fdnjvfuscnhfkm, естакада, виїзд з, виїзд на, з’їзд з, з’їзд на"
                 },
+                "highway/passing_place": {
+                    "name": "Місце для роз'їзду",
+                    "terms": "дорога,дати шлях,роз'їзд,переваги,рух,зустрічний рух"
+                },
                 "highway/path": {
                     "name": "Стежка",
                     "terms": "Path, cntrf, тропа"
@@ -4475,6 +4502,10 @@
                     "name": "Зала для танців",
                     "terms": "танці,зала,бальні танці,розваги,дозвілля,клуб,інтереси,тренування"
                 },
+                "leisure/dancing_school": {
+                    "name": "Школа танців",
+                    "terms": "школа,клуб,танці,танцювальна,танго,модерн,вальс,ча-ча-ча,латино,сучасні,хіп-хоп"
+                },
                 "leisure/dog_park": {
                     "name": "Парк для собак",
                     "terms": "Dog Park, gfhr lkz cjfr, парк для собак"
@@ -4750,6 +4781,10 @@
                     "name": "Оглядова вежа",
                     "terms": "Observation tower, jukzljdf dtf, пожежна вежа, вежа спостереження"
                 },
+                "man_made/observatory": {
+                    "name": "Обсерваторія",
+                    "terms": "астрономія,метеорологія,спостереження,зірки,погода"
+                },
                 "man_made/petroleum_well": {
                     "name": "Нафтова свердловина",
                     "terms": "drilling rig,oil derrick,oil drill,oil horse,oil rig,oil pump,petroleum well,pumpjack,нафта,насос,свердловина,викачування нафти"
@@ -6213,16 +6248,20 @@
                     "terms": "знак, обмеження, розворот, немає, заборона"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "Поворот тільки праворуч",
-                    "terms": "знак, обмеження, поворот, праворуч, тільки"
+                    "name": "Тільки ліворуч",
+                    "terms": "поворот,рух,ліворуч,заборона"
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "Поворот тільки ліворуч",
-                    "terms": "знак, обмеження, ліворуч, поворот, тільки"
+                    "name": "Тільки праворуч",
+                    "terms": "поворот,рух,праворуч,заборона"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "Тільки прямо",
-                    "terms": "знак, обмеження, тільки прямо, поворота немає"
+                    "name": "ТІльки прямо",
+                    "terms": "рух,прямо,заборона"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Тільки розворот",
+                    "terms": "рух,розворот,заборона"
                 },
                 "type/route": {
                     "name": "Маршрут",
@@ -6517,7 +6556,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Базова мапа Австрії, на основі урядових даних.",
+                "description": "Мапа Австрії, на основі урядових даних.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6579,7 +6618,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Тайли мапи від Stamen Design, CC BY 3.0"
+                    "text": "Тайли мапи від Stamen Design, CC BY 3.0. Дані OpenStreetMap, ODbL."
                 },
                 "name": "Stamen Terrain"
             },
@@ -6595,6 +6634,12 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "OSM-Reddit": {
+                "name": "OpenStreetMap на Reddit",
+                "description": "/r/openstreetmap/ чудове місце, щоб дізнатись більше про OpenStreetMap. Можете питати про будь-що!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/vi.json b/dist/locales/vi.json
index 80f81b39e..ab64ed2ee 100644
--- a/dist/locales/vi.json
+++ b/dist/locales/vi.json
@@ -1,5 +1,10 @@
 {
     "vi": {
+        "icons": {
+            "information": "thông tin",
+            "remove": "xóa",
+            "undo": "hoàn tác"
+        },
         "modes": {
             "add_area": {
                 "title": "Vùng",
@@ -1814,6 +1819,9 @@
                 "except": {
                     "label": "Ngoại lệ"
                 },
+                "faces": {
+                    "label": "Số Mặt"
+                },
                 "fax": {
                     "label": "Số Fax",
                     "placeholder": "+84 1 234 5678"
@@ -1944,6 +1952,9 @@
                 "indoor": {
                     "label": "Trong Nhà"
                 },
+                "industrial": {
+                    "label": "Kiểu"
+                },
                 "information": {
                     "label": "Kiểu"
                 },
@@ -2064,6 +2075,10 @@
                     "label": "Tốc độ Tối đa",
                     "placeholder": "40, 50, 60…"
                 },
+                "maxspeed/advisory": {
+                    "label": "Tốc độ Tối đa Khuyến cáo",
+                    "placeholder": "40, 50, 60…"
+                },
                 "maxstay": {
                     "label": "Thời gian Ở Tối đa"
                 },
@@ -2188,7 +2203,7 @@
                     "label": "Cơ quan Chủ quản"
                 },
                 "outdoor_seating": {
-                    "label": "Ngồi ở Ngoài"
+                    "label": "Ngồi Ngoài trời"
                 },
                 "par": {
                     "label": "Điểm chuẩn",
@@ -2652,6 +2667,17 @@
                     "label": "Kiểu",
                     "placeholder": "Bình thường"
                 },
+                "usage_rail": {
+                    "label": "Kiểu Sử dụng",
+                    "options": {
+                        "branch": "Nhánh",
+                        "industrial": "Công nghiệp",
+                        "main": "Chính",
+                        "military": "Quân sự",
+                        "test": "Thử nghiệm",
+                        "tourism": "Du lịch"
+                    }
+                },
                 "vending": {
                     "label": "Loại Hàng hóa"
                 },
@@ -2833,6 +2859,10 @@
                     "name": "Ga Sân bay",
                     "terms": "ga sân bay, ga phi trường, nhà ga sân bay, nhà ga phi trường, ga san bay, ga phi truong, nha ga san bay, nha ga phi truong"
                 },
+                "allotments/plot": {
+                    "name": "Mảnh Vườn Gia đình",
+                    "terms": "mảnh vườn gia đình, miếng vườn gia đình, mảnh đất trong khu vườn gia đình, miếng đất trong khu vườn gia đình, manh vuon dia dinh, mieng vuon gia dinh, manh dat trong khu vuon gia dinh, mieng dat trong khu vuon gia dinh"
+                },
                 "amenity": {
                     "name": "Tiện nghi"
                 },
@@ -3061,6 +3091,10 @@
                     "name": "Chợ phiên",
                     "terms": "chợ phiên, chợ trời, chợ xổm, chợ, cho phien, cho troi, cho xom, cho"
                 },
+                "amenity/monastery": {
+                    "name": "Sân Tu viện",
+                    "terms": "sân tu viện, san tu vien"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Chỗ Đậu Xe máy",
                     "terms": "chỗ đậu xe máy, đậu xe máy, chỗ đậu mô-tô, chỗ đậu mô tô, đậu mô-tô, chỗ đậu mô tô, chỗ đậu xe hai bánh, đậu xe hai bánh, chỗ đậu xe ba bánh, đậu xe ba bánh, cho dau xe may, dau xe may, cho dau mo-to, cho dau mo to, dau mo-to, dau mo to, cho dau xe hai banh, dau xe hai banh, cho dau xe ba banh, dau xe ba banh"
@@ -3265,6 +3299,10 @@
                     "name": "Máy Bán Thuốc lá",
                     "terms": "máy bán thuốc lá, may ban thuoc la"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "Máy Bán Cà phê",
+                    "terms": "máy bán cà phê, máy bán cà-phê, may ban ca phe, may ban ca-phe"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "Máy Bán Bao Cao su",
                     "terms": "máy bán bao cao su, máy phát bao cao su, máy bán bao dương vật, máy phát bao dương vật, máy bán túi cao su, máy phát túi cao su, máy bán ca pốt, máy phát ca pốt, máy bán ca-pốt, máy phát ca-pốt, may ban bao cao su, may phat bao cao su, may ban bao duong vat, may phat bao duong vat, may ban tui cao su, may phat tui cao su, may ban ca pot, may phat ca pot, may ban ca-pot, may phat ca-pot"
@@ -3273,6 +3311,14 @@
                     "name": "Máy Bán Nước uống",
                     "terms": "máy bán nước uống, may ban nuoc uong"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "Máy Bán Thiết bị Điện tử",
+                    "terms": "máy bán thiết bị điện tử, máy bán điện tử, điện thoại, điện thoại di động, cáp, bộ sạc điện, bộ nạp điện, máy sạc điện, máy nạp điện, tai nghe, máy tính bảng, may ban thiet bi dien tu, may ban dien tu, dien thoai, dien thoai di dong, cap, bo sac dien, bo nap dien, may sac dien, may nap dien, tai nghe, may tinh bang"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "Máy In dấu vào Tiền",
+                    "terms": "máy in dấu vào tiền, máy đóng dấu vào tiền, máy in tiền, xu, đồng xu, tiền kỷ niệm, tiền kỉ niệm, may in dau vao tien, may dong dau vao tien, may in tien, xu, dong xu, tien ky niem, tien ki niem"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "Máy Phát Bao Cứt Chó",
                     "terms": "máy phát bao cứt chó, may phat bao cut cho"
@@ -3281,6 +3327,18 @@
                     "name": "Máy Bán Sản phẩm Vệ sinh Nữ giới",
                     "terms": "máy bán sản phẩm vệ sinh nữ giới, máy bán sản phẩm vệ sinh phụ nữ, máy bán băng vệ sinh, máy bán băng vệ sinh dạng ống, may ban san pham ve sinh nu gioi, may ban san pham ve sinh phu nu, may ban bang ve sinh, may ban ban ve sinh dang ong"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "Máy Bán Đồ ăn",
+                    "terms": "máy bán đồ ăn, máy bán thức ăn, máy bán đồ ăn nhanh, máy bán đồ ăn tự động, khoai tây chiên, bánh quy, bánh ngọt, kẹo, nước ngọt, nước giải khát, nước ngọt có ga, cô ca cô la, cô-ca cô-la, cô-ca-cô-la, côcacôla, kẹo nhai, kẹo cao su, gum, kẹo gum, kẹo sinh-gum, kẹo sinh gum, sinh-gum, sinh gum, may ban do an, may ban thuc an, may ban do an nhanh, may ban do an tu dong, khoai tay chian, banh quy, banh ngot, keo, nuoc ngot, nuoc giai khat, nuoc ngot co ga, co ca co la, co-ca co-la, co-ca-co-la, cocacola, keo nhai, keo cao su, keo gum, keo sinh-gum, keo sinh gum"
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "Trụ Bơm Xăng",
+                    "terms": "trụ bơm xăng, trụ bơm xăng dầu, cây xăng, cột xăng, xăng ét xăng, ét-xăng, nhiên liệu, diesel, gazole, khí hóa lỏng, khí hoá lỏng, khí thiên nhiên lỏng, khí ga lỏng, khí gas lỏng, tru bom xang, tru bom xang dau, cay xang, cot xang, xang et xang, et-xang, nhien lieu, khi hoa long, khi thien nhien long, khi ga long, khi gas long"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "Máy Bán Kem",
+                    "terms": "máy bán kem, máy bán kem tự động, máy bán cà rem, máy bán cà-rem, kem que, may ban kem, may ban kem tu dong, may ban ca rem, may ban ca-rem"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "Máy Bán Báo"
                 },
@@ -3300,6 +3358,10 @@
                     "name": "Máy Bán Vé Phương tiện Công cộng",
                     "terms": "máy bán vé, máy bán vé phương tiện công cộng, máy bán vé xe buýt, máy bán vé xe điện, máy bán vé xe lửa, may ban ve, may ban ve phuong tien cong cong, may ban ve xe buyt, may ban ve xe dien, may ban ve xe lua"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "Máy Bán Tem",
+                    "terms": "máy bán tem, máy ban tem tự động, tem thư, tem bưu chính, may ban tem, may ban tem tu dong, tem thu, tem buu chinh"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "Máy Bán Kẹo",
                     "terms": "máy bán kẹo, may ban keo"
@@ -4103,6 +4165,10 @@
                     "name": "Nhánh Ra vào Đường Cao tốc",
                     "terms": "đường nhánh cao tốc, đoạn nhánh cao tốc, đường nhánh rẽ cao tốc, đoạn nhánh rẽ cao tốc, đường nhánh chuyển đường cao tốc, nhánh chuyển đường cao tốc, lối ra vào đường cao tốc, lối ra đường cao tốc, lối vào đường cao tốc, nhánh ra đường cao tốc, nhánh vào đường cao tốc, đường nối đường cao tốc, duong nhanh cao toc, doan nhanh cao toc, duong nhanh re cao toc, doan nhanh re cao toc, duong nhanh chuyen duong cao toc, nhanh chuyen duong cao toc, loi ra vao duong cao toc, loi ra duong cao toc, loi vao duong cao toc, nhanh ra duong cao toc, nhanh vao duong cao toc, duong noi duong cao toc"
                 },
+                "highway/passing_place": {
+                    "name": "Chỗ Tránh Xe",
+                    "terms": "chỗ tránh xe, vị trí tránh xe, nơi tránh xe, cho tranh xe, vi tri tranh xe, noi tranh xe"
+                },
                 "highway/path": {
                     "name": "Lối",
                     "terms": "đường mòn, duong mon"
@@ -4462,6 +4528,10 @@
                     "name": "Khu Trò chơi Điện tử",
                     "terms": "khu trò chơi điện tử, trung tâm trò chơi điện tử, trò chơi cảm giác mạnh, trò chơi video, trò chơi bắn bóng, pinball, trò chơi lái xe ảo, khu tro choi dien tu, trung tam tro choi dien tu, tro choi cam giac manh, tro choi video, tro choi ban bong, tro choi lai xe ao"
                 },
+                "leisure/beach_resort": {
+                    "name": "Bãi biển Nghỉ dưỡng",
+                    "terms": "bãi biển nghỉ dưỡng, bãi biển nghỉ ngơi, bãi biển nghỉ hè, bai bien nghi duong, bai bien nghi ngoi, bai bien nghi he"
+                },
                 "leisure/bird_hide": {
                     "name": "Căn nhà Quan sát Chim",
                     "terms": "căn nhà quan sát chim, căn nhà quan sát động vật, can nha quan sat chim, can nha quan sat dong vat"
@@ -4578,6 +4648,10 @@
                     "name": "Khu Bảo tồn Thiên nhiên",
                     "terms": "khu bảo tồn thiên nhiên, khu vực bảo tồn thiên nhiên, khu cấm săn bắn, khu vực cấm săn bắn, khu cấm câu cá, khu vực cấm câu cá, khu bao ton thien nhien, khu vuc bao ton thien nhien, khu cam san ban, khu vuc cam san ban, khu cam cau ca, khu vuc cam cau ca"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "Khu Ăn uống Ngoài trời",
+                    "terms": "khu ăn uống ngoài trời, điểm ăn uống ngoài trời, không gian ngoài trời, không gian giữa trời, bàn ăn ngoài trời, quán rượu ngoài trời, quán bia ngoài trời"
+                },
                 "leisure/park": {
                     "name": "Công viên",
                     "terms": "công viên, vườn, vườn hoa, vườn cây, bãi cỏ, bãi cỏ xanh, thảm cỏ xanh, vành đai xanh, khu vui chơi, khu vui chơi trẻ em, khu chơi trẻ em, sân chơi, quảng trường, rừng, cong vien, vuon, vuon hoa, vuon cay, bai co, bai co xanh, tham co xanh, vanh dai xanh, khu vui choi, khu vui choi tre em, khu choi tre em, san choi, quang truong, rung"
@@ -4706,6 +4780,10 @@
                     "name": "Lối vào Mỏ",
                     "terms": "lối vào mỏ, đường vào mỏ, loi vao mo, duong vao mo"
                 },
+                "man_made/antenna": {
+                    "name": "Ăngten",
+                    "terms": "ăngten, ăng-ten, ăng ten, anten, an-ten, radio, rađiô, ra-đi-ô, vô tuyến, anten radio, anten rađiô, an-ten ra-đi-ô, tv, tivi, anten tv, anten tivi, angten, ang-ten, ang ten, anten, an-ten, ra-di-o, vo tuyen, anten ra-di-o"
+                },
                 "man_made/breakwater": {
                     "name": "Đê Chắn Sóng",
                     "terms": "đê chắn sóng, de chan song"
@@ -4747,7 +4825,7 @@
                 },
                 "man_made/mast": {
                     "name": "Cột Ăngten",
-                    "terms": "cột ăngten, cột ăng-ten, cột ăng ten, cột anten, cột an-ten, cột radio, cột rađiô, cột ra-đi-ô, cột vô tuyến, tháp radio, tháp rađiô, tháp ra-đi-ô, tháp vô tuyến, anten radio, anten rađiô, an-ten ra-đi-ô, cột tv, cột tivi, tháp tv, tháp tivi, anten tv, anten tivi, cot angten, cot ang-ten, cot ang ten, cot anten, cot an-ten, cot radio, cot ra-di-o, cot vo tuyen, thap radio, thap ra-di-o, thap vo tuyen, anten radio, anten ra-di-o, cot tv, cot vivi, thap tv, thap tivi, anten tv, anten tivi"
+                    "terms": "cột ăngten, cột ăng-ten, cột ăng ten, cột anten, cột an-ten, cột radio, cột rađiô, cột ra-đi-ô, cột vô tuyến, tháp radio, tháp rađiô, tháp ra-đi-ô, tháp vô tuyến, anten radio, anten rađiô, an-ten ra-đi-ô, cột tv, cột tivi, tháp tv, tháp tivi, anten tv, anten tivi, cot angten, cot ang-ten, cot ang ten, cot anten, cot an-ten, cot radio, cot ra-di-o, cot vo tuyen, thap radio, thap ra-di-o, thap vo tuyen, anten radio, anten ra-di-o, cot tv, cot tivi, thap tv, thap tivi, anten tv, anten tivi"
                 },
                 "man_made/monitoring_station": {
                     "name": "Trạm Giám sát",
@@ -4757,6 +4835,10 @@
                     "name": "Tháp Quan sát",
                     "terms": "tháp quan sát, trạm quan sát, tầng quan sát, thap quan sat, tram quan sat, tang quan sat"
                 },
+                "man_made/observatory": {
+                    "name": "Đài Quan sát",
+                    "terms": "đài quan sát, đài thiên văn, đài quan sát thiên văn, kính thiên văn, kiếng thiên văn, đài quan sát khí tượng, đài quan sát núi lửa, dai quan sat, dai thien van, dai quan sat thien van, kinh thien van, kieng thien van, dai quan sat khi tuong, dai quan sat nui lua"
+                },
                 "man_made/petroleum_well": {
                     "name": "Giếng Dầu",
                     "terms": "giếng dầu, gieng dau"
@@ -4881,6 +4963,10 @@
                     "name": "Bãi hoang",
                     "terms": "bãi hoang, bai hoang"
                 },
+                "natural/mud": {
+                    "name": "Bùn",
+                    "terms": "bùn, bùn lầy, bun, bun lay"
+                },
                 "natural/peak": {
                     "name": "Đỉnh núi",
                     "terms": "đồi, núi, đỉnh núi, đỉnh, chỏm núi, chỏm, chóp núi, chóp, chỏm chóp, doi, nui, dinh nui, dinh, chom nui, chom, chop nui, chop, chom chop"
@@ -5917,6 +6003,10 @@
                     "name": "Tiệm Vật nuôi",
                     "terms": "tiệm bán vật nuôi, tiệm bán đồ nuôi thú vật, cửa hàng vật nuôi, cửa hiệu thú vật, đồ ăn thú vật, chó, mèo, tiem ban vat nuoi, tiem ban do nuoi thu vat, cua hang vat nuoi, cua hieu thu vat, do an thu vat, cho, meo"
                 },
+                "shop/pet_grooming": {
+                    "name": "Dịch vụ Tỉa lông",
+                    "terms": "dịch vụ tỉa lông, tỉa lông thú cưng, tỉa lông chó, tỉa lông mèo, tỉa lông ngựa, dich vu tia long, tia long thu cung, tia long cho, tia long meo, tia long ngua"
+                },
                 "shop/photo": {
                     "name": "Tiệm Chụp Hình",
                     "terms": "tiệm chụp hình, tiệm lấy hình, tiệm lấy ảnh, tiệm nhiếp ảnh, cửa hàng chụp hình, cửa hàng lấy hình, cửa hàng lấy ảnh, cửa hàng nhiếp ảnh, tiem chup hinh, tiem lay hinh, tiem lay anh, tiem nhiep anh, cua hang chup hinh, cua hang lay hinh, cua hang lay anh, cua hang nhiep anh"
@@ -6220,16 +6310,20 @@
                     "terms": "cấm quay ngược trở lại, không quay ngược trở lại, đừng quay ngược trở lại, cam quay nguoc tro lai, khong quay nguoc tro lai, dung quay nguoc tro lai, cam quay nguoc tro lai"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "Chỉ Rẽ Trái",
-                    "terms": "chỉ rẽ trái, chỉ cho phép rẽ trái, chỉ quẹo trái, chỉ cho phép quẹo trái, chỉ ngoặt trái, chỉ cho phép ngoặt trái, chỉ ngoắt trái, chỉ cho phép ngoắt trái, chỉ quặt trái, chỉ cho phép quặt trái, chi re trai, chi cho phep re trai, chi queo trai, chi cho phep queo trai, chi ngoat trai, chi cho phep ngoat trai, chi ngoat trai, chi cho phep ngoat trai, chi quat trai, chi cho phep quat trai"
+                    "name": "Chỉ Rẽ trái",
+                    "terms": "chỉ quẹo trái, chỉ cho phép quẹo trái, chỉ rẽ trái, chỉ cho phép rẽ trái, chi queo trai, chi cho phep queo trai, chi re trai, chi cho phep re trai"
                 },
                 "type/restriction/only_right_turn": {
                     "name": "Chỉ Rẽ Phải",
-                    "terms": "chỉ rẽ phải, chỉ cho phép rẽ phải, chỉ quẹo phải, chỉ cho phép quẹo phải, chỉ ngoặt phải, chỉ cho phép ngoặt phải, chỉ ngoắt phải, chỉ cho phép ngoắt phải, chỉ quặt phải, chỉ cho phép quặt phải, chi re phai, chi cho phep re phai, chi queo phai, chi cho phep queo phai, chi ngoat phai, chi cho phep ngoat phai, chi ngoat phai, chi cho phep ngoat phai, chi quat phai, chi cho phep quat phai"
+                    "terms": "chỉ quẹo phải, chỉ cho phép quẹo phải, chỉ rẽ phải, chỉ cho phép rẽ phải, chi queo phai, chi cho phep queo phai, chi re phai, chi cho phep re phai"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "Cấm Rẽ Trái/Phải",
-                    "terms": "cấm rẽ trái phải, không rẽ trái phải, đừng rẽ trái phải, cấm quẹo trái phải, không quẹo trái phải, đừng quẹo trái phải, chỉ chạy thẳng, chỉ cho phép chạy thẳng, cam re trai phai, khong re trai phai, dung re trai phai, cam queo trai phai, khong queo trai phai, dung queo trai phai, chi chay thang, chi cho phep chay thang"
+                    "name": "Chỉ Chạy Thẳng",
+                    "terms": "chỉ chạy thẳng, chỉ đi thẳng, chỉ cho phép chạy thẳng, chỉ cho phép đi thẳng, cấm quẹo, cấm rẽ, không quẹo, không rẽ, đừng quẹo, đừng rẽ, chi chay thang, chi di thang, chi cho phep chay thang, chi cho phep di thang, cam queo, cam re, khong queo, khong re, dung queo, dung re"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Chỉ Quay Ngược",
+                    "terms": "chỉ quay ngược, chỉ quay vòng lại, chỉ vòng ngược lại, chỉ cho phép quay ngược, chỉ cho phép quay vòng lại, chỉ cho phép vòng ngược lại, chi quay nguoc, chi quay vong lai, chi vong nguoc lai, chi cho phep quay nguoc, chi cho phep quay vong lai, chi cho phep vong nguoc lai"
                 },
                 "type/route": {
                     "name": "Tuyến đường",
@@ -6586,7 +6680,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Hình bản đồ do Stamen Design cung cấp dưới CC BY 3.0"
+                    "text": "Hình bản đồ do Stamen Design cung cấp dưới CC BY 3.0. Dữ liệu do OpenStreetMap cung cấp dưới ODbL."
                 },
                 "name": "Địa thế Stamen"
             },
@@ -6602,6 +6696,229 @@
                 },
                 "name": "Phong cảnh Thunderforest"
             }
+        },
+        "community": {
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap Ấn Độ – tham gia lập bản đồ hàng xóm",
+                "description": "Cải thiện OpenStreetMap tại Ấn Độ",
+                "extendedDescription": "Bạn có lập bản đồ tại Ấn Độ? Bạn có thắc mắc, muốn liên hệ với cộng đồng tại đây? Mời bạn tham gia tại {Url}."
+            },
+            "OSM-japan-facebook": {
+                "name": "Cộng đồng OpenStreetMap Nhật Bản",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở Nhật Bản"
+            },
+            "OSM-japan-mailinglist": {
+                "name": "Danh sách thư OpenStreetMap Nhật Bản",
+                "description": "talk-ja là danh sách thư chính thức của cộng đồng Nhật Bản"
+            },
+            "OSM-japan-twitter": {
+                "name": "Twitter OpenStreetMap Nhật Bản",
+                "description": "Thẻ băm tại Twitter: {url}"
+            },
+            "OSM-PH-facebook": {
+                "name": "Facebook OpenStreetMap Philippines",
+                "description": "OpenStreetMap Philippines khuyến khích mọi người Philippines đóng góp vào dự án OpenStreetMap."
+            },
+            "OSM-PH-mailinglist": {
+                "name": "Danh sách thư talk-ph",
+                "description": "Danh sách thư để thảo luận về OpenStreetMap tại Philippines"
+            },
+            "OSM-PH-slack": {
+                "name": "Slack OpenStreetMap Philippines",
+                "description": "Mời bạn tham gia tại {signupUrl}"
+            },
+            "OSM-PH-telegram": {
+                "name": "Telegram OpenStreetMap Philippines",
+                "description": "Cộng đồng địa phương Telegram không chính thức dành cho những người đóng góp vào OpenStreetMap và bạn bè ở Philippines"
+            },
+            "OSM-RU-forum": {
+                "name": "Diễn đàn OpenStreetMap Nga",
+                "description": "Diễn đàn Web của OpenStreetMap Nga"
+            },
+            "OSM-RU-telegram": {
+                "name": "Telegram OpenStreetMap Nga",
+                "description": "Trò chuyện Telegram của OpenStreetMap Nga"
+            },
+            "OSM-TW-facebook": {
+                "name": "Cộng đồng OpenStreetMap Đài Loan",
+                "description": "Nhóm Facebook cho phép những người lập bản đồ và người dùng OpenStreetMap để thảo luận về Đài Loan."
+            },
+            "OSM-TW-mailinglist": {
+                "name": "Danh sách thư OpenStreetMap Đài Loan",
+                "description": "talk-tw là danh sách thư chính thức của cộng đồng Đài Loan"
+            },
+            "byosm": {
+                "name": "OpenStreetMap Belarus",
+                "description": "Trò chuyện Telegram OpenStreetMap Belarus"
+            },
+            "talk-cz-mailinglist": {
+                "name": "Danh sách thư talk-cz",
+                "description": "talk-cz là danh sách thư chính thức của cộng đồng Séc"
+            },
+            "OSM-ES-telegram": {
+                "name": "@OSMes tại Telegram",
+                "description": "Trò chuyện Telegram của OpenStreetMap Tây Ban Nha"
+            },
+            "OSM-Vancouver-meetup": {
+                "name": "OpenStreetMap Vancouver",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng Vancouver, British Columbia"
+            },
+            "Bay-Area-OpenStreetMappers": {
+                "name": "Cộng đồng OpenStreetMap tại Khu vực vịnh",
+                "description": "Cải thiện OpenStreetMap tại Khu vực Vịnh San Francisco",
+                "extendedDescription": "Nhóm này ủng hộ cộng đồng OpenStreetMap của chúng ta ở Khu vực Vịnh San Francisco. Ai cũng tham gia được các sự kiện của chúng ta, kể cả người hâm mộ phần mềm nguồn mở, người đi xe đạp, chuyên gia GIS, người hâm mộ geocaching, và hơn nữa. Mời mọi người quan tâm về sử dụng bản đồ, xây dựng bản đồ, và dữ liệu bản đồ tham gia nhóm và các sự kiện của chúng ta."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "OSM Miền trung Pennsylvania",
+                "description": "Cộng đồng xây dựng bản đồ trực tuyến ở State College, Pennsylvania"
+            },
+            "Code-for-San-Jose-Slack": {
+                "name": "Slack Code for San Jose",
+                "description": "Mời bạn tham gia tại {signupUrl}, rồi tham gia kênh #osm."
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "OSM Dallas–Fort Worth",
+                "description": "Nhóm người dùng OpenStreetMap ở vùng Dallas–Fort Worth",
+                "extendedDescription": "Dallas, Fort Worth, và các thành phố ở giữa có rất nhiều người sáng tạo và khéo léo về công nghệ thông tin. Nhóm người dùng này nhằm mục đích tìm ra những cách mới để sử dụng tài nguyên OSM khá tốt."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Cuộc họp mặt cho những người hâm mộ bản đồ ở khu vực Philadelphia",
+                "extendedDescription": "GeoPhilly liên hiệp các nhà phát triển, nhà địa lý học, người hâm mộ về dữ liệu và dữ liệu mở, “civic hacker”, và người nghiện bản đồ để bày tỏ say mê bản đồ và chia sẻ các câu chuyện trong bản đồ. Nếu bạn sử dụng bản đồ trong việc làm hoặc chỉ muốn tìm hiểu thêm, bạn nên tham gia cuộc họp mặt này! Chúng ta cố gắng tổ chức các sự kiện mở rộng, thân thiện, cùng giáo dục cùng giải trí, bao gồm họp mặt tại quán rượu, bài thuyết trình nhanh chóng, và workshop. Mời bạn cùng xây dựng một cộng đồng không gian địa lý đa dạng văn hóa và gây cảm hứng tại Philadelphia!"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapping DC",
+                "description": "Cải thiện OpenStreetMap tại khu vực Washington, D.C.",
+                "extendedDescription": "Chúng ta tình nguyện xây dựng bản đồ OpenStreetMap tại khu vực Washington, D.C. Nhóm này cũng nhằm mục đích dạy người khác về hệ sinh thái OSM, môn phân tích dữ liệu, bản đồ học, và GIS. Chúng ta họp mặt hai tháng một lần để tập trung chú ý vào một phần của thành phố này."
+            },
+            "Maptime-ME-meetup": {
+                "name": "MaptimeME",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng Portland, Maine",
+                "extendedDescription": "Maptime đúng là thì giờ để lập bản đồ. Chúng ta nhằm mục đích mở cửa bản đồ học để cho mọi người có quan tâm có thể lập bản đồ, bằng cách để dành thì giờ và không gian để cộng tác tìm hiểu, khám phá, và lập bản đồ dùng công cụ và công nghệ bản đồ."
+            },
+            "OpenCleveland-meetup": {
+                "name": "Open Cleveland",
+                "description": "Cải thiện OpenStreetMap tại khu vực Cleveland",
+                "extendedDescription": "Open Geo Cleveland nhằm mục đích cho phép thảo luận và chia sẻ kiến thức về cách sử dụng kho dữ liệu địa lý mở, nhất là OpenStreetMap, cũng như cách sử dụng phần mềm không gian địa lý mở để quản lý, sửa đổi, và hiển thị dữ liệu địa lý. Chúng ta ủng hộ sử dụng dữ liệu mở và phần mềm không gian địa lý mở tại miền Đông Bắc Ohio. Chúng ta cũng là một nhánh Maptime. =)"
+            },
+            "OSM-Boston": {
+                "name": "OpenStreetMap Boston",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng Boston",
+                "extendedDescription": "OpenStreetMap là bản đồ thế giới mở kiểu wiki nhờ những người như bạn đóng góp mỗi ngày hàng trăm ngàn lần. Sửa đổi bản đồ là điều đơn giản và thú vị! Hãy tham gia chúng tôi trong nhà và ngoài đường để cùng xây dựng bản đồ đầy đủ nhất của vùng Boston và cả thế giới!"
+            },
+            "OSM-Central-Salish-Sea": {
+                "name": "OpenStreetMap Biển Salish Trung",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng Mount Vernon, Washington",
+                "extendedDescription": "OpenStreetMap (OSM) là bản đồ thế giới do những người như bạn xây dựng và cho phép mọi người sử dụng miễn phí và vô hạn chế giống như Wikipedia. Chúng tôi gặp mặt thường xuyên để nói chuyện vui vẻ về bản đồ và lập bản đồ!"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM Chattanooga",
+                "description": "Nhóm người dùng OpenStreetMap ở Chattanooga"
+            },
+            "OSM-Colorado": {
+                "name": "OpenStreetMap Colorado",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở tiểu bang Colorado, Hoa Kỳ"
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap Thành phố New York",
+                "description": "Những người lập bản đồ và những người sử dụng, nhà phát triển, và người hâm mộ OpenStreetMap ở khu vực đô thị New York"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap Portland",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng Portland",
+                "extendedDescription": "OpenStreetMap (OSM) là bản đồ thế giới do những người như bạn xây dựng và cho phép mọi người sử dụng miễn phí và vô hạn chế giống như Wikipedia. Hãy ghé vào osm.org và gặp mặt chúng ta để nói chuyện vui vẻ về bản đồ và đóng góp vào OSM cùng nhau!"
+            },
+            "OSM-Seattle": {
+                "name": "OpenStreetMap Seattle",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng Seattle"
+            },
+            "OSM-SoCal": {
+                "name": "OpenStreetMap Nam Ca Li",
+                "description": "Hãy vui vẻ đóng góp vào Los Angeles và tìm hiểu cách xây dựng bản đồ!",
+                "extendedDescription": "OpenStreetMap Nam Ca Li liên hiệp những người nào quan tâm về bản đồ để ủng hộ OpenStreetMap. OSM là Wikipedia của bản đồ, tức bản đồ thế giới mở do hơn một triệu người tình nguyện xây dựng ở khắp thế giới. Mời mọi người tham gia. Nếu bạn chưa biết đến OpenStreetMap, chúng tôi sẽ giới thiệu cho bạn. Nếu bạn có ý niệm bắt đầu dự án bản đồ hoặc dẫn nhóm đi nơi nào, tuyệt vời!"
+            },
+            "OSM-South-Bay": {
+                "name": "OSM Miền Nam Vùng Vịnh",
+                "description": "Buổi tối Bản đồ do Code for San Jose tổ chức",
+                "extendedDescription": "Code for San Jose là nhánh Code for America địa phương tổ chức các Buổi tối Bản đồ hàng tháng vào tối thứ 5 dưới phố San José. Gặp mặt những người cùng lập bản đồ ở miền Nam Vùng Vịnh, giúp đỡ các dự án xây dựng bản đồ địa phương, và tìm hiểu về các dự án công nghệ công dân (civic tech) khác. Không nhất thiết phải có kinh nghiệm lập trình hoặc GIS."
+            },
+            "OSM-Tampa-Bay": {
+                "name": "OpenStreetMap Vịnh Tampa",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng vịnh Tampa"
+            },
+            "OSM-US-Slack": {
+                "name": "Slack OpenStreetMap Hoa Kỳ",
+                "description": "Mời bạn tham gia tại {signupUrl}"
+            },
+            "OSM-US": {
+                "name": "OpenStreetMap Hoa Kỳ",
+                "description": "Chúng ta giúp phát triển và cải thiện OpenStreetMap tại Hoa Kỳ.",
+                "extendedDescription": "Chúng ta giúp OpenStreetMap bằng cách tổ chức các hội nghị hàng năm, cung cấp tài nguyên cộng đồng, tạo quan hệ đối tác, và truyền bá dự án. Mời tham gia OpenStreetMap Hoa Kỳ tại đây: {signupUrl}"
+            },
+            "OSM-Utah": {
+                "name": "OpenStreetMap Utah",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng Thành phố Salt Lake"
+            },
+            "OSM-Wyoming": {
+                "name": "OpenStreetMap Wyoming",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở tiểu bang Wyoming, Hoa Kỳ"
+            },
+            "PHXGeo-meetup": {
+                "name": "Họp mặt PHXGeo",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng Phoenix, Arizona",
+                "extendedDescription": "Nhóm họp mặt dành cho những người ở vùng Phoenix thích bản đồ, GIS, OpenStreetMap, bản đồ học, và đủ mọi thứ."
+            },
+            "PHXGeo-twitter": {
+                "name": "Twitter PHXGeo",
+                "description": "Theo dõi chúng tôi trên Twitter: {url}"
+            },
+            "Western-Slope-facebook": {
+                "name": "Facebook OSM Sườn Tây",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng Grand Junction, Colorado"
+            },
+            "Western-Slope-meetup": {
+                "name": "Họp mặt OSM Sườn Tây",
+                "description": "Những người lập bản đồ và người dùng OpenStreetMap ở vùng Grand Junction, Colorado"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Slack Maptime Úc",
+                "description": "Mời bạn tham gia tại {signupUrl}"
+            },
+            "talk-au": {
+                "name": "Danh sách thư talk-au",
+                "description": "Nơi trò chuyện của những người Úc lập bản đồ"
+            },
+            "OSM-AR-facebook": {
+                "name": "Facebook OpenStreetMap Argentina",
+                "description": "Hãy tham gia cộng đồng OpenStreetMap Argentina tại Facebook",
+                "extendedDescription": "Mời mọi người tham gia cộng đồng để tìm hiểu thêm về OpenStreetMap, hỏi đáp, và tham dự các cuộc họp mặt của chúng ta."
+            },
+            "OSM-AR-forum": {
+                "name": "Diễn đàn Web của OpenStreetMap Argentina",
+                "description": "Hãy tham gia diễn đàn Web của OpenStreetMap Argentina",
+                "extendedDescription": "Mời mọi người tham gia cộng đồng để tìm hiểu thêm về OpenStreetMap, hỏi đáp, và tham dự các cuộc họp mặt của chúng ta."
+            },
+            "OSM-AR-irc": {
+                "name": "IRC OpenStreetMap Argentina",
+                "description": "Hãy tham gia #osm-ar tại irc.oftc.net (cổng 6667)"
+            },
+            "OSM-AR-mailinglist": {
+                "name": "Danh sách thư talk-ar",
+                "description": "Danh sách thư để thảo luận về OpenStreetMap tại Argentina"
+            },
+            "OSM-AR-telegram": {
+                "name": "Telegram OpenStreetMap Argentina",
+                "description": "Hãy tham gia cộng đồng OpenStreetMap Argentina tại Telegram",
+                "extendedDescription": "Mời mọi người tham gia cộng đồng để tìm hiểu thêm về OpenStreetMap, hỏi đáp, và tham dự các cuộc họp mặt của chúng ta."
+            },
+            "OSM-AR-twitter": {
+                "name": "Twitter OpenStreetMap Argentina",
+                "description": "Theo dõi chúng tôi trên Twitter: {url}"
+            },
+            "OSM-Reddit": {
+                "name": "OpenStreetMap tại Reddit",
+                "description": "/r/openstreetmap/ là nơi để tìm hiểu thêm về OpenStreetMap. Có thắc mắc thì hỏi ở đây!"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/yue.json b/dist/locales/yue.json
index 2874ca4d8..7d4aa7c5f 100644
--- a/dist/locales/yue.json
+++ b/dist/locales/yue.json
@@ -1444,9 +1444,6 @@
                 "trees": {
                     "label": "樹"
                 },
-                "vending": {
-                    "label": "貨類"
-                },
                 "visibility": {
                     "label": "顯隱",
                     "options": {
diff --git a/dist/locales/zh-CN.json b/dist/locales/zh-CN.json
index e9155a366..453834ffc 100644
--- a/dist/locales/zh-CN.json
+++ b/dist/locales/zh-CN.json
@@ -1941,6 +1941,9 @@
                     "label": "限制速度",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "可停留时间"
                 },
@@ -2513,9 +2516,6 @@
                     "label": "类型",
                     "placeholder": "默认"
                 },
-                "vending": {
-                    "label": "商品类型"
-                },
                 "visibility": {
                     "label": "能见度",
                     "options": {
@@ -4167,7 +4167,7 @@
                     "terms": "检查点,检查站,检查,边检"
                 },
                 "landuse/military/danger_area": {
-                    "name": "危险区域",
+                    "name": "军事危险区域",
                     "terms": "危险区"
                 },
                 "landuse/military/naval_base": {
@@ -5897,18 +5897,6 @@
                     "name": "禁止掉头",
                     "terms": "禁止掉头"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "仅左转",
-                    "terms": "仅左转"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "仅右转",
-                    "terms": "仅右转"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "禁止转向",
-                    "terms": "禁止转向"
-                },
                 "type/route": {
                     "name": "线路",
                     "terms": "路线,路径"
@@ -6202,7 +6190,6 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "基于政府数据的奥地利底图",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6263,9 +6250,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "地图瓦片由 Stamen 设计，并以 署名 3.0 协议授权"
-                },
                 "name": "Stamen 地形"
             },
             "tf-cycle": {
@@ -6280,6 +6264,13 @@
                 },
                 "name": "Thunderforest 地貌"
             }
+        },
+        "community": {
+            "OSM-India-facebook": {
+                "name": "OpenStreetMap 印度 - 共同参与的街区绘图",
+                "description": "改进印度的 OpenStreetMap",
+                "extendedDescription": "在印度贡献地图？有了疑问，想要和社区共同交流？点击 {Url} 加入我们，任何问题都很欢迎！"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/zh-HK.json b/dist/locales/zh-HK.json
index b5ce2e54c..14e103fbc 100644
--- a/dist/locales/zh-HK.json
+++ b/dist/locales/zh-HK.json
@@ -1,5 +1,8 @@
 {
     "zh-HK": {
+        "icons": {
+            "information": "資訊"
+        },
         "modes": {
             "add_area": {
                 "title": "範圍",
@@ -288,6 +291,21 @@
                 }
             }
         },
+        "restriction": {
+            "help": {
+                "indirect": "(間接)",
+                "turn": {
+                    "no_left_turn": "不准左轉 {indirect}",
+                    "no_right_turn": "不准右轉 {indirect}",
+                    "no_u_turn": "不准掉頭 {indirect}",
+                    "no_straight_on": "不准直行 {indirect}",
+                    "only_left_turn": "只准左轉 {indirect}",
+                    "only_right_turn": "只准右轉 {indirect}",
+                    "only_u_turn": "只准掉頭 {indirect}",
+                    "only_straight_on": "只准直行 {indirect}"
+                }
+            }
+        },
         "undo": {
             "tooltip": "還原：{action}",
             "nothing": "沒有可還原的動作。"
@@ -456,8 +474,15 @@
             "switch": "切換回這個背景",
             "custom": "自訂",
             "custom_button": "編輯自訂背景",
+            "overlays": "覆蓋層",
             "reset": "重設",
+            "display_options": "顯示選項",
+            "brightness": "亮度",
+            "contrast": "對比",
+            "saturation": "飽和度",
+            "sharpness": "銳利度",
             "minimap": {
+                "description": "顯示小地圖",
                 "tooltip": "顯示縮小地圖以確定現在被顯示範圍的位置",
                 "key": "/"
             },
@@ -654,6 +679,9 @@
         "mapillary": {
             "view_on_mapillary": "在Mapillary上觀看這影像"
         },
+        "openstreetcam_images": {
+            "title": "相片重疊 (OpenStreetCam)"
+        },
         "openstreetcam": {
             "view_on_openstreetcam": "在 OpenStreetCam 上觀看這影像"
         },
@@ -1311,6 +1339,9 @@
                 "brand": {
                     "label": "品牌"
                 },
+                "brewery": {
+                    "label": "生啤"
+                },
                 "bridge": {
                     "label": "種類",
                     "placeholder": "預設"
@@ -1450,6 +1481,9 @@
                         "cycleway:right": "右側"
                     }
                 },
+                "dance/style": {
+                    "label": "舞蹈風格"
+                },
                 "date": {
                     "label": "日期"
                 },
@@ -1472,6 +1506,41 @@
                 "diaper": {
                     "label": "設有換片設備"
                 },
+                "direction": {
+                    "label": "方向 (順時針度數)",
+                    "placeholder": "45, 90, 180, 270"
+                },
+                "direction_cardinal": {
+                    "label": "方向",
+                    "options": {
+                        "E": "東",
+                        "ENE": "東北偏東",
+                        "ESE": "東南偏東",
+                        "N": "北",
+                        "NE": "東北",
+                        "NNE": "東北偏北",
+                        "NNW": "西北偏北",
+                        "NW": "西北",
+                        "S": "南",
+                        "SE": "東南",
+                        "SSE": "東南偏南",
+                        "SSW": "西南偏南",
+                        "SW": "西南",
+                        "W": "西",
+                        "WNW": "西北偏西",
+                        "WSW": "西南偏西"
+                    }
+                },
+                "direction_clock": {
+                    "label": "方向",
+                    "options": {
+                        "anticlockwise": "逆時針",
+                        "clockwise": "順時針"
+                    }
+                },
+                "direction_vertex": {
+                    "label": "方向"
+                },
                 "display": {
                     "label": "顯示"
                 },
@@ -1765,6 +1834,9 @@
                     "label": "速度限制",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "可停留時間"
                 },
@@ -2309,9 +2381,6 @@
                     "label": "種類",
                     "placeholder": "預設"
                 },
-                "vending": {
-                    "label": "貨品種類"
-                },
                 "visibility": {
                     "label": "可見度",
                     "options": {
@@ -2519,6 +2588,10 @@
                     "name": "茶座",
                     "terms": "Cafe,㗎啡室,㗎啡廳,咖啡,咖啡室,咖啡廳,茶座"
                 },
+                "amenity/car_pooling": {
+                    "name": "汽車共乘",
+                    "terms": "Car Pooling, 汽車共乘"
+                },
                 "amenity/car_rental": {
                     "name": "汽車租賃",
                     "terms": "Car Rental,汽車租賃處,租車,租車店,租車舖"
@@ -2665,6 +2738,10 @@
                     "name": "圖書館",
                     "terms": "Library,圖書館"
                 },
+                "amenity/love_hotel": {
+                    "name": "愛情酒店",
+                    "terms": "Love Hotel, 時鐘酒店"
+                },
                 "amenity/marketplace": {
                     "name": "街市",
                     "terms": "Marketplace,市場,菜市場,街市"
@@ -2673,6 +2750,10 @@
                     "name": "電單車停車位",
                     "terms": "摩托車停車場,電單車停車場"
                 },
+                "amenity/music_school": {
+                    "name": "音樂學校",
+                    "terms": "Music School, 音樂學校"
+                },
                 "amenity/nightclub": {
                     "name": "夜總會",
                     "terms": "夜店"
@@ -2772,6 +2853,10 @@
                     "name": "郊野公園遊客中心",
                     "terms": "Ranger Station,郊野公園管理站,郊野公園訪客中心"
                 },
+                "amenity/recycling": {
+                    "name": "回收桶",
+                    "terms": "Recycling Container, 回收箱"
+                },
                 "amenity/recycling_centre": {
                     "name": "回收中心",
                     "terms": "Recycling Center, 廢物回收中心, 資源回收中心"
@@ -2802,6 +2887,10 @@
                     "name": "淋浴處",
                     "terms": "Shower,淋浴間,沖浴間"
                 },
+                "amenity/smoking_area": {
+                    "name": "吸煙區",
+                    "terms": "Smoking Area, 食煙區"
+                },
                 "amenity/social_facility": {
                     "name": "社會服務設施",
                     "terms": "社福設施"
@@ -3035,6 +3124,10 @@
                     "name": "樹籬",
                     "terms": "Hedge,樹籬"
                 },
+                "barrier/kerb": {
+                    "name": "路緣",
+                    "terms": "Kerb, 路邊石, 路緣石, 路邊"
+                },
                 "barrier/kissing_gate": {
                     "name": "單人轉門 ",
                     "terms": "Kissing Gate,單人轉門"
@@ -3075,6 +3168,14 @@
                     "name": "穀倉",
                     "terms": "穀倉,糧倉"
                 },
+                "building/boathouse": {
+                    "name": "船屋",
+                    "terms": "Boathouse, 船屋"
+                },
+                "building/bungalow": {
+                    "name": "平房",
+                    "terms": "Bungalow, 平房, 別墅"
+                },
                 "building/bunker": {
                     "name": "地堡"
                 },
@@ -3094,6 +3195,10 @@
                     "name": "教堂建築物",
                     "terms": "教堂,聖堂"
                 },
+                "building/civic": {
+                    "name": "公民建築物",
+                    "terms": "Civic Building, 市民建築物"
+                },
                 "building/college": {
                     "name": "學院校舍",
                     "terms": "學院建築,學院建築物,技術學院建築"
@@ -3117,6 +3222,14 @@
                 "building/entrance": {
                     "name": "入口/出口"
                 },
+                "building/farm": {
+                    "name": "農舍",
+                    "terms": "Farm House, 農莊"
+                },
+                "building/farm_auxiliary": {
+                    "name": "農場建築物",
+                    "terms": "Farm Building, 農場建築物"
+                },
                 "building/garage": {
                     "name": "車庫",
                     "terms": "Garage,車房"
@@ -3153,6 +3266,10 @@
                     "name": "學前照顧/幼稚園建築物",
                     "terms": "幼兒園校舍,幼稚園校舍"
                 },
+                "building/mosque": {
+                    "name": "清真寺建築物",
+                    "terms": "Mosque Building, 清真寺建築物"
+                },
                 "building/public": {
                     "name": "公共建築物",
                     "terms": "公用建築物"
@@ -3169,6 +3286,10 @@
                     "name": "上蓋",
                     "terms": "屋頂"
                 },
+                "building/ruins": {
+                    "name": "建築物遺蹟",
+                    "terms": "Building Ruins, 建築物遺址"
+                },
                 "building/school": {
                     "name": "校舍",
                     "terms": "學校建築物,小學建築物,中學建築物"
@@ -4582,6 +4703,38 @@
                     "name": "變壓器",
                     "terms": "Transformer,火牛房,變電所"
                 },
+                "public_transport/station_tram": {
+                    "name": "電車站",
+                    "terms": "Tram Station, 電車大站"
+                },
+                "public_transport/stop_area": {
+                    "name": "交通工具停站範圍",
+                    "terms": "Transit Stop Area, 交通工具停站範圍"
+                },
+                "public_transport/stop_position": {
+                    "name": "交通工具停止位置",
+                    "terms": "Transit Stopping Location, 交通工具停止位置"
+                },
+                "public_transport/stop_position_aerialway": {
+                    "name": "纜車停止位置",
+                    "terms": "Aerialway Stopping Location, 纜車停止位置"
+                },
+                "public_transport/stop_position_bus": {
+                    "name": "巴士停止位置",
+                    "terms": "Bus Stopping Location, 巴士停止位置"
+                },
+                "public_transport/stop_position_ferry": {
+                    "name": "渡輪停止位置",
+                    "terms": "Ferry Stopping Location, 小輪停止位置"
+                },
+                "public_transport/stop_position_light_rail": {
+                    "name": "輕鐵停止位置",
+                    "terms": "Light Rail Stopping Location, 輕鐵停止位置"
+                },
+                "public_transport/stop_position_monorail": {
+                    "name": "單軌電車停止位置",
+                    "terms": "Monorail Stopping Location, 單軌電車停止位置"
+                },
                 "railway": {
                     "name": "鐵路"
                 },
@@ -5300,18 +5453,6 @@
                     "name": "不准掉頭",
                     "terms": "禁止掉頭"
                 },
-                "type/restriction/only_left_turn": {
-                    "name": "只准左轉",
-                    "terms": "只能左轉"
-                },
-                "type/restriction/only_right_turn": {
-                    "name": "只准右轉",
-                    "terms": "只准右轉"
-                },
-                "type/restriction/only_straight_on": {
-                    "name": "只准直駛",
-                    "terms": "禁止轉彎"
-                },
                 "type/route": {
                     "name": "路綫",
                     "terms": "Route,路綫,路線"
@@ -5344,6 +5485,10 @@
                     "name": "策騎路線",
                     "terms": "騎馬路線"
                 },
+                "type/route/light_rail": {
+                    "name": "輕鐵路綫",
+                    "terms": "Light Rail Route, 輕鐵路線"
+                },
                 "type/route/pipeline": {
                     "name": "管道路綫",
                     "terms": "Pipeline Route,供水路綫,供水路線,水管路綫,管道路線"
@@ -5477,6 +5622,13 @@
                 "description": "Esri world 世界航攝圖",
                 "name": "Esri world 世界航攝圖"
             },
+            "EsriWorldImageryClarity": {
+                "attribution": {
+                    "text": "條款和意見"
+                },
+                "description": "Esri 之前的航攝圖可能比預設圖層會更清楚和更準確。",
+                "name": "Esri World (Clarity) Beta 航攝圖"
+            },
             "MAPNIK": {
                 "attribution": {
                     "text": "© OpenStreetMap 貢獻者，CC-BY-SA"
@@ -5545,25 +5697,39 @@
                 "name": "TIGER Roads 2017"
             },
             "Waymarked_Trails-Cycling": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap 貢獻者，CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: 單車"
             },
             "Waymarked_Trails-Hiking": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap 貢獻者，CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: 遠足"
             },
             "Waymarked_Trails-MTB": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap 貢獻者，CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: 越野單車"
             },
             "Waymarked_Trails-Skating": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap 貢獻者，CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: 溜冰"
             },
             "Waymarked_Trails-Winter_Sports": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap 貢獻者，CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: 冬季運動"
             },
             "basemap.at": {
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "基於政府資料的奧地利底圖。",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -5624,9 +5790,6 @@
                 "name": "skobbler"
             },
             "stamen-terrain-background": {
-                "attribution": {
-                    "text": "Stamen 設計的區塊，以 CC-BY 3.0 授權"
-                },
                 "name": "Stamen 地形"
             },
             "tf-cycle": {
diff --git a/dist/locales/zh-TW.json b/dist/locales/zh-TW.json
index 80860cde6..6cf64e9bc 100644
--- a/dist/locales/zh-TW.json
+++ b/dist/locales/zh-TW.json
@@ -1,5 +1,10 @@
 {
     "zh-TW": {
+        "icons": {
+            "information": "資訊",
+            "remove": "移除",
+            "undo": "復原"
+        },
         "modes": {
             "add_area": {
                 "title": "區域",
@@ -889,16 +894,35 @@
                     "about": {
                         "title": "關於",
                         "about": "這個欄位允許你偵測和變動轉彎限制，顯示選取的交叉路口的模型，以及鄰近連結的道路。",
-                        "from_via_to": "轉彎限制總是有：一個**從路徑**，一個**到路徑**，以及一個**經由節點*，或一個或多個**經由路徑**。"
+                        "from_via_to": "轉彎限制總是有：一個**從路徑**，一個**到路徑**，以及一個**經由節點*，或一個或多個**經由路徑**。",
+                        "maxdist": "\"{distField}\" 滑塊控制怎麼搜尋額外連結的道路。",
+                        "maxvia": "\"{viaField}\"  滑塊調整搜尋時包括有多少經由路徑 (技巧：越簡單越好)"
                     },
                     "inspecting": {
-                        "title": "偵測"
+                        "title": "偵測",
+                        "about": "飄浮過任何 **FROM** 片段來看轉彎限制，每個可能的 **TO** 目標會用上色的陰影包住，顯示關聯是否存在。",
+                        "from_shadow": "{fromShadow} **從片段**",
+                        "allow_shadow": "{allowShadow} **允許到**",
+                        "restrict_shadow": "{restrictShadow} **禁止到**",
+                        "only_shadow": "{onlyShadow} **只有到**",
+                        "restricted": "\"限制\"意著有轉彎限制，例如說\"禁止左轉\"。",
+                        "only": "\"只有\"意味著汽車從這條路來的時候，只能做這項選擇，例如說，\"只淮直行\"。"
                     },
                     "modifying": {
-                        "title": "變動"
+                        "title": "變動",
+                        "about": "要變動轉彎限制，請先檢查先選取起始的 **FROM** 片段，選取的片段會放大，然後任何可能的 **TO** 目的地會以轉彎符號顯示。",
+                        "indicators": "接著，點選轉彎符號切換為\"允許\"，\"限制\"，和\"只有\"。",
+                        "allow_turn": "{allowTurn} **到允許**",
+                        "restrict_turn": "{restrictTurn} **到限制**",
+                        "only_turn": "{onlyTurn} **只有到**"
                     },
                     "tips": {
-                        "title": "技巧"
+                        "title": "技巧",
+                        "simple": "**偏好簡單限制而不是複雜的限制。**",
+                        "simple_example": "舉例來說，如果有簡單的經由點轉彎限制的話，避免創建經由道路限制。",
+                        "indirect": "**一些限制會顯示 \"(indirect)\" 文字，並且畫得比較淡。**",
+                        "indirect_example": "這此限制存在，因為其他鄰近的限制。舉例來說，一個**只允許直行**的限制會間接為其他經過的道路創建\"不允許轉彎\"限制。",
+                        "indirect_noedit": "你並不允許編輯間接限制，做為替代，你可以編輯鄰近的方向限制。"
                     }
                 }
             }
@@ -1795,6 +1819,9 @@
                 "except": {
                     "label": "例外"
                 },
+                "faces": {
+                    "label": "面的數量"
+                },
                 "fax": {
                     "label": "傳真",
                     "placeholder": "+31 42 123 4567"
@@ -1925,6 +1952,9 @@
                 "indoor": {
                     "label": "室內"
                 },
+                "industrial": {
+                    "label": "類型"
+                },
                 "information": {
                     "label": "種類"
                 },
@@ -2045,6 +2075,10 @@
                     "label": "速度限制",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "label": "建議速限",
+                    "placeholder": "40, 50, 60..."
+                },
                 "maxstay": {
                     "label": "可停留時間"
                 },
@@ -2633,8 +2667,19 @@
                     "label": "類型",
                     "placeholder": "預設"
                 },
+                "usage_rail": {
+                    "label": "用途類型",
+                    "options": {
+                        "branch": "支線",
+                        "industrial": "工業用",
+                        "main": "主線",
+                        "military": "軍事用",
+                        "test": "測試",
+                        "tourism": "觀光"
+                    }
+                },
                 "vending": {
-                    "label": "貨品種類"
+                    "label": "貨物類型"
                 },
                 "visibility": {
                     "label": "可見度",
@@ -2814,6 +2859,10 @@
                     "name": "機場航廈",
                     "terms": "航廈,機場大堂"
                 },
+                "allotments/plot": {
+                    "name": "社區園圃",
+                    "terms": "社區園圃,社區農圃,社區花園"
+                },
                 "amenity": {
                     "name": "便利設施"
                 },
@@ -3042,6 +3091,10 @@
                     "name": "市場",
                     "terms": "市集,傳統市場,marketplace"
                 },
+                "amenity/monastery": {
+                    "name": "修道院",
+                    "terms": "修道院"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "機車停車場",
                     "terms": "機車停車場,速克達停車場,摩托車停車場"
@@ -3246,6 +3299,10 @@
                     "name": "香菸販賣機",
                     "terms": "香菸自動販賣機,販賣機"
                 },
+                "amenity/vending_machine/coffee": {
+                    "name": "咖啡販賣機",
+                    "terms": "咖啡販賣機,咖啡自動販賣機"
+                },
                 "amenity/vending_machine/condoms": {
                     "name": "保險套販賣機",
                     "terms": "保險套自動販賣機,販賣機"
@@ -3254,6 +3311,14 @@
                     "name": "飲料販賣機",
                     "terms": "飲料自動販賣機,販賣機"
                 },
+                "amenity/vending_machine/electronics": {
+                    "name": "電子設備販賣機",
+                    "terms": "電子設備販賣機,電子設備自動販賣機"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "扁平紀念幣販賣機",
+                    "terms": "扁平紀念幣販賣機,扁平紀念幣自動販賣機"
+                },
                 "amenity/vending_machine/excrement_bags": {
                     "name": "糞便袋販賣機",
                     "terms": "糞便袋自動販賣機,販賣機"
@@ -3262,6 +3327,18 @@
                     "name": "女性衛生用品自動販賣機",
                     "terms": "女性衛生用品自動販賣機,衛生棉自動販賣機,棉條自動販賣機"
                 },
+                "amenity/vending_machine/food": {
+                    "name": "食物販賣機",
+                    "terms": "食物販賣機,食物自動販賣機"
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "自助加油機",
+                    "terms": "自助加油機"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "冰淇淋販賣機",
+                    "terms": "冰淇淋販賣機,冰淇淋自動販賣機"
+                },
                 "amenity/vending_machine/news_papers": {
                     "name": "報紙販賣機"
                 },
@@ -3281,6 +3358,10 @@
                     "name": "車票販賣機",
                     "terms": "車票自動販賣機,交通票券販賣機"
                 },
+                "amenity/vending_machine/stamps": {
+                    "name": "郵票販賣機",
+                    "terms": "郵票販賣機,郵票自動販賣機"
+                },
                 "amenity/vending_machine/sweets": {
                     "name": "零食販賣機",
                     "terms": "點心販賣機,販 賣機"
@@ -4084,6 +4165,10 @@
                     "name": "高速公路引道",
                     "terms": "高速公路引道"
                 },
+                "highway/passing_place": {
+                    "name": "避車彎",
+                    "terms": "避車彎"
+                },
                 "highway/path": {
                     "name": "路徑",
                     "terms": "路徑"
@@ -4443,6 +4528,10 @@
                     "name": "遊樂場",
                     "terms": "遊樂場"
                 },
+                "leisure/beach_resort": {
+                    "name": "海灘渡假村",
+                    "terms": "海灘渡假村,海濱渡假村"
+                },
                 "leisure/bird_hide": {
                     "name": "鳥類棲息處",
                     "terms": "鳥類棲息處,鳥類棲地,鳥類藏身處"
@@ -4559,6 +4648,10 @@
                     "name": "自然保留區",
                     "terms": "自然保護區"
                 },
+                "leisure/outdoor_seating": {
+                    "name": "戶外座位區",
+                    "terms": "戶外座位區,戶外座位"
+                },
                 "leisure/park": {
                     "name": "公園",
                     "terms": "綠地,遊樂場"
@@ -4687,6 +4780,10 @@
                     "name": "坑口",
                     "terms": "坑道口,礦坑口"
                 },
+                "man_made/antenna": {
+                    "name": "天線",
+                    "terms": "天線"
+                },
                 "man_made/breakwater": {
                     "name": "防波堤",
                     "terms": "防波堤"
@@ -4738,6 +4835,10 @@
                     "name": "瞭望塔",
                     "terms": "瞭望塔"
                 },
+                "man_made/observatory": {
+                    "name": "天文台",
+                    "terms": "天文館"
+                },
                 "man_made/petroleum_well": {
                     "name": "油井",
                     "terms": "油井"
@@ -4862,6 +4963,10 @@
                     "name": "荒地",
                     "terms": "荒地"
                 },
+                "natural/mud": {
+                    "name": "泥地",
+                    "terms": "泥地"
+                },
                 "natural/peak": {
                     "name": "山頂",
                     "terms": "山峰,山巔"
@@ -5898,6 +6003,10 @@
                     "name": "寵物店",
                     "terms": "寵物用品店"
                 },
+                "shop/pet_grooming": {
+                    "name": "寵物美容店",
+                    "terms": "寵物美容店"
+                },
                 "shop/photo": {
                     "name": "攝影用品店",
                     "terms": "照相店"
@@ -6201,16 +6310,20 @@
                     "terms": "禁止迴轉"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "只准左轉",
+                    "name": "只能左轉",
                     "terms": "只能左轉"
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "只准右轉",
+                    "name": "只能右轉",
                     "terms": "只能右轉"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "只准直駛",
-                    "terms": "禁止轉彎"
+                    "name": "只能直行",
+                    "terms": "只能直行"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "只能迴轉",
+                    "terms": "只能迴轉"
                 },
                 "type/route": {
                     "name": "路線",
@@ -6505,7 +6618,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "基於政府資料的奧地利底圖。",
+                "description": "奧地利的底圖，基於政府資料。",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6567,7 +6680,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Stamen 設計的圖磚，以 CC-BY 3.0 授權"
+                    "text": "Stamen Design 的圖磚，以 CC BY 3.0 授權。資料自 OpenStreetMap 處取得，以 ODbL 授權"
                 },
                 "name": "Stamen Terrain"
             },
@@ -6583,6 +6696,178 @@
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "osm-mg-facebook": {
+                "name": "開放街圖馬達加斯加 Facebook 社團",
+                "description": "馬達加斯加對開放街圖有興趣的人參與的 Facebook 社團。"
+            },
+            "talk-mg": {
+                "name": "Talk-m 郵件論壇",
+                "description": "馬達加斯加開放街圖貢獻者、社群和使用者分享和討論的園地"
+            },
+            "OSM-BGD-facebook": {
+                "name": "開放街圖孟加拉",
+                "description": "改進孟加拉的開放街圖",
+                "extendedDescription": "在孟加拉畫地圖嗎？想要問問題，想要與社群連結？請加入 {Url}，所有人都歡迎噢！"
+            },
+            "OSM-India-facebook": {
+                "name": "開放街圖印度 - 參與社區畫圖",
+                "description": "改善印度的 OpenStreetMap",
+                "extendedDescription": "在印度畫地圖嗎？有問題，想要與社群互動？來  {Url} 加入我們，歡迎所有人。"
+            },
+            "OSM-india-mailinglist": {
+                "name": "開放街圖印度郵件論壇",
+                "description": "Talk-in 是印度社群的官方郵件論壇"
+            },
+            "OSM-india-twitter": {
+                "name": "開放街圖印度 Twitter",
+                "description": "我們只是喜歡 tweet：{url}"
+            },
+            "OSM-IDN-facebook": {
+                "name": "開放街圖印尼",
+                "description": "改進印尼的開放街圖",
+                "extendedDescription": "在印尼畫地圖嗎？有問題，想要與社群互動？來 {Url} 加入我們，歡迎所有人。"
+            },
+            "OSM-japan-facebook": {
+                "name": "開放街圖日本社群",
+                "description": "日本圖客和開放街圖使用者"
+            },
+            "OSM-japan-mailinglist": {
+                "name": "開放街圖日本郵件論壇",
+                "description": "Talk-ja 是日本社群官方的郵件論壇"
+            },
+            "OSM-japan-twitter": {
+                "name": "開放街圖日本 Twitter",
+                "description": "Twitter 的標籤：{url}"
+            },
+            "OSM-MNG-facebook": {
+                "name": "開放街圖蒙古",
+                "description": "改進蒙古的開放街圖",
+                "extendedDescription": "在蒙古畫地圖嗎？有問題，想要與社群互動？來 {Url} 加入我們，歡迎所有人。"
+            },
+            "OSM-Nepal-facebook": {
+                "name": "開放街圖尼泊爾",
+                "description": "改進尼泊爾的開放街圖",
+                "extendedDescription": "在尼泊爾畫地圖嗎？有問題，想要與社群互動？來 {Url} 加入我們，歡迎所有人。"
+            },
+            "OSM-PH-facebook": {
+                "name": "開放街圖菲律賓 Facebook"
+            },
+            "byosm": {
+                "name": "開放街圖白羅斯",
+                "description": "開放街圖白羅斯 Telegram 聊天室"
+            },
+            "Bay-Area-OpenStreetMappers": {
+                "name": "灣區的 OpenStreetMap 圖客",
+                "description": "改善在灣區的 OpenStreetMap",
+                "extendedDescription": "這個群組是為了讓灣區的 OpenStreetMap 社群成長茁壯而設立。我們的活動開放給所有人參與，開放原始碼支持者、自行車騎士、地理資訊系統 (GIS) 專家、地理藏寶者都可以。只要對地圖、地圖製作與自由地圖資料有興趣的人都歡迎加入我們的群組，以及參與我們的活動。"
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "賓州中部 OSM",
+                "description": "位於賓州州立大學的線上製圖社群"
+            },
+            "Code-for-San-Jose-Slack": {
+                "name": "Code for San Jose Slack",
+                "description": "歡迎所有人加入！在 {signupUrl} 註冊，並加入 #osm 頻道。"
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "達拉斯—沃斯堡 OSM",
+                "description": "達拉斯—沃斯堡的 OpenStreetMap 使用者群組",
+                "extendedDescription": "達拉斯、沃斯堡與其間的所有城市都充滿了極具創造力且技術精湛的人才。這個使用者群組的願景是找出新的方法來使用 OSM 上的驚人資源。"
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "費城地區的地圖愛好者聚會",
+                "extendedDescription": "GeoPhilly 將開發者、地理學家、資料極客、開放原始碼愛好者、公民駭客與地圖愛好者聯合起來，並將我們對地圖的熱愛與他們的故事連結起來。如果你在工作中會用到地圖，或僅僅只是想要了解更多，這就是為你而辦的聚會！我們的活動旨在開放、友好、教育與社交，從歡樂時光到閃電講，甚至是工作坊都有。跟我們一起在費城建立一個多元化且激勵人心的地理空間社群！"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapping DC",
+                "description": "改善華府區域的 OpenStreetMap",
+                "extendedDescription": "我們是一群致力於改善華府區域的 OpenStreetMap 的群組。我們也努力教導其他人關於 OSM 的生態系、資料分析、製圖與 GIS。我們每隔一個月聚會一次，每次僅聚焦在我們的城市中的一個地區。"
+            },
+            "OSM-Boston": {
+                "name": "開放街圖波士頓",
+                "description": "波士頓的圖客與開放街圖使用者",
+                "extendedDescription": "開放街圖是一份自由開放的維基風格世界地圖，每天都有數十萬像您這樣的人們做出貢獻。編輯地圖很簡單，而且很有趣！不管是在戶內或是戶外都可以加入我們，來建立波士頓地區與世界其他地方最好的地圖吧！"
+            },
+            "OSM-Chattanooga": {
+                "name": "OSM 查塔努加",
+                "description": "查塔努加的 OpenStreetMap 使用者群組"
+            },
+            "OSM-Colorado": {
+                "name": "開放街圖科羅拉多",
+                "description": "在美國科羅拉多州的圖客與開放街圖使用者",
+                "extendedDescription": "開放街圖 (OpenStreetMap, OSM) 科羅拉多是一個喜歡貢獻他們的心力建立自由地圖的一群地區協作夥伴。我們鼓勵我們所有的圖客組織或建議橫跨整個州的製圖活動。會面活動可以是簡單的社交活動、OSM 基礎到進階訓練，或是社群製圖派對。"
+            },
+            "OSM-NYC": {
+                "name": "OpenStreetMap NYC",
+                "description": "在紐約都會區的圖客與 OpenStreetMap 使用者、開發者與愛好者"
+            },
+            "OSM-Portland": {
+                "name": "OpenStreetMap 波特蘭",
+                "description": "波特蘭區域的圖客與 OpenStreetMap 使用者",
+                "extendedDescription": "OpenStreetMap (OSM) 是一幅由像你這樣的人所製作的世界地圖。它是由你所建構，並如同維基百科那樣自由提供給所有人的地圖。看看 osm.org 以取得更多資訊，然後在聚會上加入我們來說說地圖的故事、對 OSM 貢獻然後玩得開心！"
+            },
+            "OSM-Seattle": {
+                "name": "開放街圖西雅圖",
+                "description": "在西雅圖的圖客與開放街圖使用者"
+            },
+            "OSM-South-Bay": {
+                "name": "OSM South Bay",
+                "description": "由為聖荷西寫程式主辦的地圖之夜",
+                "extendedDescription": "為聖荷西寫程式是為美國寫程式的地區分支，週四晚上在聖荷西市中心舉辦每月地圖之夜。結識南灣區的圖客，與當地的製圖專案交流，聽聽其他的公民科技專案。寫程式或 GIS 相關技能都並非必要。"
+            },
+            "OSM-Tampa-Bay": {
+                "name": "開放街圖坦帕灣",
+                "description": "坦帕灣的圖客與開放街圖使用者",
+                "extendedDescription": "OSM 坦帕灣群組讓當地居民聚在一起，用開放街圖建立坦帕灣的準確地圖。如果您使用地圖、資料、開放原始碼、GPS、徒步旅行或是騎腳踏車等等，您將會很喜歡與 OSM 合作，所以請加入吧！我們會聚在一起，製圖並討論每月的新主題。"
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap US Slack",
+                "description": "歡迎所有人加入！在 {signupUrl} 註冊"
+            },
+            "OSM-US": {
+                "name": "開放街圖美國",
+                "description": "我們協助美國的開放街圖成長茁壯並改善它。",
+                "extendedDescription": "我們透過舉辦年度研討會、提供社群資源、建立合作關係以及推廣來支援開放街圖。在此加入開放街圖美國：{signupUrl}"
+            },
+            "OSM-Utah": {
+                "name": "開放街圖猶他",
+                "description": "在鹽湖城區域的圖客與開放街圖使用者",
+                "extendedDescription": "我們可能會舉辦的活動有：學習製圖工作坊、製圖派對與戶外資料蒐集。活動將會在鹽湖城區舉辦，至少一開始是這樣。我們正在尋找經驗豐富的圖客與 OSM 新手。加入我們，一起來製圖吧！"
+            },
+            "OSM-Wyoming": {
+                "name": "開放街圖懷俄明",
+                "description": "在懷俄明州的圖客與開放街圖使用者",
+                "extendedDescription": "開放街圖 (OpenStreetMap, OSM) 懷俄明是一個喜歡貢獻他們的心力建立自由地圖的一群地區協作夥伴。我們鼓勵我們所有的圖客組織或建議橫跨整個州的製圖活動。會面活動可以是簡單的社交活動、OSM 基礎到進階訓練，或是社群製圖派對。"
+            },
+            "PHXGeo-meetup": {
+                "name": "PHXGeo Meetup",
+                "description": "在亞利桑那州鳳凰城的圖客與開放街圖使用者",
+                "extendedDescription": "這是一個給住在鳳凰城，喜歡地圖、GIS、開放街圖、製圖與其他東西的群組。"
+            },
+            "PHXGeo-twitter": {
+                "name": "PHXGeo Twitter",
+                "description": "在 {url} 上追隨我們的 Twitter"
+            },
+            "Western-Slope-facebook": {
+                "name": "Western Slope OSM Facebook",
+                "description": "在科羅拉多州大章克申的圖客與開放街圖使用者"
+            },
+            "Western-Slope-meetup": {
+                "name": "Western Slope OSM Meetup",
+                "description": "在科羅拉多州大章克申的圖客與開放街圖使用者",
+                "extendedDescription": "此群組的目標是介紹開放街圖給社群知道，並發展圖客社群、利用任何方法建立盡可能多的地理資料並把這些資料提供給社群。想像準確的線索標示！想像自行車道的進一步發展！想像您想要什麼，這就是開放街圖的有趣之處！"
+            },
+            "Maptime-Australia-Slack": {
+                "name": "Maptime Australia Slack",
+                "description": "在 {signupUrl} 註冊"
+            },
+            "OSM-Reddit": {
+                "name": "在 Reddit 上的 OpenStreetMap",
+                "description": "/r/openstreetmap/ 是一個取得更多關於 OpenStreetMap 資訊的好地方。什麼事都能問！"
+            }
         }
     }
 }
\ No newline at end of file

From 8ea2c7ff9a1ee0d53bf72764e12697abf1875162 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 7 Apr 2018 14:51:04 -0400
Subject: [PATCH 10/37] Add community icons, add icons and descriptions to
 post-save screen

---
 css/80_app.css        |  3 +++
 modules/svg/defs.js   |  3 ++-
 modules/ui/success.js | 47 ++++++++++++++++++++++++++++++++++++-------
 package.json          |  3 ++-
 4 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index 585459070..ed1fa33a3 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3611,6 +3611,9 @@ img.tile-debug {
     vertical-align: top;
     padding: 0 10px 5px 10px;
 }
+.save-success td.cell-icon {
+    width: 50px;
+}
 .save-success .details {
     margin: 0px 5px;
     white-space: nowrap;
diff --git a/modules/svg/defs.js b/modules/svg/defs.js
index d3e533ca4..7d5df37bd 100644
--- a/modules/svg/defs.js
+++ b/modules/svg/defs.js
@@ -134,6 +134,7 @@ export function svgDefs(context) {
         // symbol spritesheets
         defs
             .call(SVGSpriteDefinition('iD-sprite', context.imagePath('iD-sprite.svg')))
-            .call(SVGSpriteDefinition('maki-sprite', context.imagePath('maki-sprite.svg')));
+            .call(SVGSpriteDefinition('maki-sprite', context.imagePath('maki-sprite.svg')))
+            .call(SVGSpriteDefinition('community-sprite', context.imagePath('community-sprite.svg')));
     };
 }
diff --git a/modules/ui/success.js b/modules/ui/success.js
index ae29802bc..02b68debd 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -72,7 +72,7 @@ export function uiSuccess(context) {
 
         row
             .append('td')
-            .attr('class', 'summary-icon')
+            .attr('class', 'cell-icon summary-icon')
             .append('a')
             .attr('target', '_blank')
             .attr('href', changesetURL)
@@ -83,7 +83,7 @@ export function uiSuccess(context) {
 
         var summaryDetail = row
             .append('td')
-            .attr('class', 'summary-detail');
+            .attr('class', 'cell-detail summary-detail');
 
         summaryDetail
             .append('a')
@@ -168,13 +168,46 @@ export function uiSuccess(context) {
 
         rowEnter
             .append('td')
-            .attr('class', 'community-icon')
-            .text(function(d) { return d.type; });
+            .attr('class', 'cell-icon community-icon')
+            .append('a')
+            .attr('target', '_blank')
+            .attr('href', function(d) { return d.url; })
+            .append('svg')
+            .attr('class', 'logo-small')
+            .append('use')
+            .attr('xlink:href', function(d) { return '#community-' + d.type; });
 
-        rowEnter
+        var communityDetail = rowEnter
             .append('td')
-            .attr('class', 'community-detail')
-            .text(function(d) { return d.name; });
+            .attr('class', 'cell-detail community-detail');
+
+        communityDetail.each(function(d) {
+            var selection = d3_select(this);
+            var replacements = {
+                url: d.url,
+                signupUrl: d.signupUrl || d.url
+            };
+
+            selection
+                .append('div')
+                .attr('class', 'community-detail-name')
+                .append('a')
+                .attr('target', '_blank')
+                .attr('href', d.url)
+                .text(t('community.' + d.id + '.name'));
+
+            selection
+                .append('div')
+                .attr('class', 'community-detail-description')
+                .text(t('community.' + d.id + '.description', replacements));
+
+            if (d.extendedDescription) {
+                selection
+                    .append('div')
+                    .attr('class', 'community-detail-extendedDescription')
+                    .text(t('community.' + d.id + '.extendedDescription', replacements));
+            }
+        });
     }
 
 
diff --git a/package.json b/package.json
index 79ec8deb0..6ee3b383e 100644
--- a/package.json
+++ b/package.json
@@ -16,8 +16,9 @@
     "dist": "npm-run-all -p dist:**",
     "dist:mapillary": "shx mkdir -p dist/mapillary-js && shx cp -R node_modules/mapillary-js/dist/* dist/mapillary-js/",
     "dist:min": "uglifyjs dist/iD.js -c warnings=false -m -o dist/iD.min.js",
-    "dist:svg:maki": "svg-sprite --symbol --symbol-dest . --symbol-sprite dist/img/maki-sprite.svg node_modules/@mapbox/maki/icons/*.svg",
     "dist:svg:id": "node svg/spriteify.js --svg svg/iD-sprite.src.svg --json svg/iD-sprite.json > dist/img/iD-sprite.svg",
+    "dist:svg:community": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"community-%s\" --symbol-sprite dist/img/community-sprite.svg node_modules/osm-community-index/dist/img/*.svg",
+    "dist:svg:maki": "svg-sprite --symbol --symbol-dest . --symbol-sprite dist/img/maki-sprite.svg node_modules/@mapbox/maki/icons/*.svg",
     "imagery": "node data/update_imagery",
     "lint": "eslint *.js js/id test/spec modules",
     "start": "node development_server.js develop",

From 55e55e2021d8f3b20fe424c696a7f47bb800acda Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 7 Apr 2018 21:45:23 -0400
Subject: [PATCH 11/37] More style and language adjustments

---
 css/80_app.css        | 22 +++++++++++++++++++---
 data/core.yaml        |  6 +++---
 dist/locales/en.json  |  6 +++---
 modules/ui/success.js |  9 +++------
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index ed1fa33a3..c85c99b9e 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3607,14 +3607,30 @@ img.tile-debug {
 .save-success p {
     margin-top: 15px;
 }
+.save-success h3 {
+    font-size: 14px;
+    margin-top: 15px;
+    padding-bottom: 0;
+}
 .save-success td {
     vertical-align: top;
-    padding: 0 10px 5px 10px;
 }
 .save-success td.cell-icon {
-    width: 50px;
+    width: 40px;
 }
-.save-success .details {
+.save-success td.cell-detail {
+    padding: 0 10px;
+}
+.save-success td.community-detail {
+    padding-bottom: 20px;
+}
+
+.summary-detail-view,
+.community-detail-name {
+    font-size: 14px;
+    font-weight: bold;
+}
+.save-summary .details {
     margin: 0px 5px;
     white-space: nowrap;
 }
diff --git a/data/core.yaml b/data/core.yaml
index 8895d3f03..c3ed4645d 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -533,13 +533,13 @@ en:
     help_html: Your changes should appear on OpenStreetMap within a few minutes. It may take longer for maps elsewhere to receive updates.
     help_link_text: Details
     help_link_url: "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
-    view_on_osm: "View these changes on OpenStreetMap"
-    changeset_id: "Changeset ID: {changeset_id}"
+    view_on_osm: "View Changes on OSM"
+    changeset_id: "Changeset #: {changeset_id}"
     edited_osm: "Edited OSM!"
     facebook: "Share on Facebook"
     twitter: "Share on Twitter"
     google: "Share on Google+"
-    like_osm: "Like OpenStreetMap? Connect with others and learn more:"
+    like_osm: "Like OpenStreetMap? Connect with others:"
   confirm:
     okay: "OK"
     cancel: "Cancel"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index c6d80b9cb..dadc23e62 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -650,13 +650,13 @@
             "help_html": "Your changes should appear on OpenStreetMap within a few minutes. It may take longer for maps elsewhere to receive updates.",
             "help_link_text": "Details",
             "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F",
-            "view_on_osm": "View these changes on OpenStreetMap",
-            "changeset_id": "Changeset ID: {changeset_id}",
+            "view_on_osm": "View Changes on OSM",
+            "changeset_id": "Changeset #: {changeset_id}",
             "edited_osm": "Edited OSM!",
             "facebook": "Share on Facebook",
             "twitter": "Share on Twitter",
             "google": "Share on Google+",
-            "like_osm": "Like OpenStreetMap? Connect with others and learn more:"
+            "like_osm": "Like OpenStreetMap? Connect with others:"
         },
         "confirm": {
             "okay": "OK",
diff --git a/modules/ui/success.js b/modules/ui/success.js
index 02b68debd..38d31be2d 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -40,9 +40,7 @@ export function uiSuccess(context) {
             .attr('class', 'save-summary');
 
         summary
-            .append('p')
-            .append('strong')
-            .append('em')
+            .append('h3')
             .html(t('success.thank_you' + (_location ? '_location' : ''), { where: _location }));
 
         summary
@@ -87,6 +85,7 @@ export function uiSuccess(context) {
 
         summaryDetail
             .append('a')
+            .attr('class', 'cell-detail summary-detail-view')
             .attr('target', '_blank')
             .attr('href', changesetURL)
             .text(t('success.view_on_osm'));
@@ -150,9 +149,7 @@ export function uiSuccess(context) {
             .attr('class', 'save-communityLinks');
 
         communityLinks
-            .append('p')
-            .append('strong')
-            .append('em')
+            .append('h3')
             .html(t('success.like_osm'));
 
         var table = communityLinks

From 775525a74e2242199ff673eb511c54d37241d17f Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 7 Apr 2018 22:02:47 -0400
Subject: [PATCH 12/37] Linkify the links

---
 modules/ui/success.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/ui/success.js b/modules/ui/success.js
index 38d31be2d..98ae60806 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -41,11 +41,11 @@ export function uiSuccess(context) {
 
         summary
             .append('h3')
-            .html(t('success.thank_you' + (_location ? '_location' : ''), { where: _location }));
+            .text(t('success.thank_you' + (_location ? '_location' : ''), { where: _location }));
 
         summary
             .append('p')
-            .html(t('success.help_html'))
+            .text(t('success.help_html'))
             .append('a')
             .attr('class', 'details')
             .attr('target', '_blank')
@@ -150,7 +150,7 @@ export function uiSuccess(context) {
 
         communityLinks
             .append('h3')
-            .html(t('success.like_osm'));
+            .text(t('success.like_osm'));
 
         var table = communityLinks
             .append('table')
@@ -181,8 +181,8 @@ export function uiSuccess(context) {
         communityDetail.each(function(d) {
             var selection = d3_select(this);
             var replacements = {
-                url: d.url,
-                signupUrl: d.signupUrl || d.url
+                url: linkify(d.url),
+                signupUrl: linkify(d.signupUrl || d.url)
             };
 
             selection
@@ -196,13 +196,17 @@ export function uiSuccess(context) {
             selection
                 .append('div')
                 .attr('class', 'community-detail-description')
-                .text(t('community.' + d.id + '.description', replacements));
+                .html(t('community.' + d.id + '.description', replacements));
 
             if (d.extendedDescription) {
                 selection
                     .append('div')
                     .attr('class', 'community-detail-extendedDescription')
-                    .text(t('community.' + d.id + '.extendedDescription', replacements));
+                    .html(t('community.' + d.id + '.extendedDescription', replacements));
+            }
+
+            function linkify(url) {
+                return '<a target="_blank" href="' + url + '">' + url + '</a>';
             }
         });
     }

From 1c440f0db409099a1ae6d97f8a4f4d98d4ce28ae Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 7 Apr 2018 22:13:01 -0400
Subject: [PATCH 13/37] Remove the share links

---
 css/80_app.css        | 33 ++++-----------------------------
 data/core.yaml        |  4 ----
 dist/locales/en.json  |  4 ----
 modules/ui/success.js | 36 +-----------------------------------
 4 files changed, 5 insertions(+), 72 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index c85c99b9e..60c2ae826 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3598,11 +3598,14 @@ img.tile-debug {
 /* Success Modal
 ------------------------------------------------------- */
 .save-summary,
-.save-shareLinks,
 .save-communityLinks {
     padding: 0px 20px 15px 20px;
 }
 
+.save-communityLinks {
+    border-top: 1px solid #ccc;
+}
+
 .save-success table,
 .save-success p {
     margin-top: 15px;
@@ -3635,34 +3638,6 @@ img.tile-debug {
     white-space: nowrap;
 }
 
-.save-shareLinks,
-.save-communityLinks {
-    border-top: 1px solid #ccc;
-}
-
-.save-shareLinks a.button.social {
-    height: auto;
-    border-bottom: none;
-}
-.save-shareLinks .icon.social {
-    height: 40px;
-    width: 40px;
-    color: #7092ff;
-}
-
-.save-success a.button {
-    font-weight: normal;
-    color: #7092ff;
-    border-bottom: 1px solid #ccc;
-    border-radius: 0;
-    height: 40px;
-    width: 40px;
-    text-align: center;
-    display: inline-block;
-}
-.save-success a.button:hover {
-    background-color: #ececec;
-}
 
 /* Splash Modal
 ------------------------------------------------------- */
diff --git a/data/core.yaml b/data/core.yaml
index c3ed4645d..7371bae3c 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -535,10 +535,6 @@ en:
     help_link_url: "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
     view_on_osm: "View Changes on OSM"
     changeset_id: "Changeset #: {changeset_id}"
-    edited_osm: "Edited OSM!"
-    facebook: "Share on Facebook"
-    twitter: "Share on Twitter"
-    google: "Share on Google+"
     like_osm: "Like OpenStreetMap? Connect with others:"
   confirm:
     okay: "OK"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index dadc23e62..1611cbb83 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -652,10 +652,6 @@
             "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F",
             "view_on_osm": "View Changes on OSM",
             "changeset_id": "Changeset #: {changeset_id}",
-            "edited_osm": "Edited OSM!",
-            "facebook": "Share on Facebook",
-            "twitter": "Share on Twitter",
-            "google": "Share on Google+",
             "like_osm": "Like OpenStreetMap? Connect with others:"
         },
         "confirm": {
diff --git a/modules/ui/success.js b/modules/ui/success.js
index 98ae60806..8b37ce5a1 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -5,7 +5,6 @@ import { select as d3_select } from 'd3-selection';
 
 import { t } from '../util/locale';
 import { data } from '../../data';
-import { tooltip } from '../util/tooltip';
 import { svgIcon } from '../svg';
 import { utilRebind } from '../util/rebind';
 
@@ -105,44 +104,11 @@ export function uiSuccess(context) {
         });
 
         if (matchResources.length) {
-            body
-                .call(showCommunityLinks, matchResources);
-        } else {
-            body
-                .call(showShareLinks, changesetURL);
+            body.call(showCommunityLinks, matchResources);
         }
     }
 
 
-    function showShareLinks(selection, changesetURL) {
-        var shareLinks = selection
-            .append('div')
-            .attr('class', 'save-shareLinks');
-
-        var message = (_changeset.tags.comment || t('success.edited_osm')).substring(0, 130) +
-            ' ' + changesetURL;
-
-        var sharing = [
-            { key: 'facebook', value: 'https://facebook.com/sharer/sharer.php?u=' + encodeURIComponent(changesetURL) },
-            { key: 'twitter', value: 'https://twitter.com/intent/tweet?source=webclient&text=' + encodeURIComponent(message) },
-            { key: 'google', value: 'https://plus.google.com/share?url=' + encodeURIComponent(changesetURL) }
-        ];
-
-        shareLinks.selectAll('.button.social')
-            .data(sharing)
-            .enter()
-            .append('a')
-            .attr('class', 'button social col4')
-            .attr('target', '_blank')
-            .attr('href', function(d) { return d.value; })
-            .call(tooltip()
-                .title(function(d) { return t('success.' + d.key); })
-                .placement('bottom')
-            )
-            .each(function(d) { d3_select(this).call(svgIcon('#logo-' + d.key, 'social')); });
-    }
-
-
     function showCommunityLinks(selection, matchResources) {
         var communityLinks = selection
             .append('div')

From 4eaa2a98ce4be13f5c8bb3fd2381f86852ee3bb4 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 7 Apr 2018 22:16:50 -0400
Subject: [PATCH 14/37] Fix global community resources (e.g. Reddit)

---
 modules/ui/success.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ui/success.js b/modules/ui/success.js
index 8b37ce5a1..3cb1601ae 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -100,7 +100,7 @@ export function uiSuccess(context) {
 
         // Gather community resources that are either global or match a polygon.
         var matchResources = _filter(data.community.resources, function(v) {
-            return v.featureId === null || matchIDs.indexOf(v.featureId) !== -1;
+            return !v.featureId || matchIDs.indexOf(v.featureId) !== -1;
         });
 
         if (matchResources.length) {

From 12f7f68dda7158a6b33dd70ebf06cbf93be203a0 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 7 Apr 2018 22:23:37 -0400
Subject: [PATCH 15/37] Fix debug flag test

---
 test/spec/core/context.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/spec/core/context.js b/test/spec/core/context.js
index df3fbfdbf..3d7a5a175 100644
--- a/test/spec/core/context.js
+++ b/test/spec/core/context.js
@@ -57,6 +57,7 @@ describe('iD.Context', function() {
                 flags = {
                     tile: false,
                     collision: false,
+                    community: false,
                     imagery: false,
                     imperial: false,
                     driveLeft: false,

From 4f855d50a46595dfdfc18eef0947c00df4802b4f Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 7 Apr 2018 23:07:34 -0400
Subject: [PATCH 16/37] Expand/contract extended description

---
 css/80_app.css        | 21 ++++++++++++++++++---
 data/core.yaml        |  1 +
 dist/locales/en.json  |  3 ++-
 modules/ui/success.js | 20 +++++++++++++++-----
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index 60c2ae826..5ee91ed5a 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -412,7 +412,7 @@ li.hide {
 
 button {
     text-align: center;
-    line-height:20px;
+    line-height: 20px;
     border:0;
     background: white;
     font-weight: bold;
@@ -3613,6 +3613,7 @@ img.tile-debug {
 .save-success h3 {
     font-size: 14px;
     margin-top: 15px;
+    line-height: 1.5;
     padding-bottom: 0;
 }
 .save-success td {
@@ -3628,8 +3629,8 @@ img.tile-debug {
     padding-bottom: 20px;
 }
 
-.summary-detail-view,
-.community-detail-name {
+.summary-view-on-osm,
+.community-name {
     font-size: 14px;
     font-weight: bold;
 }
@@ -3638,6 +3639,20 @@ img.tile-debug {
     white-space: nowrap;
 }
 
+.community-detail a.hide-toggle,
+.community-detail a:visited.hide-toggle {
+    font-size: 12px;
+    font-weight: normal;
+}
+.community-detail .hide-toggle svg.icon.pre-text {
+    width: 12px;
+    height: 15px;
+}
+.community-detail .disclosure-wrap .community-extended-description {
+    background-color: #efefef;
+    padding: 8px;
+    border-radius: 4px;
+}
 
 /* Splash Modal
 ------------------------------------------------------- */
diff --git a/data/core.yaml b/data/core.yaml
index 7371bae3c..75adffa6e 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -536,6 +536,7 @@ en:
     view_on_osm: "View Changes on OSM"
     changeset_id: "Changeset #: {changeset_id}"
     like_osm: "Like OpenStreetMap? Connect with others:"
+    more: More
   confirm:
     okay: "OK"
     cancel: "Cancel"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 1611cbb83..197f127f1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -652,7 +652,8 @@
             "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F",
             "view_on_osm": "View Changes on OSM",
             "changeset_id": "Changeset #: {changeset_id}",
-            "like_osm": "Like OpenStreetMap? Connect with others:"
+            "like_osm": "Like OpenStreetMap? Connect with others:",
+            "more": "More"
         },
         "confirm": {
             "okay": "OK",
diff --git a/modules/ui/success.js b/modules/ui/success.js
index 3cb1601ae..9ebebab7a 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -6,6 +6,7 @@ import { select as d3_select } from 'd3-selection';
 import { t } from '../util/locale';
 import { data } from '../../data';
 import { svgIcon } from '../svg';
+import { uiDisclosure } from '../ui';
 import { utilRebind } from '../util/rebind';
 
 
@@ -84,7 +85,7 @@ export function uiSuccess(context) {
 
         summaryDetail
             .append('a')
-            .attr('class', 'cell-detail summary-detail-view')
+            .attr('class', 'cell-detail summary-view-on-osm')
             .attr('target', '_blank')
             .attr('href', changesetURL)
             .text(t('success.view_on_osm'));
@@ -153,21 +154,30 @@ export function uiSuccess(context) {
 
             selection
                 .append('div')
-                .attr('class', 'community-detail-name')
+                .attr('class', 'community-name')
                 .append('a')
                 .attr('target', '_blank')
                 .attr('href', d.url)
                 .text(t('community.' + d.id + '.name'));
 
-            selection
+            var description = selection
                 .append('div')
-                .attr('class', 'community-detail-description')
+                .attr('class', 'community-description')
                 .html(t('community.' + d.id + '.description', replacements));
 
             if (d.extendedDescription) {
                 selection
                     .append('div')
-                    .attr('class', 'community-detail-extendedDescription')
+                    .call(uiDisclosure(context, 'community-ext-' + d.id, false)
+                        .title(t('success.more'))
+                        .content(extendedDescription)
+                    );
+            }
+
+            function extendedDescription(selection) {
+                selection
+                    .append('div')
+                    .attr('class', 'community-extended-description')
                     .html(t('community.' + d.id + '.extendedDescription', replacements));
             }
 

From 150bd064a07a080f2beba10779476fd12161ee31 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 8 Apr 2018 00:23:23 -0400
Subject: [PATCH 17/37] Center sidebar heading, lighten placeholders

---
 css/80_app.css | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index 5ee91ed5a..7919cd081 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -163,6 +163,17 @@ h4, h5 {
     outline-style: none;
 }
 
+::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
+    color: #aaa;
+    opacity: 1; /* Firefox */
+}
+:-ms-input-placeholder { /* Internet Explorer 10-11 */
+    color: #aaa;
+}
+::-ms-input-placeholder { /* Microsoft Edge */
+    color: #aaa;
+}
+
 p {
     font-size: 12px;
     margin:0;
@@ -656,16 +667,12 @@ button.save.has-count .count::before {
 }
 
 .header h3 {
-    text-align: left;
+    text-align: center;
     margin-bottom: 0;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
-    padding: 20px 20px 20px 40px;
-}
-[dir='rtl'] .header h3 {
-    text-align: right;
-    padding: 20px 40px 20px 20px;
+    padding: 20px;
 }
 
 .header button,

From 30d94db9a2627d920197c871493a4432342d33e3 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 8 Apr 2018 01:20:35 -0400
Subject: [PATCH 18/37] Precompute areas and sort communities by area ascending

Note: Currently unreliable because the polygons have inconsistent winding,
but this will be fixed in the next release of osm-community-index
---
 data/index.js         | 14 +++++++++-----
 modules/ui/success.js | 18 ++++++++++++++++--
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/data/index.js b/data/index.js
index c1b282fab..7e4bc9997 100644
--- a/data/index.js
+++ b/data/index.js
@@ -12,7 +12,6 @@ export { default as dataImperial } from './imperial.json';
 export { default as dataDriveLeft } from './drive-left.json';
 export { en as dataEn } from '../dist/locales/en.json';
 
-
 import {
     features as ociFeatures,
     resources as ociResources
@@ -27,14 +26,19 @@ import { fields } from './presets/fields.json';
 import maki from '@mapbox/maki';
 export var dataFeatureIcons = maki.layouts.all.all;
 
+import { geoArea as d3_geoArea } from 'd3-geo';
 import _values from 'lodash-es/values';
 import whichPolygon from 'which-polygon';
 
-// workaround for which-polygon
-// only supports `properties`, not `id`
-// https://github.com/mapbox/which-polygon/pull/6
 var features = _values(ociFeatures).map(function(feature) {
-    feature.properties = { id: feature.id };
+    // workaround for which-polygon
+    // only supports `properties`, not `id`
+    // https://github.com/mapbox/which-polygon/pull/6
+    feature.properties = {
+        id: feature.id,
+        area: d3_geoArea(feature)   // also precompute areas
+    };
+
     return feature;
 });
 
diff --git a/modules/ui/success.js b/modules/ui/success.js
index 9ebebab7a..37e2425d6 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -105,7 +105,21 @@ export function uiSuccess(context) {
         });
 
         if (matchResources.length) {
-            body.call(showCommunityLinks, matchResources);
+            // sort by size ascending
+            matchResources.sort(function(a, b) {
+                var aSize = Infinity;
+                var bSize = Infinity;
+                if (a.featureId) {
+                    aSize = data.community.features[a.featureId].properties.area;
+                }
+                if (b.featureId) {
+                    bSize = data.community.features[b.featureId].properties.area;
+                }
+                return aSize < bSize ? -1 : aSize > bSize ? 1 : 0;
+            });
+
+            body
+                .call(showCommunityLinks, matchResources);
         }
     }
 
@@ -160,7 +174,7 @@ export function uiSuccess(context) {
                 .attr('href', d.url)
                 .text(t('community.' + d.id + '.name'));
 
-            var description = selection
+            selection
                 .append('div')
                 .attr('class', 'community-description')
                 .html(t('community.' + d.id + '.description', replacements));

From 8a0a5e309e03bedf6a044f80a2e5e71562eb40b7 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 8 Apr 2018 08:59:49 -0400
Subject: [PATCH 19/37] Show languages

---
 css/80_app.css        | 11 ++++++++++-
 data/core.yaml        |  1 +
 dist/locales/en.json  |  3 ++-
 modules/ui/success.js | 25 +++++++++++++++++++------
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index 7919cd081..c75209c00 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3604,6 +3604,11 @@ img.tile-debug {
 
 /* Success Modal
 ------------------------------------------------------- */
+.save-success.body {
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
+
 .save-summary,
 .save-communityLinks {
     padding: 0px 20px 15px 20px;
@@ -3641,6 +3646,9 @@ img.tile-debug {
     font-size: 14px;
     font-weight: bold;
 }
+.community-languages {
+    font-style: italic;
+}
 .save-summary .details {
     margin: 0px 5px;
     white-space: nowrap;
@@ -3655,12 +3663,13 @@ img.tile-debug {
     width: 12px;
     height: 15px;
 }
-.community-detail .disclosure-wrap .community-extended-description {
+.community-detail .community-more {
     background-color: #efefef;
     padding: 8px;
     border-radius: 4px;
 }
 
+
 /* Splash Modal
 ------------------------------------------------------- */
 .modal-actions .logo-walkthrough,
diff --git a/data/core.yaml b/data/core.yaml
index 75adffa6e..bac0beb6c 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -537,6 +537,7 @@ en:
     changeset_id: "Changeset #: {changeset_id}"
     like_osm: "Like OpenStreetMap? Connect with others:"
     more: More
+    languages: "Languages: {languages}"
   confirm:
     okay: "OK"
     cancel: "Cancel"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 197f127f1..f5bcac69c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -653,7 +653,8 @@
             "view_on_osm": "View Changes on OSM",
             "changeset_id": "Changeset #: {changeset_id}",
             "like_osm": "Like OpenStreetMap? Connect with others:",
-            "more": "More"
+            "more": "More",
+            "languages": "Languages: {languages}"
         },
         "confirm": {
             "okay": "OK",
diff --git a/modules/ui/success.js b/modules/ui/success.js
index 37e2425d6..1de9a6a79 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -179,20 +179,33 @@ export function uiSuccess(context) {
                 .attr('class', 'community-description')
                 .html(t('community.' + d.id + '.description', replacements));
 
-            if (d.extendedDescription) {
+            if (d.extendedDescription || (d.languageCodes && d.languageCodes.length)) {
                 selection
                     .append('div')
                     .call(uiDisclosure(context, 'community-ext-' + d.id, false)
                         .title(t('success.more'))
-                        .content(extendedDescription)
+                        .content(showMore)
                     );
             }
 
-            function extendedDescription(selection) {
-                selection
+            function showMore(selection) {
+                var more = selection
                     .append('div')
-                    .attr('class', 'community-extended-description')
-                    .html(t('community.' + d.id + '.extendedDescription', replacements));
+                    .attr('class', 'community-more');
+
+                if (d.extendedDescription) {
+                    more
+                        .append('div')
+                        .attr('class', 'community-extended-description')
+                        .html(t('community.' + d.id + '.extendedDescription', replacements));
+                }
+
+                if (d.languageCodes && d.languageCodes.length) {
+                    more
+                        .append('div')
+                        .attr('class', 'community-languages')
+                        .text(t('success.languages', { languages: d.languageCodes.join(', ') }));
+                }
             }
 
             function linkify(url) {

From cd2d42799e330d9f0885be00a65243270dbeebff Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 8 Apr 2018 21:23:05 -0400
Subject: [PATCH 20/37] Show events

---
 css/80_app.css        |  13 +++-
 data/core.yaml        |   3 +-
 dist/locales/en.json  |   3 +-
 modules/ui/success.js | 163 +++++++++++++++++++++++++++++++-----------
 4 files changed, 136 insertions(+), 46 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index c75209c00..216f2aee2 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3638,7 +3638,7 @@ img.tile-debug {
     padding: 0 10px;
 }
 .save-success td.community-detail {
-    padding-bottom: 20px;
+    padding-bottom: 15px;
 }
 
 .summary-view-on-osm,
@@ -3658,15 +3658,24 @@ img.tile-debug {
 .community-detail a:visited.hide-toggle {
     font-size: 12px;
     font-weight: normal;
+    padding-bottom: 0;
 }
 .community-detail .hide-toggle svg.icon.pre-text {
     width: 12px;
     height: 15px;
 }
-.community-detail .community-more {
+
+.community-event,
+.community-more {
     background-color: #efefef;
     padding: 8px;
     border-radius: 4px;
+    margin-bottom: 5px;
+}
+
+.community-event-name,
+.community-event-when {
+    font-weight: bold;
 }
 
 
diff --git a/data/core.yaml b/data/core.yaml
index bac0beb6c..c9f28d8d6 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -534,9 +534,10 @@ en:
     help_link_text: Details
     help_link_url: "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
     view_on_osm: "View Changes on OSM"
-    changeset_id: "Changeset #: {changeset_id}"
+    changeset_id: "Your changeset #: {changeset_id}"
     like_osm: "Like OpenStreetMap? Connect with others:"
     more: More
+    events: Events
     languages: "Languages: {languages}"
   confirm:
     okay: "OK"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f5bcac69c..4398a7948 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -651,9 +651,10 @@
             "help_link_text": "Details",
             "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F",
             "view_on_osm": "View Changes on OSM",
-            "changeset_id": "Changeset #: {changeset_id}",
+            "changeset_id": "Your changeset #: {changeset_id}",
             "like_osm": "Like OpenStreetMap? Connect with others:",
             "more": "More",
+            "events": "Events",
             "languages": "Languages: {languages}"
         },
         "confirm": {
diff --git a/modules/ui/success.js b/modules/ui/success.js
index 1de9a6a79..01d1a992d 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -7,11 +7,14 @@ import { t } from '../util/locale';
 import { data } from '../../data';
 import { svgIcon } from '../svg';
 import { uiDisclosure } from '../ui';
+import { utilDetect } from '../util/detect';
 import { utilRebind } from '../util/rebind';
 
 
 export function uiSuccess(context) {
+    var detected = utilDetect();
     var dispatch = d3_dispatch('cancel');
+    var MAXEVENTS = 2;
     var _changeset;
     var _location;
 
@@ -159,59 +162,135 @@ export function uiSuccess(context) {
             .append('td')
             .attr('class', 'cell-detail community-detail');
 
-        communityDetail.each(function(d) {
-            var selection = d3_select(this);
-            var replacements = {
-                url: linkify(d.url),
-                signupUrl: linkify(d.signupUrl || d.url)
-            };
+        communityDetail
+            .each(showCommunityDetails);
+    }
 
+
+    function showCommunityDetails(d) {
+        var selection = d3_select(this);
+        var replacements = {
+            url: linkify(d.url),
+            signupUrl: linkify(d.signupUrl || d.url)
+        };
+
+        selection
+            .append('div')
+            .attr('class', 'community-name')
+            .append('a')
+            .attr('target', '_blank')
+            .attr('href', d.url)
+            .text(t('community.' + d.id + '.name'));
+
+        selection
+            .append('div')
+            .attr('class', 'community-description')
+            .html(t('community.' + d.id + '.description', replacements));
+
+        if (d.extendedDescription || (d.languageCodes && d.languageCodes.length)) {
             selection
                 .append('div')
-                .attr('class', 'community-name')
+                .call(uiDisclosure(context, 'community-more-' + d.id, false)
+                    .title(t('success.more'))
+                    .content(showMore)
+                );
+        }
+
+        var nextEvents = (d.events || [])
+            .map(function(event) {                  // add parsed date
+                event.date = new Date(event.when);
+                return event;
+            })
+            .filter(function(event) {               // date is valid and future (or today)
+                var t = event.date.getTime();
+                var now = (new Date()).setHours(0,0,0,0);
+                return !isNaN(t) && t >= now;
+            })
+            .sort(function(a, b) {                  // sort by date ascending
+                return a.date < b.date ? -1 : a.date > b.date ? 1 : 0;
+            })
+            .slice(0, MAXEVENTS);                   // limit number of events shown
+
+        if (nextEvents.length) {
+            selection
+                .append('div')
+                .call(uiDisclosure(context, 'community-events-' + d.id, false)
+                    .title(t('success.events'))
+                    .content(showNextEvents)
+                );
+        }
+
+
+        function showMore(selection) {
+            var more = selection
+                .append('div')
+                .attr('class', 'community-more');
+
+            if (d.extendedDescription) {
+                more
+                    .append('div')
+                    .attr('class', 'community-extended-description')
+                    .html(t('community.' + d.id + '.extendedDescription', replacements));
+            }
+
+            if (d.languageCodes && d.languageCodes.length) {
+                more
+                    .append('div')
+                    .attr('class', 'community-languages')
+                    .text(t('success.languages', { languages: d.languageCodes.join(', ') }));
+            }
+        }
+
+
+        function showNextEvents(selection) {
+            var events = selection
+                .append('div')
+                .attr('class', 'community-events');
+
+            var item = events.selectAll('.community-event')
+                .data(nextEvents);
+
+            var itemEnter = item.enter()
+                .append('div')
+                .attr('class', 'community-event');
+
+            itemEnter
+                .append('div')
+                .attr('class', 'community-event-name')
                 .append('a')
                 .attr('target', '_blank')
-                .attr('href', d.url)
-                .text(t('community.' + d.id + '.name'));
+                .attr('href', function(d) { return d.url; })
+                .text(function(d) { return d.name; });
 
-            selection
+            itemEnter
                 .append('div')
-                .attr('class', 'community-description')
-                .html(t('community.' + d.id + '.description', replacements));
+                .attr('class', 'community-event-when')
+                .text(function(d) {
+                    var options = {
+                        weekday: 'short', day: 'numeric', month: 'short', year: 'numeric'
+                    };
+                    if (d.date.getHours() || d.date.getMinutes()) {   // include time if it has one
+                        options.hour = 'numeric';
+                        options.minute = 'numeric';
+                    }
+                    return d.date.toLocaleString(detected.locale, options);
+                });
 
-            if (d.extendedDescription || (d.languageCodes && d.languageCodes.length)) {
-                selection
-                    .append('div')
-                    .call(uiDisclosure(context, 'community-ext-' + d.id, false)
-                        .title(t('success.more'))
-                        .content(showMore)
-                    );
-            }
+            itemEnter
+                .append('div')
+                .attr('class', 'community-event-where')
+                .text(function(d) { return d.where; });
 
-            function showMore(selection) {
-                var more = selection
-                    .append('div')
-                    .attr('class', 'community-more');
+            itemEnter
+                .append('div')
+                .attr('class', 'community-event-description')
+                .text(function(d) { return d.description; });
+        }
 
-                if (d.extendedDescription) {
-                    more
-                        .append('div')
-                        .attr('class', 'community-extended-description')
-                        .html(t('community.' + d.id + '.extendedDescription', replacements));
-                }
 
-                if (d.languageCodes && d.languageCodes.length) {
-                    more
-                        .append('div')
-                        .attr('class', 'community-languages')
-                        .text(t('success.languages', { languages: d.languageCodes.join(', ') }));
-                }
-            }
-
-            function linkify(url) {
-                return '<a target="_blank" href="' + url + '">' + url + '</a>';
-            }
-        });
+        function linkify(url) {
+            return '<a target="_blank" href="' + url + '">' + url + '</a>';
+        }
     }
 
 

From cab78c2c6b54cbc408d2561dc4d90ad4a03d255c Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 8 Apr 2018 21:55:36 -0400
Subject: [PATCH 21/37] Add notification badge for events, default disclosures
 to closed

---
 css/80_app.css        | 34 +++++++++++++++++++++++++++++++++-
 modules/ui/success.js | 10 +++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index 216f2aee2..5b6567435 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3460,6 +3460,9 @@ img.tile-debug {
     color: #ccf;
 }
 
+/* Notification Badges */
+
+/* For an icon (e.g. new version) */
 .badge {
     display: inline-block;
     background: #d32232;
@@ -3486,6 +3489,24 @@ img.tile-debug {
     fill: white;
 }
 
+/* For text (e.g. upcoming events) */
+.badge-text {
+    display: inline-block;
+    color: white;
+    text-align: center;
+    width: 16px;
+    height: 16px;
+    font-size: 10px;
+    font-weight: bold;
+    margin-left: 5px;
+    background: #f00;
+    border-radius: 9px;
+}
+[dir='rtl'] .badge-text {
+    margin-left: 0;
+    margin-right: 5px;
+}
+
 
 /* Modals
 ------------------------------------------------------- */
@@ -3647,8 +3668,12 @@ img.tile-debug {
     font-weight: bold;
 }
 .community-languages {
+    margin-top: 5px;
     font-style: italic;
 }
+.community-languages:only-child {
+    margin-top: 0;
+}
 .save-summary .details {
     margin: 0px 5px;
     white-space: nowrap;
@@ -3665,6 +3690,10 @@ img.tile-debug {
     height: 15px;
 }
 
+.community-events {
+    margin-top: 5px;
+}
+
 .community-event,
 .community-more {
     background-color: #efefef;
@@ -3673,7 +3702,10 @@ img.tile-debug {
     margin-bottom: 5px;
 }
 
-.community-event-name,
+.community-event-name {
+    font-size: 14px;
+    font-weight: bold;
+}
 .community-event-when {
     font-weight: bold;
 }
diff --git a/modules/ui/success.js b/modules/ui/success.js
index 01d1a992d..52581aead 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -191,6 +191,8 @@ export function uiSuccess(context) {
             selection
                 .append('div')
                 .call(uiDisclosure(context, 'community-more-' + d.id, false)
+                    .expanded(false)
+                    .updatePreference(false)
                     .title(t('success.more'))
                     .content(showMore)
                 );
@@ -215,9 +217,15 @@ export function uiSuccess(context) {
             selection
                 .append('div')
                 .call(uiDisclosure(context, 'community-events-' + d.id, false)
+                    .expanded(false)
+                    .updatePreference(false)
                     .title(t('success.events'))
                     .content(showNextEvents)
-                );
+                )
+                .select('.hide-toggle')
+                .append('span')
+                .attr('class', 'badge-text')
+                .text(nextEvents.length);
         }
 
 

From c35b4906fd128b0808150109b02b5120f0f48fc0 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 8 Apr 2018 22:23:26 -0400
Subject: [PATCH 22/37] Add support for translated i18n events

---
 modules/ui/success.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/modules/ui/success.js b/modules/ui/success.js
index 52581aead..f8e1a6a97 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -169,6 +169,7 @@ export function uiSuccess(context) {
 
     function showCommunityDetails(d) {
         var selection = d3_select(this);
+        var communityID = d.id;
         var replacements = {
             url: linkify(d.url),
             signupUrl: linkify(d.signupUrl || d.url)
@@ -268,7 +269,13 @@ export function uiSuccess(context) {
                 .append('a')
                 .attr('target', '_blank')
                 .attr('href', function(d) { return d.url; })
-                .text(function(d) { return d.name; });
+                .text(function(d) {
+                    var name = d.name;
+                    if (d.i18n && d.id) {
+                        name = t('community.' + communityID + '.events.' + d.id + '.name', { default: name });
+                    }
+                    return name;
+                });
 
             itemEnter
                 .append('div')
@@ -287,12 +294,24 @@ export function uiSuccess(context) {
             itemEnter
                 .append('div')
                 .attr('class', 'community-event-where')
-                .text(function(d) { return d.where; });
+                .text(function(d) {
+                    var where = d.where;
+                    if (d.i18n && d.id) {
+                        where = t('community.' + communityID + '.events.' + d.id + '.where', { default: where });
+                    }
+                    return where;
+                });
 
             itemEnter
                 .append('div')
                 .attr('class', 'community-event-description')
-                .text(function(d) { return d.description; });
+                .text(function(d) {
+                    var description = d.description;
+                    if (d.i18n && d.id) {
+                        description = t('community.' + communityID + '.events.' + d.id + '.description', { default: description });
+                    }
+                    return description;
+                });
         }
 
 

From 514ddffd22144412f388c7ddee503e6ecd3ead83 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 8 Apr 2018 23:41:51 -0400
Subject: [PATCH 23/37] Add link to report missing info in the community list

---
 css/80_app.css        | 14 ++++++++++----
 data/core.yaml        |  2 ++
 dist/locales/en.json  |  4 +++-
 modules/ui/success.js | 15 ++++++++++++++-
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index 5b6567435..e49a92987 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3630,6 +3630,11 @@ img.tile-debug {
     overflow-x: hidden;
 }
 
+.save-success .link-out {
+    margin: 0px 5px;
+    white-space: nowrap;
+}
+
 .save-summary,
 .save-communityLinks {
     padding: 0px 20px 15px 20px;
@@ -3674,10 +3679,6 @@ img.tile-debug {
 .community-languages:only-child {
     margin-top: 0;
 }
-.save-summary .details {
-    margin: 0px 5px;
-    white-space: nowrap;
-}
 
 .community-detail a.hide-toggle,
 .community-detail a:visited.hide-toggle {
@@ -3710,6 +3711,11 @@ img.tile-debug {
     font-weight: bold;
 }
 
+.community-missing {
+    padding: 10px;
+    text-align: center;
+}
+
 
 /* Splash Modal
 ------------------------------------------------------- */
diff --git a/data/core.yaml b/data/core.yaml
index c9f28d8d6..6c3c59961 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -539,6 +539,8 @@ en:
     more: More
     events: Events
     languages: "Languages: {languages}"
+    missing: "Is something missing from this list?"
+    tell_us: "Tell us!"
   confirm:
     okay: "OK"
     cancel: "Cancel"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 4398a7948..e8d1784f2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -655,7 +655,9 @@
             "like_osm": "Like OpenStreetMap? Connect with others:",
             "more": "More",
             "events": "Events",
-            "languages": "Languages: {languages}"
+            "languages": "Languages: {languages}",
+            "missing": "Is something missing from this list?",
+            "tell_us": "Tell us!"
         },
         "confirm": {
             "okay": "OK",
diff --git a/modules/ui/success.js b/modules/ui/success.js
index f8e1a6a97..69457029b 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -50,7 +50,7 @@ export function uiSuccess(context) {
             .append('p')
             .text(t('success.help_html'))
             .append('a')
-            .attr('class', 'details')
+            .attr('class', 'link-out')
             .attr('target', '_blank')
             .attr('tabindex', -1)
             .attr('href', t('success.help_link_url'))
@@ -164,6 +164,19 @@ export function uiSuccess(context) {
 
         communityDetail
             .each(showCommunityDetails);
+
+        communityLinks
+            .append('div')
+            .attr('class', 'community-missing')
+            .text(t('success.missing'))
+            .append('a')
+            .attr('class', 'link-out')
+            .attr('target', '_blank')
+            .attr('tabindex', -1)
+            .call(svgIcon('#icon-out-link', 'inline'))
+            .attr('href', 'https://github.com/osmlab/osm-community-index/issues')
+            .append('span')
+            .text(t('success.tell_us'));
     }
 
 

From f0d8583f748c64dcc6ff2b4612a7feeb2afafb59 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 9 Apr 2018 09:20:55 -0400
Subject: [PATCH 24/37] Adjust sort weight by community type

---
 modules/ui/success.js | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/modules/ui/success.js b/modules/ui/success.js
index 69457029b..b81957100 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -12,9 +12,22 @@ import { utilRebind } from '../util/rebind';
 
 
 export function uiSuccess(context) {
+    var MAXEVENTS = 2;
+
+    // All else being equal, rank more "social" communities higher
+    // (anything not in this list receives no adjustment)
+    var COMMUNITYRANK = {
+        'meetup': +5,
+        'slack': +4,
+        'facebook': +3,
+        'reddit': +2,
+        'forum': -2,
+        'mailinglist': -3,
+        'irc': -4
+    };
+
     var detected = utilDetect();
     var dispatch = d3_dispatch('cancel');
-    var MAXEVENTS = 2;
     var _changeset;
     var _location;
 
@@ -108,17 +121,21 @@ export function uiSuccess(context) {
         });
 
         if (matchResources.length) {
-            // sort by size ascending
+            // sort by size ascending, then by community rank
             matchResources.sort(function(a, b) {
                 var aSize = Infinity;
                 var bSize = Infinity;
+                var aRank = COMMUNITYRANK[a.type] || 0;
+                var bRank = COMMUNITYRANK[b.type] || 0;
+
                 if (a.featureId) {
                     aSize = data.community.features[a.featureId].properties.area;
                 }
                 if (b.featureId) {
                     bSize = data.community.features[b.featureId].properties.area;
                 }
-                return aSize < bSize ? -1 : aSize > bSize ? 1 : 0;
+
+                return aSize < bSize ? -1 : aSize > bSize ? 1 : bRank - aRank;
             });
 
             body

From 7bf544c28a408b628de4a7587a98e4be7c636dac Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 9 Apr 2018 10:48:21 -0400
Subject: [PATCH 25/37] Don't click cycle through `alternating` or `reversible`
 oneway states (closes #4970)

They are still supported as translated strings, and user can still enter these
values in the raw tag editor, but they should not toggle with clicks in the
checkbox field.  This is because novice users are confused by what they mean.
---
 modules/ui/fields/check.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/ui/fields/check.js b/modules/ui/fields/check.js
index f7300c598..945085aa0 100644
--- a/modules/ui/fields/check.js
+++ b/modules/ui/fields/check.js
@@ -126,10 +126,17 @@ export function uiFieldCheck(field, context) {
 
         input
             .on('click', function() {
+                d3_event.stopPropagation();
                 var t = {};
                 t[field.key] = values[(values.indexOf(_value) + 1) % values.length];
+
+                // Don't cycle through `alternating` or `reversible` states - #4970
+                // (They are supported as translated strings, but should not toggle with clicks)
+                if (t[field.key] === 'reversible' || t[field.key] === 'alternating') {
+                    t[field.key] = values[0];
+                }
+
                 dispatch.call('change', this, t);
-                d3_event.stopPropagation();
             });
 
         if (field.type === 'onewayCheck') {

From 96a7d38e2a94b13f82f5104d66e1fdf10e439daf Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 9 Apr 2018 10:57:30 -0400
Subject: [PATCH 26/37] npm run build

---
 dist/locales/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/locales/en.json b/dist/locales/en.json
index 4e830fc4d..8bf4f41d7 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -6677,7 +6677,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Basemap of Austria, based on government data.",
+                "description": "Basemap of Austria, based on goverment data.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6739,7 +6739,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL"
+                    "text": "Map tiles by Stamen Design, under CC BY 3.0"
                 },
                 "name": "Stamen Terrain"
             },

From c42556ec96beea2de880a04a177a68931c4b30a4 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 9 Apr 2018 12:59:13 -0400
Subject: [PATCH 27/37] When boundaries are shared with roads, consider them as
 roads. (closes #4973)

This is same as existing logic in the feature matching code
for the "rail" and "past_future" rules.
---
 modules/renderer/features.js   | 10 ++++++++--
 test/spec/renderer/features.js |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/renderer/features.js b/modules/renderer/features.js
index 8f88e77eb..d7d382af7 100644
--- a/modules/renderer/features.js
+++ b/modules/renderer/features.js
@@ -138,7 +138,13 @@ export function rendererFeatures(context) {
     });
 
     defineFeature('boundaries', function isBoundary(entity) {
-        return !!entity.tags.boundary;
+        return (
+            !!entity.tags.boundary
+        ) && !(
+            traffic_roads[entity.tags.highway] ||
+            service_roads[entity.tags.highway] ||
+            paths[entity.tags.highway]
+        );
     });
 
     defineFeature('water', function isWater(entity) {
@@ -483,7 +489,7 @@ export function rendererFeatures(context) {
             var storageDisabled = storage.replace(/;/g, ',').split(',');
             storageDisabled.forEach(features.disable);
         }
-        
+
         var q = utilStringQs(window.location.hash.substring(1));
         if (q.disable_features) {
             var hashDisabled = q.disable_features.replace(/;/g, ',').split(',');
diff --git a/test/spec/renderer/features.js b/test/spec/renderer/features.js
index ff8bcd9bf..7280991a4 100644
--- a/test/spec/renderer/features.js
+++ b/test/spec/renderer/features.js
@@ -166,6 +166,7 @@ describe('iD.Features', function() {
 
             // Boundaries
             iD.Way({id: 'boundary', tags: {boundary: 'administrative'}, version: 1}),
+            iD.Way({id: 'boundary_road', tags: {boundary: 'administrative', highway: 'primary'}, version: 1}),
 
             // Water
             iD.Way({id: 'water', tags: {area: 'yes', natural: 'water'}, version: 1}),
@@ -251,7 +252,7 @@ describe('iD.Features', function() {
                 'motorway', 'motorway_link', 'trunk', 'trunk_link',
                 'primary', 'primary_link', 'secondary', 'secondary_link',
                 'tertiary', 'tertiary_link', 'residential', 'living_street',
-                'unclassified', 'inner3'
+                'unclassified', 'boundary_road', 'inner3'
             ]);
 
             dontMatch([
@@ -340,6 +341,7 @@ describe('iD.Features', function() {
             ]);
 
             dontMatch([
+                'boundary_road',   // because boundary also used as highway - #4973
                 'point_bar', 'motorway', 'service', 'path', 'building_yes',
                 'forest', 'water', 'railway', 'power_line',
                 'motorway_construction', 'fence'

From b09c712fc5cbd3225a653cf9662fa3429360609e Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 9 Apr 2018 14:20:40 -0400
Subject: [PATCH 28/37] When connecting nodes, prefer to keep an existing (not
 new) node (closes #4974, closes #4674)

---
 modules/actions/connect.js   |  21 +++--
 test/spec/actions/connect.js | 144 ++++++++++++++++++-----------------
 2 files changed, 90 insertions(+), 75 deletions(-)

diff --git a/modules/actions/connect.js b/modules/actions/connect.js
index 1eb0bc5cc..df633715b 100644
--- a/modules/actions/connect.js
+++ b/modules/actions/connect.js
@@ -3,8 +3,8 @@ import { actionDeleteNode } from './delete_node';
 
 // Connect the ways at the given nodes.
 //
-// The last node will survive. All other nodes will be replaced with
-// the surviving node in parent ways, and then removed.
+// First choose a node to be the survivor, with preference given
+// to an existing (not new) node.
 //
 // Tags and relation memberships of of non-surviving nodes are merged
 // to the survivor.
@@ -17,11 +17,20 @@ import { actionDeleteNode } from './delete_node';
 //
 export function actionConnect(nodeIds) {
     return function(graph) {
-        var last = nodeIds[nodeIds.length - 1];
-        var survivor = graph.entity(last);
+        var survivor;
+        var node;
+        var i;
 
-        for (var i = 0; i < nodeIds.length - 1; i++) {
-            var node = graph.entity(nodeIds[i]);
+        // Choose a survivor node, prefer an existing (not new) node - #4974
+        for (i = 0; i < nodeIds.length; i++) {
+            survivor = graph.entity(nodeIds[i]);
+            if (survivor.version) break;  // found one
+        }
+
+        // Replace all non-surviving nodes with the survivor and merge tags.
+        for (i = 0; i < nodeIds.length; i++) {
+            node = graph.entity(nodeIds[i]);
+            if (node.id === survivor.id) continue;
 
             /* eslint-disable no-loop-func */
             graph.parentWays(node).forEach(function(parent) {
diff --git a/test/spec/actions/connect.js b/test/spec/actions/connect.js
index 066e4a73a..a9316c2c2 100644
--- a/test/spec/actions/connect.js
+++ b/test/spec/actions/connect.js
@@ -1,18 +1,31 @@
 describe('iD.actionConnect', function() {
-    it('removes all but the final node', function() {
-        var graph = iD.Graph([
-                iD.Node({id: 'a'}),
-                iD.Node({id: 'b'}),
-                iD.Node({id: 'c'})
-            ]);
+    it('chooses the first non-new node as the survivor', function() {
+        var graph = iD.coreGraph([
+            iD.osmNode({id: 'a'}),
+            iD.osmNode({id: 'b', version: '1'}),
+            iD.osmNode({id: 'c', version: '1'})
+        ]);
 
         graph = iD.actionConnect(['a', 'b', 'c'])(graph);
-
-        expect(graph.hasEntity('a')).to.be.undefined;
-        expect(graph.hasEntity('b')).to.be.undefined;
-        expect(graph.entity('c')).not.to.be.undefined;
+        expect(graph.hasEntity('a')).not.to.be.ok;
+        expect(graph.hasEntity('b')).to.be.ok;
+        expect(graph.hasEntity('c')).not.to.be.ok;
     });
 
+    it('chooses the last node as the survivor when all are new', function() {
+        var graph = iD.coreGraph([
+            iD.osmNode({id: 'a'}),
+            iD.osmNode({id: 'b'}),
+            iD.osmNode({id: 'c'})
+        ]);
+
+        graph = iD.actionConnect(['a', 'b', 'c'])(graph);
+        expect(graph.hasEntity('a')).not.to.be.ok;
+        expect(graph.hasEntity('b')).not.to.be.ok;
+        expect(graph.hasEntity('c')).to.be.ok;
+    });
+
+
     it('replaces non-surviving nodes in parent ways', function() {
         // a --- b --- c
         //
@@ -28,18 +41,17 @@ describe('iD.actionConnect', function() {
         //       |
         //       d
         //
-        var graph = iD.Graph([
-                iD.Node({id: 'a'}),
-                iD.Node({id: 'b'}),
-                iD.Node({id: 'c'}),
-                iD.Node({id: 'd'}),
-                iD.Node({id: 'e'}),
-                iD.Way({id: '-', nodes: ['a', 'b', 'c']}),
-                iD.Way({id: '|', nodes: ['d', 'e']})
-            ]);
+        var graph = iD.coreGraph([
+            iD.osmNode({id: 'a'}),
+            iD.osmNode({id: 'b'}),
+            iD.osmNode({id: 'c'}),
+            iD.osmNode({id: 'd'}),
+            iD.osmNode({id: 'e'}),
+            iD.osmWay({id: '-', nodes: ['a', 'b', 'c']}),
+            iD.osmWay({id: '|', nodes: ['d', 'e']})
+        ]);
 
         graph = iD.actionConnect(['e', 'b'])(graph);
-
         expect(graph.entity('-').nodes).to.eql(['a', 'b', 'c']);
         expect(graph.entity('|').nodes).to.eql(['d', 'b']);
     });
@@ -53,18 +65,17 @@ describe('iD.actionConnect', function() {
         //
         // Connect [a, d].
         //
-        var graph = iD.Graph([
-                iD.Node({id: 'a'}),
-                iD.Node({id: 'b'}),
-                iD.Node({id: 'c'}),
-                iD.Node({id: 'd'}),
-                iD.Node({id: 'e'}),
-                iD.Way({id: '-', nodes: ['a', 'b', 'c', 'a']}),
-                iD.Way({id: '=', nodes: ['d', 'e']})
-            ]);
+        var graph = iD.coreGraph([
+            iD.osmNode({id: 'a'}),
+            iD.osmNode({id: 'b'}),
+            iD.osmNode({id: 'c'}),
+            iD.osmNode({id: 'd'}),
+            iD.osmNode({id: 'e'}),
+            iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'a']}),
+            iD.osmWay({id: '=', nodes: ['d', 'e']})
+        ]);
 
         graph = iD.actionConnect(['a', 'd'])(graph);
-
         expect(graph.entity('-').nodes).to.eql(['d', 'b', 'c', 'd']);
     });
 
@@ -77,15 +88,14 @@ describe('iD.actionConnect', function() {
         //
         // a --- c
         //
-        var graph = iD.Graph([
-                iD.Node({id: 'a'}),
-                iD.Node({id: 'b'}),
-                iD.Node({id: 'c'}),
-                iD.Way({id: '-', nodes: ['a', 'b', 'c']})
-            ]);
+        var graph = iD.coreGraph([
+            iD.osmNode({id: 'a'}),
+            iD.osmNode({id: 'b'}),
+            iD.osmNode({id: 'c'}),
+            iD.osmWay({id: '-', nodes: ['a', 'b', 'c']})
+        ]);
 
         graph = iD.actionConnect(['b', 'c'])(graph);
-
         expect(graph.entity('-').nodes).to.eql(['a', 'c']);
         expect(graph.hasEntity('b')).to.be.undefined;
     });
@@ -103,17 +113,16 @@ describe('iD.actionConnect', function() {
         //       |
         //       d
         //
-        var graph = iD.Graph([
-                iD.Node({id: 'a'}),
-                iD.Node({id: 'b'}),
-                iD.Node({id: 'c'}),
-                iD.Node({id: 'c'}),
-                iD.Way({id: '-', nodes: ['a', 'b', 'c']}),
-                iD.Way({id: '|', nodes: ['b', 'd']})
-            ]);
+        var graph = iD.coreGraph([
+            iD.osmNode({id: 'a'}),
+            iD.osmNode({id: 'b'}),
+            iD.osmNode({id: 'c'}),
+            iD.osmNode({id: 'c'}),
+            iD.osmWay({id: '-', nodes: ['a', 'b', 'c']}),
+            iD.osmWay({id: '|', nodes: ['b', 'd']})
+        ]);
 
         graph = iD.actionConnect(['b', 'c'])(graph);
-
         expect(graph.entity('-').nodes).to.eql(['a', 'c']);
         expect(graph.entity('|').nodes).to.eql(['c', 'd']);
         expect(graph.hasEntity('b')).to.be.undefined;
@@ -124,44 +133,41 @@ describe('iD.actionConnect', function() {
         //
         // Connect [a, b]
         //
-        var graph = iD.Graph([
-                iD.Node({id: 'a'}),
-                iD.Node({id: 'b'}),
-                iD.Way({id: '-', nodes: ['a', 'b']})
-            ]);
+        var graph = iD.coreGraph([
+            iD.osmNode({id: 'a'}),
+            iD.osmNode({id: 'b'}),
+            iD.osmWay({id: '-', nodes: ['a', 'b']})
+        ]);
 
         graph = iD.actionConnect(['a', 'b'])(graph);
-
         expect(graph.hasEntity('a')).to.be.undefined;
         expect(graph.hasEntity('-')).to.be.undefined;
     });
 
     it('merges tags to the surviving node', function() {
-        var graph = iD.Graph([
-                iD.Node({id: 'a', tags: {a: 'a'}}),
-                iD.Node({id: 'b', tags: {b: 'b'}}),
-                iD.Node({id: 'c', tags: {c: 'c'}})
-            ]);
+        var graph = iD.coreGraph([
+            iD.osmNode({id: 'a', tags: {a: 'a'}}),
+            iD.osmNode({id: 'b', tags: {b: 'b'}}),
+            iD.osmNode({id: 'c', tags: {c: 'c'}})
+        ]);
 
         graph = iD.actionConnect(['a', 'b', 'c'])(graph);
-
         expect(graph.entity('c').tags).to.eql({a: 'a', b: 'b', c: 'c'});
     });
 
     it('merges memberships to the surviving node', function() {
-        var graph = iD.Graph([
-                iD.Node({id: 'a'}),
-                iD.Node({id: 'b'}),
-                iD.Node({id: 'c'}),
-                iD.Node({id: 'c'}),
-                iD.Way({id: '-', nodes: ['a', 'b']}),
-                iD.Way({id: '=', nodes: ['c', 'd']}),
-                iD.Relation({id: 'r1', members: [{id: 'b', role: 'r1', type: 'node'}]}),
-                iD.Relation({id: 'r2', members: [{id: 'b', role: 'r2', type: 'node'}, {id: 'c', role: 'r2', type: 'node'}]})
-            ]);
+        var graph = iD.coreGraph([
+            iD.osmNode({id: 'a'}),
+            iD.osmNode({id: 'b'}),
+            iD.osmNode({id: 'c'}),
+            iD.osmNode({id: 'c'}),
+            iD.osmWay({id: '-', nodes: ['a', 'b']}),
+            iD.osmWay({id: '=', nodes: ['c', 'd']}),
+            iD.osmRelation({id: 'r1', members: [{id: 'b', role: 'r1', type: 'node'}]}),
+            iD.osmRelation({id: 'r2', members: [{id: 'b', role: 'r2', type: 'node'}, {id: 'c', role: 'r2', type: 'node'}]})
+        ]);
 
         graph = iD.actionConnect(['b', 'c'])(graph);
-
         expect(graph.entity('r1').members).to.eql([{id: 'c', role: 'r1', type: 'node'}]);
         expect(graph.entity('r2').members).to.eql([{id: 'c', role: 'r2', type: 'node'}]);
     });

From f9c1cbf6bc904249aa953ecb38ce70597d0a7cfc Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 9 Apr 2018 14:33:39 -0400
Subject: [PATCH 29/37] Show a message on the History Panel if the feature is
 new (closes #4975)

---
 data/core.yaml               |  1 +
 dist/locales/en.json         |  1 +
 modules/ui/panels/history.js | 11 +++++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index 6c3c59961..059d8975d 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -325,6 +325,7 @@ en:
       key: H
       title: History
       selected: "{n} selected"
+      no_history: "No History (New Feature)"
       version: Version
       last_edit: Last Edit
       edited_by: Edited By
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 8bf4f41d7..9dfb67330 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -407,6 +407,7 @@
                 "key": "H",
                 "title": "History",
                 "selected": "{n} selected",
+                "no_history": "No History (New Feature)",
                 "version": "Version",
                 "last_edit": "Last Edit",
                 "edited_by": "Edited By",
diff --git a/modules/ui/panels/history.js b/modules/ui/panels/history.js
index b665fe5f9..710cfa8b1 100644
--- a/modules/ui/panels/history.js
+++ b/modules/ui/panels/history.js
@@ -96,8 +96,8 @@ export function uiPanelHistory(context) {
 
 
     function redraw(selection) {
-        var selected = _filter(context.selectedIDs(), function(e) { return context.hasEntity(e); }),
-            singular = selected.length === 1 ? selected[0] : null;
+        var selected = _filter(context.selectedIDs(), function(e) { return context.hasEntity(e); });
+        var singular = selected.length === 1 ? selected[0] : null;
 
         osm = context.connection();
 
@@ -112,6 +112,13 @@ export function uiPanelHistory(context) {
 
         var entity = context.entity(singular);
 
+        if (!entity.version) {
+            selection
+                .append('div')
+                .text(t('info_panels.history.no_history'));
+            return;
+        }
+
         var list = selection
             .append('ul');
 

From 0f2a2f47a399c08047633a3353e12cd8d0f93552 Mon Sep 17 00:00:00 2001
From: vershwal <vershwal.princi@gmail.com>
Date: Tue, 10 Apr 2018 00:29:21 +0530
Subject: [PATCH 30/37] Added name for pitch preset.

---
 data/presets/presets/leisure/pitch/american_football.json | 1 +
 data/presets/presets/leisure/pitch/baseball.json          | 1 +
 data/presets/presets/leisure/pitch/basketball.json        | 1 +
 data/presets/presets/leisure/pitch/beachvolleyball.json   | 1 +
 data/presets/presets/leisure/pitch/boules.json            | 1 +
 data/presets/presets/leisure/pitch/bowls.json             | 1 +
 data/presets/presets/leisure/pitch/cricket.json           | 1 +
 data/presets/presets/leisure/pitch/equestrian.json        | 1 +
 data/presets/presets/leisure/pitch/rugby_league.json      | 1 +
 data/presets/presets/leisure/pitch/rugby_union.json       | 1 +
 data/presets/presets/leisure/pitch/skateboard.json        | 1 +
 data/presets/presets/leisure/pitch/soccer.json            | 1 +
 data/presets/presets/leisure/pitch/table_tennis.json      | 1 +
 data/presets/presets/leisure/pitch/tennis.json            | 1 +
 data/presets/presets/leisure/pitch/volleyball.json        | 1 +
 15 files changed, 15 insertions(+)

diff --git a/data/presets/presets/leisure/pitch/american_football.json b/data/presets/presets/leisure/pitch/american_football.json
index dac3b6834..5b2d30d9e 100644
--- a/data/presets/presets/leisure/pitch/american_football.json
+++ b/data/presets/presets/leisure/pitch/american_football.json
@@ -1,6 +1,7 @@
 {
     "icon": "america-football",
     "fields": [
+        "name",
         "surface",
         "lit"
     ],
diff --git a/data/presets/presets/leisure/pitch/baseball.json b/data/presets/presets/leisure/pitch/baseball.json
index 084983617..510ee2205 100644
--- a/data/presets/presets/leisure/pitch/baseball.json
+++ b/data/presets/presets/leisure/pitch/baseball.json
@@ -1,6 +1,7 @@
 {
     "icon": "baseball",
     "fields": [
+        "name",
         "lit"
     ],
     "geometry": [
diff --git a/data/presets/presets/leisure/pitch/basketball.json b/data/presets/presets/leisure/pitch/basketball.json
index b3dfe3032..30955d275 100644
--- a/data/presets/presets/leisure/pitch/basketball.json
+++ b/data/presets/presets/leisure/pitch/basketball.json
@@ -1,6 +1,7 @@
 {
     "icon": "basketball",
     "fields": [
+        "name",
         "surface",
         "hoops",
         "lit",
diff --git a/data/presets/presets/leisure/pitch/beachvolleyball.json b/data/presets/presets/leisure/pitch/beachvolleyball.json
index 4974e517e..3374ddcd2 100644
--- a/data/presets/presets/leisure/pitch/beachvolleyball.json
+++ b/data/presets/presets/leisure/pitch/beachvolleyball.json
@@ -1,6 +1,7 @@
 {
     "icon": "basketball",
     "fields": [
+        "name",
         "surface",
         "lit"
     ],
diff --git a/data/presets/presets/leisure/pitch/boules.json b/data/presets/presets/leisure/pitch/boules.json
index ba4c67d32..75831331b 100644
--- a/data/presets/presets/leisure/pitch/boules.json
+++ b/data/presets/presets/leisure/pitch/boules.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "boules",
         "surface",
         "lit"
diff --git a/data/presets/presets/leisure/pitch/bowls.json b/data/presets/presets/leisure/pitch/bowls.json
index 67ebde655..17d7f6b54 100644
--- a/data/presets/presets/leisure/pitch/bowls.json
+++ b/data/presets/presets/leisure/pitch/bowls.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "surface",
         "lit"
     ],
diff --git a/data/presets/presets/leisure/pitch/cricket.json b/data/presets/presets/leisure/pitch/cricket.json
index 1b4eee713..8f9310be2 100644
--- a/data/presets/presets/leisure/pitch/cricket.json
+++ b/data/presets/presets/leisure/pitch/cricket.json
@@ -1,6 +1,7 @@
 {
     "icon": "cricket",
     "fields": [
+        "name",
         "surface",
         "lit"
     ],
diff --git a/data/presets/presets/leisure/pitch/equestrian.json b/data/presets/presets/leisure/pitch/equestrian.json
index 83aa07573..77ece3699 100644
--- a/data/presets/presets/leisure/pitch/equestrian.json
+++ b/data/presets/presets/leisure/pitch/equestrian.json
@@ -1,6 +1,7 @@
 {
     "icon": "horse-riding",
     "fields": [
+        "name",
         "surface",
         "lit",
         "building"
diff --git a/data/presets/presets/leisure/pitch/rugby_league.json b/data/presets/presets/leisure/pitch/rugby_league.json
index c4c4cbb28..d8d497c07 100644
--- a/data/presets/presets/leisure/pitch/rugby_league.json
+++ b/data/presets/presets/leisure/pitch/rugby_league.json
@@ -1,6 +1,7 @@
 {
     "icon": "america-football",
     "fields": [
+        "name",
         "surface",
         "lit"
     ],
diff --git a/data/presets/presets/leisure/pitch/rugby_union.json b/data/presets/presets/leisure/pitch/rugby_union.json
index 645324ff0..eaf91e449 100644
--- a/data/presets/presets/leisure/pitch/rugby_union.json
+++ b/data/presets/presets/leisure/pitch/rugby_union.json
@@ -1,6 +1,7 @@
 {
     "icon": "america-football",
     "fields": [
+        "name",
         "surface",
         "lit"
     ],
diff --git a/data/presets/presets/leisure/pitch/skateboard.json b/data/presets/presets/leisure/pitch/skateboard.json
index e6f00b932..b2e0493fc 100644
--- a/data/presets/presets/leisure/pitch/skateboard.json
+++ b/data/presets/presets/leisure/pitch/skateboard.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "surface",
         "lit"
     ],
diff --git a/data/presets/presets/leisure/pitch/soccer.json b/data/presets/presets/leisure/pitch/soccer.json
index 302209aa6..e77223d21 100644
--- a/data/presets/presets/leisure/pitch/soccer.json
+++ b/data/presets/presets/leisure/pitch/soccer.json
@@ -1,6 +1,7 @@
 {
     "icon": "soccer",
     "fields": [
+        "name",
         "surface",
         "lit"
     ],
diff --git a/data/presets/presets/leisure/pitch/table_tennis.json b/data/presets/presets/leisure/pitch/table_tennis.json
index ec7f379e0..2569cc9b4 100644
--- a/data/presets/presets/leisure/pitch/table_tennis.json
+++ b/data/presets/presets/leisure/pitch/table_tennis.json
@@ -1,6 +1,7 @@
 {
     "icon": "tennis",
     "fields": [
+        "name",,
         "lit",
         "access_simple"
     ],
diff --git a/data/presets/presets/leisure/pitch/tennis.json b/data/presets/presets/leisure/pitch/tennis.json
index 76348b7eb..f954a558f 100644
--- a/data/presets/presets/leisure/pitch/tennis.json
+++ b/data/presets/presets/leisure/pitch/tennis.json
@@ -1,6 +1,7 @@
 {
     "icon": "tennis",
     "fields": [
+        "name",
         "surface",
         "lit",
         "access_simple"
diff --git a/data/presets/presets/leisure/pitch/volleyball.json b/data/presets/presets/leisure/pitch/volleyball.json
index 3d2aa2974..df56e2b5f 100644
--- a/data/presets/presets/leisure/pitch/volleyball.json
+++ b/data/presets/presets/leisure/pitch/volleyball.json
@@ -1,6 +1,7 @@
 {
     "icon": "basketball",
     "fields": [
+        "name",
         "surface",
         "lit"
     ],

From 378d31274090c05219bde58f594895cc575f42f3 Mon Sep 17 00:00:00 2001
From: vershwal <vershwal.princi@gmail.com>
Date: Tue, 10 Apr 2018 00:34:42 +0530
Subject: [PATCH 31/37] built

---
 data/presets/presets/leisure/pitch/table_tennis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets/presets/leisure/pitch/table_tennis.json b/data/presets/presets/leisure/pitch/table_tennis.json
index 2569cc9b4..55357ccd4 100644
--- a/data/presets/presets/leisure/pitch/table_tennis.json
+++ b/data/presets/presets/leisure/pitch/table_tennis.json
@@ -1,7 +1,7 @@
 {
     "icon": "tennis",
     "fields": [
-        "name",,
+        "name",
         "lit",
         "access_simple"
     ],

From 9999a48679eef28178943ab3e25c7cee986bded0 Mon Sep 17 00:00:00 2001
From: vershwal <vershwal.princi@gmail.com>
Date: Tue, 10 Apr 2018 00:35:26 +0530
Subject: [PATCH 32/37] built

---
 data/presets/presets.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index e73a1f525..c066ef28a 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -10599,6 +10599,7 @@
         "leisure/pitch/american_football": {
             "icon": "america-football",
             "fields": [
+                "name",
                 "surface",
                 "lit"
             ],
@@ -10620,6 +10621,7 @@
         "leisure/pitch/baseball": {
             "icon": "baseball",
             "fields": [
+                "name",
                 "lit"
             ],
             "geometry": [
@@ -10640,6 +10642,7 @@
         "leisure/pitch/basketball": {
             "icon": "basketball",
             "fields": [
+                "name",
                 "surface",
                 "hoops",
                 "lit",
@@ -10663,6 +10666,7 @@
         "leisure/pitch/beachvolleyball": {
             "icon": "basketball",
             "fields": [
+                "name",
                 "surface",
                 "lit"
             ],
@@ -10696,6 +10700,7 @@
         "leisure/pitch/boules": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "boules",
                 "surface",
                 "lit"
@@ -10722,6 +10727,7 @@
         "leisure/pitch/bowls": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "surface",
                 "lit"
             ],
@@ -10743,6 +10749,7 @@
         "leisure/pitch/cricket": {
             "icon": "cricket",
             "fields": [
+                "name",
                 "surface",
                 "lit"
             ],
@@ -10764,6 +10771,7 @@
         "leisure/pitch/equestrian": {
             "icon": "horse-riding",
             "fields": [
+                "name",
                 "surface",
                 "lit",
                 "building"
@@ -10792,6 +10800,7 @@
         "leisure/pitch/rugby_league": {
             "icon": "america-football",
             "fields": [
+                "name",
                 "surface",
                 "lit"
             ],
@@ -10813,6 +10822,7 @@
         "leisure/pitch/rugby_union": {
             "icon": "america-football",
             "fields": [
+                "name",
                 "surface",
                 "lit"
             ],
@@ -10834,6 +10844,7 @@
         "leisure/pitch/skateboard": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "surface",
                 "lit"
             ],
@@ -10855,6 +10866,7 @@
         "leisure/pitch/soccer": {
             "icon": "soccer",
             "fields": [
+                "name",
                 "surface",
                 "lit"
             ],
@@ -10878,6 +10890,7 @@
         "leisure/pitch/table_tennis": {
             "icon": "tennis",
             "fields": [
+                "name",
                 "lit",
                 "access_simple"
             ],
@@ -10902,6 +10915,7 @@
         "leisure/pitch/tennis": {
             "icon": "tennis",
             "fields": [
+                "name",
                 "surface",
                 "lit",
                 "access_simple"
@@ -10924,6 +10938,7 @@
         "leisure/pitch/volleyball": {
             "icon": "basketball",
             "fields": [
+                "name",
                 "surface",
                 "lit"
             ],

From ab9ba0a6325fa49011ecceabee80d3bf80dfc7fb Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 9 Apr 2018 16:06:58 -0400
Subject: [PATCH 33/37] Several changes

* Proper Case all the things
* Remove the `trailblazing_` fields, which require special knowledge to use
* Fix the icon on `trail_riding_station` preset
* Make the `horse_` checkboxes more consistent (yes/no)
* Remove `watering_place` field, remove it from `amenity=fountain` preset
* Update build script to not include "undefined" values in `taginfo.json`
---
 build_data.js                                 |  1 +
 data/presets.yaml                             | 49 ++++++++++++++
 data/presets/fields.json                      | 66 +++++++++++++++++++
 data/presets/fields/distance.json             |  3 +-
 data/presets/fields/horse_dressage.json       |  8 ++-
 data/presets/fields/horse_riding.json         |  8 ++-
 data/presets/fields/horse_stables.json        | 10 ++-
 data/presets/fields/trailblazing_osmc.json    |  5 --
 data/presets/fields/trailblazing_text.json    |  5 --
 data/presets/fields/trailblazing_wiki.json    |  5 --
 data/presets/fields/watering_place.json       |  5 --
 data/presets/presets.json                     | 37 ++++++++++-
 data/presets/presets/amenity/fountain.json    |  3 +-
 .../presets/tourism/trail_riding_station.json |  4 +-
 data/presets/presets/type/route/hiking.json   |  5 +-
 data/presets/presets/type/route/horse.json    |  7 +-
 data/taginfo.json                             | 58 ++++++++++++++--
 dist/locales/en.json                          | 40 +++++++++++
 18 files changed, 267 insertions(+), 52 deletions(-)
 delete mode 100644 data/presets/fields/trailblazing_osmc.json
 delete mode 100644 data/presets/fields/trailblazing_text.json
 delete mode 100644 data/presets/fields/trailblazing_wiki.json
 delete mode 100644 data/presets/fields/watering_place.json

diff --git a/build_data.js b/build_data.js
index d77cae01f..7ed3f53bc 100644
--- a/build_data.js
+++ b/build_data.js
@@ -359,6 +359,7 @@ function generateTaginfo(presets, fields) {
             if (field.strings && field.strings.options) {
                 var values = Object.keys(field.strings.options);
                 values.forEach(function(value) {
+                    if (value === 'undefined' || value === '*' || value === '') return;
                     var tag = { key: key, value: value };
                     if (field.label) {
                         tag.description = [ field.label ];
diff --git a/data/presets.yaml b/data/presets.yaml
index 05e9794df..28ef3fd4e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -493,6 +493,9 @@ en:
       display:
         # display=*
         label: Display
+      distance:
+        # distance=*
+        label: Total Distance
       dock:
         # dock=*
         label: Type
@@ -669,6 +672,48 @@ en:
         label: Hoops
         # hoops field placeholder
         placeholder: '1, 2, 4...'
+      horse_dressage:
+        # sport=*
+        label: Dressage Riding
+        options:
+          # sport=equestrian
+          equestrian: 'Yes'
+          # sport=undefined
+          undefined: 'No'
+      horse_riding:
+        # leisure=*
+        label: Horseback Riding
+        options:
+          # leisure=horse_riding
+          horse_riding: 'Yes'
+          # leisure=undefined
+          undefined: 'No'
+      horse_scale:
+        # horse_scale=*
+        label: Horseback Riding Difficulty
+        options:
+          # horse_scale=common
+          common: 'Easy: No problems or difficulties. (default)'
+          # horse_scale=critical
+          critical: 'Borderline: Passable only for experienced riders and horses. Major obstacles. Bridges should be examined carefully.'
+          # horse_scale=dangerous
+          dangerous: 'Dangerous: Passable only for very experienced riders and horses and only in good weather. Dismount.'
+          # horse_scale=demanding
+          demanding: 'Use with caution: Uneven way, occasional difficult passages.'
+          # horse_scale=difficult
+          difficult: 'Difficult: Way narrow and exposed. May contain obstacles to step over and narrow passages.'
+          # horse_scale=impossible
+          impossible: 'Impassable: Way or bridge not passable for horses. Too narrow, insuffient support, obstacles like ladders. Danger of life.'
+        # horse_scale field placeholder
+        placeholder: 'Difficult, Dangerous...'
+      horse_stables:
+        # amenity=*
+        label: Riding Stable
+        options:
+          # amenity=stables
+          stables: 'Yes'
+          # amenity=undefined
+          undefined: 'No'
       iata:
         # iata=*
         label: IATA
@@ -5620,6 +5665,10 @@ en:
         # tourism=theme_park
         name: Theme Park
         terms: '<translate with synonyms or related terms for ''Theme Park'', separated by commas>'
+      tourism/trail_riding_station:
+        # tourism=trail_riding_station
+        name: Trail Riding Station
+        terms: '<translate with synonyms or related terms for ''Trail Riding Station'', separated by commas>'
       tourism/viewpoint:
         # tourism=viewpoint
         name: Viewpoint
diff --git a/data/presets/fields.json b/data/presets/fields.json
index a0ff0836b..ac5e0dada 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -671,6 +671,11 @@
                 "unorthodox"
             ]
         },
+        "distance": {
+            "key": "distance",
+            "type": "text",
+            "label": "Total Distance"
+        },
         "dock": {
             "key": "dock",
             "type": "combo",
@@ -925,6 +930,67 @@
             "label": "Hoops",
             "placeholder": "1, 2, 4..."
         },
+        "horse_dressage": {
+            "key": "sport",
+            "type": "check",
+            "label": "Dressage Riding",
+            "strings": {
+                "options": {
+                    "undefined": "No",
+                    "equestrian": "Yes"
+                }
+            },
+            "reference": {
+                "key": "sport",
+                "value": "equestrian"
+            }
+        },
+        "horse_riding": {
+            "key": "leisure",
+            "type": "check",
+            "label": "Horseback Riding",
+            "strings": {
+                "options": {
+                    "undefined": "No",
+                    "horse_riding": "Yes"
+                }
+            },
+            "reference": {
+                "key": "leisure",
+                "value": "horse_riding"
+            }
+        },
+        "horse_scale": {
+            "key": "horse_scale",
+            "type": "combo",
+            "label": "Horseback Riding Difficulty",
+            "placeholder": "Difficult, Dangerous...",
+            "strings": {
+                "options": {
+                    "common": "Easy: No problems or difficulties. (default)",
+                    "demanding": "Use with caution: Uneven way, occasional difficult passages.",
+                    "difficult": "Difficult: Way narrow and exposed. May contain obstacles to step over and narrow passages.",
+                    "critical": "Borderline: Passable only for experienced riders and horses. Major obstacles. Bridges should be examined carefully.",
+                    "dangerous": "Dangerous: Passable only for very experienced riders and horses and only in good weather. Dismount.",
+                    "impossible": "Impassable: Way or bridge not passable for horses. Too narrow, insuffient support, obstacles like ladders. Danger of life."
+                }
+            }
+        },
+        "horse_stables": {
+            "key": "amenity",
+            "type": "check",
+            "label": "Riding Stable",
+            "strings": {
+                "options": {
+                    "undefined": "No",
+                    "stables": "Yes"
+                }
+            },
+            "reference": {
+                "key": "amenity",
+                "value": "stables"
+            }
+        },
         "iata": {
             "key": "iata",
             "type": "text",
diff --git a/data/presets/fields/distance.json b/data/presets/fields/distance.json
index 0f8077bfa..4619784a6 100644
--- a/data/presets/fields/distance.json
+++ b/data/presets/fields/distance.json
@@ -1,6 +1,5 @@
 {
     "key": "distance",
     "type": "text",
-    "label": "Total distance",
-    "placeholder": "0"
+    "label": "Total Distance"
 }
diff --git a/data/presets/fields/horse_dressage.json b/data/presets/fields/horse_dressage.json
index c1df84053..5c4653b39 100644
--- a/data/presets/fields/horse_dressage.json
+++ b/data/presets/fields/horse_dressage.json
@@ -1,11 +1,15 @@
 {
     "key": "sport",
     "type": "check",
-    "label": "Dressage riding",
+    "label": "Dressage Riding",
     "strings": {
         "options": {
             "undefined": "No",
-            "equestrian": "Offered"
+            "equestrian": "Yes"
         }
+    },
+    "reference": {
+        "key": "sport",
+        "value": "equestrian"
     }
 }
diff --git a/data/presets/fields/horse_riding.json b/data/presets/fields/horse_riding.json
index 375283f79..88c7f9045 100644
--- a/data/presets/fields/horse_riding.json
+++ b/data/presets/fields/horse_riding.json
@@ -1,11 +1,15 @@
 {
     "key": "leisure",
     "type": "check",
-    "label": "Horseback riding",
+    "label": "Horseback Riding",
     "strings": {
         "options": {
             "undefined": "No",
-            "horse_riding": "Offered"
+            "horse_riding": "Yes"
         }
+    },
+    "reference": {
+        "key": "leisure",
+        "value": "horse_riding"
     }
 }
diff --git a/data/presets/fields/horse_stables.json b/data/presets/fields/horse_stables.json
index 1600a3cf6..57dd3804b 100644
--- a/data/presets/fields/horse_stables.json
+++ b/data/presets/fields/horse_stables.json
@@ -1,11 +1,15 @@
 {
     "key": "amenity",
     "type": "check",
-    "label": "Riding stable",
+    "label": "Riding Stable",
     "strings": {
         "options": {
-            "stables": "Riding stable",
-            "undefined": "No"
+            "undefined": "No",
+            "stables": "Yes"
         }
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "stables"
     }
 }
diff --git a/data/presets/fields/trailblazing_osmc.json b/data/presets/fields/trailblazing_osmc.json
deleted file mode 100644
index 4ce2b4557..000000000
--- a/data/presets/fields/trailblazing_osmc.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key": "osmc:symbol",
-    "type": "text",
-    "label": "Machine readable trailblazing"
-}
diff --git a/data/presets/fields/trailblazing_text.json b/data/presets/fields/trailblazing_text.json
deleted file mode 100644
index 289a1dae1..000000000
--- a/data/presets/fields/trailblazing_text.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key": "symbol",
-    "type": "textarea",
-    "label": "Trailblazing description"
-}
diff --git a/data/presets/fields/trailblazing_wiki.json b/data/presets/fields/trailblazing_wiki.json
deleted file mode 100644
index 4e2b93e7d..000000000
--- a/data/presets/fields/trailblazing_wiki.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key": "wiki:symbol",
-    "type": "text",
-    "label": "OSM Wiki name of trailblazing graphic"
-}
diff --git a/data/presets/fields/watering_place.json b/data/presets/fields/watering_place.json
deleted file mode 100644
index 0210294d7..000000000
--- a/data/presets/fields/watering_place.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key": "watering_place",
-    "type": "defaultCheck",
-    "label": "Accessible for horses"
-}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index ab8c515c4..c0fb05fb9 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1691,6 +1691,9 @@
         },
         "amenity/fountain": {
             "icon": "poi-fountain",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "point",
                 "area"
@@ -7698,6 +7701,7 @@
                 "mtb/scale",
                 "mtb/scale/uphill",
                 "mtb/scale/imba",
+                "horse_scale",
                 "ref"
             ],
             "geometry": [
@@ -8273,7 +8277,8 @@
                 "smoothness",
                 "mtb/scale",
                 "mtb/scale/uphill",
-                "mtb/scale/imba"
+                "mtb/scale/imba",
+                "horse_scale"
             ],
             "geometry": [
                 "line"
@@ -19366,6 +19371,28 @@
             },
             "name": "Theme Park"
         },
+        "tourism/trail_riding_station": {
+            "icon": "horse-riding",
+            "fields": [
+                "name",
+                "horse_stables",
+                "horse_riding",
+                "horse_dressage",
+                "address",
+                "phone",
+                "website",
+                "description"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "tourism": "trail_riding_station"
+            },
+            "name": "Trail Riding Station",
+            "matchScore": 2
+        },
         "tourism/viewpoint": {
             "icon": "poi-binoculars",
             "geometry": [
@@ -19910,7 +19937,9 @@
                 "name",
                 "ref_route",
                 "operator",
-                "network_foot"
+                "network_foot",
+                "description",
+                "distance"
             ],
             "geometry": [
                 "relation"
@@ -19927,7 +19956,9 @@
                 "name",
                 "ref_route",
                 "operator",
-                "network_horse"
+                "network_horse",
+                "description",
+                "distance"
             ],
             "geometry": [
                 "relation"
diff --git a/data/presets/presets/amenity/fountain.json b/data/presets/presets/amenity/fountain.json
index a41ee82f3..27afc73ac 100644
--- a/data/presets/presets/amenity/fountain.json
+++ b/data/presets/presets/amenity/fountain.json
@@ -1,8 +1,7 @@
 {
     "icon": "poi-fountain",
     "fields": [
-        "name",
-        "watering_place"
+        "name"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/tourism/trail_riding_station.json b/data/presets/presets/tourism/trail_riding_station.json
index 660e732b2..a825d8608 100644
--- a/data/presets/presets/tourism/trail_riding_station.json
+++ b/data/presets/presets/tourism/trail_riding_station.json
@@ -1,5 +1,5 @@
 {
-    "icon": "horse_riding",
+    "icon": "horse-riding",
     "fields": [
         "name",
         "horse_stables",
@@ -17,6 +17,6 @@
     "tags": {
         "tourism": "trail_riding_station"
     },
-    "name": "Trail riding station",
+    "name": "Trail Riding Station",
     "matchScore": 2.0
 }
diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json
index 3917b8eba..7a84fbfe5 100644
--- a/data/presets/presets/type/route/hiking.json
+++ b/data/presets/presets/type/route/hiking.json
@@ -6,10 +6,7 @@
         "operator",
         "network_foot",
         "description",
-        "distance",
-        "trailblazing_text",
-        "trailblazing_osmc",
-        "trailblazing_wiki"
+        "distance"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/horse.json b/data/presets/presets/type/route/horse.json
index 551be6747..06e903933 100644
--- a/data/presets/presets/type/route/horse.json
+++ b/data/presets/presets/type/route/horse.json
@@ -4,12 +4,9 @@
         "name",
         "ref_route",
         "operator",
+        "network_horse",
         "description",
-        "distance",
-        "trailblazing_text",
-        "trailblazing_osmc",
-        "trailblazing_wiki",
-        "network_horse"
+        "distance"
     ],
     "geometry": [
         "relation"
diff --git a/data/taginfo.json b/data/taginfo.json
index a4b2dcfd3..5fd93c8e6 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -4308,7 +4308,7 @@
         {
             "key": "leisure",
             "value": "horse_riding",
-            "description": "Horseback Riding Facility",
+            "description": "Horseback Riding Facility, Horseback Riding",
             "object_types": [
                 "node",
                 "area"
@@ -4467,7 +4467,7 @@
         {
             "key": "sport",
             "value": "equestrian",
-            "description": "Riding Arena",
+            "description": "Riding Arena, Dressage Riding",
             "object_types": [
                 "node",
                 "area"
@@ -7806,6 +7806,16 @@
             ],
             "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/amusement-park-15.svg?sanitize=true"
         },
+        {
+            "key": "tourism",
+            "value": "trail_riding_station",
+            "description": "Trail Riding Station",
+            "object_types": [
+                "node",
+                "area"
+            ],
+            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true"
+        },
         {
             "key": "tourism",
             "value": "viewpoint",
@@ -9043,6 +9053,10 @@
             "key": "display",
             "description": "Display"
         },
+        {
+            "key": "distance",
+            "description": "Total Distance"
+        },
         {
             "key": "dock",
             "description": "Type"
@@ -9276,6 +9290,41 @@
             "key": "hoops",
             "description": "Hoops"
         },
+        {
+            "key": "horse_scale",
+            "value": "common",
+            "description": "Horseback Riding Difficulty"
+        },
+        {
+            "key": "horse_scale",
+            "value": "demanding",
+            "description": "Horseback Riding Difficulty"
+        },
+        {
+            "key": "horse_scale",
+            "value": "difficult",
+            "description": "Horseback Riding Difficulty"
+        },
+        {
+            "key": "horse_scale",
+            "value": "critical",
+            "description": "Horseback Riding Difficulty"
+        },
+        {
+            "key": "horse_scale",
+            "value": "dangerous",
+            "description": "Horseback Riding Difficulty"
+        },
+        {
+            "key": "horse_scale",
+            "value": "impossible",
+            "description": "Horseback Riding Difficulty"
+        },
+        {
+            "key": "amenity",
+            "value": "stables",
+            "description": "Riding Stable"
+        },
         {
             "key": "iata",
             "description": "IATA"
@@ -9634,11 +9683,6 @@
             "key": "note",
             "description": "Note"
         },
-        {
-            "key": "oneway",
-            "value": "undefined",
-            "description": "One Way"
-        },
         {
             "key": "oneway",
             "value": "yes",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9dfb67330..cf6d57bf1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1785,6 +1785,9 @@
                 "display": {
                     "label": "Display"
                 },
+                "distance": {
+                    "label": "Total Distance"
+                },
                 "dock": {
                     "label": "Type"
                 },
@@ -1939,6 +1942,39 @@
                     "label": "Hoops",
                     "placeholder": "1, 2, 4..."
                 },
+                "horse_dressage": {
+                    "label": "Dressage Riding",
+                    "options": {
+                        "undefined": "No",
+                        "equestrian": "Yes"
+                    }
+                },
+                "horse_riding": {
+                    "label": "Horseback Riding",
+                    "options": {
+                        "undefined": "No",
+                        "horse_riding": "Yes"
+                    }
+                },
+                "horse_scale": {
+                    "label": "Horseback Riding Difficulty",
+                    "placeholder": "Difficult, Dangerous...",
+                    "options": {
+                        "common": "Easy: No problems or difficulties. (default)",
+                        "demanding": "Use with caution: Uneven way, occasional difficult passages.",
+                        "difficult": "Difficult: Way narrow and exposed. May contain obstacles to step over and narrow passages.",
+                        "critical": "Borderline: Passable only for experienced riders and horses. Major obstacles. Bridges should be examined carefully.",
+                        "dangerous": "Dangerous: Passable only for very experienced riders and horses and only in good weather. Dismount.",
+                        "impossible": "Impassable: Way or bridge not passable for horses. Too narrow, insuffient support, obstacles like ladders. Danger of life."
+                    }
+                },
+                "horse_stables": {
+                    "label": "Riding Stable",
+                    "options": {
+                        "undefined": "No",
+                        "stables": "Yes"
+                    }
+                },
                 "iata": {
                     "label": "IATA"
                 },
@@ -6288,6 +6324,10 @@
                     "name": "Theme Park",
                     "terms": ""
                 },
+                "tourism/trail_riding_station": {
+                    "name": "Trail Riding Station",
+                    "terms": ""
+                },
                 "tourism/viewpoint": {
                     "name": "Viewpoint",
                     "terms": ""

From 961b0300ffbf5254af8e9731effc19aabe883bd1 Mon Sep 17 00:00:00 2001
From: vershwal <vershwal.princi@gmail.com>
Date: Tue, 10 Apr 2018 23:20:14 +0530
Subject: [PATCH 34/37] healthcare=laboratory preset

---
 .../presets/healthcare/laboratory.json        | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 data/presets/presets/healthcare/laboratory.json

diff --git a/data/presets/presets/healthcare/laboratory.json b/data/presets/presets/healthcare/laboratory.json
new file mode 100644
index 000000000..741cbc233
--- /dev/null
+++ b/data/presets/presets/healthcare/laboratory.json
@@ -0,0 +1,24 @@
+{
+    "icon": "hospital",
+    "fields": [
+        "name",
+        "operator",
+        "website",
+        "ref",
+        "address",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "medical_laboratory",
+        "medical_lab",
+        "blood_check"
+    ],
+    "tags": {
+        "healthcare": "laboratory"
+    },
+    "name": "Laboratory"
+}

From 0e632f60e705cd121b8aac9ebd8066a4e2536bc1 Mon Sep 17 00:00:00 2001
From: vershwal <vershwal.princi@gmail.com>
Date: Tue, 10 Apr 2018 23:23:48 +0530
Subject: [PATCH 35/37] built

---
 data/presets.yaml         |  5 +++++
 data/presets/presets.json | 24 ++++++++++++++++++++++++
 data/taginfo.json         | 10 ++++++++++
 dist/locales/en.json      |  4 ++++
 4 files changed, 43 insertions(+)

diff --git a/data/presets.yaml b/data/presets.yaml
index 36ec94a18..219546307 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3142,6 +3142,11 @@ en:
         name: Hospice
         # 'terms: terminal,illness'
         terms: '<translate with synonyms or related terms for ''Hospice'', separated by commas>'
+      healthcare/laboratory:
+        # healthcare=laboratory
+        name: Laboratory
+        # 'terms: medical_laboratory,medical_lab,blood_check'
+        terms: '<translate with synonyms or related terms for ''Laboratory'', separated by commas>'
       healthcare/midwife:
         # healthcare=midwife
         name: Midwife
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c066ef28a..9b68e2600 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -7070,6 +7070,30 @@
             },
             "name": "Hospice"
         },
+        "healthcare/laboratory": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "website",
+                "ref",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "medical_laboratory",
+                "medical_lab",
+                "blood_check"
+            ],
+            "tags": {
+                "healthcare": "laboratory"
+            },
+            "name": "Laboratory"
+        },
         "healthcare/midwife": {
             "icon": "hospital",
             "fields": [
diff --git a/data/taginfo.json b/data/taginfo.json
index a6a9cdbd1..4fcfb8826 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -3078,6 +3078,16 @@
             ],
             "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"
         },
+        {
+            "key": "healthcare",
+            "value": "laboratory",
+            "description": "Laboratory",
+            "object_types": [
+                "node",
+                "area"
+            ],
+            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"
+        },
         {
             "key": "healthcare",
             "value": "midwife",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ec3318bcf..568954428 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4111,6 +4111,10 @@
                     "name": "Hospice",
                     "terms": "terminal,illness"
                 },
+                "healthcare/laboratory": {
+                    "name": "Laboratory",
+                    "terms": "medical_laboratory,medical_lab,blood_check"
+                },
                 "healthcare/midwife": {
                     "name": "Midwife",
                     "terms": "baby,childbirth,delivery,labour,labor,pregnancy"

From cc92966d4a4bf71f16a9998c1e0237158dae1ee5 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 10 Apr 2018 16:52:37 -0400
Subject: [PATCH 36/37] Capitalize "Faces" reported at
 https://www.transifex.com/openstreetmap/id-editor/translate/#vi/presets/138895230

---
 data/presets.yaml              | 2 +-
 data/presets/fields.json       | 2 +-
 data/presets/fields/faces.json | 2 +-
 data/taginfo.json              | 2 +-
 dist/locales/en.json           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 28ef3fd4e..99bb320e8 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -545,7 +545,7 @@ en:
         label: Exceptions
       faces:
         # faces=*
-        label: faces
+        label: Faces
       fax:
         # fax=*
         label: Fax
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ac5e0dada..7958dd4df 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -744,7 +744,7 @@
         "faces": {
             "key": "faces",
             "type": "number",
-            "label": "faces"
+            "label": "Faces"
         },
         "fax": {
             "key": "fax",
diff --git a/data/presets/fields/faces.json b/data/presets/fields/faces.json
index e1eb8c75a..972b051e5 100644
--- a/data/presets/fields/faces.json
+++ b/data/presets/fields/faces.json
@@ -1,5 +1,5 @@
 {
     "key": "faces",
     "type": "number",
-    "label": "faces"
+    "label": "Faces"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 5fd93c8e6..5435c40ba 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -9111,7 +9111,7 @@
         },
         {
             "key": "faces",
-            "description": "faces"
+            "description": "Faces"
         },
         {
             "key": "fax",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index cf6d57bf1..ba9220c6c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1829,7 +1829,7 @@
                     "label": "Exceptions"
                 },
                 "faces": {
-                    "label": "faces"
+                    "label": "Faces"
                 },
                 "fax": {
                     "label": "Fax",

From 997ab66e5c3fdafe686a8f23c45866568de5781e Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 10 Apr 2018 17:06:37 -0400
Subject: [PATCH 37/37] Rename to "Medical Laboratory" to avoid ambiguity

---
 data/presets.yaml                               | 4 ++--
 data/presets/presets.json                       | 2 +-
 data/presets/presets/healthcare/laboratory.json | 2 +-
 data/taginfo.json                               | 2 +-
 dist/locales/en.json                            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index ebdcb0512..e6ecbfe57 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3196,9 +3196,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Hospice'', separated by commas>'
       healthcare/laboratory:
         # healthcare=laboratory
-        name: Laboratory
+        name: Medical Laboratory
         # 'terms: medical_laboratory,medical_lab,blood_check'
-        terms: '<translate with synonyms or related terms for ''Laboratory'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Medical Laboratory'', separated by commas>'
       healthcare/midwife:
         # healthcare=midwife
         name: Midwife
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9b6eba750..d57ecf9fa 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -7110,7 +7110,7 @@
             "tags": {
                 "healthcare": "laboratory"
             },
-            "name": "Laboratory"
+            "name": "Medical Laboratory"
         },
         "healthcare/midwife": {
             "icon": "hospital",
diff --git a/data/presets/presets/healthcare/laboratory.json b/data/presets/presets/healthcare/laboratory.json
index 741cbc233..c6ca18f60 100644
--- a/data/presets/presets/healthcare/laboratory.json
+++ b/data/presets/presets/healthcare/laboratory.json
@@ -20,5 +20,5 @@
     "tags": {
         "healthcare": "laboratory"
     },
-    "name": "Laboratory"
+    "name": "Medical Laboratory"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 34eacb13d..38b1a6f08 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -3090,7 +3090,7 @@
         {
             "key": "healthcare",
             "value": "laboratory",
-            "description": "Laboratory",
+            "description": "Medical Laboratory",
             "object_types": [
                 "node",
                 "area"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index abfd79a9d..90bb1a55d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4161,7 +4161,7 @@
                     "terms": "terminal,illness"
                 },
                 "healthcare/laboratory": {
-                    "name": "Laboratory",
+                    "name": "Medical Laboratory",
                     "terms": "medical_laboratory,medical_lab,blood_check"
                 },
                 "healthcare/midwife": {