X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f20766401b6375161691e3681eecbdaa8ec81f66..d83954a8d10cbfc50a2d4f47e8ceb8f33801feb8:/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 394af054c..b14feda02 100644
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -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}",
@@ -330,9 +332,10 @@
         "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."
@@ -1437,7 +1440,7 @@
                     "ford": "Ford"
                 }
             },
-            "studio_type": {
+            "studio": {
                 "label": "Type"
             },
             "substation": {
@@ -1854,6 +1857,10 @@
                 "name": "Post Office",
                 "terms": "letter,mail"
             },
+            "amenity/prison": {
+                "name": "Prison Grounds",
+                "terms": "cell,jail"
+            },
             "amenity/pub": {
                 "name": "Pub",
                 "terms": "dive,beer,bier,booze"
@@ -3490,6 +3497,10 @@
                 "name": "Clothing Store",
                 "terms": ""
             },
+            "shop/coffee": {
+                "name": "Coffee Store",
+                "terms": ""
+            },
             "shop/computer": {
                 "name": "Computer Store",
                 "terms": ""
@@ -3686,6 +3697,10 @@
                 "name": "Newspaper/Magazine Shop",
                 "terms": ""
             },
+            "shop/nutrition_supplements": {
+                "name": "Nutrition Supplements Store",
+                "terms": ""
+            },
             "shop/optician": {
                 "name": "Optician",
                 "terms": "eye,glasses"