Phase 2 CTs implementation and tests, with config parameter

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b11f2f886d576801f3a7392bbced198efb183c87..09b4838e7b850f1012d514f07600b35bee3e1b9c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -936,19 +936,21 @@ 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
-    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."
-    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
+    sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!'
     license:
       alt: CC by-sa 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
@@ -1260,7 +1262,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:
-      map_key: "Map key"
+      map_key: "Map Key"
       map_key_tooltip: "Key for the map"
       table:
         entry:
@@ -1436,6 +1438,7 @@ en:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
     setup_user_auth:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
+      need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:
     oauthorize:
       request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
@@ -1514,6 +1517,11 @@ en:
       remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"
+      register now: Register now
+      already have: Already have 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