From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 15 Aug 2013 22:05:51 +0000 (-0700)
Subject: Update to iD v1.1.3
X-Git-Tag: live~4757
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2fed3f0d6b1b2d5809ae87d1814af5e31e5e75d4

Update to iD v1.1.3
---

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 322dad746..8c00db1c2 100644
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -2185,7 +2185,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     overflow: hidden;
 }
 
-.inspector-preset form.preset-form {
+.inspector-preset .preset-form {
     padding: 10px;
     margin: 0 10px 20px 10px;
     border-radius: 8px;
@@ -3453,7 +3453,7 @@ img.wiki-image {
 }
 
 .modal-actions button,
-.save-success a {
+.save-success a.button {
     font-weight: normal;
     color: #7092FF;
     border-bottom: 1px solid #CCC;
@@ -3464,12 +3464,12 @@ img.wiki-image {
 }
 
 .modal-actions button:hover
-.save-success a:hover {
+.save-success a.button:hover {
     background-color: #ececec;
 }
 
 .modal-actions button:before,
-.save-success a:before,
+.save-success a.button:before,
 .walkthrough a:before {
     display: block;
     content: '';
@@ -3498,7 +3498,11 @@ img.wiki-image {
 /* Success Modal
 ------------------------------------------------------- */
 
-.save-success a {
+.save-success p {
+    padding: 15px;
+}
+
+.save-success .button {
     padding-top: 15px;
 }
 
diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index b6b040f07..9aef5671a 100644
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -5725,6 +5725,10 @@ d3.combobox = function() {
                         position: 'absolute',
                         display: 'block',
                         left: '0px'
+                    })
+                    .on('mousedown', function () {
+                        // prevent moving focus out of the text field
+                        d3.event.preventDefault();
                     });
 
                 d3.select(document.body)
@@ -15232,7 +15236,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.1.2';
+iD.version = '1.1.3';
 
 (function() {
     var detected = {};
@@ -18208,12 +18212,16 @@ iD.modes.Browse = function(context) {
         iD.modes.DragNode(context).behavior];
 
     mode.enter = function() {
+        context.history().save();
+
         behaviors.forEach(function(behavior) {
             context.install(behavior);
         });
 
         // Get focus on the body.
-        document.activeElement.blur();
+        if (document.activeElement) {
+            document.activeElement.blur();
+        }
 
         if (sidebar) {
             context.ui().sidebar.show(sidebar);
@@ -18884,6 +18892,8 @@ iD.modes.Select = function(context, selectedIDs) {
     };
 
     mode.enter = function() {
+        context.history().save();
+
         behaviors.forEach(function(behavior) {
             context.install(behavior);
         });
@@ -19918,6 +19928,8 @@ iD.Entity = function(attrs) {
     // Create the appropriate subtype.
     if (attrs && attrs.type) {
         return iD.Entity[attrs.type].apply(this, arguments);
+    } else if (attrs && attrs.id) {
+        return iD.Entity[iD.Entity.id.type(attrs.id)].apply(this, arguments);
     }
 
     // Initialize a generic Entity (used only in tests).
@@ -19944,7 +19956,7 @@ iD.Entity.id.type = function(id) {
 
 // A function suitable for use as the second argument to d3.selection#data().
 iD.Entity.key = function(entity) {
-    return entity.id + ',' + entity.v;
+    return entity.id + 'v' + (entity.v || 0);
 };
 
 iD.Entity.areaPath = d3.geo.path()
@@ -20319,28 +20331,14 @@ iD.Graph.prototype = {
 
     // Obliterates any existing entities
     load: function(entities) {
-
-        var base = this.base(),
-            i, entity, prefix;
+        var base = this.base();
         this.entities = Object.create(base.entities);
 
-        for (i in entities) {
-            entity = entities[i];
-            prefix = i[0];
-
-            if (entity === 'undefined') {
-                this.entities[i] = undefined;
-            } else if (prefix == 'n') {
-                this.entities[i] = new iD.Node(entity);
-
-            } else if (prefix == 'w') {
-                this.entities[i] = new iD.Way(entity);
-
-            } else if (prefix == 'r') {
-                this.entities[i] = new iD.Relation(entity);
-            }
+        for (var i in entities) {
+            this.entities[i] = entities[i];
             this._updateCalculated(base.entities[i], this.entities[i]);
         }
+
         return this;
     }
 };
@@ -20533,33 +20531,85 @@ iD.History = function(context) {
         toJSON: function() {
             if (stack.length <= 1) return;
 
+            var allEntities = {};
+
             var s = stack.map(function(i) {
-                var x = { entities: i.graph.entities };
+                var modified = [], deleted = [];
+
+                _.forEach(i.graph.entities, function(entity, id) {
+                    if (entity) {
+                        var key = iD.Entity.key(entity);
+                        allEntities[key] = entity;
+                        modified.push(key);
+                    } else {
+                        deleted.push(id);
+                    }
+                });
+
+                var x = {};
+
+                if (modified.length) x.modified = modified;
+                if (deleted.length) x.deleted = deleted;
                 if (i.imageryUsed) x.imageryUsed = i.imageryUsed;
                 if (i.annotation) x.annotation = i.annotation;
+
                 return x;
             });
 
             return JSON.stringify({
+                version: 2,
+                entities: _.values(allEntities),
                 stack: s,
                 nextIDs: iD.Entity.id.next,
                 index: index
-            }, function includeUndefined(key, value) {
-                if (typeof value === 'undefined') return 'undefined';
-                return value;
             });
         },
 
         fromJSON: function(json) {
-
             var h = JSON.parse(json);
 
             iD.Entity.id.next = h.nextIDs;
             index = h.index;
-            stack = h.stack.map(function(d) {
-                d.graph = iD.Graph(stack[0].graph).load(d.entities);
-                return d;
-            });
+
+            if (h.version === 2) {
+                var allEntities = {};
+
+                h.entities.forEach(function(entity) {
+                    allEntities[iD.Entity.key(entity)] = iD.Entity(entity);
+                });
+
+                stack = h.stack.map(function(d) {
+                    var entities = {}, entity;
+
+                    d.modified && d.modified.forEach(function(key) {
+                        entity = allEntities[key];
+                        entities[entity.id] = entity;
+                    });
+
+                    d.deleted && d.deleted.forEach(function(id) {
+                        entities[id] = undefined;
+                    });
+
+                    return {
+                        graph: iD.Graph(stack[0].graph).load(entities),
+                        annotation: d.annotation,
+                        imageryUsed: d.imageryUsed
+                    };
+                });
+            } else { // original version
+                stack = h.stack.map(function(d) {
+                    var entities = {};
+
+                    for (var i in d.entities) {
+                        var entity = d.entities[i];
+                        entities[i] = entity === 'undefined' ? undefined : iD.Entity(entity);
+                    }
+
+                    d.graph = iD.Graph(stack[0].graph).load(entities);
+                    return d;
+                });
+            }
+
             stack[0].graph.inherited = false;
             dispatch.change();
 
@@ -24515,9 +24565,10 @@ iD.ui.FeatureList = function(context) {
             .text(t('inspector.feature_list'));
 
         function keypress() {
-            var q = search.property('value');
-            if (d3.event.keyCode === 13 && q.length) {
-                click(list.selectAll('.feature-list-item:first-child').datum().entity);
+            var q = search.property('value'),
+                items = list.selectAll('.feature-list-item');
+            if (d3.event.keyCode === 13 && q.length && items.size()) {
+                click(items.datum().entity);
             }
         }
 
@@ -25474,10 +25525,10 @@ iD.ui.preset = function(context) {
         var shown = fields.filter(function(field) { return field.shown(); }),
             notShown = fields.filter(function(field) { return !field.shown(); });
 
-        var $form = selection.selectAll('form')
+        var $form = selection.selectAll('.preset-form')
             .data([0]);
 
-        $form.enter().append('form')
+        $form.enter().append('div')
             .attr('class', 'preset-form inspector-inner fillL3');
 
         var $fields = $form.selectAll('.form-field')
@@ -25673,7 +25724,7 @@ iD.ui.PresetList = function(context) {
         var message = messagewrap.append('h3')
             .text(t('inspector.choose'));
 
-        if (currentPreset) {
+        if (context.entity(id).isUsed(context.graph())) {
             messagewrap.append('button')
                 .attr('class', 'preset-choose')
                 .on('click', function() { event.choose(currentPreset); })
@@ -25883,6 +25934,7 @@ iD.ui.PresetList = function(context) {
     presetList.entityID = function(_) {
         if (!arguments.length) return id;
         id = _;
+        presetList.preset(context.presets().match(context.entity(id), context.graph()));
         return presetList;
     };
 
@@ -26884,21 +26936,24 @@ iD.ui.Success = function(context) {
             .on('click', function() { event.cancel(success) });
 
         header.append('h3')
-            .text(t('just_edited'));
+            .text(t('success.just_edited'));
 
         var body = selection.append('div')
             .attr('class', 'body save-success');
 
+        body.append('p')
+            .html(t('success.help_html'));
+
         body.append('a')
-            .attr('class', 'col12 osm')
+            .attr('class', 'button col12 osm')
             .attr('target', '_blank')
             .attr('href', function() {
                 return context.connection().changesetURL(changeset.id);
             })
-            .text(t('view_on_osm'));
+            .text(t('success.view_on_osm'));
 
         body.append('a')
-            .attr('class', 'col12 twitter')
+            .attr('class', 'button col12 twitter')
             .attr('target', '_blank')
             .attr('href', function() {
                 return 'https://twitter.com/intent/tweet?source=webclient&text=' +
@@ -26907,7 +26962,7 @@ iD.ui.Success = function(context) {
             .text(t('success.tweet'));
 
         body.append('a')
-            .attr('class', 'col12 facebook')
+            .attr('class', 'button col12 facebook')
             .attr('target', '_blank')
             .attr('href', function() {
                 return 'https://facebook.com/sharer/sharer.php?u=' +
@@ -27108,7 +27163,9 @@ iD.ui.UndoRedo = function(context) {
             .placement('bottom')
             .html(true)
             .title(function (d) {
-                return iD.ui.tooltipHtml(d.annotation() || t('nothing_to_' + d.id), d.cmd);
+                return iD.ui.tooltipHtml(d.annotation() ?
+                    t(d.id + '.tooltip', {action: d.annotation()}) :
+                    t(d.id + '.nothing'), d.cmd);
             });
 
         var buttons = selection.selectAll('button')
@@ -32485,7 +32542,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "area": {
                 "name": "Area",
-                "tags": {},
+                "tags": {
+                    "area": "yes"
+                },
                 "geometry": [
                     "area"
                 ]
@@ -32836,6 +32895,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Ambulance Station"
             },
+            "emergency/fire_hydrant": {
+                "fields": [
+                    "fire_hydrant/type"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "emergency": "fire_hydrant"
+                },
+                "name": "Fire Hydrant"
+            },
             "emergency/phone": {
                 "icon": "emergency-telephone",
                 "fields": [
@@ -34058,6 +34130,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "swimming",
                 "name": "Swimming Pool"
             },
+            "leisure/track": {
+                "icon": "pitch",
+                "fields": [
+                    "surface"
+                ],
+                "geometry": [
+                    "point",
+                    "line",
+                    "area"
+                ],
+                "tags": {
+                    "leisure": "track"
+                },
+                "name": "Race Track"
+            },
             "line": {
                 "name": "Line",
                 "tags": {},
@@ -34597,6 +34684,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Power"
             },
             "power/generator": {
+                "name": "Power Generator",
                 "geometry": [
                     "point",
                     "vertex",
@@ -34605,7 +34693,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "tags": {
                     "power": "generator"
                 },
-                "name": "Power Plant"
+                "fields": [
+                    "generator/source",
+                    "generator/method",
+                    "generator/type"
+                ]
             },
             "power/line": {
                 "geometry": [
@@ -36831,11 +36923,37 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "check",
                 "label": "Fee"
             },
+            "fire_hydrant/type": {
+                "key": "fire_hydrant:type",
+                "type": "combo",
+                "options": [
+                    "pillar",
+                    "pond",
+                    "underground",
+                    "wall"
+                ],
+                "label": "Type"
+            },
             "fixme": {
                 "key": "fixme",
                 "type": "textarea",
                 "label": "Fix Me"
             },
+            "generator/method": {
+                "key": "generator:method",
+                "type": "combo",
+                "label": "Method"
+            },
+            "generator/source": {
+                "key": "generator:source",
+                "type": "combo",
+                "label": "Source"
+            },
+            "generator/type": {
+                "key": "generator:type",
+                "type": "combo",
+                "label": "Type"
+            },
             "highway": {
                 "key": "highway",
                 "type": "combo",
@@ -49007,12 +49125,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "multiple_ways": "There are too many lines here to split."
             }
         },
-        "nothing_to_undo": "Nothing to undo.",
-        "nothing_to_redo": "Nothing to redo.",
+        "undo": {
+            "tooltip": "Undo: {action}",
+            "nothing": "Nothing to undo."
+        },
+        "redo": {
+            "tooltip": "Redo: {action}",
+            "nothing": "Nothing to redo."
+        },
         "tooltip_keyhint": "Shortcut:",
-        "just_edited": "You just edited OpenStreetMap!",
         "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
-        "view_on_osm": "View on OSM",
         "translate": {
             "translate": "Translate",
             "localized_translation_label": "Multilingual name",
@@ -49097,9 +49219,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         },
         "success": {
             "edited_osm": "Edited OSM!",
+            "just_edited": "You just edited OpenStreetMap!",
+            "view_on_osm": "View on OSM",
             "facebook": "Share on Facebook",
             "tweet": "Tweet",
-            "okay": "Okay"
+            "help_html": "Your changes should appear in the \"Standard\" layer in a few minutes. Other layers, and certain features, may take longer\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>details</a>).\n"
         },
         "confirm": {
             "okay": "Okay"
@@ -49355,9 +49479,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fee": {
                     "label": "Fee"
                 },
+                "fire_hydrant/type": {
+                    "label": "Type"
+                },
                 "fixme": {
                     "label": "Fix Me"
                 },
+                "generator/method": {
+                    "label": "Method"
+                },
+                "generator/source": {
+                    "label": "Source"
+                },
+                "generator/type": {
+                    "label": "Type"
+                },
                 "highway": {
                     "label": "Type"
                 },
@@ -49898,6 +50034,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Ambulance Station",
                     "terms": ""
                 },
+                "emergency/fire_hydrant": {
+                    "name": "Fire Hydrant",
+                    "terms": ""
+                },
                 "emergency/phone": {
                     "name": "Emergency Phone",
                     "terms": ""
@@ -50214,6 +50354,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Swimming Pool",
                     "terms": ""
                 },
+                "leisure/track": {
+                    "name": "Race Track",
+                    "terms": ""
+                },
                 "line": {
                     "name": "Line",
                     "terms": ""
@@ -50383,7 +50527,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "power/generator": {
-                    "name": "Power Plant",
+                    "name": "Power Generator",
                     "terms": ""
                 },
                 "power/line": {
diff --git a/vendor/assets/iD/iD/locales/af.json b/vendor/assets/iD/iD/locales/af.json
index 6883cf50e..fcc800263 100644
--- a/vendor/assets/iD/iD/locales/af.json
+++ b/vendor/assets/iD/iD/locales/af.json
@@ -146,11 +146,13 @@
             "multiple_ways": "Daar is te veel lyne hier om te split."
         }
     },
-    "nothing_to_undo": "Niks om ongedaan te maak.",
-    "nothing_to_redo": "Niks om weer te doen nie.",
-    "just_edited": "Jy het nou net 'n OpenStreetMapKaart bydra gemaak!",
+    "undo": {
+        "nothing": "Niks om ongedaan te maak."
+    },
+    "redo": {
+        "nothing": "Niks om weer te doen nie."
+    },
     "browser_notice": "Hierdie program is bruikbaar in Firefox, Chrome, Safair, Opera en Internet Explorer 9 en later weergawes. Gradeer asseblief jou webbrowser op of gebruik Potlatch 2 om die kaart te verander.",
-    "view_on_osm": "Besigtig op OSM",
     "logout": "voetsek",
     "loading_auth": "Maak kontak met OpenStreetMap...",
     "report_a_bug": "Raporteer 'n probleem",
@@ -204,6 +206,10 @@
         "uploading": "Laai verandering op na OpenStreetMap.",
         "unsaved_changes": "Jy het ongestoorde veranderinge"
     },
+    "success": {
+        "just_edited": "Jy het nou net 'n OpenStreetMapKaart bydra gemaak!",
+        "view_on_osm": "Besigtig op OSM"
+    },
     "splash": {
         "welcome": "Welkom by die iD OpenStreetMap program",
         "walkthrough": "Begin die Deurloop",
@@ -1195,9 +1201,6 @@
             "power": {
                 "name": "Krag"
             },
-            "power/generator": {
-                "name": "Kragstasie"
-            },
             "power/line": {
                 "name": "Kraglyn"
             },
diff --git a/vendor/assets/iD/iD/locales/ar.json b/vendor/assets/iD/iD/locales/ar.json
index e035c1d05..df71a97e9 100644
--- a/vendor/assets/iD/iD/locales/ar.json
+++ b/vendor/assets/iD/iD/locales/ar.json
@@ -38,7 +38,6 @@
             "title": "فصل"
         }
     },
-    "nothing_to_undo": "لا يوجد شيء للتراجع",
     "logout": "تسجيل خروج",
     "commit": {
         "save": "حفظ",
diff --git a/vendor/assets/iD/iD/locales/ast.json b/vendor/assets/iD/iD/locales/ast.json
index ad874f303..0a2426782 100644
--- a/vendor/assets/iD/iD/locales/ast.json
+++ b/vendor/assets/iD/iD/locales/ast.json
@@ -125,12 +125,14 @@
             "key": "X"
         }
     },
-    "nothing_to_undo": "Ren que desfacer.",
-    "nothing_to_redo": "Ren pa refacer.",
+    "undo": {
+        "nothing": "Ren que desfacer."
+    },
+    "redo": {
+        "nothing": "Ren pa refacer."
+    },
     "tooltip_keyhint": "Atayu:",
-    "just_edited": "¡Acaba d'editar OpenStreetMap!",
     "browser_notice": "Esti editor tien sofitu en Firefox, Chrome, Safari, Opera, ya Internet Explorer 9 y superior. Anueve'l so navegador o use Potlatch 2 pa editar el mapa.",
-    "view_on_osm": "Ver en OSM",
     "translate": {
         "localized_translation_language": "Escoyer idioma",
         "localized_translation_name": "Nome"
@@ -180,9 +182,10 @@
     },
     "success": {
         "edited_osm": "¡Editáu OSM!",
+        "just_edited": "¡Acaba d'editar OpenStreetMap!",
+        "view_on_osm": "Ver en OSM",
         "facebook": "Compartir en Facebook",
-        "tweet": "Tuitear",
-        "okay": "Aceutar"
+        "tweet": "Tuitear"
     },
     "confirm": {
         "okay": "Aceutar"
diff --git a/vendor/assets/iD/iD/locales/bg-BG.json b/vendor/assets/iD/iD/locales/bg-BG.json
index e4a1ae14f..58f21b20a 100644
--- a/vendor/assets/iD/iD/locales/bg-BG.json
+++ b/vendor/assets/iD/iD/locales/bg-BG.json
@@ -165,12 +165,14 @@
             "multiple_ways": "Има твърде много линии за разделяне тук."
         }
     },
-    "nothing_to_undo": "Нищо за отменяне.",
-    "nothing_to_redo": "Нищо за повторение.",
+    "undo": {
+        "nothing": "Нищо за отменяне."
+    },
+    "redo": {
+        "nothing": "Нищо за повторение."
+    },
     "tooltip_keyhint": "Бързи клавиши:",
-    "just_edited": "Вие редактирахте OpenStreetMap!",
     "browser_notice": "Този редактор поддържа Firefox, Chrome, Safari, Opera, Internet Explorer 9 и нагоре. Моля обновете вашия браузър или използвайте Potlatch 2, за да редактирате картата.",
-    "view_on_osm": "Вижте в OSM",
     "translate": {
         "translate": "Превод",
         "localized_translation_label": "Многоезично име",
@@ -248,9 +250,10 @@
     },
     "success": {
         "edited_osm": "Редактирахте OSM!",
+        "just_edited": "Вие редактирахте OpenStreetMap!",
+        "view_on_osm": "Вижте в OSM",
         "facebook": "Споделете във Facebook",
-        "tweet": "Tweet",
-        "okay": "Окей"
+        "tweet": "Tweet"
     },
     "confirm": {
         "okay": "Окей"
@@ -1294,9 +1297,6 @@
             "power": {
                 "name": "Енергетика"
             },
-            "power/generator": {
-                "name": "Електроцентрала"
-            },
             "power/line": {
                 "name": "Електропровод"
             },
diff --git a/vendor/assets/iD/iD/locales/bs.json b/vendor/assets/iD/iD/locales/bs.json
index 2c0736c15..ce94246df 100644
--- a/vendor/assets/iD/iD/locales/bs.json
+++ b/vendor/assets/iD/iD/locales/bs.json
@@ -166,12 +166,14 @@
             "multiple_ways": "Ovdje postoji previše linija za razdvajanje."
         }
     },
-    "nothing_to_undo": "Ništa za poništiti.",
-    "nothing_to_redo": "Ništa za vratiti.",
+    "undo": {
+        "nothing": "Ništa za poništiti."
+    },
+    "redo": {
+        "nothing": "Ništa za vratiti."
+    },
     "tooltip_keyhint": "Prečica:",
-    "just_edited": "Upravo ste uredili OpenStreetMap kartu!",
     "browser_notice": "Ovaj uređivač je podržan u preglednicima interneta: Firefox, Chrome, Safari, Opera, i Internet Explorer 9 i iznad. Molimo nadogradite Vaš browser ili koristite Potlach 2 da uređujete kartu.",
-    "view_on_osm": "Pogledajte na OSM-u",
     "translate": {
         "translate": "Prevesti",
         "localized_translation_label": "Višejezični naziv",
@@ -256,9 +258,10 @@
     },
     "success": {
         "edited_osm": "OSM uređen!",
+        "just_edited": "Upravo ste uredili OpenStreetMap kartu!",
+        "view_on_osm": "Pogledajte na OSM-u",
         "facebook": "Podijeliti na Facebooku",
-        "tweet": "Podijeliti na Twitteru",
-        "okay": "Uredu"
+        "tweet": "Podijeliti na Twitteru"
     },
     "confirm": {
         "okay": "Uredu"
@@ -1539,10 +1542,6 @@
                 "name": "Energija",
                 "terms": "enegija,napajanje"
             },
-            "power/generator": {
-                "name": "Elektrana",
-                "terms": "elektrana,postrojenje za proizvodnju el. energije"
-            },
             "power/line": {
                 "name": "Energetski vod",
                 "terms": "energetski vod,naponski vod,elektroenergetska linija"
diff --git a/vendor/assets/iD/iD/locales/ca.json b/vendor/assets/iD/iD/locales/ca.json
index ea33d1da2..79e5bfa30 100644
--- a/vendor/assets/iD/iD/locales/ca.json
+++ b/vendor/assets/iD/iD/locales/ca.json
@@ -166,12 +166,16 @@
             "multiple_ways": "Aquí hi ha masses línies a dividir."
         }
     },
-    "nothing_to_undo": "Res a desfer.",
-    "nothing_to_redo": "Res a refer.",
+    "undo": {
+        "tooltip": "Desfés: {action}",
+        "nothing": "Res a desfer"
+    },
+    "redo": {
+        "tooltip": "Refés: {action}",
+        "nothing": "Res a refer."
+    },
     "tooltip_keyhint": "Drecera:",
-    "just_edited": "Acabes d'editar l'OpenStreetMap!",
     "browser_notice": "Aquest editor és compatible amb Firefox, Chrome, Safari, Opera i Internet Explorer 9 o superior.\nSiusplau actualitza el teu navegador o bé fes servir Potlach 2 per editar el mapa.",
-    "view_on_osm": "Mostra-ho a OSM",
     "translate": {
         "translate": "Traduïu",
         "localized_translation_label": "Nom multilingüe",
@@ -256,9 +260,11 @@
     },
     "success": {
         "edited_osm": "Heu editat l'OSM!",
+        "just_edited": "Acabes d'editar l'OpenStreetMap!",
+        "view_on_osm": "Mostra-ho a OSM",
         "facebook": "Comparteix a Facebook",
         "tweet": "Tuiteja-ho",
-        "okay": "D'acord"
+        "help_html": "Els canvis haurien d'aparèxier a la capa \"Estàndard\" en pocs minuts. Altres capes i algunes característiques, poden trigar més temps.\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>detalls</a>).\n"
     },
     "confirm": {
         "okay": "D'acord"
@@ -514,9 +520,21 @@
             "fee": {
                 "label": "Pagament"
             },
+            "fire_hydrant/type": {
+                "label": "Tipus"
+            },
             "fixme": {
                 "label": "Arregla'm"
             },
+            "generator/method": {
+                "label": "Mètode"
+            },
+            "generator/source": {
+                "label": "Font"
+            },
+            "generator/type": {
+                "label": "Tipus"
+            },
             "highway": {
                 "label": "Tipus"
             },
@@ -1044,6 +1062,10 @@
             "emergency/ambulance_station": {
                 "name": "Parada d'ambulàncies"
             },
+            "emergency/fire_hydrant": {
+                "name": "Boca d'incendis",
+                "terms": "Boca d'incendis, presa d'aigua per a bombers, incendi, bombers, sortida d'aigua, aigua"
+            },
             "emergency/phone": {
                 "name": "Telèfon per a emergències"
             },
@@ -1087,7 +1109,8 @@
                 "name": "Camí"
             },
             "highway/pedestrian": {
-                "name": "Transeünt"
+                "name": "Via Peatonal",
+                "terms": "Carrer Peatonal, Àrea per a peatons, Trànsit tallat, Carrer tancat al trànsit, Carrer per a vianants, Àrea per a vianants, Carrer per a transeünts, Peatons, Peatonal, Carrer per a Transeünts, Àrea peatonal"
             },
             "highway/primary": {
                 "name": "Carretera primària"
@@ -1281,6 +1304,9 @@
             "leisure/swimming_pool": {
                 "name": "Piscina"
             },
+            "leisure/track": {
+                "name": "Circuit de carreres"
+            },
             "line": {
                 "name": "Línia"
             },
@@ -1408,7 +1434,7 @@
                 "name": "Electricitat"
             },
             "power/generator": {
-                "name": "Planta de generació d'electricitat"
+                "name": "Generador elèctric"
             },
             "power/line": {
                 "name": "Línia elèctrica"
diff --git a/vendor/assets/iD/iD/locales/cs.json b/vendor/assets/iD/iD/locales/cs.json
index 823dbe039..5a3444941 100644
--- a/vendor/assets/iD/iD/locales/cs.json
+++ b/vendor/assets/iD/iD/locales/cs.json
@@ -166,12 +166,16 @@
             "multiple_ways": "Není jasné, kterou cestu rozdělit."
         }
     },
-    "nothing_to_undo": "Není co vracet.",
-    "nothing_to_redo": "Není co znovu provádět.",
+    "undo": {
+        "tooltip": "Zpět: {action}",
+        "nothing": "Není co vracet."
+    },
+    "redo": {
+        "tooltip": "Znovu: {action}",
+        "nothing": "Není co znovu provádět."
+    },
     "tooltip_keyhint": "Zkratka:",
-    "just_edited": "Právě jste upravil/a OpenStreetMap!",
     "browser_notice": "Tento editor funguje ve Firefoxu, Chrome, Safari, Opeře a Internet Exploreru od verze 9. Musíte tedy upgradovat na novější verzi prohlížeče; nebo použijte editor Potlatch 2.",
-    "view_on_osm": "Zobrazit na OSM",
     "translate": {
         "translate": "Přeložit",
         "localized_translation_label": "Mezinárodní název",
@@ -256,9 +260,11 @@
     },
     "success": {
         "edited_osm": "OSM upraveno!",
+        "just_edited": "Právě jste upravil OpenStreetMap!",
+        "view_on_osm": "Zobrazit na OSM",
         "facebook": "Sdílet na Facebooku",
         "tweet": "Tweet",
-        "okay": "OK"
+        "help_html": "Vaše úpravy by se obvykle měly objevit na \"Standardní\" vrstvě během několika minut. U některých objektů a ostatních vrstev to může trvat déle⏎\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>detaily anglicky</a>).⏎\n"
     },
     "confirm": {
         "okay": "OK"
@@ -609,7 +615,7 @@
                 "label": "Typ"
             },
             "power": {
-                "label": "yp"
+                "label": "typ"
             },
             "railway": {
                 "label": "Typ"
@@ -939,7 +945,8 @@
                 "name": "Přejezdový rošt"
             },
             "barrier/city_wall": {
-                "name": "Hradby"
+                "name": "Hradby",
+                "terms": "hradby"
             },
             "barrier/cycle_barrier": {
                 "name": "Zábrana proti kolům"
@@ -951,10 +958,12 @@
                 "name": "Vchod"
             },
             "barrier/fence": {
-                "name": "Plot"
+                "name": "Plot",
+                "terms": "plot,oplocení"
             },
             "barrier/gate": {
-                "name": "Brána"
+                "name": "Brána",
+                "terms": "brána"
             },
             "barrier/hedge": {
                 "name": "Živý plot"
@@ -963,10 +972,12 @@
                 "name": "Turniket"
             },
             "barrier/lift_gate": {
-                "name": "Závora"
+                "name": "Závora",
+                "terms": "závora"
             },
             "barrier/retaining_wall": {
-                "name": "Opěrná zeď"
+                "name": "Opěrná zeď",
+                "terms": "opěrná zeď"
             },
             "barrier/stile": {
                 "name": "Schůdky přes ohradu"
@@ -975,22 +986,26 @@
                 "name": "Mýtná brána"
             },
             "barrier/wall": {
-                "name": "Zeď"
+                "name": "Zeď",
+                "terms": "zděný plot, zeď"
             },
             "boundary/administrative": {
                 "name": "Administrativní hranice"
             },
             "building": {
-                "name": "Budova"
+                "name": "Budova",
+                "terms": "budova"
             },
             "building/apartments": {
                 "name": "Byty"
             },
             "building/entrance": {
-                "name": "Vchod"
+                "name": "Vchod",
+                "terms": "vchod"
             },
             "building/house": {
-                "name": "Dům"
+                "name": "Dům",
+                "terms": "dům"
             },
             "emergency/ambulance_station": {
                 "name": "Zdravotní pohotovost"
@@ -1002,119 +1017,144 @@
                 "name": "Vchod"
             },
             "highway": {
-                "name": "Pozemní komunikace"
+                "name": "Pozemní komunikace",
+                "terms": "komunikace"
             },
             "highway/bridleway": {
                 "name": "Jezdecká stezka",
                 "terms": "jezdecká stezka,jezdecká trasa,stezka pro jezdce,stezka pro koně,koňská stezka"
             },
             "highway/bus_stop": {
-                "name": "Autobusová zastávka"
+                "name": "Autobusová zastávka",
+                "terms": "zastávka autobusu"
             },
             "highway/crossing": {
                 "name": "Přechod",
                 "terms": "přechod,zebra"
             },
             "highway/cycleway": {
-                "name": "Cyklostezka"
+                "name": "Cyklostezka",
+                "terms": "cyklotrasa"
             },
             "highway/footway": {
                 "name": "Pěšina",
                 "terms": "cesta,silnice,ulice,ulička,chodník,třída,bulvár,avenue,pasáž,stezka,trasa,trať,magistrála,radiála,pěšina"
             },
             "highway/living_street": {
-                "name": "Obytná zóna"
+                "name": "Obytná zóna",
+                "terms": "obytná zóna"
             },
             "highway/mini_roundabout": {
-                "name": "Malý kruhový objezd"
+                "name": "Malý kruhový objezd",
+                "terms": "malý kruhový objezd, kruháč"
             },
             "highway/motorway": {
-                "name": "Dálnice"
+                "name": "Dálnice",
+                "terms": "dálnice"
             },
             "highway/motorway_junction": {
-                "name": "Dálniční sjezd"
+                "name": "Dálniční sjezd",
+                "terms": "dálniční nájezd, dálniční výjezd, dálniční exit"
             },
             "highway/motorway_link": {
                 "name": "Dálnice - nájezd",
                 "terms": "nájezd,sjezd,výjezd,příjezd,rampa,exit"
             },
             "highway/path": {
-                "name": "Pěšina"
+                "name": "Pěšina",
+                "terms": "cesta"
             },
             "highway/pedestrian": {
-                "name": "Pěší zóna"
+                "name": "Pěší zóna",
+                "terms": "pěší zóna"
             },
             "highway/primary": {
-                "name": "Silnice 1. třídy"
+                "name": "Silnice 1. třídy",
+                "terms": "silnice I. třídy"
             },
             "highway/primary_link": {
                 "name": "Silnice 1. třídy - nájezd",
                 "terms": "nájezd,sjezd,výjezd,příjezd,rampa,exit"
             },
             "highway/residential": {
-                "name": "Ulice"
+                "name": "Ulice",
+                "terms": "obytná zóna"
             },
             "highway/road": {
-                "name": "Silnice neznámého typu"
+                "name": "Silnice neznámého typu",
+                "terms": "neznámá komunikace"
             },
             "highway/secondary": {
-                "name": "Silnice 2. třídy"
+                "name": "Silnice 2. třídy",
+                "terms": "silnice II. třídy"
             },
             "highway/secondary_link": {
                 "name": "Silnice 2. třídy - nájezd",
                 "terms": "nájezd,sjezd,výjezd,příjezd,rampa,exit"
             },
             "highway/service": {
-                "name": "Účelová komunikace, příjezd"
+                "name": "Účelová komunikace, příjezd",
+                "terms": "účelová komunikace"
             },
             "highway/service/alley": {
-                "name": "Ulička"
+                "name": "Ulička",
+                "terms": "ulička"
             },
             "highway/service/drive-through": {
-                "name": "Drive-through"
+                "name": "Drive-through",
+                "terms": "okénko pro řidiče, pult pro řidiče, obsluha řidiče, obsluha do auta"
             },
             "highway/service/driveway": {
-                "name": "Příjezdová cesta"
+                "name": "Příjezdová cesta",
+                "terms": "příjezdová cesta, příjezd"
             },
             "highway/service/emergency_access": {
-                "name": "Nouzový vjezd"
+                "name": "Nouzový vjezd",
+                "terms": "přístup záchranářů"
             },
             "highway/service/parking_aisle": {
-                "name": "Parkovací ulička"
+                "name": "Parkovací ulička",
+                "terms": "jízdní pruh na parkovišti"
             },
             "highway/steps": {
                 "name": "Schody",
                 "terms": "schody,schodiště"
             },
             "highway/tertiary": {
-                "name": "Silnice 3. třídy"
+                "name": "Silnice 3. třídy",
+                "terms": "silnice III. třídy"
             },
             "highway/tertiary_link": {
                 "name": "Silnice 3. třídy - nájezd",
                 "terms": "nájezd,sjezd,výjezd,příjezd,rampa,exit"
             },
             "highway/track": {
-                "name": "Polní, lesní cesta"
+                "name": "Polní, lesní cesta",
+                "terms": "polní cesta, lesní cesta, cesta, polní a lesní cesta"
             },
             "highway/traffic_signals": {
                 "name": "Semafory",
                 "terms": "světla,semafor,dopravní signalizace"
             },
             "highway/trunk": {
-                "name": "Víceproudá silnice"
+                "name": "Víceproudá silnice",
+                "terms": "rychlostní komunikace, vícepruhá komunikace"
             },
             "highway/trunk_link": {
                 "name": "Víceproudá silnice - nájezd",
                 "terms": "nájezd,sjezd,výjezd,příjezd,rampa,exit"
             },
             "highway/turning_circle": {
-                "name": "Obratiště"
+                "name": "Obratiště",
+                "terms": "místo k otočení"
             },
             "highway/unclassified": {
-                "name": "Silnice bez klasifikace"
+                "name": "Silnice bez klasifikace",
+                "terms": "silnice bez klasifikace"
             },
             "historic": {
-                "name": "Památné místo"
+                "name": "Památné místo",
+                "terms": "historické místo"
             },
             "historic/archaeological_site": {
                 "name": "Archeologické naleziště"
@@ -1150,7 +1190,8 @@
                 "name": "Umělá vodní plocha"
             },
             "landuse/cemetery": {
-                "name": "Hřbitov"
+                "name": "Hřbitov",
+                "terms": "hřbitov,pohřebiště"
             },
             "landuse/commercial": {
                 "name": "Obchody"
@@ -1165,10 +1206,12 @@
                 "name": "Farma"
             },
             "landuse/forest": {
-                "name": "Les"
+                "name": "Les",
+                "terms": "les,hospodářský les"
             },
             "landuse/grass": {
-                "name": "Tráva"
+                "name": "Tráva",
+                "terms": "tráva"
             },
             "landuse/industrial": {
                 "name": "Průmysl"
@@ -1195,7 +1238,8 @@
                 "name": "Volný čas"
             },
             "leisure/garden": {
-                "name": "Zahrada"
+                "name": "Zahrada",
+                "terms": "zahrada"
             },
             "leisure/golf_course": {
                 "name": "Golfové hřiště"
@@ -1337,7 +1381,8 @@
                 "name": "Mokřad"
             },
             "natural/wood": {
-                "name": "Les"
+                "name": "Les",
+                "terms": "prales,přírodní les"
             },
             "office": {
                 "name": "Kanceláře"
@@ -1371,16 +1416,16 @@
                 "name": "Uzel"
             },
             "power": {
-                "name": "Energetika"
-            },
-            "power/generator": {
-                "name": "Elektrárna"
+                "name": "Energetika",
+                "terms": "Energetika"
             },
             "power/line": {
-                "name": "Elektrické vedení"
+                "name": "Elektrické vedení",
+                "terms": "elektrické vedení"
             },
             "power/pole": {
-                "name": "Eletrický sloup"
+                "name": "Eletrický sloup",
+                "terms": "sloup el.vedení,elektrický sloup,sloup elektrického vedení,sloupový stožár"
             },
             "power/sub_station": {
                 "name": "Transformátorová stanice"
diff --git a/vendor/assets/iD/iD/locales/da.json b/vendor/assets/iD/iD/locales/da.json
index 27a594420..c4ab89168 100644
--- a/vendor/assets/iD/iD/locales/da.json
+++ b/vendor/assets/iD/iD/locales/da.json
@@ -166,12 +166,16 @@
             "multiple_ways": "Der er for mange linjer her til at dele op."
         }
     },
-    "nothing_to_undo": "Intet at fortryde.",
-    "nothing_to_redo": "Intet at gendanne.",
+    "undo": {
+        "tooltip": "Fortryd:{action}",
+        "nothing": "Ingenting at fortryde."
+    },
+    "redo": {
+        "tooltip": "Gendan:{action}",
+        "nothing": "Ingenting at gendanne."
+    },
     "tooltip_keyhint": "Genvejstast:",
-    "just_edited": "Du redigerede lige OpenStreetMap!",
     "browser_notice": "Dette værktøj er understøttet i Firefox, Chrome, Safari, Opera og Internet Explorer 9 og højere. Vær venlig at opgradere din browser eller benyt Potlatch 2 for at rette i kortet.",
-    "view_on_osm": "Vis på OSM",
     "translate": {
         "translate": "Oversæt",
         "localized_translation_label": "Flersproget navne",
@@ -256,9 +260,11 @@
     },
     "success": {
         "edited_osm": "Redigerede OSM!",
+        "just_edited": "Du har lige redigeret OpenStreetMap!",
+        "view_on_osm": "Vis på OSM",
         "facebook": "Del på Facebook",
         "tweet": "Tweet",
-        "okay": "Okay"
+        "help_html": "Dine ændringer skulle blive synlige om nogle få minutter i \"Standard\" laget. Andre lag og specielle objekter kan tage længere tid\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>mere information</a>).\n"
     },
     "confirm": {
         "okay": "Okay"
@@ -514,9 +520,21 @@
             "fee": {
                 "label": "Gebyr"
             },
+            "fire_hydrant/type": {
+                "label": "Type"
+            },
             "fixme": {
                 "label": "Ret mig"
             },
+            "generator/method": {
+                "label": "Metode"
+            },
+            "generator/source": {
+                "label": "Kilde"
+            },
+            "generator/type": {
+                "label": "Type"
+            },
             "highway": {
                 "label": "Type"
             },
@@ -1055,6 +1073,10 @@
                 "name": "Udrykningsstation",
                 "terms": "Ambulancestation, Falckstation"
             },
+            "emergency/fire_hydrant": {
+                "name": "Brandhane",
+                "terms": "Brandhane"
+            },
             "emergency/phone": {
                 "name": "Nødtelefon",
                 "terms": "Nødtelefon, Nødopkaldstelefon"
@@ -1371,6 +1393,10 @@
                 "name": "Svømmebassin",
                 "terms": "Svømmebassin, Swimming Pool, Pool"
             },
+            "leisure/track": {
+                "name": "Racerbane",
+                "terms": "Racerbane"
+            },
             "line": {
                 "name": "Linje",
                 "terms": "Linje"
diff --git a/vendor/assets/iD/iD/locales/de.json b/vendor/assets/iD/iD/locales/de.json
index 09825708c..e73992318 100644
--- a/vendor/assets/iD/iD/locales/de.json
+++ b/vendor/assets/iD/iD/locales/de.json
@@ -166,12 +166,14 @@
             "multiple_ways": "Es gibt hier zu viele Linien, um diese teilen zu können."
         }
     },
-    "nothing_to_undo": "Nichts zum Rückgängigmachen.",
-    "nothing_to_redo": "Nichts zum Wiederherstellen.",
+    "undo": {
+        "nothing": "Nichts zum Rückgängigmachen."
+    },
+    "redo": {
+        "nothing": "Nichts zum Wiederherstellen."
+    },
     "tooltip_keyhint": "Tastenkürzel:",
-    "just_edited": "Sie haben gerade OpenStreetMap editiert!",
     "browser_notice": "Dieser Editor wird von Firefox, Chrome, Safari, Opera, und Internet Explorer (Version 9 und höher) unterstützt. Bitte aktualisieren Sie Ihren Browser oder nutzen Sie Potlatch 2, um die Karte zu modifizieren.",
-    "view_on_osm": "Auf OpenStreetMap anschauen",
     "translate": {
         "translate": "Übersetzen",
         "localized_translation_label": "Mehrsprachiger Name",
@@ -256,9 +258,10 @@
     },
     "success": {
         "edited_osm": "OSM bearbeitet!",
+        "just_edited": "Sie haben gerade OpenStreetMap editiert!",
+        "view_on_osm": "auf OpenStreetMap ansehen",
         "facebook": "Auf Facebook teilen",
-        "tweet": "Twittern",
-        "okay": "OK"
+        "tweet": "Twittern"
     },
     "confirm": {
         "okay": "OK"
@@ -1366,9 +1369,6 @@
             "power": {
                 "name": "Energieversorgung"
             },
-            "power/generator": {
-                "name": "Kraftwerk"
-            },
             "power/line": {
                 "name": "Stromleitung"
             },
diff --git a/vendor/assets/iD/iD/locales/el.json b/vendor/assets/iD/iD/locales/el.json
index 1f55fc8e1..f2b8066d2 100644
--- a/vendor/assets/iD/iD/locales/el.json
+++ b/vendor/assets/iD/iD/locales/el.json
@@ -21,6 +21,9 @@
     },
     "presets": {
         "categories": {
+            "category-rail": {
+                "name": "Σιδηροδρομική Γραμμή"
+            },
             "category-road": {
                 "name": "Δρόμος"
             },
@@ -31,7 +34,10 @@
         "fields": {
             "access": {
                 "types": {
+                    "access": "Γενική",
+                    "foot": "Πεζοί",
                     "motor_vehicle": "Μηχανάκια",
+                    "bicycle": "Μοτοσικλέτες",
                     "horse": "Άλογα"
                 },
                 "options": {
@@ -126,9 +132,18 @@
                 "label": "Λωρίδες",
                 "placeholder": "1, 2, 3..."
             },
+            "leisure": {
+                "label": "Είδος"
+            },
             "levels": {
                 "placeholder": "2, 4, 6..."
             },
+            "location": {
+                "label": "Τοποθεσία"
+            },
+            "man_made": {
+                "label": "Είδος"
+            },
             "maxspeed": {
                 "label": "Όριο Ταχύτητας",
                 "placeholder": "40, 50, 60..."
@@ -142,9 +157,24 @@
             "network": {
                 "label": "Δίκτυο"
             },
+            "note": {
+                "label": "Σημείωση"
+            },
+            "office": {
+                "label": "Είδος"
+            },
             "oneway": {
                 "label": "Μονόδρομος"
             },
+            "oneway_yes": {
+                "label": "Μονόδρομος"
+            },
+            "opening_hours": {
+                "label": "Ωράριο"
+            },
+            "operator": {
+                "label": "Διαχειριστής"
+            },
             "parking": {
                 "label": "Είδος"
             },
@@ -158,6 +188,9 @@
             "power": {
                 "label": "Είδος"
             },
+            "railway": {
+                "label": "Είδος"
+            },
             "relation": {
                 "label": "Είδος"
             },
@@ -168,7 +201,8 @@
                     "muslim": "Μουσουλμάνισμος",
                     "buddhist": "Βουδισμός",
                     "jewish": "Ιουδαϊσμός",
-                    "hindu": "Ινδουισμός"
+                    "hindu": "Ινδουισμός",
+                    "taoist": "Ταοϊσμός"
                 }
             },
             "restriction": {
@@ -180,6 +214,9 @@
             "route_master": {
                 "label": "Είδος"
             },
+            "sac_scale": {
+                "label": "Δυσκολία Μονοπατιού"
+            },
             "shelter": {
                 "label": "Καταφύγιο"
             },
@@ -192,6 +229,9 @@
                     "tunnel": "Τούνελ"
                 }
             },
+            "supervised": {
+                "label": "Επιτηρείται"
+            },
             "surface": {
                 "label": "Επιφάνεια"
             },
@@ -211,6 +251,9 @@
             "wetland": {
                 "label": "Είδος"
             },
+            "wheelchair": {
+                "label": "Πρόσβαση Σε Αναπήρικο Καροτσάκι"
+            },
             "wood": {
                 "label": "Είδος"
             }
@@ -228,6 +271,9 @@
             "aeroway/helipad": {
                 "name": "Ελικοδρόμιο"
             },
+            "aeroway/taxiway": {
+                "name": "Πιάτσα Ταξί"
+            },
             "amenity/bank": {
                 "name": "Τράπεζα"
             },
@@ -237,9 +283,18 @@
             "amenity/bench": {
                 "name": "Παγκάκι"
             },
+            "amenity/bicycle_parking": {
+                "name": "Χώρος Σταύθμεσης Ποδηλάτων"
+            },
+            "amenity/bicycle_rental": {
+                "name": "Κατάστημα Ενοικίασης Ποδηλάτων"
+            },
             "amenity/cafe": {
                 "name": "Καφετέρια"
             },
+            "amenity/car_rental": {
+                "name": "Ενοικίαση Αυτοκινήτων"
+            },
             "amenity/car_wash": {
                 "name": "Πλυντήριο Αυτοκινήτων"
             },
@@ -249,6 +304,9 @@
             "amenity/college": {
                 "name": "Κολλέγιο"
             },
+            "amenity/courthouse": {
+                "name": "Δικαστήριο"
+            },
             "amenity/embassy": {
                 "name": "Πρεσβεία"
             },
@@ -258,6 +316,9 @@
             "amenity/fire_station": {
                 "name": "Πυροσβεστική"
             },
+            "amenity/fountain": {
+                "name": "Συντριβάνι"
+            },
             "amenity/fuel": {
                 "name": "Βενζινάδικο"
             },
@@ -273,6 +334,9 @@
             "amenity/marketplace": {
                 "name": "Αγορά"
             },
+            "amenity/parking": {
+                "name": "Χώρος Σταύθμεσης"
+            },
             "amenity/pharmacy": {
                 "name": "Φαρμακείο"
             },
@@ -291,6 +355,9 @@
             "amenity/police": {
                 "name": "Αστυνομία"
             },
+            "amenity/post_box": {
+                "name": "Γραμματοκιβώτιο"
+            },
             "amenity/post_office": {
                 "name": "Ταχυδρομείο"
             },
@@ -303,6 +370,9 @@
             "amenity/swimming_pool": {
                 "name": "Πισίνα"
             },
+            "amenity/taxi": {
+                "name": "Πιάτσα Ταξί"
+            },
             "amenity/telephone": {
                 "name": "Τηλέφωνο"
             },
@@ -321,30 +391,51 @@
             "amenity/waste_basket": {
                 "name": "Κάδος Απορριμάτων"
             },
+            "area": {
+                "name": "Περιοχή"
+            },
+            "barrier/cattle_grid": {
+                "name": "Συρματόπλεγμα"
+            },
             "barrier/ditch": {
                 "name": "Χαντάκι"
             },
             "barrier/entrance": {
                 "name": "Είσοδος"
             },
+            "barrier/fence": {
+                "name": "Φράκτης"
+            },
             "barrier/gate": {
                 "name": "Πύλη"
             },
             "barrier/hedge": {
                 "name": "Περίφραξη"
             },
+            "barrier/stile": {
+                "name": "Στύλος"
+            },
+            "barrier/toll_booth": {
+                "name": "Διόδια"
+            },
             "barrier/wall": {
                 "name": "Τοίχος"
             },
             "building": {
                 "name": "Κτίριο"
             },
+            "building/apartments": {
+                "name": "Διαμερίσματα"
+            },
             "building/entrance": {
                 "name": "Είσοδος"
             },
             "building/house": {
                 "name": "Σπίτι"
             },
+            "emergency/phone": {
+                "name": "Τηλέφωνο Ανάγκης"
+            },
             "entrance": {
                 "name": "Είσοδος"
             },
@@ -363,9 +454,21 @@
             "highway/footway": {
                 "name": "Μονοπάτι"
             },
+            "highway/motorway": {
+                "name": "Αυτοκινητόδρομος"
+            },
+            "highway/road": {
+                "name": "Άγνωστος Δρόμος"
+            },
+            "highway/service/emergency_access": {
+                "name": "Πρόσβαση Εκτακτού Αναγκής"
+            },
             "highway/steps": {
                 "name": "Σκαλοπάτια"
             },
+            "highway/track": {
+                "name": "Αγροτικός Δρόμος"
+            },
             "highway/traffic_signals": {
                 "name": "Φανάρια"
             },
@@ -378,18 +481,39 @@
             "historic/monument": {
                 "name": "Μνημείο"
             },
+            "historic/ruins": {
+                "name": "Ερείπια"
+            },
+            "landuse/basin": {
+                "name": "Κανάλι Αποστράγγισης"
+            },
             "landuse/cemetery": {
                 "name": "Κοιμητήριο"
             },
+            "landuse/farm": {
+                "name": "Αγρο"
+            },
             "landuse/forest": {
                 "name": "Δάσος"
             },
             "landuse/industrial": {
                 "name": "Βιομηχανική"
             },
+            "landuse/meadow": {
+                "name": "Λιβάδι"
+            },
+            "landuse/orchard": {
+                "name": "Δενδρώνας"
+            },
             "landuse/quarry": {
                 "name": "Λατομείο"
             },
+            "landuse/vineyard": {
+                "name": "Αμπελώνας"
+            },
+            "leisure": {
+                "name": "Αναψυχή"
+            },
             "leisure/golf_course": {
                 "name": "Γήπεδο Γκολφ"
             },
@@ -399,9 +523,18 @@
             "leisure/park": {
                 "name": "Πάρκο"
             },
+            "leisure/pitch/american_football": {
+                "name": "Γήπεδο Αμερικάνικου Ποδοσφαίρου"
+            },
+            "leisure/pitch/baseball": {
+                "name": "Γήπεδο Μπέϊζμπολ"
+            },
             "leisure/pitch/basketball": {
                 "name": "Γήπεδο Μπάσκετ"
             },
+            "leisure/pitch/soccer": {
+                "name": "Γήπεδο Ποδοσφαίρου"
+            },
             "leisure/pitch/tennis": {
                 "name": "Γήπεδο Τέννις"
             },
@@ -420,6 +553,9 @@
             "man_made/lighthouse": {
                 "name": "Φάρος"
             },
+            "man_made/pier": {
+                "name": "Αποβάθρα"
+            },
             "man_made/water_tower": {
                 "name": "Δεξαμενή Νερού"
             },
@@ -429,12 +565,24 @@
             "natural/beach": {
                 "name": "Παραλία"
             },
+            "natural/cliff": {
+                "name": "Βράχος"
+            },
             "natural/coastline": {
                 "name": "Ακτογραμμή"
             },
             "natural/glacier": {
                 "name": "Παγετώνας"
             },
+            "natural/grassland": {
+                "name": "Χορτολιβαδική Έκταση"
+            },
+            "natural/scrub": {
+                "name": "Θάμνος"
+            },
+            "natural/spring": {
+                "name": "Πηγή"
+            },
             "natural/tree": {
                 "name": "Δέντρο"
             },
@@ -450,14 +598,38 @@
             "place/city": {
                 "name": "Πόλη"
             },
+            "place/hamlet": {
+                "name": "Χωριουδάκι"
+            },
             "place/island": {
                 "name": "Νησί"
             },
             "place/village": {
                 "name": "Χωριό"
             },
-            "power/generator": {
-                "name": "Εργοστάσιο Ενέργειας"
+            "power/line": {
+                "name": "Καλώδιο Ρεύματος"
+            },
+            "power/pole": {
+                "name": "Κολώνα Ρεύματος"
+            },
+            "power/sub_station": {
+                "name": "Υπόγειος Σταθμός "
+            },
+            "power/tower": {
+                "name": "Κολώνα Υψηλής Τάσης"
+            },
+            "power/transformer": {
+                "name": "Μετασχηματιστής"
+            },
+            "railway": {
+                "name": "Σιδηροδρομικός Διάδρομος"
+            },
+            "railway/abandoned": {
+                "name": "Εγκατελείμενη Σιδηροδρομική Γραμμή"
+            },
+            "railway/rail": {
+                "name": "Σιδηροδρομική Γραμμή"
             },
             "railway/station": {
                 "name": "Σιδηροδρομικός Σταθμός"
@@ -471,18 +643,33 @@
             "railway/tram": {
                 "name": "Τραμ"
             },
+            "route/ferry": {
+                "name": "Γραμμή Πλοίων"
+            },
             "shop": {
-                "name": "Μαγαζί"
+                "name": "Κατάστημα"
+            },
+            "shop/alcohol": {
+                "name": "Κάβα Ποτών"
             },
             "shop/bakery": {
                 "name": "Αρτοποιείο"
             },
+            "shop/beverages": {
+                "name": "Αναψυκτήριο"
+            },
+            "shop/bicycle": {
+                "name": "Κατάστημα Ποδηλάτων"
+            },
             "shop/books": {
                 "name": "Βιβλιοπωλείο"
             },
             "shop/butcher": {
                 "name": "Χασάπικο"
             },
+            "shop/car": {
+                "name": "Εμπορία Αυτοκινήτων"
+            },
             "shop/car_repair": {
                 "name": "Συνεργείο Αυτοκινήτων"
             },
@@ -495,12 +682,24 @@
             "shop/computer": {
                 "name": "Κατάστημα Υπολογιστών"
             },
+            "shop/dry_cleaning": {
+                "name": "Στεγνοκαθαριστήριο"
+            },
+            "shop/fishmonger": {
+                "name": "Ψαράδικο"
+            },
             "shop/florist": {
                 "name": "Ανθοπωλείο"
             },
             "shop/furniture": {
                 "name": "Κατάστημα Επίπλων"
             },
+            "shop/gift": {
+                "name": "Καταστημά Δώρων"
+            },
+            "shop/greengrocer": {
+                "name": "Οπωροπωλείο"
+            },
             "shop/hairdresser": {
                 "name": "Κομμωτήριο"
             },
@@ -543,27 +742,45 @@
             "tourism": {
                 "name": "Τουρισμός"
             },
+            "tourism/attraction": {
+                "name": "Τ"
+            },
             "tourism/camp_site": {
                 "name": "Κατασκήνωση"
             },
+            "tourism/chalet": {
+                "name": "Σαλέ"
+            },
             "tourism/guest_house": {
                 "name": "Ξενώνας"
             },
             "tourism/hotel": {
                 "name": "Ξενοδοχείο"
             },
+            "tourism/information": {
+                "name": "Πληροφορίες"
+            },
             "tourism/motel": {
                 "name": "Μοτέλ"
             },
             "tourism/museum": {
                 "name": "Μουσείο"
             },
+            "tourism/theme_park": {
+                "name": "Θεματικό Πάρκο"
+            },
             "tourism/zoo": {
                 "name": "Ζωολογικός Κήπος"
             },
             "type/route/bus": {
                 "name": "Γραμμή Λεοφορείων"
             },
+            "type/route/ferry": {
+                "name": "Γραμμή Πλοίων"
+            },
+            "type/route/train": {
+                "name": "Γραμμή Τραίνων"
+            },
             "vertex": {
                 "name": "Άλλο"
             },
@@ -575,6 +792,9 @@
             },
             "waterway/river": {
                 "name": "Ποταμός"
+            },
+            "waterway/riverbank": {
+                "name": "Όχθη Ποταμιού"
             }
         }
     }
diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json
index 1b727925d..e63f7775e 100644
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -166,12 +166,16 @@
             "multiple_ways": "There are too many lines here to split."
         }
     },
-    "nothing_to_undo": "Nothing to undo.",
-    "nothing_to_redo": "Nothing to redo.",
+    "undo": {
+        "tooltip": "Undo: {action}",
+        "nothing": "Nothing to undo."
+    },
+    "redo": {
+        "tooltip": "Redo: {action}",
+        "nothing": "Nothing to redo."
+    },
     "tooltip_keyhint": "Shortcut:",
-    "just_edited": "You just edited OpenStreetMap!",
     "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
-    "view_on_osm": "View on OSM",
     "translate": {
         "translate": "Translate",
         "localized_translation_label": "Multilingual name",
@@ -256,9 +260,11 @@
     },
     "success": {
         "edited_osm": "Edited OSM!",
+        "just_edited": "You just edited OpenStreetMap!",
+        "view_on_osm": "View on OSM",
         "facebook": "Share on Facebook",
         "tweet": "Tweet",
-        "okay": "Okay"
+        "help_html": "Your changes should appear in the \"Standard\" layer in a few minutes. Other layers, and certain features, may take longer\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>details</a>).\n"
     },
     "confirm": {
         "okay": "Okay"
@@ -514,9 +520,21 @@
             "fee": {
                 "label": "Fee"
             },
+            "fire_hydrant/type": {
+                "label": "Type"
+            },
             "fixme": {
                 "label": "Fix Me"
             },
+            "generator/method": {
+                "label": "Method"
+            },
+            "generator/source": {
+                "label": "Source"
+            },
+            "generator/type": {
+                "label": "Type"
+            },
             "highway": {
                 "label": "Type"
             },
@@ -1057,6 +1075,10 @@
                 "name": "Ambulance Station",
                 "terms": ""
             },
+            "emergency/fire_hydrant": {
+                "name": "Fire Hydrant",
+                "terms": ""
+            },
             "emergency/phone": {
                 "name": "Emergency Phone",
                 "terms": ""
@@ -1373,6 +1395,10 @@
                 "name": "Swimming Pool",
                 "terms": ""
             },
+            "leisure/track": {
+                "name": "Race Track",
+                "terms": ""
+            },
             "line": {
                 "name": "Line",
                 "terms": ""
@@ -1542,7 +1568,7 @@
                 "terms": ""
             },
             "power/generator": {
-                "name": "Power Plant",
+                "name": "Power Generator",
                 "terms": ""
             },
             "power/line": {
diff --git a/vendor/assets/iD/iD/locales/es.json b/vendor/assets/iD/iD/locales/es.json
index 940eaf49d..aff09f25c 100644
--- a/vendor/assets/iD/iD/locales/es.json
+++ b/vendor/assets/iD/iD/locales/es.json
@@ -166,12 +166,16 @@
             "multiple_ways": "Hay demasiadas líneas para dividir."
         }
     },
-    "nothing_to_undo": "Nada que deshacer.",
-    "nothing_to_redo": "Nada que rehacer.",
+    "undo": {
+        "tooltip": "Deshacer: {action}",
+        "nothing": "Nada que deshacer"
+    },
+    "redo": {
+        "tooltip": "Rehacer: {action}",
+        "nothing": "Nada que rehacer"
+    },
     "tooltip_keyhint": "Acceso directo:",
-    "just_edited": "¡Acaba de editar OpenStreetMap!",
     "browser_notice": "Este editor soporta Firefox, Chrome, Safari, Opera e Internet Explorer 9 o superior. Por favor actualice su navegador o utilice Potlatch 2 para editar el mapa.",
-    "view_on_osm": "Ver en OSM",
     "translate": {
         "translate": "Traducir",
         "localized_translation_label": "Nombre multilingüe",
@@ -256,9 +260,10 @@
     },
     "success": {
         "edited_osm": "¡OSM editado!",
+        "just_edited": "¡Acaba de editar OpenStreetMap!",
+        "view_on_osm": "Ver en OSM",
         "facebook": "Compartir en Facebook",
-        "tweet": "Tweet",
-        "okay": "De acuerdo"
+        "tweet": "Tweet"
     },
     "confirm": {
         "okay": "De acuerdo"
@@ -514,9 +519,21 @@
             "fee": {
                 "label": "Tarifa"
             },
+            "fire_hydrant/type": {
+                "label": "Tipo"
+            },
             "fixme": {
                 "label": "Arreglame"
             },
+            "generator/method": {
+                "label": "Método"
+            },
+            "generator/source": {
+                "label": "Fuente"
+            },
+            "generator/type": {
+                "label": "Tipo"
+            },
             "highway": {
                 "label": "Tipo"
             },
@@ -1009,6 +1026,10 @@
             "emergency/ambulance_station": {
                 "name": "Estación de ambulancias"
             },
+            "emergency/fire_hydrant": {
+                "name": "Boca de incendio",
+                "terms": "boca de incendio,hidrante de incendio"
+            },
             "emergency/phone": {
                 "name": "Teléfono de emergencias"
             },
@@ -1380,9 +1401,6 @@
             "power": {
                 "name": "Electricidad"
             },
-            "power/generator": {
-                "name": "Planta de energía"
-            },
             "power/line": {
                 "name": "Línea de alta tensión"
             },
diff --git a/vendor/assets/iD/iD/locales/et.json b/vendor/assets/iD/iD/locales/et.json
index bb8c7f6ab..ac811d8c1 100644
--- a/vendor/assets/iD/iD/locales/et.json
+++ b/vendor/assets/iD/iD/locales/et.json
@@ -127,8 +127,12 @@
             "not_eligible": "Jooni ei saa tükeldada nende algusest või lõpust."
         }
     },
-    "nothing_to_undo": "Pole midagi tagasi võtta.",
-    "nothing_to_redo": "Pole midagi uuesti teha.",
+    "undo": {
+        "nothing": "Pole midagi tagasi võtta."
+    },
+    "redo": {
+        "nothing": "Pole midagi uuesti teha."
+    },
     "browser_notice": "See redaktor on toetatud järgnevates veebilehitsejates: Firefox, Chrome, Safari, Opera, ja Internet Explorer 9 ning uuemates. Palun uuenda oma veebilehitsejat või kasuta Potlatch 2'te kaardi muutmiseks.",
     "logout": "Logi välja",
     "loading_auth": "OpenStreetMap'iga ühendamine...",
@@ -728,9 +732,6 @@
             "power": {
                 "name": "Elekter"
             },
-            "power/generator": {
-                "name": "Elektrijaam"
-            },
             "power/line": {
                 "name": "Elektriliin"
             },
diff --git a/vendor/assets/iD/iD/locales/fi.json b/vendor/assets/iD/iD/locales/fi.json
index 03e9c6893..5bb9d6906 100644
--- a/vendor/assets/iD/iD/locales/fi.json
+++ b/vendor/assets/iD/iD/locales/fi.json
@@ -166,12 +166,14 @@
             "multiple_ways": "Viivoja on liian monta jotta niitä voitaisiin jakaa osiin."
         }
     },
-    "nothing_to_undo": "Ei muokkaushistoriaa.",
-    "nothing_to_redo": "Ei muokkaushistoriaa.",
+    "undo": {
+        "nothing": "Ei muokkaushistoriaa."
+    },
+    "redo": {
+        "nothing": "Ei muokkaushistoriaa."
+    },
     "tooltip_keyhint": "Pikanäppäin:",
-    "just_edited": "Muokkasit juuri OpenStreetMapia!",
     "browser_notice": "Tämä kartanmuokkausohjelma toimii Firefox-, Chrome-, Safari- ja Opera-selaimissa sekä Internet Explorer 9 tai uudemmalla selaimella. Nykyinen verkkoselain ei ole tuettu, joten päivitä verkkoselain tai muokkaa karttaa Potlatch 2 -ohjelmalla.",
-    "view_on_osm": "Näytä OSM-kartalla",
     "translate": {
         "translate": "Käännä",
         "localized_translation_label": "Monikielinen nimi",
@@ -256,9 +258,10 @@
     },
     "success": {
         "edited_osm": "OSM:ia muokattu!",
+        "just_edited": "Muokkasit juuri OpenStreetMapia!",
+        "view_on_osm": "Näytä OSM-kartalla",
         "facebook": "Jaa Facebookissa",
-        "tweet": "Twiittaa",
-        "okay": "OK"
+        "tweet": "Twiittaa"
     },
     "confirm": {
         "okay": "OK"
@@ -1306,9 +1309,6 @@
             "power": {
                 "name": "Sähkö"
             },
-            "power/generator": {
-                "name": "Voimalaitos"
-            },
             "power/line": {
                 "name": "Voimalinja"
             },
diff --git a/vendor/assets/iD/iD/locales/fr.json b/vendor/assets/iD/iD/locales/fr.json
index 97ec78f36..88f071321 100644
--- a/vendor/assets/iD/iD/locales/fr.json
+++ b/vendor/assets/iD/iD/locales/fr.json
@@ -166,12 +166,14 @@
             "multiple_ways": "Il y a trop de ligne à cet endroit pour pouvoir couper."
         }
     },
-    "nothing_to_undo": "Rien à annuler.",
-    "nothing_to_redo": "Rien à refaire.",
+    "undo": {
+        "nothing": "Rien à annuler."
+    },
+    "redo": {
+        "nothing": "Rien à refaire."
+    },
     "tooltip_keyhint": "Raccourci:",
-    "just_edited": "Vous venez de participer à OpenStreetMap !",
     "browser_notice": "Les navigateurs supportés par cet éditeur sont : Firefox, Chrome, Safari, Opera et Internet Explorer (version 9 et supérieures). Pour éditer la carte, veuillez mettre à jour votre navigateur ou utiliser Potlatch 2.",
-    "view_on_osm": "Consulter dans OSM",
     "translate": {
         "translate": "Traduire",
         "localized_translation_label": "Nom multi-langues",
@@ -256,9 +258,10 @@
     },
     "success": {
         "edited_osm": "OSM Edité!",
+        "just_edited": "Vous venez de participer à OpenStreetMap !",
+        "view_on_osm": "Visualiser sur OSM",
         "facebook": "Partager sur Facebook",
-        "tweet": "Tweeter",
-        "okay": "OK"
+        "tweet": "Tweeter"
     },
     "confirm": {
         "okay": "OK"
@@ -1520,10 +1523,6 @@
                 "name": "Énergie",
                 "terms": "Electricité"
             },
-            "power/generator": {
-                "name": "Centrale de production d'électricité",
-                "terms": "Centrale électrique"
-            },
             "power/line": {
                 "name": "Câble aérien",
                 "terms": "Ligne électrique"
diff --git a/vendor/assets/iD/iD/locales/hr.json b/vendor/assets/iD/iD/locales/hr.json
index b984c4ebd..4357e6d80 100644
--- a/vendor/assets/iD/iD/locales/hr.json
+++ b/vendor/assets/iD/iD/locales/hr.json
@@ -166,12 +166,16 @@
             "multiple_ways": "Previše linija za razdvajanje."
         }
     },
-    "nothing_to_undo": "Nema ništa za opovrgnuti.",
-    "nothing_to_redo": "Nema ništa za ponoviti.",
+    "undo": {
+        "tooltip": "Opovrgni: {action}",
+        "nothing": "Nema ništa za opovrgnuti."
+    },
+    "redo": {
+        "tooltip": "Ponovi: {action}",
+        "nothing": "Nema ništa za ponoviti."
+    },
     "tooltip_keyhint": "Kratica:",
-    "just_edited": "Upravo si uredio/la OpenStreetMap!",
     "browser_notice": "Ovaj uređivač je podržan u preglednicima: Firefox, Chrome, Safari, Opera i Internet Explorer 9 ili novijim. Molimo nadogradite svoj preglednik ili koristite Potlatch 2 za uređivanje karte.",
-    "view_on_osm": "Pogledaj na OSM-u",
     "translate": {
         "translate": "Prevedi",
         "localized_translation_label": "Višejezični naziv",
@@ -256,9 +260,11 @@
     },
     "success": {
         "edited_osm": "Uređen OSM!",
+        "just_edited": "Upravo si uredio/la OpenStreetMap!",
+        "view_on_osm": "Pogledaj na OSM",
         "facebook": "Podijeli na Facebook-u.",
         "tweet": "Tweet",
-        "okay": "Ok"
+        "help_html": "Tvoje promjene bi se trebale pojaviti u sloju \"Standard\" kroz par minuta. Za druge slojeve i određena svojstva trebati će više vremena.⏎\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>detalji</a>).⏎\n"
     },
     "confirm": {
         "okay": "Ok"
@@ -420,22 +426,28 @@
                 "label": "Administratorsko područje"
             },
             "aeroway": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "amenity": {
-                "label": "Tip"
+                "label": "Vrsta"
+            },
+            "artist": {
+                "label": "Umjetnik"
+            },
+            "artwork_type": {
+                "label": "Vrsta"
             },
             "atm": {
                 "label": "Bankomat"
             },
             "barrier": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "bicycle_parking": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "boundary": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "building": {
                 "label": "Građevina"
@@ -460,14 +472,17 @@
                     "anticlockwise": "U suprotnom smijeru od kazaljke na satu"
                 }
             },
+            "collection_times": {
+                "label": "Vrijeme preuzimanja"
+            },
             "construction": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "country": {
                 "label": "Država"
             },
             "crossing": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "cuisine": {
                 "label": "Hrana"
@@ -488,7 +503,7 @@
                 "label": "Hitna pomoć"
             },
             "entrance": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "fax": {
                 "label": "Fax",
@@ -497,14 +512,26 @@
             "fee": {
                 "label": "Plaćanje"
             },
+            "fire_hydrant/type": {
+                "label": "Vrsta"
+            },
             "fixme": {
                 "label": "Popravi me"
             },
+            "generator/method": {
+                "label": "Metoda"
+            },
+            "generator/source": {
+                "label": "Izvor"
+            },
+            "generator/type": {
+                "label": "Vrsta"
+            },
             "highway": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "historic": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "iata": {
                 "label": "Međunarodni IATA kôd zračne luke"
@@ -524,7 +551,7 @@
                 }
             },
             "landuse": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "lanes": {
                 "label": "Broj traka",
@@ -534,7 +561,7 @@
                 "label": "Sloj"
             },
             "leisure": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "levels": {
                 "label": "Razina",
@@ -544,7 +571,7 @@
                 "label": "Lokacija"
             },
             "man_made": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "maxspeed": {
                 "label": "Ograničenje brzine",
@@ -564,7 +591,7 @@
                 "label": "Bilješka"
             },
             "office": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "oneway": {
                 "label": "Jednosmjerna"
@@ -582,26 +609,26 @@
                 "label": "Parkiraj i idi javnim prijevozom"
             },
             "parking": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "phone": {
                 "label": "Telefon",
                 "placeholder": "+385 01 123 4567"
             },
             "place": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "power": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "railway": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "ref": {
                 "label": "Broj ceste"
             },
             "relation": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "religion": {
                 "label": "Religija",
@@ -616,25 +643,25 @@
                 }
             },
             "restriction": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "route": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "route_master": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "sac_scale": {
                 "label": "Težina staze"
             },
             "service": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "shelter": {
                 "label": "Sklonište"
             },
             "shop": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "source": {
                 "label": "Izvor"
@@ -659,29 +686,29 @@
                 "label": "Površina"
             },
             "tourism": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "towertype": {
                 "label": "Vrsta tornja"
             },
             "tracktype": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "trail_visibility": {
                 "label": "Vidljivost staze"
             },
             "water": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "waterway": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "website": {
                 "label": "Web stranica",
                 "placeholder": "http://primjer.com/"
             },
             "wetland": {
-                "label": "Tip"
+                "label": "Vrsta"
             },
             "wheelchair": {
                 "label": "Pristup s invalidskim kolicima"
@@ -690,7 +717,7 @@
                 "label": "Wikipedia"
             },
             "wood": {
-                "label": "Tip"
+                "label": "Vrsta"
             }
         },
         "presets": {
@@ -751,6 +778,9 @@
             "amenity/car_rental": {
                 "name": "Iznajmljivanje vozila"
             },
+            "amenity/car_sharing": {
+                "name": "Servis za razmjenu automobila"
+            },
             "amenity/car_wash": {
                 "name": "Autopraonica"
             },
@@ -885,6 +915,9 @@
             "barrier/bollard": {
                 "name": "Stup"
             },
+            "barrier/cattle_grid": {
+                "name": "Mreža koja sprječava prijelaz stoke preko ceste"
+            },
             "barrier/city_wall": {
                 "name": "Gradske zidine",
                 "terms": "Gradske zidine"
@@ -908,12 +941,18 @@
             "barrier/hedge": {
                 "name": "Živica"
             },
+            "barrier/kissing_gate": {
+                "name": "Rotirajući prolaz za ljude"
+            },
             "barrier/lift_gate": {
                 "name": "Rampa"
             },
             "barrier/retaining_wall": {
                 "name": "Potporni zid"
             },
+            "barrier/stile": {
+                "name": "Ograda preko koje pješaci mogu preći"
+            },
             "barrier/toll_booth": {
                 "name": "Naplatna kućica"
             },
@@ -950,6 +989,12 @@
             "building/residential": {
                 "name": "Stambena zgrada"
             },
+            "emergency/ambulance_station": {
+                "name": "Ambulantna garaža"
+            },
+            "emergency/fire_hydrant": {
+                "name": "Požarni hidrant"
+            },
             "emergency/phone": {
                 "name": "Telefon za nuždu"
             },
@@ -1019,6 +1064,9 @@
             "highway/service/alley": {
                 "name": "Uska uličica"
             },
+            "highway/service/drive-through": {
+                "name": "Provezi-kroz"
+            },
             "highway/service/driveway": {
                 "name": "Prilaz"
             },
@@ -1184,6 +1232,9 @@
             "leisure/swimming_pool": {
                 "name": "Sportski bazen"
             },
+            "leisure/track": {
+                "name": "Autodrom"
+            },
             "line": {
                 "name": "Linija"
             },
@@ -1311,7 +1362,7 @@
                 "name": "Struja"
             },
             "power/generator": {
-                "name": "Elektrana"
+                "name": "Generator struje"
             },
             "power/line": {
                 "name": "Energetska mreža"
@@ -1622,6 +1673,9 @@
             "type/route/tram": {
                 "name": "Tramvajska putanja"
             },
+            "type/route_master": {
+                "name": "Glavna ruta"
+            },
             "vertex": {
                 "name": "Drugo"
             },
diff --git a/vendor/assets/iD/iD/locales/hu.json b/vendor/assets/iD/iD/locales/hu.json
index 98bde6c70..162cb99c7 100644
--- a/vendor/assets/iD/iD/locales/hu.json
+++ b/vendor/assets/iD/iD/locales/hu.json
@@ -30,7 +30,8 @@
         "add": {
             "annotation": {
                 "point": "Pont hozzáadása.",
-                "vertex": "Pont hozzáadása a vonalhoz."
+                "vertex": "Pont hozzáadása a vonalhoz.",
+                "relation": "Kapcsolat hozzáadva."
             }
         },
         "start": {
@@ -165,12 +166,14 @@
             "multiple_ways": "Túl sok kettévágandó vonal van itt."
         }
     },
-    "nothing_to_undo": "Nincs mit visszavonni.",
-    "nothing_to_redo": "Nincs mit visszaállítani.",
+    "undo": {
+        "nothing": "Nincs mit visszavonni."
+    },
+    "redo": {
+        "nothing": "Nincs mit visszaállítani."
+    },
     "tooltip_keyhint": "Gyorsbillentyű:",
-    "just_edited": "Szerkesztetted az OpenStreetMapet!",
     "browser_notice": "Ez a szerkesztőprogram Firefoxban, Chrome-ban, Safariban, Operában és Internet Explorer 9-ben támogatott. Kérlek, frissítsd a böngésződet, vagy szerkeszd a térképet Potlatch 2-vel.",
-    "view_on_osm": "Megtekintés OSM-en",
     "translate": {
         "translate": "Fordítás",
         "localized_translation_label": "Többnyelvű név",
@@ -203,6 +206,11 @@
         "list": "Szerkesztette {users}",
         "truncated_list": "Szerkesztette {users} és {count} másik szerkesztő"
     },
+    "geocoder": {
+        "search": "Keresés a világban…",
+        "no_results_visible": "Nincs találat a térkép látható részén",
+        "no_results_worldwide": "Nincs találat"
+    },
     "geolocate": {
         "title": "Pozícióm megjelenítése"
     },
@@ -224,6 +232,7 @@
         "search": "Keresés",
         "unknown": "Ismeretlen",
         "incomplete": "<nincs letöltve>",
+        "feature_list": "Elem keresése",
         "edit": "Elem szerkesztése"
     },
     "background": {
@@ -249,9 +258,10 @@
     },
     "success": {
         "edited_osm": "OSM szerkesztve!",
+        "just_edited": "Szerkesztetted az OpenStreetMap-et!",
+        "view_on_osm": "Megtekintés OSM-en",
         "facebook": "Megosztás Facebookon",
-        "tweet": "Twittelés",
-        "okay": "Oké"
+        "tweet": "Twittelés"
     },
     "confirm": {
         "okay": "Oké"
@@ -426,6 +436,12 @@
             "amenity": {
                 "label": "típus"
             },
+            "artist": {
+                "label": "Művész"
+            },
+            "artwork_type": {
+                "label": "Típus"
+            },
             "atm": {
                 "label": "Bankautomata"
             },
@@ -923,12 +939,28 @@
             "building/apartments": {
                 "name": "Lakások"
             },
+            "building/commercial": {
+                "name": "Kereskedelmi épület"
+            },
             "building/entrance": {
                 "name": "Bejárat"
             },
+            "building/garage": {
+                "name": "Garázs"
+            },
             "building/house": {
                 "name": "Ház"
             },
+            "building/industrial": {
+                "name": "Ipari épület"
+            },
+            "building/residential": {
+                "name": "Lakóépület"
+            },
+            "emergency/ambulance_station": {
+                "name": "Mentőállomás",
+                "terms": "Mentőautó állomás"
+            },
             "emergency/phone": {
                 "name": "Segélykérő telefon"
             },
@@ -1118,6 +1150,10 @@
             "leisure": {
                 "name": "Szabadidő"
             },
+            "leisure/dog_park": {
+                "name": "Kutyafuttató",
+                "terms": "Kutyasétáltató"
+            },
             "leisure/garden": {
                 "name": "Kert"
             },
@@ -1289,9 +1325,6 @@
             "power": {
                 "name": "Energia"
             },
-            "power/generator": {
-                "name": "Erőmű"
-            },
             "power/line": {
                 "name": "Távvezeték"
             },
diff --git a/vendor/assets/iD/iD/locales/id.json b/vendor/assets/iD/iD/locales/id.json
index 94b10b1ca..1daff4745 100644
--- a/vendor/assets/iD/iD/locales/id.json
+++ b/vendor/assets/iD/iD/locales/id.json
@@ -163,12 +163,14 @@
             "multiple_ways": "Terlalu banyak garis untuk dipisahkan"
         }
     },
-    "nothing_to_undo": "Tak ada yang bisa di ulang.",
-    "nothing_to_redo": "Tak ada yang bisa di redo.",
+    "undo": {
+        "nothing": "Tak ada yang bisa di ulang."
+    },
+    "redo": {
+        "nothing": "Tak ada yang bisa di redo."
+    },
     "tooltip_keyhint": "Pintasan:",
-    "just_edited": "Anda baru saja menyunting OpenStreetMap!",
     "browser_notice": "Penyuting ini mendukung di Firefox, Chrome, Safari, Opera, dan Internet Explorer 9 dan di atasnya. Sila tingkatnya peramban anda atau gunakan Potlatc 2 untuk menyuting peta.",
-    "view_on_osm": "Lihat di OSM",
     "translate": {
         "translate": "Terjemahkan",
         "localized_translation_label": "Nama banyak-bahasa",
@@ -243,9 +245,10 @@
     },
     "success": {
         "edited_osm": "OSM tersunting!",
+        "just_edited": "Anda baru saja menyunting OpenStreetMap!",
+        "view_on_osm": "Lihat di OSM",
         "facebook": "Bagikan di Facebook",
-        "tweet": "Tweet",
-        "okay": "Baiklah"
+        "tweet": "Tweet"
     },
     "confirm": {
         "okay": "Baiklah"
diff --git a/vendor/assets/iD/iD/locales/is.json b/vendor/assets/iD/iD/locales/is.json
index dfd169d36..babdc3372 100644
--- a/vendor/assets/iD/iD/locales/is.json
+++ b/vendor/assets/iD/iD/locales/is.json
@@ -166,12 +166,14 @@
             "multiple_ways": "Of margar línur hér til að hægt sé að aðskilja."
         }
     },
-    "nothing_to_undo": "Ekkert til að hætta við.",
-    "nothing_to_redo": "Ekkert til að endurtaka.",
+    "undo": {
+        "nothing": "Ekkert til að hætta við."
+    },
+    "redo": {
+        "nothing": "Ekkert til að endurtaka."
+    },
     "tooltip_keyhint": "Flýtival:",
-    "just_edited": "Þú hefur breytt OpenStreetMap!",
     "browser_notice": "Þessi ritill er studdur af Firefox, Chrome, Safari, Opera og Internet Explorer 9 og betri. Vinsamlegast uppfærðu vafrann þinn eða notaðu Potlatch 2 til að breyta kortinu.",
-    "view_on_osm": "Skoða á OSM",
     "translate": {
         "translate": "Þýða",
         "localized_translation_label": "Margtyngt nafn",
@@ -256,9 +258,10 @@
     },
     "success": {
         "edited_osm": "Þú breyttir OSM!",
+        "just_edited": "Þú hefur breytt OpenStreetMap!",
+        "view_on_osm": "Skoða á OSM",
         "facebook": "Deila á Facebook",
-        "tweet": "Tísta",
-        "okay": "Í lagi"
+        "tweet": "Tísta"
     },
     "confirm": {
         "okay": "Í lagi"
@@ -1301,9 +1304,6 @@
             "power": {
                 "name": "Orka"
             },
-            "power/generator": {
-                "name": "Orkuver"
-            },
             "power/line": {
                 "name": "Orkulína"
             },
diff --git a/vendor/assets/iD/iD/locales/it.json b/vendor/assets/iD/iD/locales/it.json
index b6c05077c..579f3c92d 100644
--- a/vendor/assets/iD/iD/locales/it.json
+++ b/vendor/assets/iD/iD/locales/it.json
@@ -166,12 +166,14 @@
             "multiple_ways": "Ci sono troppe linee da dividere."
         }
     },
-    "nothing_to_undo": "Niente da ripristinare.",
-    "nothing_to_redo": "Niente da rifare.",
+    "undo": {
+        "nothing": "Niente da ripristinare."
+    },
+    "redo": {
+        "nothing": "Niente da rifare."
+    },
     "tooltip_keyhint": "Scorciatoia da tastiera:",
-    "just_edited": "Hai appena modificato OpenStreetMap!",
     "browser_notice": "Questo editor è supportato in Firefox, Chrome, Safari, Opera, e Internet Explorer 9 e superiori. Aggiorna il tuo browser o usa Potlatch 2 per modificare la mappa.",
-    "view_on_osm": "Guarda su OSM",
     "translate": {
         "translate": "Traduci",
         "localized_translation_label": "Nome multilingua",
@@ -256,9 +258,10 @@
     },
     "success": {
         "edited_osm": "OSMI Modificato",
+        "just_edited": "Hai appena modificato OpenStreetMap!",
+        "view_on_osm": "Mostra su OSM",
         "facebook": "Condividi su Facebook",
-        "tweet": "Condividi su Twitter",
-        "okay": "Okay"
+        "tweet": "Condividi su Twitter"
     },
     "confirm": {
         "okay": "Okay"
@@ -1323,9 +1326,6 @@
             "power": {
                 "name": "Energia"
             },
-            "power/generator": {
-                "name": "Centrale elettrica"
-            },
             "power/line": {
                 "name": "Linea elettrica"
             },
diff --git a/vendor/assets/iD/iD/locales/ja.json b/vendor/assets/iD/iD/locales/ja.json
index a9bf64bd2..bad6b5bc4 100644
--- a/vendor/assets/iD/iD/locales/ja.json
+++ b/vendor/assets/iD/iD/locales/ja.json
@@ -166,12 +166,14 @@
             "multiple_ways": "複数のラインを分割します"
         }
     },
-    "nothing_to_undo": "やり直す変更点がありません",
-    "nothing_to_redo": "やり直した変更点がありません",
+    "undo": {
+        "nothing": "やり直す変更点がありません"
+    },
+    "redo": {
+        "nothing": "やり直した変更点がありません"
+    },
     "tooltip_keyhint": "ショートカット",
-    "just_edited": "OpenStreetMap編集完了！",
     "browser_notice": "このエディタは Firefox, Chrome, Safari, Opera, および Internet Explorer 9 以上をサポートしています。ブラウザのバージョンを更新するか、Potlatch 2を使用して編集してください",
-    "view_on_osm": "オブジェクト情報をOSMで確認",
     "translate": {
         "translate": "翻訳",
         "localized_translation_label": "多言語名称",
@@ -256,9 +258,10 @@
     },
     "success": {
         "edited_osm": "OSM編集完了！",
+        "just_edited": "OpenStreetMap編集完了！",
+        "view_on_osm": "詳細情報確認",
         "facebook": "Facebookでシェア",
-        "tweet": "Tweet",
-        "okay": "OK"
+        "tweet": "Tweet"
     },
     "confirm": {
         "okay": "OK"
@@ -514,9 +517,21 @@
             "fee": {
                 "label": "利用料金"
             },
+            "fire_hydrant/type": {
+                "label": "タイプ"
+            },
             "fixme": {
                 "label": "Fix Me"
             },
+            "generator/method": {
+                "label": "方式"
+            },
+            "generator/source": {
+                "label": "参照した情報"
+            },
+            "generator/type": {
+                "label": "タイプ"
+            },
             "highway": {
                 "label": "道路区分"
             },
@@ -970,6 +985,9 @@
             "emergency/ambulance_station": {
                 "name": "救急看護"
             },
+            "emergency/fire_hydrant": {
+                "name": "消火栓"
+            },
             "emergency/phone": {
                 "name": "緊急電話"
             },
@@ -1207,6 +1225,9 @@
             "leisure/swimming_pool": {
                 "name": "プール"
             },
+            "leisure/track": {
+                "name": "競技場"
+            },
             "line": {
                 "name": "ライン"
             },
diff --git a/vendor/assets/iD/iD/locales/lt.json b/vendor/assets/iD/iD/locales/lt.json
index 7e7b0f723..8d7482a4b 100644
--- a/vendor/assets/iD/iD/locales/lt.json
+++ b/vendor/assets/iD/iD/locales/lt.json
@@ -98,9 +98,6 @@
     "save": {
         "title": "IÅ¡saugoti"
     },
-    "success": {
-        "okay": "Gerai"
-    },
     "confirm": {
         "okay": "Gerai"
     },
diff --git a/vendor/assets/iD/iD/locales/lv.json b/vendor/assets/iD/iD/locales/lv.json
index cfde71ec3..7fadcff05 100644
--- a/vendor/assets/iD/iD/locales/lv.json
+++ b/vendor/assets/iD/iD/locales/lv.json
@@ -144,11 +144,13 @@
             "not_eligible": "Līnijas nevar sadalīt to sākumā vai beigās."
         }
     },
-    "nothing_to_undo": "Nav nekā, ko atcelt",
-    "nothing_to_redo": "Nav nekā, ko atsaukt",
-    "just_edited": "Jūs nupat rediģējāt OpenStreetMap",
+    "undo": {
+        "nothing": "Nav nekā, ko atcelt"
+    },
+    "redo": {
+        "nothing": "Nav nekā, ko atsaukt"
+    },
     "browser_notice": "Šis redaktors tiek atbalstīts ar Firefox, Chrome, Safari, Opera, un Internet Explorer 9 un jaunāku. Lūdzu, atjauniniet savu pārlūkprogrammu vai izmantojiet Potlatch 2 kartes rediģēšanai",
-    "view_on_osm": "Aplūkot OSM kartē",
     "zoom_in_edit": "Pietuvināt, lai labotu",
     "logout": "atslēgties",
     "loading_auth": "Savienojas ar OpenStreetMap...",
@@ -203,9 +205,10 @@
         "unsaved_changes": "Jums ir nesaglabātas izmaiņas"
     },
     "success": {
+        "just_edited": "Jūs nupat rediģējāt OpenStreetMap",
+        "view_on_osm": "Apskatīt OSM",
         "facebook": "Dalīties Facebook",
-        "tweet": "Dalīties Twitter",
-        "okay": "Labi"
+        "tweet": "Dalīties Twitter"
     },
     "confirm": {
         "okay": "Labi"
@@ -921,9 +924,6 @@
             "power": {
                 "name": "Enerģija"
             },
-            "power/generator": {
-                "name": "Elektrostacija"
-            },
             "power/line": {
                 "name": "Elektrolīnija"
             },
diff --git a/vendor/assets/iD/iD/locales/nl.json b/vendor/assets/iD/iD/locales/nl.json
index 9d5c01d36..d40e60324 100644
--- a/vendor/assets/iD/iD/locales/nl.json
+++ b/vendor/assets/iD/iD/locales/nl.json
@@ -166,12 +166,14 @@
             "multiple_ways": "Er zijn hier teveel lijnen om op te splitsen."
         }
     },
-    "nothing_to_undo": "Niets om ongedaan te maken.",
-    "nothing_to_redo": "Niets om opnieuw uit te voeren.",
+    "undo": {
+        "nothing": "Niets om ongedaan te maken."
+    },
+    "redo": {
+        "nothing": "Niets om opnieuw uit te voeren."
+    },
     "tooltip_keyhint": "Sneltoetscombinatie:",
-    "just_edited": "Je hebt zojuist OpenStreetMap aangepast!",
     "browser_notice": "Deze editor wordt door Firefox, Chrome, Safari, Opera en Internet Explorer (versie 9 en hoger) ondersteund. Download een nieuwere versie van je browser of gebruik Potlatch 2 om de kaart aan te passen.",
-    "view_on_osm": "Bekijk op OSM",
     "translate": {
         "translate": "Vertaal",
         "localized_translation_label": "Meertalige naam",
@@ -256,9 +258,10 @@
     },
     "success": {
         "edited_osm": "OSM aangepast!",
+        "just_edited": "Je hebt zojuist OpenStreetMap aangepast!",
+        "view_on_osm": "Bekijk op OSM",
         "facebook": "Deel op Facebook",
-        "tweet": "Tweet",
-        "okay": "OK"
+        "tweet": "Tweet"
     },
     "confirm": {
         "okay": "OK"
@@ -1302,9 +1305,6 @@
             "power": {
                 "name": "Stroomvoorziening"
             },
-            "power/generator": {
-                "name": "Electriciteitscentrale"
-            },
             "power/line": {
                 "name": "Electriciteitsdraad"
             },
diff --git a/vendor/assets/iD/iD/locales/no.json b/vendor/assets/iD/iD/locales/no.json
index 0fd4b0ef2..9fd4859db 100644
--- a/vendor/assets/iD/iD/locales/no.json
+++ b/vendor/assets/iD/iD/locales/no.json
@@ -124,9 +124,12 @@
             "key": "X"
         }
     },
-    "nothing_to_undo": "Ingen ting å gjøre.",
-    "nothing_to_redo": "Ingen ting å gjøre tilbake.",
-    "just_edited": "Du har akkurat endret OpenStreetMap!",
+    "undo": {
+        "nothing": "Ingen ting å gjøre."
+    },
+    "redo": {
+        "nothing": "Ingen ting å gjøre tilbake."
+    },
     "browser_notice": "Denne editor er støttet i Firefox, Chrome, Safari, Opera og Internet Explorer 9 og høyere. Vennligst oppgrader din nettleser eller bruk Potlatch 2 for å redigere kartet.",
     "logout": "logg ut",
     "report_a_bug": "meld en programvarefeil",
@@ -168,6 +171,9 @@
         "uploading": "Laster opp endringer til OpenStreetMap.",
         "unsaved_changes": "Du har ulagrede endringer"
     },
+    "success": {
+        "just_edited": "Du har akkurat endret OpenStreetMap!"
+    },
     "splash": {
         "welcome": "Velkommen til iD OpenStreetMap editor"
     },
@@ -1019,9 +1025,6 @@
             "power": {
                 "name": "Strøm"
             },
-            "power/generator": {
-                "name": "Kraftverk"
-            },
             "power/line": {
                 "name": "Høyspentlinje"
             },
diff --git a/vendor/assets/iD/iD/locales/pl.json b/vendor/assets/iD/iD/locales/pl.json
index 3f91a0b7c..d05f14c1f 100644
--- a/vendor/assets/iD/iD/locales/pl.json
+++ b/vendor/assets/iD/iD/locales/pl.json
@@ -166,12 +166,16 @@
             "multiple_ways": "Jest tu zbyt wiele linii do rozdzielenia."
         }
     },
-    "nothing_to_undo": "Nie ma nic do cofnięcia.",
-    "nothing_to_redo": "Nie ma nic do powtórzenia.",
+    "undo": {
+        "tooltip": "Cofnij: {action}",
+        "nothing": "Nie ma nic do cofnięcia."
+    },
+    "redo": {
+        "tooltip": "Powtórz: {action}",
+        "nothing": "Nie ma nic do powtórzenia."
+    },
     "tooltip_keyhint": "Skrót:",
-    "just_edited": "Właśnie wprowadziłeś zmiany w OpenStreetMap!",
     "browser_notice": "Ten edytor działa w Firefoksie, Chrome, Safari, Operze oraz Internet Explorerze 9 i wyżej. Zaktualizuj swoją przeglądarkę lub użyj Potlatch 2, aby edytować mapę.",
-    "view_on_osm": "Pokaż na OSM",
     "translate": {
         "translate": "Przetłumacz",
         "localized_translation_label": "Wielojęzyczna nazwa",
@@ -256,9 +260,11 @@
     },
     "success": {
         "edited_osm": "Zmiany zostały wprowadzone do OSM!",
+        "just_edited": "Właśnie wprowadziłeś zmiany w OpenStreetMap!",
+        "view_on_osm": "Zobacz na OSM",
         "facebook": "Podziel się na Facebooku",
         "tweet": "Tweetnij",
-        "okay": "Okej"
+        "help_html": "Twoje zmiany powinny się pojawić w przeciągu kilku minut na standardowej warstwie mapy. Odświeżenie innych warstw może potrwać nieco dłużej (<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>szczegóły</a>).\n"
     },
     "confirm": {
         "okay": "Okej"
@@ -433,6 +439,12 @@
             "amenity": {
                 "label": "Typ"
             },
+            "artist": {
+                "label": "Dzieło sztuki"
+            },
+            "artwork_type": {
+                "label": "Typ"
+            },
             "atm": {
                 "label": "Bankomat"
             },
@@ -508,9 +520,15 @@
             "fee": {
                 "label": "Opłata"
             },
+            "fire_hydrant/type": {
+                "label": "Typ"
+            },
             "fixme": {
                 "label": "Napraw mnie"
             },
+            "generator/source": {
+                "label": "Źródło"
+            },
             "highway": {
                 "label": "Typ"
             },
@@ -983,6 +1001,9 @@
             "building/residential": {
                 "name": "Budynek mieszklany"
             },
+            "emergency/fire_hydrant": {
+                "name": "Hydrant"
+            },
             "emergency/phone": {
                 "name": "Telefon alarmowy"
             },
@@ -1180,6 +1201,9 @@
             "leisure": {
                 "name": "Rozrywka i wypoczynek"
             },
+            "leisure/dog_park": {
+                "name": "Park dla psów"
+            },
             "leisure/garden": {
                 "name": "Ogród"
             },
@@ -1226,6 +1250,9 @@
             "leisure/swimming_pool": {
                 "name": "Basen"
             },
+            "leisure/track": {
+                "name": "Tor wyścigowy"
+            },
             "line": {
                 "name": "Linia"
             },
@@ -1359,9 +1386,6 @@
             "power": {
                 "name": "Energetyka"
             },
-            "power/generator": {
-                "name": "Elektrownia"
-            },
             "power/line": {
                 "name": "Linia elektryczna",
                 "terms": "lina wysokiego napięcia, lina energetyczna"
diff --git a/vendor/assets/iD/iD/locales/pt-BR.json b/vendor/assets/iD/iD/locales/pt-BR.json
index d85b2772d..b254445a8 100644
--- a/vendor/assets/iD/iD/locales/pt-BR.json
+++ b/vendor/assets/iD/iD/locales/pt-BR.json
@@ -166,12 +166,14 @@
             "multiple_ways": "Há muitas linhas para dividir aqui."
         }
     },
-    "nothing_to_undo": "Nada para desfazer.",
-    "nothing_to_redo": "Nada para refazer.",
+    "undo": {
+        "nothing": "Nada para desfazer."
+    },
+    "redo": {
+        "nothing": "Nada para refazer."
+    },
     "tooltip_keyhint": "Atalho:",
-    "just_edited": "Você acaba de editar o OpenStreetMap!",
     "browser_notice": "Este editor é suportado no Firefox, Chrome, Safari, Opera e Internet Explorer 9 ou superior. Por favor atualize seu navegador ou use o Potlatch 2 para editar o mapa.",
-    "view_on_osm": "Ver no OSM",
     "translate": {
         "translate": "Traduzir",
         "localized_translation_label": "Nome multilíngue",
@@ -256,9 +258,10 @@
     },
     "success": {
         "edited_osm": "OSM editado!",
+        "just_edited": "Você acaba de editar o OpenStreetMap!",
+        "view_on_osm": "Ver no OSM",
         "facebook": "Compartilhar no Facebook",
-        "tweet": "Tuitar",
-        "okay": "OK"
+        "tweet": "Tuitar"
     },
     "confirm": {
         "okay": "O.K."
@@ -1539,10 +1542,6 @@
                 "name": "Eletricidade",
                 "terms": "Eletricidade"
             },
-            "power/generator": {
-                "name": "Usina Elétrica",
-                "terms": "Usina Elétrica, Hidrelétrica, Termoelétrica, Parque Eólico, Central Nuclear, Usina Nuclear"
-            },
             "power/line": {
                 "name": "Linha de Transmissão de Energia Elétrica",
                 "terms": "Fio Elétrico"
diff --git a/vendor/assets/iD/iD/locales/pt.json b/vendor/assets/iD/iD/locales/pt.json
index 8cb0ad346..71d9cf06e 100644
--- a/vendor/assets/iD/iD/locales/pt.json
+++ b/vendor/assets/iD/iD/locales/pt.json
@@ -166,12 +166,14 @@
             "multiple_ways": "Existem aqui demasiadas linhas para dividir."
         }
     },
-    "nothing_to_undo": "Nada a desfazer.",
-    "nothing_to_redo": "Nada a refazer.",
+    "undo": {
+        "nothing": "Nada a desfazer."
+    },
+    "redo": {
+        "nothing": "Nada a refazer."
+    },
     "tooltip_keyhint": "Atalho:",
-    "just_edited": "Acaba de editar o OpenStreetMap!",
     "browser_notice": "Este editor suporta Firefox, Chrome, Safari, Opera e Internet Explorer 9 ou superior. Por favor atualize o seu navegador de internet ou utilize Potlatch 2 para editar o mapa.",
-    "view_on_osm": "Ver no OSM",
     "translate": {
         "translate": "Traduzir",
         "localized_translation_label": "Nome noutras línguas",
@@ -256,9 +258,10 @@
     },
     "success": {
         "edited_osm": "Acabou de editar o OSM!",
+        "just_edited": "Acaba de editar o OpenStreetMap!",
+        "view_on_osm": "Ver em OSM",
         "facebook": "Partilhar no Facebook",
-        "tweet": "Partilhar no Twitter",
-        "okay": "OK"
+        "tweet": "Partilhar no Twitter"
     },
     "confirm": {
         "okay": "OK"
@@ -1330,9 +1333,6 @@
             "power": {
                 "name": "Energia"
             },
-            "power/generator": {
-                "name": "Central de Geração de Energia"
-            },
             "power/line": {
                 "name": "Linha de Transmissão"
             },
diff --git a/vendor/assets/iD/iD/locales/ru.json b/vendor/assets/iD/iD/locales/ru.json
index c0e298460..ae5ac0b41 100644
--- a/vendor/assets/iD/iD/locales/ru.json
+++ b/vendor/assets/iD/iD/locales/ru.json
@@ -164,12 +164,14 @@
             "multiple_ways": "Слишком много линий для разрезания."
         }
     },
