Frontpage redesign

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ee567d7b240b8d51a72515d7c2aa2eaa8b03e76f..3afa70365f31ea3cf3e7fb3f6dade421b13b9797 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -999,9 +999,9 @@ en:
       alt_text: OpenStreetMap logo
     home: Go to Home Location
     logout: Logout
       alt_text: OpenStreetMap logo
     home: Go to Home Location
     logout: Logout

-    log_in: log in
+    log_in: Log In

     log_in_tooltip: Log in with an existing account
     log_in_tooltip: Log in with an existing account

-    sign_up: sign up
+    sign_up: Sign Up

     sign_up_tooltip: Create an account for editing
     view: View
     view_tooltip: View the map
     sign_up_tooltip: Create an account for editing
     view: View
     view_tooltip: View the map


@@ -1015,13 +1015,9 @@ en:
     user_diaries_tooltip: View user diaries
     edit_with: Edit with %{editor}
     tag_line: The Free Wiki World Map
     user_diaries_tooltip: View user diaries
     edit_with: Edit with %{editor}
     tag_line: The Free Wiki World Map

-    intro_1: "OpenStreetMap is a free worldwide map, created by people like you."
-    intro_2_html: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map."
+    intro_header: Welcome to OpenStreetMap!
+    intro_text: OpenStreetMap is a free and editable map of the world maintained by an active community of contributors.

     intro_2_create_account: "Create a user account"
     intro_2_create_account: "Create a user account"

-    intro_2_license: "open license"
-    intro_2_use: "use"
-    intro_2_download: "download"
-    intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap"

     partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
     partners_ucl: "the UCL VR Centre"
     partners_ic: "Imperial College London"
     partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
     partners_ucl: "the UCL VR Centre"
     partners_ic: "Imperial College London"


@@ -1031,8 +1027,8 @@ en:
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     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."
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     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: help
+    help: Help
+    about: About

     copyright: "Copyright & License"
     community: Community
     community_blogs: "Community Blogs"
     copyright: "Copyright & License"
     community: Community
     community_blogs: "Community Blogs"


@@ -1188,8 +1184,9 @@ en:
     questions:
       title: Any questions?
       paragraph_1_html: |
     questions:
       title: Any questions?
       paragraph_1_html: |

-        Need help mapping, or not clear on how to use OpenStreetMap? Get your questions answered
-        on <a href='http://help.openstreetmap.org/'>the help website</a>.
+        OpenStreetMap has several resources for learning about the project, asking and answering
+        questions, and collaboratively discussing and documenting mapping topics.
+        <a href='%{help_url}'>Get help here</a>.

     start_mapping: Start Mapping
     add_a_note:
       title: No Time To Edit? Add a Note!
     start_mapping: Start Mapping
     add_a_note:
       title: No Time To Edit? Add a Note!


@@ -1209,10 +1206,6 @@ en:
       url: http://www.openstreetmap.org/welcome
       title: Welcome to OSM
       description: Start with this quick guide covering the OpenStreetMap basics.
       url: http://www.openstreetmap.org/welcome
       title: Welcome to OSM
       description: Start with this quick guide covering the OpenStreetMap basics.

-    learnosm:
-      url: http://learnosm.org/
-      title: LearnOSM
-      description: Learn how to edit OpenStreetMap with the JOSM editor step-by-step.

     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org


@@ -1394,10 +1387,7 @@ en:
       close: Close
     search:
       search: Search
       close: Close
     search:
       search: Search

-      where_am_i: "Where am I?"
-      where_am_i_title: Describe the current location using the search engine

       submit_text: "Go"
       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:
       table:
         entry:
     key:
       table:
         entry: