X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d83954a8d10cbfc50a2d4f47e8ceb8f33801feb8..cdc4e3f8d1fd6071151327389c08db911de3bcf4:/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 b14feda02..0c776b4db 100644
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -241,7 +241,7 @@
     },
     "commit": {
         "title": "Save Changes",
-        "description_placeholder": "Brief description of your contributions",
+        "description_placeholder": "Brief description of your contributions (required)",
         "message_label": "Changeset comment",
         "upload_explanation": "The changes you upload will be visible on all maps that use OpenStreetMap data.",
         "upload_explanation_with_user": "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.",
@@ -316,6 +316,7 @@
             "yes": "Yes",
             "no": "No"
         },
+        "add": "Add",
         "none": "None",
         "node": "Node",
         "way": "Way",
@@ -329,6 +330,7 @@
         "percent_brightness": "{opacity}% brightness",
         "none": "None",
         "best_imagery": "Best known imagery source for this location",
+        "switch": "Switch back to this background",
         "custom": "Custom",
         "custom_button": "Edit custom background",
         "custom_prompt": "Enter a tile URL template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
@@ -510,7 +512,7 @@
         "title": "Photo Overlay (Mapillary)"
     },
     "mapillary_signs": {
-        "tooltip": "Traffic signs from Mapillary",
+        "tooltip": "Traffic signs from Mapillary (must enable Photo Overlay)",
         "title": "Traffic Sign Overlay (Mapillary)"
     },
     "mapillary": {
@@ -611,6 +613,9 @@
     },
     "presets": {
         "categories": {
+            "category-barrier": {
+                "name": "Barrier Features"
+            },
             "category-building": {
                 "name": "Building Features"
             },
@@ -780,6 +785,9 @@
             "bicycle_parking": {
                 "label": "Type"
             },
+            "bin": {
+                "label": "Waste Bin"
+            },
             "boundary": {
                 "label": "Type"
             },
@@ -851,6 +859,9 @@
             "cuisine": {
                 "label": "Cuisine"
             },
+            "currency_multi": {
+                "label": "Currency Types"
+            },
             "cycleway": {
                 "label": "Bike Lanes",
                 "placeholder": "none",
@@ -954,32 +965,8 @@
             "fuel": {
                 "label": "Fuel"
             },
-            "fuel/biodiesel": {
-                "label": "Sells Biodiesel"
-            },
-            "fuel/diesel": {
-                "label": "Sells Diesel"
-            },
-            "fuel/e10": {
-                "label": "Sells E10"
-            },
-            "fuel/e85": {
-                "label": "Sells E85"
-            },
-            "fuel/lpg": {
-                "label": "Sells Propane"
-            },
-            "fuel/octane_100": {
-                "label": "Sells Racing Gasoline"
-            },
-            "fuel/octane_91": {
-                "label": "Sells Regular Gasoline"
-            },
-            "fuel/octane_95": {
-                "label": "Sells Midgrade Gasoline"
-            },
-            "fuel/octane_98": {
-                "label": "Sells Premium Gasoline"
+            "fuel_multi": {
+                "label": "Fuel Types"
             },
             "gauge": {
                 "label": "Gauge"
@@ -1052,6 +1039,12 @@
                     "terminal": "Terminal"
                 }
             },
+            "internet_access/fee": {
+                "label": "Internet Access Fee"
+            },
+            "kerb": {
+                "label": "Curb Ramp"
+            },
             "lamp_type": {
                 "label": "Type"
             },
@@ -1208,6 +1201,13 @@
                 "label": "Par",
                 "placeholder": "3, 4, 5..."
             },
+            "parallel_direction": {
+                "label": "Direction",
+                "options": {
+                    "forward": "Forward",
+                    "backward": "Backward"
+                }
+            },
             "park_ride": {
                 "label": "Park and Ride"
             },
@@ -1223,6 +1223,9 @@
                     "lane": "Roadside Lane"
                 }
             },