-    "nothing_to_undo": "Отменять нечего.",
-    "nothing_to_redo": "Повторять нечего.",
+    "undo": {
+        "nothing": "Отменять нечего."
+    },
+    "redo": {
+        "nothing": "Повторять нечего."
+    },
     "tooltip_keyhint": "Горячая клавиша:",
-    "just_edited": "Вы только что отредактировали карту OpenStreetMap!",
     "browser_notice": "Этот редактор работает в браузерах Firefox, Chrome, Safari, Opera и Internet Explorer версии 9 и выше. Пожалуйста, обновите свой браузер или воспользуйтесь редактором Potlatch 2.",
-    "view_on_osm": "Посмотреть на OSM",
     "translate": {
         "translate": "Перевести",
         "localized_translation_label": "Многоязычное  название",
@@ -246,9 +248,10 @@
     },
     "success": {
         "edited_osm": "ОСМ отредактирована!",
+        "just_edited": "Вы только что отредактировали карту OpenStreetMap!",
+        "view_on_osm": "Посмотреть в OSM",
         "facebook": "Поделиться на Facebook",
-        "tweet": "Затвитить",
-        "okay": "Ок"
+        "tweet": "Затвитить"
     },
     "confirm": {
         "okay": "Ок"
@@ -1288,9 +1291,6 @@
             "power": {
                 "name": "Электричество"
             },
-            "power/generator": {
-                "name": "Электростанция"
-            },
             "power/line": {
                 "name": "ЛЭП"
             },
diff --git a/vendor/assets/iD/iD/locales/sk.json b/vendor/assets/iD/iD/locales/sk.json
index afdae20e7..bb09f0903 100644
--- a/vendor/assets/iD/iD/locales/sk.json
+++ b/vendor/assets/iD/iD/locales/sk.json
@@ -166,12 +166,16 @@
             "multiple_ways": "Príliš veľa čiar na rozdelenie."
         }
     },
