Merge branch 'master' into openID

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7b9720fbdcbb1c469b7e6ac742d5b303dfd69384..b3c564af6be9db04380e7c646ee619a3c1480fda 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1365,11 +1365,16 @@ en:
       create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"
       create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"

+      openid: "OpenID:"
+      openid description: "Use your OpenID to login"
+      alternatively: "Alternatively"

       remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"
       account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
       auth failure: "Sorry, could not log in with those details."
       remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"
       account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
       auth failure: "Sorry, could not log in with those details."

+      openid missing provider: "Sorry, could not contact your OpenID provider"
+      openid invalid: "Sorry, your OpenID seems misformed"

     logout:
       title: "Logout"
       heading: "Logout from OpenStreetMap"
     logout:
       title: "Logout"
       heading: "Logout from OpenStreetMap"


@@ -1404,6 +1409,8 @@ en:
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"

+      openID: "OpenID:"
+      openID description: '(Optional) If you have an <a href="http://wiki.openstreetmap.org/wiki/openID">OpenID</a> you can associate it with this account to login'

       signup: Signup
       flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<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."
     no_such_user:
       signup: Signup
       flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<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."
     no_such_user:


@@ -1467,6 +1474,10 @@ en:
       current email address: "Current Email Address:"
       new email address: "New Email Address:"
       email never displayed publicly: "(never displayed publicly)"
       current email address: "Current Email Address:"
       new email address: "New Email Address:"
       email never displayed publicly: "(never displayed publicly)"

+      openid:
+        openid: "OpenID:"
+        link: "http://wiki.openstreetmap.org/wiki/OpenID"
+        link text: "what is this?"

       public editing:
         heading: "Public editing:"
         enabled: "Enabled. Not anonymous and can edit data."
       public editing:
         heading: "Public editing:"
         enabled: "Enabled. Not anonymous and can edit data."