X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2d7a678772b50c04042b03ed58c94b8c4d3e9d15..6e981a9fcbea4db27a1428a88c012e64f9e8e4b6:/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 b9d4e6a23..d263ffd20 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.",
@@ -253,7 +253,9 @@
         "deleted": "Deleted",
         "created": "Created",
         "about_changeset_comments": "About changeset comments",
-        "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments"
+        "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
+        "google_warning": "You mentioned Google in this comment: remember that copying from Google Maps is strictly forbidden.",
+        "google_warning_link": "http://www.openstreetmap.org/copyright"
     },
     "contributors": {
         "list": "Edits by {users}",
@@ -285,7 +287,8 @@
         "no_results_worldwide": "No results found"
     },
     "geolocate": {
-        "title": "Show My Location"
+        "title": "Show My Location",
+        "locating": "Locating, please wait..."
     },
     "inspector": {
         "no_documentation_combination": "There is no documentation available for this tag combination",
@@ -313,6 +316,7 @@
             "yes": "Yes",
             "no": "No"
         },
+        "add": "Add",
         "none": "None",
         "node": "Node",
         "way": "Way",
@@ -326,12 +330,14 @@
         "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.",
-        "fix_misalignment": "Fix alignment",
+        "fix_misalignment": "Adjust imagery offset",
         "imagery_source_faq": "Where does this imagery come from?",
         "reset": "reset",
+        "offset": "Drag anywhere in the gray area below to adjust the imagery offset, or enter the offset values in meters.",
         "minimap": {
             "description": "Minimap",
             "tooltip": "Show a zoomed out map to help locate the area currently displayed."
@@ -350,12 +356,12 @@
             "description": "Points",
             "tooltip": "Points of Interest"
         },
-        "major_roads": {
-            "description": "Major Roads",
+        "traffic_roads": {
+            "description": "Traffic Roads",
             "tooltip": "Highways, Streets, etc."
         },
-        "minor_roads": {
-            "description": "Minor Roads",
+        "service_roads": {
+            "description": "Service Roads",
             "tooltip": "Service Roads, Parking Aisles, Tracks, etc."
         },
         "paths": {
@@ -607,6 +613,9 @@
     },
     "presets": {
         "categories": {
+            "category-barrier": {
+                "name": "Barrier Features"
+            },
             "category-building": {
                 "name": "Building Features"
             },
@@ -776,6 +785,9 @@
             "bicycle_parking": {
                 "label": "Type"
             },
+            "bin": {
+                "label": "Waste Bin"
+            },
             "boundary": {
                 "label": "Type"
             },
@@ -847,6 +859,9 @@
             "cuisine": {
                 "label": "Cuisine"
             },
+            "currency_multi": {
+                "label": "Currency Types"
+            },
             "cycleway": {
                 "label": "Bike Lanes",
                 "placeholder": "none",
@@ -950,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"
@@ -1219,6 +1210,9 @@
                     "lane": "Roadside Lane"
                 }
             },
+            "payment_multi": {
+                "label": "Payment Types"
+            },
             "phone": {
                 "label": "Phone",
                 "placeholder": "+31 42 123 4567"
@@ -1276,30 +1270,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"
@@ -1436,7 +1408,7 @@
                     "ford": "Ford"
                 }
             },
-            "studio_type": {
+            "studio": {
                 "label": "Type"
             },
             "substation": {
@@ -1853,6 +1825,10 @@
                 "name": "Post Office",
                 "terms": "letter,mail"
             },
+            "amenity/prison": {
+                "name": "Prison Grounds",
+                "terms": "cell,jail"
+            },
             "amenity/pub": {
                 "name": "Pub",
                 "terms": "dive,beer,bier,booze"
@@ -2026,7 +2002,7 @@
                 "terms": ""
             },
             "barrier/ditch": {
-                "name": "Ditch",
+                "name": "Trench",
                 "terms": ""
             },
             "barrier/entrance": {
@@ -2634,7 +2610,7 @@
                 "terms": "cul-de-sac"
             },
             "highway/unclassified": {
-                "name": "Minor Road",
+                "name": "Minor/Unclassified Road",
                 "terms": ""
             },
             "historic": {
@@ -2777,6 +2753,10 @@
                 "name": "Adult Gaming Center",
                 "terms": "gambling,slot machine"
             },
+            "leisure/bird_hide": {
+                "name": "Bird Hide",
+                "terms": "machan,ornithology"
+            },
             "leisure/bowling_alley": {
                 "name": "Bowling Alley",
                 "terms": ""
@@ -2955,7 +2935,7 @@
             },
             "man_made/pier": {
                 "name": "Pier",
-                "terms": ""
+                "terms": "dock"
             },
             "man_made/pipeline": {
                 "name": "Pipeline",
@@ -3485,6 +3465,10 @@
                 "name": "Clothing Store",
                 "terms": ""
             },
+            "shop/coffee": {
+                "name": "Coffee Store",
+                "terms": ""
+            },
             "shop/computer": {
                 "name": "Computer Store",
                 "terms": ""
@@ -3681,6 +3665,10 @@
                 "name": "Newspaper/Magazine Shop",
                 "terms": ""
             },
+            "shop/nutrition_supplements": {
+                "name": "Nutrition Supplements Store",
+                "terms": ""
+            },
             "shop/optician": {
                 "name": "Optician",
                 "terms": "eye,glasses"
@@ -3981,6 +3969,10 @@
                 "name": "Hiking Route",
                 "terms": ""
             },
+            "type/route/horse": {
+                "name": "Riding Route",
+                "terms": ""
+            },
             "type/route/pipeline": {
                 "name": "Pipeline Route",
                 "terms": ""
@@ -4034,8 +4026,8 @@
                 "terms": ""
             },
             "waterway/dock": {
-                "name": "Dock",
-                "terms": ""
+                "name": "Wet Dock / Dry Dock",
+                "terms": "boat,ship,vessel,marine"
             },
             "waterway/drain": {
                 "name": "Drain",