Hook up user confirmation page

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 04573b6a7f9ff7a5caa61447e15193569cc9081a..b750386512f359759a02a7f8dbbde78c898936ba 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1148,13 +1148,6 @@ 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: |
@@ -1736,8 +1729,6 @@ en:
           </li>
         </ul>
       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!"
       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
@@ -1881,14 +1872,19 @@ 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.
+      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.
       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."