-    "nothing_to_undo": "Nič na vrátenie.",
-    "nothing_to_redo": "Nič na zopakovanie.",
+    "undo": {
+        "tooltip": "Vrátiť: {action}",
+        "nothing": "Nič na vrátenie."
+    },
+    "redo": {
+        "tooltip": "Zopakuj: {action}",
+        "nothing": "Nič na zopakovanie."
+    },
     "tooltip_keyhint": "Skratka:",
-    "just_edited": "Práve ste upravili OpenStreetMap!",
     "browser_notice": "Tento editor je podporovaný v prehliadačoch Firefox, Chrome, Safari, Opera, a Internet Explorer 9 a vyšší. Prosím aktualizujte svoj prehliadač alebo použite  Potlatch 2 na editovanie mapy.",
-    "view_on_osm": "Ukáž na OSM",
     "translate": {
         "translate": "Prelož",
         "localized_translation_label": "Viacjazyčný názov",
@@ -256,9 +260,11 @@
     },
     "success": {
         "edited_osm": "OSM bol upravený!",
+        "just_edited": "Práve ste upravili OpenStreetMap!",
+        "view_on_osm": "Zobraz na OSM",
         "facebook": "Zdieľaj na Facebooku",
         "tweet": "Tweetuj",
-        "okay": "OK"
+        "help_html": "Vaše zmeny by sa mali objaviť na \"Základnej\" vrstve v priebehu niekoľkých minút. Ostatným vrstvám a niektorým objektom to môže trvať dlhšie.\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>detaily</a>).\n"
     },
     "confirm": {
         "okay": "OK"
@@ -514,9 +520,21 @@
             "fee": {
                 "label": "Poplatok"
             },
+            "fire_hydrant/type": {
+                "label": "Typ"
+            },
             "fixme": {
                 "label": "Oprav ma!"
             },
+            "generator/method": {
+                "label": "Metóda"
+            },
+            "generator/source": {
+                "label": "Zroj"
+            },
+            "generator/type": {
+                "label": "Typ"
+            },
             "highway": {
                 "label": "Typ"
             },
@@ -1055,6 +1073,10 @@
                 "name": "Stanovište sanitiek",
                 "terms": "stanoviste sanitiek,garaze,garáže,sanitky,sanitka,garaz,garáž"
             },
