Update to iD v2.18.4

[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 5f051d1dafd21908e538266ad7cff92f209614fa..d9306797e40b8ed4d5efa2d15b50467fe8c49c42 100644 (file)
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -231,7 +231,7 @@
                 },
                 "too_bendy": {
                     "single": "This can't be straightened because it bends too much.",
-                    "multiple": "These can't be straighted because they bend too much."
+                    "multiple": "These can't be straightened because they bend too much."
                 },
                 "connected_to_hidden": {
                     "single": "This can't be straightened because it is connected to a hidden feature.",
@@ -1096,7 +1096,7 @@
                 "delete": "Leave Deleted",
                 "download_changes": "Or download osmChange file",
                 "done": "All conflicts resolved!",
-                "help": "Another user changed some of the same map features you changed.\nClick on each feature below for more details about the conflict, and choose whether to keep\nyour changes or the other user's changes.\n"
+                "help": "Another user changed some of the same map features you changed. Click on each feature below for more details about the conflict, and choose whether to keep your changes or the other user's changes."
             }
         },
         "merge_remote_changes": {