+            "payment_multi": {
+                "label": "Payment Types"
+            },
             "phone": {
                 "label": "Phone",
                 "placeholder": "+31 42 123 4567"
@@ -1280,30 +1283,8 @@
             "railway": {
                 "label": "Type"
             },
-            "recycling/cans": {
-                "label": "Accepts Cans"
-            },
-            "recycling/clothes": {
-                "label": "Accepts Clothes"
-            },
-            "recycling/glass": {
-                "label": "Accepts Glass"
-            },
-            "recycling/glass_bottles": {
-                "label": "Accepts Glass Bottles"
-            },
-            "recycling/paper": {
-                "label": "Accepts Paper"
-            },
-            "recycling/plastic": {
-                "label": "Accepts Plastic"
-            },
-            "recycling/type": {
-                "label": "Recycling Type",
-                "options": {
-                    "container": "Container",
-                    "centre": "Recycling Center"
-                }
+            "recycling_accepts": {
+                "label": "Accepts"
             },
             "ref": {
                 "label": "Reference"
@@ -1320,6 +1301,9 @@
             "restrictions": {
                 "label": "Turn Restrictions"
             },
+            "rooms": {
+                "label": "Rooms"
+            },
             "route": {
                 "label": "Type"
             },
@@ -1384,9 +1368,6 @@
             "site": {
                 "label": "Type"
             },
-            "sloped_curb": {
-                "label": "Sloped Curb"
-            },
             "smoking": {
                 "label": "Smoking",
                 "placeholder": "No, Separated, Yes...",
@@ -1429,6 +1410,16 @@
             "sport_racing": {
                 "label": "Sport"
             },
+            "stars": {
+                "label": "Stars"
+            },
+            "stop": {
+                "label": "Stop Type",
+                "options": {
+                    "all": "All Ways",
+                    "minor": "Minor Road"
+                }
+            },
             "structure": {
                 "label": "Structure",
                 "placeholder": "Unknown",
@@ -1643,7 +1634,7 @@
             },
             "amenity/bbq": {
                 "name": "Barbecue/Grill",
-                "terms": "bbq"
+                "terms": "bbq,grill"
             },
             "amenity/bench": {
                 "name": "Bench",
@@ -1823,7 +1814,7 @@
             },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
-                "terms": "drug,medicine"
+                "terms": "drug*,med*,prescription"
             },
             "amenity/place_of_worship": {
                 "name": "Place of Worship",
@@ -2034,7 +2025,7 @@
                 "terms": ""
             },
             "barrier/ditch": {
-                "name": "Ditch",
+                "name": "Trench",
                 "terms": ""
             },
             "barrier/entrance": {
@@ -2421,6 +2412,10 @@
                 "name": "Ambulance Station",
                 "terms": "EMS,EMT,rescue"
             },
+            "emergency/defibrillator": {
+                "name": "Defibrillator",
+                "terms": ""
+            },
             "emergency/fire_hydrant": {
                 "name": "Fire Hydrant",
                 "terms": ""
@@ -2513,6 +2508,10 @@
                 "name": "Foot Path",
                 "terms": "hike,hiking,trackway,trail,walk"
             },
+            "highway/give_way": {
+                "name": "Yield Sign",
+                "terms": "give way,yield,sign"
+            },
             "highway/living_street": {
                 "name": "Living Street",
                 "terms": ""
@@ -2607,7 +2606,7 @@
             },
             "highway/stop": {
                 "name": "Stop Sign",
-                "terms": "stop sign"
+                "terms": "stop,halt,sign"
             },
             "highway/street_lamp": {
                 "name": "Street Lamp",
@@ -2925,6 +2924,10 @@
                 "name": "Breakwater",
                 "terms": ""
             },
+            "man_made/bridge": {
+                "name": "Bridge",
+                "terms": ""
+            },
             "man_made/chimney": {
                 "name": "Chimney",
                 "terms": ""
@@ -3486,8 +3489,8 @@
                 "terms": ""
             },
             "shop/chemist": {
-                "name": "Chemist",
-                "terms": ""
+                "name": "Drugstore",
+                "terms": "med*,drug*,gift"
             },
             "shop/chocolate": {
                 "name": "Chocolate Store",
@@ -4001,6 +4004,10 @@
                 "name": "Hiking Route",
                 "terms": ""
             },
+            "type/route/horse": {
+                "name": "Riding Route",
+                "terms": ""
+            },
             "type/route/pipeline": {
                 "name": "Pipeline Route",
                 "terms": ""