+            "emergency/fire_hydrant": {
+                "name": "Požiarny hydrant",
+                "terms": "poziarny hydrant,hydrant, zdroj vody,hadica,uzáver vod,uzaver vody"
+            },
             "emergency/phone": {
                 "name": "Núdzový telefón",
                 "terms": "nudzovy telefon,SOS,tiesňová linka,tiesnova linka,núdzový telefón.nudzovy telefon"
@@ -1371,6 +1393,10 @@
                 "name": "Plaváreň",
                 "terms": "Plavaren,kúpalisko,kupalisko"
             },
+            "leisure/track": {
+                "name": "Závodná dráha",
+                "terms": "závodisko,zavodisko,okruh,preteky"
+            },
             "line": {
                 "name": "Čiara",
                 "terms": "ciara,cesta,trat,kanal,trasa,trať,trat"
@@ -1541,7 +1567,7 @@
             },
             "power/generator": {
                 "name": "Elektráreň",
-                "terms": "elektraren,tepelna elektraren,tepelná elektráreň,atomova elektraren,atómova elektráreň,vodná elektráreň,vodna elektraren"
+                "terms": "elektraren,veterna elektraren,veterná elektráreň,atómka,atomka,vodná,vodna,tepelna,tepelna"
             },
             "power/line": {
                 "name": "Elektrické vedenie",
diff --git a/vendor/assets/iD/iD/locales/sl.json b/vendor/assets/iD/iD/locales/sl.json
index bf6a4ff7f..6be86b08d 100644
--- a/vendor/assets/iD/iD/locales/sl.json
+++ b/vendor/assets/iD/iD/locales/sl.json
@@ -877,9 +877,6 @@
             "power": {
                 "name": "Elektro"
             },
-            "power/generator": {
-                "name": "Elektrarna"
-            },
             "power/line": {
                 "name": "Daljnovod"
             },
diff --git a/vendor/assets/iD/iD/locales/sr.json b/vendor/assets/iD/iD/locales/sr.json
index f411a1f58..cc88bdb1d 100644
--- a/vendor/assets/iD/iD/locales/sr.json
+++ b/vendor/assets/iD/iD/locales/sr.json
@@ -166,12 +166,16 @@
             "multiple_ways": "Има превише линија за раздвајање."
         }
     },
