Merge branch 'master' into next

[rails.git] / vendor / assets / iD / iD / locales / en-GB.json

diff --git a/vendor/assets/iD/iD/locales/en-GB.json b/vendor/assets/iD/iD/locales/en-GB.json
index 551428de600703f346fa24aee4fc5cb305be67a6..838106b9fd234d7b5fb8543f5d5744f94af868db 100644 (file)
--- a/vendor/assets/iD/iD/locales/en-GB.json
+++ b/vendor/assets/iD/iD/locales/en-GB.json
@@ -170,7 +170,6 @@
                 "annotation": "Merged {n} features.",
                 "not_eligible": "These features can't be merged.",
                 "not_adjacent": "These features can't be merged because their endpoints aren't connected.",
-                "restriction": "These features 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.",
                 "conflicting_tags": "These features can't be merged because some of their tags have conflicting values."
             },
@@ -2177,7 +2176,6 @@
                     "placeholder": "1, 2, 3..."
                 },
                 "phone": {
-                    "label": "Telephone",
                     "placeholder": "+44 1632 961234"
                 },
                 "piste/difficulty": {