Merge branch 'master' into openID

diff --combined config/locales/en.yml
index b3c564af6be9db04380e7c646ee619a3c1480fda,f1e0e6a8581c1cc098c987c0f802d026a4d3cea4..02eff8f5608fbc8f2f2475aa621dff9c07594596
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -89,7 -89,7 +89,7 @@@ en
        feed:
          title: "Changeset {{id}}"
          title_comment: "Changeset {{id}} - {{comment}}"
-     changeset_navigation:
+     navigation:
        paging:
          user:
            prev: "« {{id}}"
@@@ -98,12 -98,18 +98,18 @@@
            prev: "« {{id}}"
            next: "{{id}} »"
        user:
-         name_tooltip: "View edits by {{user}}"
-         prev_tooltip: "Previous edit by {{user}}"
-         next_tooltip: "Next edit by {{user}}"
+         name_changeset_tooltip: "View edits by {{user}}"
+         prev_changeset_tooltip: "Previous edit by {{user}}"
+         next_changeset_tooltip: "Next edit by {{user}}"
        all:
-         prev_tooltip: "Previous changeset"
-         next_tooltip: "Next changeset"
+         prev_node_tooltip: "Previous node"
+         next_node_tooltip: "Next node"
+         prev_way_tooltip: "Previous way"
+         next_way_tooltip: "Next way"
+         prev_relation_tooltip: "Previous relation"
+         next_relation_tooltip: "Next relation"
+         prev_changeset_tooltip: "Previous changeset"
+         next_changeset_tooltip: "Next changeset"
      changeset_details:
        created_at: "Created at:"
        closed_at: "Closed at:"
@@@ -236,6 -242,7 +242,7 @@@
        wiki_link:
          key: "The wiki description page for the {{key}} tag"
          tag: "The wiki description page for the {{key}}={{value}} tag"
+       wikipedia_link: "The {{page}} article on Wikipedia"
      way_details:
        nodes: "Nodes:"
        part_of: "Part of:"
@@@ -917,6 -924,7 +924,7 @@@
      help_wiki: "Help & Wiki"
      help_wiki_tooltip: "Help & Wiki site for the project"
      help_wiki_url: "http://wiki.openstreetmap.org"
+     copyright: "Copyright & License"
      news_blog: "News blog"
      news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
      shop: Shop
@@@ -1365,16 -1373,11 +1373,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"
@@@ -1409,8 -1412,6 +1417,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:
@@@ -1474,10 -1475,6 +1482,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."