-    "nothing_to_undo": "Ништа за поништити.",
-    "nothing_to_redo": "Ништа за поновити.",
+    "undo": {
+        "tooltip": "Опозови: {action}",
+        "nothing": "Ништа за поништити."
+    },
+    "redo": {
+        "tooltip": "Врати: {action}",
+        "nothing": "Ништа за поновити."
+    },
     "tooltip_keyhint": "Пречица:",
-    "just_edited": "Управо сте уређивали Опенстреетмап!",
     "browser_notice": "Овај уређивач је подржан у Фирефоксу, Хрому, Сафарију, Опери и Интернет екплореру 9 и новијим. Надоградите прегледач или користите Потлач 2 како бисте уређивали мапу.",
-    "view_on_osm": "Прикажи на ОСМ",
     "translate": {
         "translate": "Преведи",
         "localized_translation_label": "Вишејезички назив",
@@ -256,9 +260,10 @@
     },
     "success": {
         "edited_osm": "Уреди ОСМ!",
+        "just_edited": "Управо сте уређивали OpenStreetMap!",
+        "view_on_osm": "Преглед на OSM",
         "facebook": "Подели на Фејсбуку",
-        "tweet": "Твитуј",
-        "okay": "У реду"
+        "tweet": "Твитуј"
     },
     "confirm": {
         "okay": "У реду"
@@ -514,9 +519,21 @@
             "fee": {
                 "label": "Провизија"
             },
+            "fire_hydrant/type": {
+                "label": "Врста"
+            },
             "fixme": {
                 "label": "Поправи ме"
             },
+            "generator/method": {
+                "label": "Начин"
+            },
+            "generator/source": {
+                "label": "Извор"
+            },
+            "generator/type": {
+                "label": "Врста"
+            },
             "highway": {
                 "label": "Врста"
             },
@@ -969,6 +986,9 @@
             "emergency/ambulance_station": {
                 "name": "Амбуланта"
             },
+            "emergency/fire_hydrant": {
+                "name": "Хидрант"
+            },
             "emergency/phone": {
                 "name": "Телефон за хитне случајеве"
             },
@@ -1206,6 +1226,9 @@
             "leisure/swimming_pool": {
                 "name": "Базен"
             },
+            "leisure/track": {
+                "name": "Тркачка стаза"
+            },
             "line": {
                 "name": "Путања"
             },
@@ -1333,7 +1356,7 @@
                 "name": "Енергија"
             },
             "power/generator": {
-                "name": "Електрана"
+                "name": "Електро-генератор"
             },
             "power/line": {
                 "name": "Енергетски вод"
diff --git a/vendor/assets/iD/iD/locales/sv.json b/vendor/assets/iD/iD/locales/sv.json
index 634e04ade..1d511b317 100644
--- a/vendor/assets/iD/iD/locales/sv.json
+++ b/vendor/assets/iD/iD/locales/sv.json
@@ -166,12 +166,14 @@
             "multiple_ways": "Det är för många linjer här för att kunna dela dem."
         }
     },
