Rework the login page to explain better what to do if you're new

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index beccc22faa55228f7605a2b52667979f85588d23..5214a28d9de3a0e0b766b94045321442edc2f857 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)"
     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"
   browse:
     changeset:
       title: "Changeset"


@@ -936,19 +936,20 @@ en:
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating

-    help_and_wiki: "{{help}} & {{wiki}}"

     help: Help
     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
     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"
     copyright: "Copyright & License"

-    news_blog: "News blog"
-    news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
-    shop: Shop
-    shop_tooltip: Shop with branded OpenStreetMap merchandise
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
+    community_blogs: "Community Blogs"
+    community_blogs_title: "Blogs from members of the OpenStreetMap community"
+    foundation: Foundation
+    foundation_title: The OpenStreetMap Foundation

     license:
       alt: CC by-sa 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
     license:
       alt: CC by-sa 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License


@@ -1238,7 +1239,7 @@ en:
         license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
         project_name: "OpenStreetMap project"
         project_url: "http://openstreetmap.org"
         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}}."
     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 +1249,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.)"
       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
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     sidebar:
       search_results: Search Results


@@ -1259,7 +1261,7 @@ en:
       submit_text: "Go"
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
     key:
       submit_text: "Go"
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
     key:

-      map_key: "Map key"
+      map_key: "Map Key"

       map_key_tooltip: "Key for the map"
       table:
         entry:
       map_key_tooltip: "Key for the map"
       table:
         entry:


@@ -1513,6 +1515,11 @@ en:
       remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"
       remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"

+      register now: Register now
+      already got: Already got an OpenStreetMap account? Please login.
+      new to osm: New to OpenStreetMap?
+      to make changes: To make changes to the OpenStreetMap data, you must have an account.
+      create account minute: Create an account. It only takes a minute.

       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"{{reconfirm}}\">request a new confirmation email</a>."
       account suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the {{webmaster}} if you wish to discuss this.
       webmaster: webmaster
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"{{reconfirm}}\">request a new confirmation email</a>."
       account suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the {{webmaster}} if you wish to discuss this.
       webmaster: webmaster


@@ -1591,6 +1598,7 @@ en:
       add as friend: add as friend
       mapper since: "Mapper since:"
       ago: "({{time_in_words_ago}} ago)"
       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:"
       email address: "Email address:"
       created from: "Created from:"
       status: "Status:"