X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef880621a40a6065699ee69e3ba69c7a64a2afde..24422a3bafaf0f81f2417f30d896a859f6cb0ff2:/config/locales/en.yml?ds=sidebyside

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a0fa9888..063057d62 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1149,31 +1149,11 @@ en:
         procedure</a> or file directly at our
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
   welcome_page:
-    title: Welcome to OpenStreetMap
-    subtitle: a free map that you can edit
+    title: Welcome!
     introduction_html: |
-      Unlike other maps, OpenStreetMap is completely <abbr title="OpenStreetMap has over
-      1 million users, who add data based on local knowledge, GPS tracks, and more">created
-      by people like you</abbr>, and free for anyone to fix, update, download and use.
-      Here's a quick guide to get you started.
-    one_map_many_uses:
-      title: One Map, Many Uses
-      paragraph_1_html: |
-        OpenStreetMap is used in websites, phones, hand-held GPS devices, sat-navs, and even
-        games and art projects. This site is the place to make contributions to the map which
-        will be available to all of these sites and applications. Copying the map data from
-        place to place can take from a few minutes to a few hours, so don't worry if it isn't
-        instant.
-      names:
-        - Apple
-        - Craigslist
-        - Flickr
-        - Foursquare
-        - Garmin
-        - Le Monde
-        - MapQuest
-        - Telenav
-        - USA Today
+      Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed
+      up, you're all set to get started mapping. Here's a quick guide with the most important
+      things you need to know.
     whats_on_the_map:
       title: What's on the Map
       on_html: |
@@ -1203,24 +1183,7 @@ en:
       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>.
-    contributing:
-      title: Start Contributing
-      paragraph_1_html: |
-        With your user account, you can edit the map and <abbr title="Users on OpenStreetMap talk
-        over mailing lists, chat, and private messages sent on the website">collaborate with other
-        mappers</abbr>. To start contributing, zoom in anywhere in the world and click the <em>Edit</em>
-        button.
-      paragraph_located: |
-        Or, start contributing now:
-      paragraph_geocoded_html: |
-        Or, start near <span class='edit-geocoded-location'></span>:
-      paragraph_geolocated: |
-        Or, start directly at your current location:
-      paragraph_1_no_user_html: |
-        To edit OpenStreetMap, you'll need a user account. Once you have an account, you can zoom in
-        anywhere in the world and click the <em>Edit</em> button to start contributing.
-      start_mapping: Start Mapping
-      sign_up: Sign Up
+    start_mapping: Start Mapping
     add_a_note:
       title: No Time To Edit? Add a Note!
       paragraph_1_html: |
@@ -1736,11 +1699,15 @@ en:
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
     new:
-      title: "Create account"
-      heading: "Create a User Account"
+      title: "Sign Up"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
-      fill_form: "Fill in the form and we will send you a quick email to activate your account."
+      about:
+        header: Free and editable
+        html: |
+          <p>Unlike other maps, OpenStreetMap is completely created by people like you,
+          and free for anyone to fix, update, download and use.</p>
+          <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
@@ -1762,7 +1729,7 @@ en:
             with your OpenID in your user settings.
           </li>
         </ul>
-      continue: Continue
+      continue: Sign Up
       flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started."
       flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
       terms accepted: "Thanks for accepting the new contributor terms!"