X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9c2de4039c3053c35e76f596faa95557dc237c74..97261143d66a9d6f23227fb65a0e27de95259690:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index beccc22fa..95bd2b63f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -87,9 +87,9 @@ en:
     potlatch2:
       name: "Potlatch 2"
       description: "Potlatch 2 (in-browser editor)"
-    josm:
-      name: "JOSM"
-      description: "JOSM (via remote-control plugin)"
+    remote:
+      name: "Remote Control"
+      description: "Remote Control (JOSM or Merkaartor)"
   browse:
     changeset:
       title: "Changeset"
@@ -938,14 +938,21 @@ en:
     donate_link_text: donating
     help_and_wiki: "{{help}} & {{wiki}}"
     help: Help
+    help_centre: Help Centre
     help_url: http://help.openstreetmap.org/
     help_title: Help site for the project
     wiki: Wiki
     wiki_url: http://wiki.openstreetmap.org/
     wiki_title: Wiki site for the project
+    documentation: Documentation
+    documentation_title: Documentation for the project
     copyright: "Copyright & License"
     news_blog: "News blog"
     news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
+    community_blogs: "Community blogs"
+    community_blogs_title: "Blogs from members of the OpenStreetMap community"
+    foundation: Foundation
+    foundation_title: The OpenStreetMap Foundation
     shop: Shop
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
@@ -1238,7 +1245,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"
+      remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option 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}}."
@@ -1248,6 +1255,7 @@ en:
       anon_edits_link_text: "Find out why this is the case."
       flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
       potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
+      potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     sidebar:
       search_results: Search Results
@@ -1591,6 +1599,7 @@ en:
       add as friend: add as friend
       mapper since: "Mapper since:"
       ago: "({{time_in_words_ago}} ago)"
+      latest edit: "Latest edit {{ago}}:"
       email address: "Email address:"
       created from: "Created from:"
       status: "Status:"