X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef880621a40a6065699ee69e3ba69c7a64a2afde..c4cdcc1ee1e7617ef0010759c7b3130c735c4308:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a0fa9888..5a1cd3a51 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: |
@@ -1194,40 +1174,22 @@ en:
         A <strong>node</strong> is a point on the map, like a single restauraunt or a tree.
       way_html: |
         A <strong>way</strong> is a line or area, like a road, stream, lake or building.
-      changeset_html: |
-        A <strong>changeset</strong> is <abbr title='changesets can have comments, like "adding a
-        road here", that let other users know what you were intending to change and why'>group of
-        changes</abbr> to the map saved by a user.
+      tag_html: |
+        A <strong>tag</strong> is a bit of data about a node or way, like a
+        restaurant's name or a road's speed limit.
     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>.
-    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: |
         If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
         easy to add a note.
       paragraph_2_html: |
-        Just go to <a href='http://www.openstreetmap.org/'>the map</a> and click the note icon:
+        Just go to <a href='%{map_url}'>the map</a> and click the note icon:
         <span class='icon note'></span>. This will add a marker to the map, which you can move
         by dragging. Add your message, then click save, and other mappers will investigate.
   notifier:
@@ -1736,11 +1698,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 it's 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,16 +1728,14 @@ en:
             with your OpenID in your user settings.
           </li>
         </ul>
-      continue: Continue
-      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."
+      continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
       terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
       title: "Contributor terms"
       heading: "Contributor terms"
-      read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
+      read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
       consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
@@ -1780,7 +1744,7 @@ en:
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
-      legale_select: "Please select your country of residence:"
+      legale_select: "Country of residence:"
       legale_names:
         france: "France"
         italy: "Italy"
@@ -1908,14 +1872,16 @@ en:
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
     confirm:
-      heading: Confirm a user account
+      heading: Check your email!
+      introduction_1: |
+        We sent you a confirmation email.
+      introduction_2: |
+        Confirm your account by clicking on the link in the email and you'll be able to start mapping.
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below."
       already active: "This account has already been confirmed."
       unknown token: "That token doesn't seem to exist."
-      reconfirm: "If it's been a while since you signed up you might need to <a href=\"%{reconfirm}\">send yourself a new confirmation email</a>."
+      reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
     confirm_resend:
       success: "We've sent a new 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."
       failure: "User %{name} not found."