X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2aa391e8490dcc4bfcb6cdcf483ee3ce5d610851..ad60ee5c9c9fbb760d54c94448ba96a790e78a71:/config/locales/en.yml?ds=sidebyside

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 97b856c92..adc940667 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -459,7 +459,6 @@ en:
       click_add_marker: "Click on the map to add a marker"
       change_marker: "Change marker position"
       add_marker: "Add a marker to the map"
-      view_larger_map: "View Larger Map"
   geocoder:
     search:
       title:
@@ -1149,6 +1148,58 @@ en:
         to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
         procedure</a> or file directly at our
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
+  verify_page:
+    title: Congratulations!
+    introduction_html: |
+      We sent a confirmation email to %{email}. <span class='deemphasize'>Confirm your account 
+      by clicking on the link in the email and you'll be able to start mapping.</span>
+    antispam_alert_html: | 
+      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."
+  welcome_page:
+    title: Welcome!
+    introduction_html: |
+      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: |
+        OpenStreetMap is a place for mapping things that are both <em>real and current</em> -
+        it includes millions of buildings, roads, and other details about places. You can map
+        whatever real-world features are interesting to you.
+      off_html: |
+        What it <em>doesn't</em> include is opinionated data like ratings, historical or
+        hypothetical features, and data from copyrighted sources. Unless you have special
+        permission, don't copy from online or paper maps.
+    basic_terms:
+      title: Basic Terms For Mapping
+      paragraph_1_html: |
+        OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.
+      editor_html: |
+        An <strong>editor</strong> is a program or website you can use to edit the map.
+      node_html: |
+        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.
+    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>.
+    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:
+        <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:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -1185,28 +1236,7 @@ en:
       greeting: "Hi there!"
       created: "Someone (hopefully you) just created an account at %{site_url}."
       confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:"
-      welcome: "We would like to welcome you and provide you with some additional information to get you started."
-    signup_confirm_plain:
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
-      more_videos: "There are more videos here:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_guide"
-      blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:"
-      ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:"
-      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      user_wiki_page: "It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user: "A list of current users in categories, based on where in the world they are, is available from:"
-    signup_confirm_html:
-      introductory_video: "You can watch an %{introductory_video_link}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are %{more_videos_link}."
-      more_videos_here: "more videos here"
-      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_guide">on the wiki</a>, and catch up with the latest news via the <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> or <a href="http://twitter.com/openstreetmap">Twitter</a>.
-      ask_questions: You can ask any questions you may have about OpenStreetMap at our <a href="http://help.openstreetmap.org/">question and answer site</a>.
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+      welcome: "After you confirm your account, we'll provide you with some additional information to get you started."
     email_confirm:
       subject: "[OpenStreetMap] Confirm your email address"
     email_confirm_plain:
@@ -1676,11 +1706,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:"
@@ -1702,7 +1736,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!"
@@ -2052,25 +2086,31 @@ en:
       title: "Share"
       cancel: "Cancel"
       image: "Image"
-      link: "Link"
+      link: "Link or HTML"
+      long_link: "Link"
       short_link: "Short Link"
-      long_link: "Long Link"
-      embed: "Embeddable HTML"
+      embed: "HTML"
       custom_dimensions: "Set custom dimensions"
-      format: "Format"
-      scale: "Scale"
+      format: "Format:"
+      scale: "Scale:"
       image_size: "Image will show standard layer at "
       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"
+      center_marker: "Center map on marker"
       paste_html: "Paste HTML to embed in website"
+      view_larger_map: "View Larger Map"
     key:
       title: "Map Key"
       tooltip: "Map Key"
+      tooltip_disabled: "Map Key available only for Standard layer"
     map:
       zoom:
         in: Zoom In
         out: Zoom Out
+      locate:
+        title: Show My Location
+        popup: You are within {distance} {unit} of this point
       base:
         standard: Standard
         cycle_map: Cycle Map
@@ -2081,6 +2121,7 @@ en:
         notes: Map Notes
         data: Map Data
         overlays: Enable overlays for troubleshooting the map
+      copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map