X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f9570c4f054411c92007a146683f9f4724c1f9db..3251cdf5d6d4ce51e52d96f52f266ab37f1fa695:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 32f4649da..321821d02 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1083,7 +1083,7 @@ en: on-line filing page. trademarks_title_html: Trademarks trademarks_1_html: | - OpenStreetMap and the looking glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the Licence Working Group. + OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the Licence Working Group. welcome_page: title: Welcome! introduction_html: | @@ -1735,6 +1735,9 @@ en: windowslive: title: Login with Windows Live alt: Login with a Windows Live Account + github: + title: Login with GitHub + alt: Login with a GitHub Account yahoo: title: Login with Yahoo alt: Login with a Yahoo OpenID @@ -1767,7 +1770,7 @@ en: new: title: "Sign Up" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." - contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.' + contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.' about: header: Free and editable html: | @@ -1785,16 +1788,6 @@ en: confirm password: "Confirm Password:" use external auth: "Alternatively, use a third party to login" auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one." - auth association: | -

Your ID is not associated with a OpenStreetMap account yet.

- continue: Sign Up 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." @@ -1820,6 +1813,7 @@ en: title: "No such user" heading: "The user %{user} does not exist" body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong." + deleted: "deleted" view: my diary: My Diary new diary entry: new diary entry @@ -1870,16 +1864,16 @@ en: revoke: administrator: "Revoke administrator access" moderator: "Revoke moderator access" - block_history: "blocks received" - moderator_history: "blocks given" + block_history: "Active Blocks" + moderator_history: "Blocks Given" comments: "Comments" - create_block: "block this user" - activate_user: "activate this user" - deactivate_user: "deactivate this user" - confirm_user: "confirm this user" - hide_user: "hide this user" - unhide_user: "unhide this user" - delete_user: "delete this user" + create_block: "Block this User" + activate_user: "Activate this User" + deactivate_user: "Deactivate this User" + confirm_user: "Confirm this User" + hide_user: "Hide this User" + unhide_user: "Unhide this User" + delete_user: "Delete this User" confirm: "Confirm" friends_changesets: "friends' changesets" friends_diaries: "friends' diary entries" @@ -1953,7 +1947,7 @@ en: unknown token: "That confirmation code has expired or does not exist." reconfirm_html: "If you need us to resend the confirmation email, click here." 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." + 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 %{sender} as we are unable to reply to any confirmation requests." failure: "User %{name} not found." confirm_email: heading: Confirm a change of email address @@ -2009,6 +2003,15 @@ en: no_authorization_code: No authorization code unknown_signature_algorithm: Unknown signature algorithm invalid_scope: Invalid scope + auth_association: + heading: Your ID is not associated with a OpenStreetMap account yet. + option_1: | + If you are new to OpenStreetMap, please create a new account + using the form below. + option_2: | + If you already have an account, you can login to your account + using your username and password and then associate the account + with your ID in your user settings. user_role: filter: not_an_administrator: "Only administrators can perform user role management, and you are not an administrator." @@ -2172,6 +2175,9 @@ en: center_marker: "Center map on marker" paste_html: "Paste HTML to embed in website" view_larger_map: "View Larger Map" + only_standard_layer: "Only the standard layer can be exported as an image" + embed: + report_problem: "Report a problem" key: title: "Map Key" tooltip: "Map Key" @@ -2187,7 +2193,6 @@ en: standard: Standard cycle_map: Cycle Map transport_map: Transport Map - mapquest: MapQuest Open hot: Humanitarian layers: header: Map Layers