X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/82db7eccc8857081316469d7eb242f422332f097..f539c79a56ac10a6ab0dcb65d6ee3932f3aa0b6d:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index f8cbb6e37..f161f18a5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -141,6 +141,8 @@ en: common_details: edited_at: "Edited at:" edited_by: "Edited by:" + deleted_at: "Deleted at:" + deleted_by: "Deleted by:" version: "Version:" in_changeset: "In changeset:" changeset_comment: "Comment:" @@ -219,6 +221,8 @@ en: zoom_or_select: "Zoom in or select an area of the map to view" drag_a_box: "Drag a box on the map to select an area" manually_select: "Manually select a different area" + hide_areas: "Hide areas" + show_areas: "Show areas" loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below." load_data: "Load Data" unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})" @@ -1057,6 +1061,8 @@ en: Resources Canada), CanVec (© Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada). +
  • France: Contains data sourced from + Direction Générale des Impôts.
  • New Zealand: Contains data sourced from Land Information New Zealand. Crown Copyright reserved.
  • Poland: Contains data from download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.' potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)" + potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information" potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)" no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature." sidebar: @@ -1373,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" @@ -1438,6 +1444,7 @@ en: cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing." setup_user_auth: blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." + need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." oauth: oauthorize: request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like." @@ -1509,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. @@ -1526,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 + yahoo: + title: Login with Yahoo + alt: Login with a Yahoo OpenID + google: + title: Login with Google + alt: Login with a Google OpenID + myopenid: + title: Login with myOpenID + alt: Login with a myOpenID OpenID + wordpress: + title: Login with Wordpress + alt: Login with a Wordpress OpenID + myspace: + title: Login with MySpace + alt: Login with a MySpace OpenID logout: title: "Logout" heading: "Logout from OpenStreetMap" @@ -1558,11 +1587,26 @@ 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: "Thanks for signing up. We've sent a confirmation note to {{email}} and as soon as you confirm your account you'll be able to get mapping.

    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 accepted: "Thanks for accepting the new contributor terms!" + terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see this wiki page." + terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: "Contributor terms" heading: "Contributor terms" @@ -1570,9 +1614,11 @@ en: consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain" consider_pd_why: "what's this?" consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain + guidance: 'Information to help understand these terms: a human readable summary and some informal translations' agree: Agree declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" decline: "Decline" + you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue." legale_select: "Please select your country of residence:" legale_names: france: "France" @@ -1643,6 +1689,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."