Split the help and wiki into two links - help centre and documentation

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 36ba2db7231daafda575dd0617538612241e299a..95bd2b63f91709008b8aad6ee7966565bc663d79 100644 (file)
--- 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}}."
@@ -1592,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:"