Merge pull request #1151 from polarbearing/patch-1

[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 a6fa4d7345e627eef25a468db3ca3ed7e3f9bdeb..e1786907e4a0f275ad0adb22d22ad2bbaf51d89e 100644 (file)
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -506,6 +506,7 @@
             "all_members": "All members",
             "all_relations": "All relations",
             "new_relation": "New relation...",
+            "choose_relation": "Choose a parent relation",
             "role": "Role",
             "choose": "Select feature type",
             "results": "{n} results for {search}",
@@ -1653,6 +1654,9 @@
                 "barrier": {
                     "label": "Type"
                 },
+                "basin": {
+                    "label": "Type"
+                },
                 "bath/open_air": {
                     "label": "Open Air"
                 },
@@ -2172,6 +2176,9 @@
                 "inscription": {
                     "label": "Inscription"
                 },
+                "intermittent_yes": {
+                    "label": "Intermittent"
+                },
                 "intermittent": {
                     "label": "Intermittent"
                 },
@@ -4206,7 +4213,7 @@
                     "terms": ""
                 },
                 "building/apartments": {
-                    "name": "Apartments",
+                    "name": "Apartment Building",
                     "terms": ""
                 },
                 "building/barn": {
@@ -5241,6 +5248,10 @@
                     "name": "Residential Area",
                     "terms": ""
                 },
+                "landuse/residential/apartments": {
+                    "name": "Apartment Complex",
+                    "terms": "flat,residence,tenement"
+                },
                 "landuse/retail": {
                     "name": "Retail Area",
                     "terms": ""