X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/04a6c41be94cea2175e49aa290bf204e69c41a5c..9fde18af5b15a2e3a50ee5a4a3d6702717df0c30:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2b2694a11..beccc22fa 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -79,6 +79,17 @@ en:
     with_id: "{{id}}"
     with_version: "{{id}}, v{{version}}"
     with_name: "{{name}} ({{id}})"
+  editor:
+    default: "Default (currently {{name}})"
+    potlatch:
+      name: "Potlatch 1"
+      description: "Potlatch 1 (in-browser editor)"
+    potlatch2:
+      name: "Potlatch 2"
+      description: "Potlatch 2 (in-browser editor)"
+    josm:
+      name: "JOSM"
+      description: "JOSM (via remote-control plugin)"
   browse:
     changeset:
       title: "Changeset"
@@ -1227,6 +1238,7 @@ en:
         license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
         project_name: "OpenStreetMap project"
         project_url: "http://openstreetmap.org"
+      josm_failed: "Editing failed - make sure JOSM is loaded and the remote control plugin is enabled"
     edit:
       not_public: "You have not set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
@@ -1659,10 +1671,6 @@ en:
       return to profile: Return to profile
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
-      editor:
-        potlatch: "Potlatch 1 (in-browser editor)"
-        potlatch2: "Potlatch 2 (in-browser editor)"
-        josm: "JOSM (via remote-control plugin)"
     confirm:
       heading: Confirm a user account
       press confirm button: "Press the confirm button below to activate your account."