Update to iD v1.8.0

[rails.git] / 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 7fdbb96b037d1e10cda06f64958057f49c1e5fc5..4d1bada0f841be1c47d71cb3ee132a06e997f2eb 100644 (file)
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -143,7 +143,8 @@
             "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."
+            "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."
         },
         "move": {
             "title": "Move",
@@ -226,7 +227,8 @@
     "zoom_in_edit": "Zoom in to Edit",
     "logout": "logout",
     "loading_auth": "Connecting to OpenStreetMap...",
-    "report_a_bug": "report a bug",
+    "report_a_bug": "Report a bug",
+    "help_translate": "Help translate",
     "feature_info": {
         "hidden_warning": "{count} hidden features",
         "hidden_details": "These features are currently hidden: {details}"
@@ -1423,6 +1425,9 @@
                     "grade5": "Soft: soil/sand/grass"
                 }
             },
+            "traffic_signals": {
+                "label": "Type"
+            },
             "trail_visibility": {
                 "label": "Trail Visibility",
                 "placeholder": "Excellent, Good, Bad...",
@@ -1723,6 +1728,10 @@
                 "name": "Marketplace",
                 "terms": ""
             },
+            "amenity/motorcycle_parking": {
+                "name": "Motorcycle Parking",
+                "terms": ""
+            },
             "amenity/nightclub": {
                 "name": "Nightclub",
                 "terms": "disco*,night club,dancing,dance club"
@@ -1992,8 +2001,8 @@
                 "terms": ""
             },
             "building/detached": {
-                "name": "Detached Home",
-                "terms": ""
+                "name": "Detached House",
+                "terms": "home,single,family,residence,dwelling"
             },
             "building/dormitory": {
                 "name": "Dormitory",
@@ -2025,7 +2034,7 @@
             },
             "building/house": {
                 "name": "House",
-                "terms": ""
+                "terms": "home,family,residence,dwelling"
             },
             "building/hut": {
                 "name": "Hut",
@@ -2059,6 +2068,10 @@
                 "name": "School Building",
                 "terms": "academy,elementary school,middle school,high school"
             },
+            "building/semidetached_house": {
+                "name": "Semi-Detached House",
+                "terms": "home,double,duplex,twin,family,residence,dwelling"
+            },
             "building/shed": {
                 "name": "Shed",
                 "terms": ""
@@ -2073,7 +2086,7 @@
             },
             "building/terrace": {
                 "name": "Row Houses",
-                "terms": ""
+                "terms": "home,terrace,brownstone,family,residence,dwelling"
             },
             "building/train_station": {
                 "name": "Train Station",
@@ -2552,8 +2565,8 @@
                 "terms": ""
             },
             "landuse/allotments": {
-                "name": "Allotments",
-                "terms": ""
+                "name": "Community Garden",
+                "terms": "allotment,garden"
             },
             "landuse/basin": {
                 "name": "Basin",
@@ -2707,6 +2720,14 @@
                 "name": "Basketball Court",
                 "terms": ""
             },
+            "leisure/pitch/rugby_league": {
+                "name": "Rugby League Field",
+                "terms": ""
+            },
+            "leisure/pitch/rugby_union": {
+                "name": "Rugby Union Field",
+                "terms": ""
+            },
             "leisure/pitch/skateboard": {
                 "name": "Skate Park",
                 "terms": ""
@@ -2847,10 +2868,30 @@
                 "name": "Bunker",
                 "terms": ""
             },
+            "military/checkpoint": {
+                "name": "Checkpoint",
+                "terms": ""
+            },
+            "military/danger_area": {
+                "name": "Danger Area",
+                "terms": ""
+            },
+            "military/naval_base": {
+                "name": "Naval Base",
+                "terms": ""
+            },
+            "military/obstacle_course": {
+                "name": "Obstacle Course",
+                "terms": ""
+            },
             "military/range": {
                 "name": "Military Range",
                 "terms": ""
             },
+            "military/training_area": {
+                "name": "Training area",
+                "terms": ""
+            },
             "natural": {
                 "name": "Natural",
                 "terms": ""