-    "nothing_to_undo": "Inget att ångra.",
-    "nothing_to_redo": "Inget att upprepa.",
+    "undo": {
+        "nothing": "Inget att ångra."
+    },
+    "redo": {
+        "nothing": "Inget att upprepa."
+    },
     "tooltip_keyhint": "Genväg:",
-    "just_edited": "Du har nu redigerat OpenStreetMap!",
     "browser_notice": "Denna redigerare funkar i Firefox, Chrome, Safari, Opera och Internet Explorer 9 eller högre. Uppgradera din webbläsare eller använd Potlatch 2 för att redigera kartan.",
-    "view_on_osm": "Visa på OSM",
     "translate": {
         "translate": "Översätt",
         "localized_translation_label": "Flerspråkigt namn",
@@ -250,9 +252,10 @@
     },
     "success": {
         "edited_osm": "Redigerat OSM!",
+        "just_edited": "Du har nu redigerat OpenStreetMap!",
+        "view_on_osm": "Visa på OSM",
         "facebook": "Dela på Facebook",
-        "tweet": "Tweet",
-        "okay": "OK"
+        "tweet": "Tweet"
     },
     "confirm": {
         "okay": "Ok"
@@ -986,9 +989,6 @@
             "power": {
                 "name": "Kraft"
             },
-            "power/generator": {
-                "name": "Kraftverk"
-            },
             "power/line": {
                 "name": "Kraftledning"
             },
diff --git a/vendor/assets/iD/iD/locales/te.json b/vendor/assets/iD/iD/locales/te.json
index 6e9496728..fea34da84 100644
--- a/vendor/assets/iD/iD/locales/te.json
+++ b/vendor/assets/iD/iD/locales/te.json
@@ -27,7 +27,6 @@
             "description": "దీన్ని వేరే చోటకు తరలించండి."
         }
     },
