X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f85681c5cee9406aacc1745a3fb3bd0331d3c0e4..a53c7bf623f7a08706eaf73de44380fbf11b14ad:/config/locales/en.yml?ds=inline

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 97551164f..7e6592165 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1485,10 +1485,9 @@ en:
       create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"
-      openid: "OpenID:"
-      openid description: "Use your OpenID to login"
+      openid: "{{logo}} OpenID:"
       username_heading: "Login with username and password:"
-      openid_heading: "Login with an OpenID:"
+      openid_heading: "Login with OpenID:"
       remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"
@@ -1496,7 +1495,7 @@ en:
       account suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> if you wish to discuss this.
       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"
+      openid invalid: "Sorry, your OpenID seems to be malformed"
       openid_logo_alt: "Log in with an OpenID"
       openid_providers:
         openid:
@@ -1549,20 +1548,19 @@ en:
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
+      openid: "{{logo}} OpenID:"
       password: "Password:"
       confirm password: "Confirm Password:"
-      openID associate: "Associate an OpenID with your account"
-      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'
-      openID nopassword: "With OpenID, you don't need to specify a password during signup, but some extra OpenStreetMap services or tools may still need one"
-      openID association: |
-        Your OpenID is not associated with a OpenStreetMap account yet.
+      use openid: "Alternatively, use {{logo}} OpenID to login"
+      openid no password: "With OpenID a password is not required, but some extra tools or server may still need one."
+      openid association: |
+        <p>Your OpenID is not associated with a OpenStreetMap account yet.</p>
         <ul>
           <li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
           <li>
-            If you already have an account, you can normally login to
-            your account and then associate the account with your openID
-            in your user settings
+            If you already have an account, you can login to your account
+            using your username and password and then associate the account
+            with your OpenID in your user settings.
           </li>
         </ul> 
       signup: Signup