X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3590335221807ed06e3fa705b8c4366f99a1b25e..7f955a4aca277350a70bb95f0ca97e64d7d808c4:/config/locales/en.yml?ds=inline diff --git a/config/locales/en.yml b/config/locales/en.yml index a2ac4eafd..deef86307 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -924,16 +924,19 @@ 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_wiki: "Help & Wiki" - help_wiki_tooltip: "Help & Wiki site for the project" - help_wiki_url: "http://wiki.openstreetmap.org" + help_and_wiki: "{{help}} & {{wiki}}" + help: Help + 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 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 - sotm: 'Come to the 2010 OpenStreetMap Conference, The State of the Map, July 9-11 in Girona!' license: alt: CC by-sa 2.0 title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License @@ -1062,7 +1065,7 @@ en: header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:" footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}" message_notification: - subject: "[OpenStreetMap] {{user}} sent you a new message" + subject_header: "[OpenStreetMap] {{subject}}" hi: "Hi {{to_user}}," header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:" footer1: "You can also read the message at {{readurl}}" @@ -1101,6 +1104,7 @@ en: the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide" blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:" opengeodata: "OpenGeoData.org is OpenStreetMap founder Steve Coast's blog, and it has podcasts too:" + ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:" wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:" wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page" # next four translations are in pairs : please word wrap appropriately @@ -1117,6 +1121,7 @@ en: more_videos: "There are {{more_videos_link}}." more_videos_here: "more videos here" get_reading: Get reading about OpenStreetMap on the wiki, catch up with the latest news via the OpenStreetMap blog or Twitter, or browse through OpenStreetMap founder Steve Coast's OpenGeoData blog for the potted history of the project, which has podcasts to listen to also! + ask_questions: You can ask any questions you may have about OpenStreetMap at our question and answer site. wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.' user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].' current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.' @@ -1241,9 +1246,8 @@ en: 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_tooltip: "Key for the map" table: - heading: "Legend for z{{zoom_level}}" entry: motorway: "Motorway" trunk: "Trunk road" @@ -1352,7 +1356,8 @@ en: help: "Help" help_url: "http://wiki.openstreetmap.org/wiki/Upload" trace_header: - see_just_your_traces: "See just your traces, or upload a trace" + your_traces: "See just your traces" + upload_trace: "Upload a trace" see_all_traces: "See all traces" see_your_traces: "See all 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." @@ -1494,10 +1499,11 @@ en: 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 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)" logout: title: "Logout" heading: "Logout from OpenStreetMap" @@ -1533,13 +1539,15 @@ en: password: "Password:" confirm password: "Confirm Password:" 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" heading: "Contributor terms" - press accept button: "Please read the agreement below and press the agree button to create your account." - consider_pd: "I consider my contributions to be in the Public Domain" + read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions." + 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://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain + consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain agree: Agree declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" decline: "Decline" @@ -1622,6 +1630,14 @@ en: public editing note: heading: "Public editing" text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. Since the 0.6 API changeover, only public users can edit map data. (find out why)." + contributor terms: + heading: "Contributor Terms:" + agreed: "You have agreed to the new Contributor Terms." + not yet agreed: "You have not yet agreed to the new Contributor Terms." + review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms." + agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain." + link: "http://www.osmfoundation.org/wiki/License/Contributor_Terms" + link text: "what is this?" profile description: "Profile Description:" preferred languages: "Preferred Languages:" image: "Image:" @@ -1645,7 +1661,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."