X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bb9f20710e851eb4943bfb8e63386680e359834a..e5c4822d2cbae7ebd6efa9c10c2f09a63750aa61:/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 4d1bada0f..3d9c46bc7 100644
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -137,14 +137,14 @@
         },
         "merge": {
             "title": "Merge",
-            "description": "Merge these lines.",
+            "description": "Merge these features.",
             "key": "C",
-            "annotation": "Merged {n} lines.",
+            "annotation": "Merged {n} features.",
             "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.",
+            "not_adjacent": "These features can't be merged because they aren't connected.",
+            "restriction": "These features 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.",
-            "conflicting_tags": "These lines can't be merged because some of their tags have conflicting values."
+            "conflicting_tags": "These features can't be merged because some of their tags have conflicting values."
         },
         "move": {
             "title": "Move",
@@ -217,7 +217,7 @@
         "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.",
+    "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 11 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
     "translate": {
         "translate": "Translate",
         "localized_translation_label": "Multilingual name",
@@ -954,6 +954,9 @@
                 "label": "Handicap",
                 "placeholder": "1-18"
             },
+            "handrail": {
+                "label": "Handrail"
+            },
             "highway": {
                 "label": "Type"
             },
@@ -1068,6 +1071,9 @@
                 "label": "Speed Limit",
                 "placeholder": "40, 50, 60..."
             },
+            "maxstay": {
+                "label": "Max Stay"
+            },
             "mtb/scale": {
                 "label": "Mountain Biking Difficulty",
                 "placeholder": "0, 1, 2, 3...",
@@ -1864,9 +1870,45 @@
                 "name": "University Grounds",
                 "terms": "college"
             },
-            "amenity/vending_machine": {
+            "amenity/vending_machine/cigarettes": {
+                "name": "Cigarette Vending Machine",
+                "terms": "cigarette"
+            },
+            "amenity/vending_machine/condoms": {
+                "name": "Condom Vending Machine",
+                "terms": "condom"
+            },
+            "amenity/vending_machine/drinks": {
+                "name": "Drink Vending Machine",
+                "terms": "drink,soda,beverage,juice,pop"
+            },
+            "amenity/vending_machine/excrement_bags": {
+                "name": "Excrement Bag Vending Machine",
+                "terms": "excrement bags,poop,dog,animal"
+            },
+            "amenity/vending_machine/news_papers": {
+                "name": "Newspaper Vending Machine",
+                "terms": "newspaper"
+            },
+            "amenity/vending_machine/parcel_pickup_dropoff": {
+                "name": "Parcel Pickup/Dropoff Vending Machine",
+                "terms": "parcel,mail,pickup"
+            },
+            "amenity/vending_machine/parking_tickets": {
+                "name": "Parking Ticket Vending Machine",
+                "terms": "parking,ticket"
+            },
+            "amenity/vending_machine/public_transport_tickets": {
+                "name": "Transit Ticket Vending Machine",
+                "terms": "bus,train,ferry,rail,ticket,transportation"
+            },
+            "amenity/vending_machine/sweets": {
+                "name": "Snack Vending Machine",
+                "terms": "candy,gum,chip,pretzel,cookie,cracker"
+            },
+            "amenity/vending_machine/vending_machine": {
                 "name": "Vending Machine",
-                "terms": "snack,soda,ticket"
+                "terms": ""
             },
             "amenity/veterinary": {
                 "name": "Veterinary",
@@ -1977,15 +2019,15 @@
                 "terms": ""
             },
             "building/cathedral": {
-                "name": "Cathedral",
+                "name": "Cathedral Building",
                 "terms": ""
             },
             "building/chapel": {
-                "name": "Chapel",
+                "name": "Chapel Building",
                 "terms": ""
             },
             "building/church": {
-                "name": "Church",
+                "name": "Church Building",
                 "terms": ""
             },
             "building/college": {