-    "just_edited": "మీరు ఓపెన్‌స్ట్రీట్‌మ్యాపుని సవరించారు!",
     "translate": {
         "translate": "అనువదించండి",
         "localized_translation_language": "భాషను ఎంచుకోండి",
@@ -71,8 +70,7 @@
     },
     "success": {
         "facebook": "ఫేస్‌బుక్‌లో పంచుకోండి",
-        "tweet": "ట్వీటండి",
-        "okay": "సరే"
+        "tweet": "ట్వీటండి"
     },
     "confirm": {
         "okay": "సరే"
diff --git a/vendor/assets/iD/iD/locales/tr.json b/vendor/assets/iD/iD/locales/tr.json
index d47dac7f2..e8b6d616b 100644
--- a/vendor/assets/iD/iD/locales/tr.json
+++ b/vendor/assets/iD/iD/locales/tr.json
@@ -146,11 +146,13 @@
             "multiple_ways": "Burada ayrılacak çok fazla çizgi var"
         }
     },
-    "nothing_to_undo": "Geri alınacak birşey yok.",
-    "nothing_to_redo": "Tekrar yapılacak birşey yok.",
-    "just_edited": "Şu an OpenStreetMap'de bir değişiklik yaptınız!",
+    "undo": {
+        "nothing": "Geri alınacak birşey yok."
+    },
+    "redo": {
+        "nothing": "Tekrar yapılacak birşey yok."
+    },
     "browser_notice": "Bu editör sadece Firefox, Chrome, Safari, Opera ile Internet Explorer 9 ve üstü tarayıcılarda çalışmaktadır. Lütfen tarayınıcı güncelleyin ya da Potlatch 2'yi kullanarak haritada güncelleme yapınız.",
-    "view_on_osm": "OSM üstünde Gör",
     "logout": "Çıkış",
     "loading_auth": "OpenStreetMap'e bağlanıyor...",
     "report_a_bug": "Hata rapor et",
@@ -196,6 +198,10 @@
         "uploading": "Değişiklikleriniz OpenStreetMap'e gönderiliyor.",
         "unsaved_changes": "Kaydedilmemiş değişiklikleriniz var"
     },
+    "success": {
+        "just_edited": "Şu an OpenStreetMap'de bir değişiklik yaptınız!",
+        "view_on_osm": "OSM üzerinde gör"
+    },
     "splash": {
         "welcome": "OpenStreetMap Editörü iD'ye hoşgeldiniz",
         "walkthrough": "Örnek çalışmaya başla",
@@ -812,9 +818,6 @@
             "power": {
                 "name": "Güç"
             },
-            "power/generator": {
-                "name": "Elektrik Santrali"
-            },
             "power/line": {
                 "name": "Güç Hattı"
             },
diff --git a/vendor/assets/iD/iD/locales/uk.json b/vendor/assets/iD/iD/locales/uk.json
index a955aef74..fd33075f4 100644
--- a/vendor/assets/iD/iD/locales/uk.json
+++ b/vendor/assets/iD/iD/locales/uk.json
@@ -166,12 +166,16 @@
             "multiple_ways": "Забагато ліній для розділення."
         }
     },
