Merge branch 'master' into openID

diff --combined config/locales/en.yml
index 2df80cd1d7ccebcf56d977a9bda7f797e5f18d37,7b9720fbdcbb1c469b7e6ac742d5b303dfd69384..b3c564af6be9db04380e7c646ee619a3c1480fda
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -233,6 -233,9 +233,9 @@@ en
              # There is no 'relation' type because it is not represented in OpenLayers
      tag_details:
        tags: "Tags:"
+       wiki_link:
+         key: "The wiki description page for the {{key}} tag"
+         tag: "The wiki description page for the {{key}}={{value}} tag"
      way_details:
        nodes: "Nodes:"
        part_of: "Part of:"
@@@ -1362,16 -1365,11 +1365,16 @@@
        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."
 +      openid missing provider: "Sorry, could not contact your OpenID provider"
 +      openid invalid: "Sorry, your OpenID seems misformed"
      logout:
        title: "Logout"
        heading: "Logout from OpenStreetMap"
@@@ -1406,8 -1404,6 +1409,8 @@@
        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:
@@@ -1471,10 -1467,6 +1474,10 @@@
        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."