Update to iD v1.3.7

[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 5a7bf2306d89b4c68b223849c9a79e2fa5460ab8..1b40481ad320d9c016eab66e977b1edb943cbd98 100644 (file)
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -134,7 +134,8 @@
             "annotation": "Merged {n} lines.",
             "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."
+            "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."
         },
         "move": {
             "title": "Move",
@@ -1290,10 +1291,46 @@
                 "name": "Apartments",
                 "terms": ""
             },
+            "building/barn": {
+                "name": "Barn",
+                "terms": ""
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": ""
+            },
+            "building/cabin": {
+                "name": "Cabin",
+                "terms": ""
+            },
+            "building/cathedral": {
+                "name": "Cathedral",
+                "terms": ""
+            },
+            "building/chapel": {
+                "name": "Chapel",
+                "terms": ""
+            },
+            "building/church": {
+                "name": "Church",
+                "terms": ""
+            },
             "building/commercial": {
                 "name": "Commercial Building",
                 "terms": ""
             },
+            "building/construction": {
+                "name": "Building Under Construction",
+                "terms": ""
+            },
+            "building/detached": {
+                "name": "Detached Home",
+                "terms": ""
+            },
+            "building/dormitory": {
+                "name": "Dormitory",
+                "terms": ""
+            },
             "building/entrance": {
                 "name": "Entrance",
                 "terms": ""
@@ -1302,6 +1339,22 @@
                 "name": "Garage",
                 "terms": ""
             },
+            "building/garages": {
+                "name": "Garages",
+                "terms": ""
+            },
+            "building/greenhouse": {
+                "name": "Greenhouse",
+                "terms": ""
+            },
+            "building/hospital": {
+                "name": "Hospital Building",
+                "terms": ""
+            },
+            "building/hotel": {
+                "name": "Hotel Building",
+                "terms": ""
+            },
             "building/house": {
                 "name": "House",
                 "terms": ""
@@ -1314,10 +1367,54 @@
                 "name": "Industrial Building",
                 "terms": ""
             },
+            "building/public": {
+                "name": "Public Building",
+                "terms": ""
+            },
             "building/residential": {
                 "name": "Residential Building",
                 "terms": ""
             },
+            "building/retail": {
+                "name": "Retail Building",
+                "terms": ""
+            },
+            "building/roof": {
+                "name": "Roof",
+                "terms": ""
+            },
+            "building/school": {
+                "name": "School Building",
+                "terms": ""
+            },
+            "building/shed": {
+                "name": "Shed",
+                "terms": ""
+            },
+            "building/stable": {
+                "name": "Stable",
+                "terms": ""
+            },
+            "building/static_caravan": {
+                "name": "Static Mobile Home",
+                "terms": ""
+            },
+            "building/terrace": {
+                "name": "Row Houses",
+                "terms": ""
+            },
+            "building/train_station": {
+                "name": "Train Station",
+                "terms": ""
+            },
+            "building/university": {
+                "name": "University Building",
+                "terms": ""
+            },
+            "building/warehouse": {
+                "name": "Warehouse",
+                "terms": ""
+            },
             "craft/basket_maker": {
                 "name": "Basket Maker",
                 "terms": "basket,basketry,basket maker,basket weaver"
@@ -2294,6 +2391,10 @@
                 "name": "Liquor Store",
                 "terms": "alcohol"
             },
+            "shop/art": {
+                "name": "Art Shop",
+                "terms": "art store,art gallery"
+            },
             "shop/bakery": {
                 "name": "Bakery",
                 "terms": ""
@@ -2310,6 +2411,10 @@
                 "name": "Bicycle Shop",
                 "terms": ""
             },
+            "shop/bookmaker": {
+                "name": "Bookmaker",
+                "terms": ""
+            },
             "shop/books": {
                 "name": "Bookstore",
                 "terms": ""
@@ -2430,6 +2535,10 @@
                 "name": "Locksmith",
                 "terms": "keys"
             },
+            "shop/lottery": {
+                "name": "Lottery Shop",
+                "terms": ""
+            },
             "shop/mall": {
                 "name": "Mall",
                 "terms": ""