Remove "antispam alert"

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6ad207999eb430251f22ef13091cb8451e096665..212ef633e75feec57de9a6cf881e2b3a3356daed 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1174,10 +1174,9 @@ 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.
         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: |
     questions:
       title: Any questions?
       paragraph_1_html: |


@@ -1730,8 +1729,6 @@ en:
           </li>
         </ul>
       continue: Sign Up
           </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
       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


@@ -1875,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:
       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
       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."
       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."
     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."