X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2e43a275de10e162d605df71e3e0f16ba596ad25..dc35b597a2210d77e3d3e6996138dfdeb3add4a3:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 5abae7222..5b6924f5c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -297,6 +297,8 @@ en: description_user: "Changesets by {{user}}" description_bbox: "Changesets within {{bbox}}" description_user_bbox: "Changesets by {{user}} within {{bbox}}" + timeout: + sorry: "Sorry, the list of changesets you requested took too long to retrieve." diary_entry: new: title: New Diary Entry @@ -414,6 +416,7 @@ en: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})" suffix_suburb: "{{suffix}}, {{parentname}}" search_osm_nominatim: + prefix_format: "{{name}}" prefix: amenity: airport: "Airport" @@ -945,7 +948,7 @@ en: english_link: the English original native: title: About this page - text: You are viewing the English version of the copyright page. You can go back to the {{native_link}} of this pag or you can stop reading about copyright and {{mapping_link}}. + text: You are viewing the English version of the copyright page. You can go back to the {{native_link}} of this page or you can stop reading about copyright and {{mapping_link}}. native_link: THIS_LANGUAGE_NAME_HERE version mapping_link: start mapping legal_babble: | @@ -1039,6 +1042,9 @@ en: Statistics Canada).
  • New Zealand: Contains data sourced from Land Information New Zealand. Crown Copyright reserved.
    • +
  • Poland: Contains data from UMP-pcPL maps. Copyright + UMP-pcPL contributors.
  • United Kingdom: Contains Ordnance Survey data © Crown copyright and database right 2010.
    • @@ -1485,12 +1491,38 @@ en: create_account: "create an account" email or username: "Email Address or Username:" password: "Password:" + openid: "{{logo}} OpenID:" + username_heading: "Login with username and password:" + openid_heading: "Login with OpenID:" remember: "Remember me:" lost password link: "Lost your password?" login_button: "Login" account not active: "Sorry, your account is not active yet.
    Please click on the link in the account confirmation email to activate your account." - account suspended: Sorry, your account has been suspended due to suspicious activity.
    Please contact the webmaster if you wish to discuss this. + account suspended: Sorry, your account has been suspended due to suspicious activity.
    Please contact the {{webmaster}} if you wish to discuss this. + webmaster: webmaster 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 to be malformed" + openid_logo_alt: "Log in with an OpenID" + openid_providers: + openid: + title: Login with an OpenID URL + alt: Login with an OpenID URL + yahoo: + title: Login with a Yahoo! OpenID + alt: Login with a Yahoo! OpenID + google: + title: Login with a Google OpenID + alt: Login with a Google OpenID + myopenid: + title: Login with a myOpenID OpenID + alt: Login with a myOpenID OpenID + wordpress: + title: Login with a Wordpress.com OpenID + alt: Login with a Wordpress.com OpenID + myspace: + title: Login with a MySpace OpenID + alt: Login with a MySpace OpenID logout: title: "Logout" heading: "Logout from OpenStreetMap" @@ -1523,8 +1555,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.

    + continue: Continue flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)

    Please note that you will not be able to login until you've received and confirmed your email address.

    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." terms: @@ -1537,7 +1582,6 @@ en: declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" decline: "Decline" legale_select: "Please select your country of residence:" - legale_button: "Go" legale_names: france: "France" italy: "Italy" @@ -1606,6 +1650,10 @@ en: 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." @@ -1673,6 +1721,7 @@ en: suspended: title: Account Suspended heading: Account Suspended + webmaster: webmaster body: |

    Sorry, your account has been automatically suspended due to @@ -1680,8 +1729,7 @@ en:

    This decision will be reviewed by an administrator shortly, or - you may contact the webmaster if - you wish to discuss this. + you may contact the {{webmaster}} if you wish to discuss this.

    user_role: filter: