X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c919340c1193730c29710468f8d528967914bc61..2fed3f0d6b1b2d5809ae87d1814af5e31e5e75d4:/vendor/assets/iD/iD/locales/en.json

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": {