X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4fbb6226569ea4bf12e17779a4d2796c26b45756..11aff90f63d79406e9efa1343c965a19dcf5dbba:/config/locales/en.yml?ds=inline diff --git a/config/locales/en.yml b/config/locales/en.yml index e090c0212..1fa2831ea 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -79,6 +79,17 @@ en: with_id: "{{id}}" with_version: "{{id}}, v{{version}}" with_name: "{{name}} ({{id}})" + editor: + default: "Default (currently {{name}})" + potlatch: + name: "Potlatch 1" + description: "Potlatch 1 (in-browser editor)" + potlatch2: + name: "Potlatch 2" + description: "Potlatch 2 (in-browser editor)" + remote: + name: "Remote Control" + description: "Remote Control (JOSM or Merkaartor)" browse: changeset: title: "Changeset" @@ -912,6 +923,7 @@ en: gps_traces_tooltip: Manage GPS traces user_diaries: User Diaries user_diaries_tooltip: View user diaries + edit_with: Edit with {{editor}} tag_line: The Free Wiki World Map intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you." intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth." @@ -924,19 +936,20 @@ en: osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out." donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund." donate_link_text: donating - help_and_wiki: "{{help}} & {{wiki}}" help: Help + help_centre: Help Centre help_url: http://help.openstreetmap.org/ help_title: Help site for the project wiki: Wiki wiki_url: http://wiki.openstreetmap.org/ wiki_title: Wiki site for the project + documentation: Documentation + documentation_title: Documentation for the project copyright: "Copyright & License" - news_blog: "News blog" - news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc." - shop: Shop - shop_tooltip: Shop with branded OpenStreetMap merchandise - shop_url: http://wiki.openstreetmap.org/wiki/Merchandise + community_blogs: "Community Blogs" + community_blogs_title: "Blogs from members of the OpenStreetMap community" + foundation: Foundation + foundation_title: The OpenStreetMap Foundation license: alt: CC by-sa 2.0 title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License @@ -1226,6 +1239,7 @@ en: license_url: "http://creativecommons.org/licenses/by-sa/2.0/" project_name: "OpenStreetMap project" project_url: "http://openstreetmap.org" + remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled" edit: not_public: "You have not set your edits to be public." not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}." @@ -1235,6 +1249,8 @@ en: anon_edits_link_text: "Find out why this is the case." flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can 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_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: search_results: Search Results close: Close @@ -1245,10 +1261,9 @@ en: submit_text: "Go" search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..." key: - map_key: "Map key" - map_key_tooltip: "Map key for the mapnik rendering at this zoom level" + map_key: "Map Key" + map_key_tooltip: "Key for the map" table: - heading: "Legend for z{{zoom_level}}" entry: motorway: "Motorway" trunk: "Trunk road" @@ -1493,18 +1508,45 @@ 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" - account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account." + register now: Register now + 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. + account not active: "Sorry, your account is not active yet.
Please use the link in the account confirmation email to activate your account, or request a new confirmation email." 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." 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 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" @@ -1537,10 +1579,23 @@ 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." + 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: title: "Contributor terms" @@ -1578,6 +1633,7 @@ en: add as friend: add as friend mapper since: "Mapper since:" ago: "({{time_in_words_ago}} ago)" + latest edit: "Latest edit {{ago}}:" email address: "Email address:" created from: "Created from:" status: "Status:" @@ -1621,6 +1677,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." @@ -1641,6 +1701,7 @@ en: link text: "what is this?" profile description: "Profile Description:" preferred languages: "Preferred Languages:" + preferred editor: "Preferred Editor:" image: "Image:" new image: "Add an image" keep image: "Keep the current image" @@ -1662,7 +1723,13 @@ en: press confirm button: "Press the confirm button below to activate your account." button: Confirm success: "Confirmed your account, thanks for signing up!" - failure: "A user account with this token has already been confirmed." + before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below." + already active: "This account has already been confirmed." + unknown token: "That token doesn't seem to exist." + reconfirm: "If it's been a while since you signed up you might need to send yourself a new confirmation email." + confirm_resend: + success: "We've sent a new 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." + failure: "User {{name}} not found." confirm_email: heading: Confirm a change of email address press confirm button: "Press the confirm button below to confirm your new email address."