X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cb24fccb8a3a83ccfc2299b1abfe5400c09dab3f..26b42dbe975dd6c49590eb764879d710e64efbb1:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 352e3d15e..153dca1fe 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1380,10 +1380,9 @@ en: help: "Help" help_url: "http://wiki.openstreetmap.org/wiki/Upload" trace_header: - your_traces: "See just your traces" upload_trace: "Upload a trace" see_all_traces: "See all traces" - see_your_traces: "See all your traces" + see_your_traces: "See your traces" traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users." trace_optionals: tags: "Tags" @@ -1517,15 +1516,15 @@ en: login: title: "Login" heading: "Login" - please login: "Please login or {{create_user_link}}." - create_account: "create an account" email or username: "Email Address or Username:" password: "Password:" + openid: "{{logo}} OpenID:" remember: "Remember me:" lost password link: "Lost your password?" login_button: "Login" register now: Register now - already have: Already have an OpenStreetMap account? Please login. + with username: "Already have an OpenStreetMap account? Please login with your username and password:" + with openid: "Alternatively please use your OpenID to login:" new to osm: New to OpenStreetMap? to make changes: To make changes to the OpenStreetMap data, you must have an account. create account minute: Create an account. It only takes a minute. @@ -1534,6 +1533,28 @@ en: webmaster: webmaster auth failure: "Sorry, could not log in with those details." notice: "Find out more about OpenStreetMap's upcoming license change (translations) (discussion)" + openid missing provider: "Sorry, could not contact your OpenID provider" + openid invalid: "Sorry, your OpenID seems to be malformed" + openid_logo_alt: "Log in with an OpenID" + openid_providers: + openid: + title: Login with OpenID + alt: Login with an OpenID URL + google: + title: Login with Google + alt: Login with a Google OpenID + yahoo: + title: Login with Yahoo + alt: Login with a Yahoo OpenID + myopenid: + title: Login with myOpenID + alt: Login with a myOpenID OpenID + wordpress: + title: Login with Wordpress + alt: Login with a Wordpress OpenID + aol: + title: Login with AOL + alt: Login with an AOL OpenID logout: title: "Logout" heading: "Logout from OpenStreetMap" @@ -1566,8 +1587,21 @@ en: not displayed publicly: 'Not displayed publicly (see privacy policy)' 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:" + 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: | +
Your OpenID is not associated with a OpenStreetMap account yet.
+