Update to iD v1.8.2

[rails.git] / vendor / assets / iD / iD / locales / en-GB.json

diff --git a/vendor/assets/iD/iD/locales/en-GB.json b/vendor/assets/iD/iD/locales/en-GB.json
index 97588476430476c627411e4ac472934e1a0ff044..1cfb43c154bebee7a35863661d863ff9e6aee8ac 100644 (file)
--- a/vendor/assets/iD/iD/locales/en-GB.json
+++ b/vendor/assets/iD/iD/locales/en-GB.json
@@ -131,12 +131,8 @@
         },
         "merge": {
             "title": "Merge",
-            "description": "Merge these lines.",
             "key": "C",
-            "annotation": "Merged {n} lines.",
             "not_eligible": "These features can't be merged.",
-            "not_adjacent": "These lines can't be merged because they aren't connected.",
-            "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation.",
             "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded."
         },
         "move": {
@@ -207,7 +203,6 @@
         "nothing": "Nothing to redo."
     },
     "tooltip_keyhint": "Shortcut:",
-    "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.",
     "translate": {
         "translate": "Translate"
     },
@@ -272,14 +267,11 @@
             "building/terrace": {
                 "name": "Terraced houses"
             },
-            "footway/crosswalk": {
-                "name": "Pedestrian Crossing"
-            },
             "highway/bridleway": {
                 "name": "Bridleway"
             },
-            "highway/crosswalk": {
-                "name": "Zebra Crossing"
+            "landuse/allotments": {
+                "name": "Allotments"
             },
             "leisure/pitch/baseball": {
                 "name": "Baseball"