Simplify handling of verified emails in OpenID signup

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index bc43ab4bfbdff626782e1f5b222fb8c030c38510..9f6ea5ef5f347414f8eb6e479a25b70d225721ff 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1144,14 +1144,18 @@ en:
         subject: "[OpenStreetMap] GPX Import success"
         loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
     signup_confirm:
-      subject: "[OpenStreetMap] Confirm your email address"
+      subject: "[OpenStreetMap] Welcome to OpenStreetMap"
     signup_confirm_plain:
       greeting: "Hi there!"
       hopefully_you: "Someone (hopefully you) would like to create an account over at"
+      created_account: "You have just created a new account over at"
       # next two translations run-on : please word wrap appropriately
       click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
       click_the_link_2: "account and read on for more information about OpenStreetMap."
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
+      # next two translations run-on : please word wrap appropriately
+      welcome_1: "We would like to welcome you and provide you with some additional information"
+      welcome_2: "to get you started."
+      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"
@@ -1168,7 +1172,9 @@ en:
     signup_confirm_html:
       greeting: "Hi there!"
       hopefully_you: "Someone (hopefully you) would like to create an account over at"
+      created_account: "You have just created a new account over at"
       click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
+      welcome: "We would like to welcome you and provide you with some additional information to get you started."
       introductory_video: "You can watch an %{introductory_video_link}."
       video_to_openstreetmap: "introductory video to OpenStreetMap"
       more_videos: "There are %{more_videos_link}."
@@ -1654,6 +1660,7 @@ en:
           </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."
       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>."