-    "nothing_to_undo": "Скасовувати нічого.",
-    "nothing_to_redo": "Повертати нічого.",
+    "undo": {
+        "tooltip": "Відмінити: {action}",
+        "nothing": "Нема чого відміняти."
+    },
+    "redo": {
+        "tooltip": "Повернути: {action}",
+        "nothing": "Немає чого повертати."
+    },
     "tooltip_keyhint": "Клавішна клмбінація:",
-    "just_edited": "Ви щойно відредагували мапу OpenStreetMap!",
     "browser_notice": "Цей редактор працює в оглядачах Firefox, Chrome, Safari, Opera і Internet Explorer версії 9 і вище.  Будь ласка, оновіть свій оглядач або скористайтеся редактором Potlatch 2.",
-    "view_on_osm": "Подивитись в ОСМ",
     "translate": {
         "translate": "Перекласти",
         "localized_translation_label": "Багатомовна назва",
@@ -256,9 +260,11 @@
     },
     "success": {
         "edited_osm": "Відредаговано OSM!",
+        "just_edited": "Ви щойно відредагували мапу OpenStreetMap!",
+        "view_on_osm": "Подивтись в OSM",
         "facebook": "Поділитись на Facebook",
         "tweet": "у Твітер",
-        "okay": "Готово"
+        "help_html": "Ваші зміни повинні з’явитись в «Стандартному» шарі через кілька хвилин. Зміни інших шарів, та певниї об’єктів,\nможуть відбуватись довше (<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>подробиці</a>).\n"
     },
     "confirm": {
         "okay": "Готово"
@@ -1417,9 +1423,6 @@
             "power": {
                 "name": "Енергетика"
             },
-            "power/generator": {
-                "name": "Електростанція"
-            },
             "power/line": {
                 "name": "Лінія електропередач"
             },
diff --git a/vendor/assets/iD/iD/locales/vi.json b/vendor/assets/iD/iD/locales/vi.json
index 556ba2501..795471098 100644
--- a/vendor/assets/iD/iD/locales/vi.json
+++ b/vendor/assets/iD/iD/locales/vi.json
@@ -29,31 +29,31 @@
     "operations": {
         "add": {
             "annotation": {
-                "point": "Đã thêm địa điểm.",
-                "vertex": "Đã thêm nốt vào lối.",
-                "relation": "Đã thêm quan hệ."
+                "point": "thêm địa điểm",
+                "vertex": "thêm nốt vào lối",
+                "relation": "thêm quan hệ"
             }
         },
         "start": {
             "annotation": {
-                "line": "Đã bắt đầu vẽ đường kẻ.",
-                "area": "Đã bắt đầu vẽ vùng."
+                "line": "bắt đầu vẽ đường kẻ",
+                "area": "bắt đầu vẽ vùng"
             }
         },
         "continue": {
             "annotation": {
-                "line": "Đã vẽ tiếp đường kẻ.",
-                "area": "Đã vẽ tiếp vùng."
+                "line": "vẽ tiếp đường kẻ",
+                "area": "vẽ tiếp vùng"
             }
         },
         "cancel_draw": {
-            "annotation": "Đã hủy vẽ đối tượng."
+            "annotation": "hủy vẽ đối tượng"
         },
         "change_role": {
-            "annotation": "Đã thay đổi vai trò của thành viên quan hệ."
+            "annotation": "thay đổi vai trò của thành viên quan hệ"
         },
         "change_tags": {
-            "annotation": "Đã thay đổi thẻ."
+            "annotation": "thay đổi thẻ"
         },
         "circularize": {
             "title": "Làm Tròn",
@@ -63,8 +63,8 @@
             },
             "key": "O",
             "annotation": {
-                "line": "Đã làm tròn một đường kẻ.",
-                "area": "Đã làm tròn một vùng."
+                "line": "làm tròn một đường kẻ",
+                "area": "làm tròn một vùng"
             },
             "not_closed": "Không thể làm tròn một đối tượng không phải là đa giác kín."
         },
@@ -73,8 +73,8 @@
             "description": "Làm vuông góc một đối tượng.",
             "key": "Q",
             "annotation": {
-                "line": "Đã làm vuông góc một đường kẻ.",
-                "area": "Đã làm vuông góc một vùng."
+                "line": "làm vuông góc một đường kẻ",
+                "area": "làm vuông góc một vùng"
             },
             "not_closed": "Không thể làm vuông góc một đối tượng không phải là đa giác kín."
         },
@@ -82,41 +82,41 @@
             "title": "Xóa",
             "description": "Xóa đối tượng này khỏi bản đồ.",
             "annotation": {
-                "point": "Đã xóa địa điểm.",
-                "vertex": "Đã xóa nốt khỏi lối.",
-                "line": "Đã xóa đường kẻ.",
-                "area": "Đã xóa vùng.",
-                "relation": "Đã xóa quan hệ.",
-                "multiple": "Đã xóa {n} đối tượng."
+                "point": "xóa địa điểm",
+                "vertex": "xóa nốt khỏi lối",
+                "line": "xóa đường kẻ",
+                "area": "xóa vùng",
+                "relation": "xóa quan hệ",
+                "multiple": "xóa {n} đối tượng"
             },
             "incomplete_relation": "Không thể xóa đối tượng chưa được tải về hoàn toàn."
         },
         "add_member": {
-            "annotation": "Đã thêm thành viên vào quan hệ."
+            "annotation": "thêm thành viên vào quan hệ"
         },
         "delete_member": {
-            "annotation": "Đã gỡ thành viên khỏi quan hệ."
+            "annotation": "gỡ thành viên khỏi quan hệ"
         },
         "connect": {
             "annotation": {
-                "point": "Đã nối liền lối với địa điểm.",
-                "vertex": "Đã nối liền đường kẻ với đường khác.",
-                "line": "Đã nối liền lối với đường kẻ.",
-                "area": "Đã nối liền đường kẻ với vùng."
+                "point": "nối liền lối với địa điểm",
+                "vertex": "nối liền đường kẻ với đường khác",
+                "line": "nối liền lối với đường kẻ",
+                "area": "nối liền đường kẻ với vùng"
             }
         },
         "disconnect": {
             "title": "Tháo gỡ",
             "description": "Gỡ các lối này khỏi nhau.",
             "key": "T",
-            "annotation": "Đã tháo gỡ đường kẻ và vùng.",
+            "annotation": "tháo gỡ đường kẻ và vùng",
             "not_connected": "Không có đủ đường kẻ hoặc vùng ở đây để tháo gỡ."
         },
         "merge": {
             "title": "Gộp",
             "description": "Gộp các đường kẻ này.",
             "key": "G",
-            "annotation": "Đã gộp {n} đường kẻ.",
+            "annotation": "gộp {n} đường kẻ",
             "not_eligible": "Không thể gộp các đối tượng này.",
             "not_adjacent": "Không thể gộp các đường kẻ không nối liền với nhau.",
             "restriction": "Không thể gộp các đường kẻ này vì ít nhất một trong những đường kẻ trực thuộc quan hệ “{relation}”."
@@ -126,11 +126,11 @@
             "description": "Di chuyển đối tượng này sang chỗ khác.",
             "key": "D",
             "annotation": {
-                "point": "Đã di chuyển địa điểm.",
-                "vertex": "Đã di chuyển nốt trong lối.",
-                "line": "Đã di chuyển đường kẻ.",
-                "area": "Đã di chuyển vùng.",
-                "multiple": "Đã di chuyển hơn một đối tượng."
+                "point": "di chuyển địa điểm",
+                "vertex": "di chuyển nốt trong lối",
+                "line": "di chuyển đường kẻ",
+                "area": "di chuyển vùng",
+                "multiple": "di chuyển hơn một đối tượng"
             },
             "incomplete_relation": "Không thể di chuyển đối tượng chưa được tải về hoàn toàn."
         },
@@ -139,15 +139,15 @@
             "description": "Xoay đối tượng này quanh trung tâm.",
             "key": "X",
             "annotation": {
-                "line": "Đã xoay đường kẻ.",
-                "area": "Đã xoay vùng."
+                "line": "xoay đường kẻ",
+                "area": "xoay vùng"
             }
         },
         "reverse": {
             "title": "Đảo ngược",
             "description": "Đảo nguợc chiều đường kẻ này.",
             "key": "V",
-            "annotation": "Đã đảo ngược đường kẻ."
+            "annotation": "đảo ngược đường kẻ"
         },
         "split": {
             "title": "Chia cắt",
@@ -158,20 +158,24 @@
             },
             "key": "C",
             "annotation": {
-                "line": "Đã cắt đôi một đường kẻ.",
-                "area": "Đã cắt đôi một đường biên của vùng.",
-                "multiple": "Đã cắt đôi {n} đường kẻ và đường biên."
+                "line": "cắt đôi một đường kẻ",
+                "area": "cắt đôi một đường biên của vùng",
+                "multiple": "cắt đôi {n} đường kẻ và đường biên"
             },
             "not_eligible": "Không thể cắt đôi đường kẻ vào đầu hoặc cuối đường.",
             "multiple_ways": "Có quá nhiều đường kẻ tại đây để cắt đôi."
         }
     },
-    "nothing_to_undo": "Không có gì để hoàn tác.",
-    "nothing_to_redo": "Không có gì để làm lại.",
+    "undo": {
+        "tooltip": "Hoàn tác việc {action}.",
+        "nothing": "Không có gì để hoàn tác."
+    },
+    "redo": {
+        "tooltip": "Làm lại việc {action}.",
+        "nothing": "Không có gì để làm lại."
+    },
     "tooltip_keyhint": "Phím tắt:",
-    "just_edited": "Bạn vừa sửa đổi OpenStreetMap!",
     "browser_notice": "Chường trình vẽ bản đồ này chạy tốt trong Firefox, Chrome, Safari, Opera, và Internet Explorer 9 trở lên. Xin vui lòng nâng cấp trình duyệt của bạn hoặc dùng Potlach 2 để biên tập bản đồ.",
-    "view_on_osm": "Xem tại OSM",
     "translate": {
         "translate": "Biên dịch",
         "localized_translation_label": "Tên đa ngôn ngữ",
@@ -256,9 +260,11 @@
     },
     "success": {
         "edited_osm": "Bạn đã sửa đổi OSM!",
+        "just_edited": "Bạn vừa sửa đổi OpenStreetMap!",
+        "view_on_osm": "Xem tại OSM",
         "facebook": "Chia sẻ trên Facebook",
         "tweet": "Tweet",
-        "okay": "OK"
+        "help_html": "Các thay đổi của bạn sẽ xuất hiện trên lớp “Chuẩn” trong vòng vài phút. Các lớp và tính năng kia có thể được cập nhật chậm hơn \n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>chi tiết</a>).\n"
     },
     "confirm": {
         "okay": "OK"
@@ -514,9 +520,21 @@
             "fee": {
                 "label": "Phí"
             },
+            "fire_hydrant/type": {
+                "label": "Kiểu"
+            },
             "fixme": {
                 "label": "Cần Sửa chữa"
             },
+            "generator/method": {
+                "label": "Phương pháp"
+            },
+            "generator/source": {
+                "label": "Nguồn"
+            },
+            "generator/type": {
+                "label": "Kiểu"
+            },
             "highway": {
                 "label": "Kiểu"
             },
@@ -1055,6 +1073,10 @@
                 "name": "Trạm Xe cứu thương",
                 "terms": "trạm xe cứu thương,trạm xe cấp cứu,tram xe cuu thuong,tram xe cap cuu"
             },
+            "emergency/fire_hydrant": {
+                "name": "Trụ Cứu hỏa",
+                "terms": "trụ cứu hỏa,trụ cứu hoả,trụ chữa cháy,cột cứu hỏa,cột cứu hoả,cột chữa cháy,tru cuu hoa,tru chua chay,cot cuu hoa,cot chua chay"
+            },
             "emergency/phone": {
                 "name": "Điện thoại Khẩn cấp",
                 "terms": "điện thoại khẩn cấp,dien thoai khan cap"
@@ -1371,6 +1393,10 @@
                 "name": "Hồ Bơi",
                 "terms": "hồ bơi,hồ tắm,ho boi,ho tam"
             },
+            "leisure/track": {
+                "name": "Đường Đua",
+                "terms": "đường đua,trường đua,đường chạy điền kinh,đua ngựa,đua xe đạp,duong dua,truong dua,duong chay dien kinh,dua ngua,dua xe dap"
+            },
             "line": {
                 "name": "Đường kẻ",
                 "terms": "đường kẻ,đường,lối,duong ke,duong,loi"
@@ -1540,8 +1566,8 @@
                 "terms": "điện năng,dien nang"
             },
             "power/generator": {
-                "name": "Nhà máy Điện",
-                "terms": "nhà máy điện,nha may dien"
+                "name": "Máy phát điện",
+                "terms": "máy phát điện,động cơ,tua bin,tuabin,may phat dien,dong co"
             },
             "power/line": {
                 "name": "Đường Dây điện",
diff --git a/vendor/assets/iD/iD/locales/zh-TW.json b/vendor/assets/iD/iD/locales/zh-TW.json
index a4c3c79cc..9f768b9db 100644
--- a/vendor/assets/iD/iD/locales/zh-TW.json
+++ b/vendor/assets/iD/iD/locales/zh-TW.json
@@ -165,12 +165,14 @@
             "multiple_ways": "太多線段，未能進行分割。"
         }
     },
-    "nothing_to_undo": "沒有動作可以撤銷。",
-    "nothing_to_redo": "沒有動作可以重做。",
+    "undo": {
+        "nothing": "沒有動作可以撤銷。"
+    },
+    "redo": {
+        "nothing": "沒有動作可以重做。"
+    },
     "tooltip_keyhint": "快速鍵",
-    "just_edited": "您剛剛編輯了OpenStreetMap！",
     "browser_notice": "這編輯器支援Firefox、Chrome、Safari、Opera及Internet Explorer 9或以上。請先把你的瀏覽器升級或使用Potlatch 2來編輯地圖。",
-    "view_on_osm": "於OSM上顯示",
     "translate": {
         "translate": "翻譯",
         "localized_translation_label": "多語言名稱",
@@ -248,9 +250,10 @@
     },
     "success": {
         "edited_osm": "已編輯了OSM！",
+        "just_edited": "您剛剛編輯了OpenStreetMap！",
+        "view_on_osm": "於OSM上顯示",
         "facebook": "在 Facebook 上分享",
-        "tweet": "發Tweet",
-        "okay": "確定"
+        "tweet": "發Tweet"
     },
     "confirm": {
         "okay": "確定"
@@ -1294,9 +1297,6 @@
             "power": {
                 "name": "電力設施"
             },
-            "power/generator": {
-                "name": "發電廠"
-            },
             "power/line": {
                 "name": "電線"
             },
diff --git a/vendor/assets/iD/iD/locales/zh.json b/vendor/assets/iD/iD/locales/zh.json
index 9a390caa6..d77e927e2 100644
--- a/vendor/assets/iD/iD/locales/zh.json
+++ b/vendor/assets/iD/iD/locales/zh.json
@@ -164,12 +164,14 @@
             "multiple_ways": "这里有太多的线条待分割。"
         }
     },
-    "nothing_to_undo": "没有可撤消的。",
-    "nothing_to_redo": "没有可重做的。",
+    "undo": {
+        "nothing": "没有可撤消的。"
+    },
+    "redo": {
+        "nothing": "没有可重做的。"
+    },
     "tooltip_keyhint": "快捷方式",
-    "just_edited": "你正在编辑的OpenStreetMap！",
     "browser_notice": "该编辑器支持Firefox、Chrome、Safari、Opera和Internet Explorer9及以上的浏览器。请升级您的浏览器或者使用Potlatch 2来编辑地图。",
-    "view_on_osm": "在OSM上查看",
     "translate": {
         "translate": "翻译",
         "localized_translation_label": "多种语言名称",
@@ -247,9 +249,10 @@
     },
     "success": {
         "edited_osm": "编辑OSM！",
+        "just_edited": "你正在编辑的OpenStreetMap！",
+        "view_on_osm": "在OSM上查看",
         "facebook": "在Facebook上分享",
-        "tweet": "Tweet",
-        "okay": "确定"
+        "tweet": "Tweet"
     },
     "confirm": {
         "okay": "确定"
@@ -1268,9 +1271,6 @@
             "power": {
                 "name": "电力设施"
             },
-            "power/generator": {
-                "name": "发电厂"
-            },
             "power/line": {
                 "name": "电路线"
             },