X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2955fe4d4b5ef2d8c0f0fae850ffda8ab7493253..44199f23e1520623555eac2de6a2e97e3ed0e4ad:/config/locales/en.yml?ds=inline diff --git a/config/locales/en.yml b/config/locales/en.yml index cfe717fe2..fcfb2bc89 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -21,6 +21,9 @@ en: client_application: create: Register update: Update + doorkeeper_application: + create: Register + update: Update redaction: create: Create redaction update: Save redaction @@ -95,6 +98,11 @@ en: latitude: "Latitude" longitude: "Longitude" language: "Language" + doorkeeper/application: + name: Name + redirect_uri: Redirect URIs + confidential: Confidential application? + scopes: Permissions friend: user: "User" friend: "Friend" @@ -138,6 +146,9 @@ en: pass_crypt: "Password" pass_crypt_confirmation: "Confirm Password" help: + doorkeeper/application: + confidential: "Application will be used where the client secret can be kept confidential (native mobile apps and single page apps are not confidential)" + redirect_uri: "Use one line per URI" trace: tagstring: comma delimited user_block: @@ -480,6 +491,11 @@ en: comment: Comment newer_comments: "Newer Comments" older_comments: "Older Comments" + doorkeeper: + flash: + applications: + create: + notice: Application Registered. friendships: make_friend: heading: "Add %{user} as a friend?" @@ -487,6 +503,7 @@ en: success: "%{name} is now your friend!" failed: "Sorry, failed to add %{name} as a friend." already_a_friend: "You are already friends with %{name}." + limit_exceeded: "You have friended a lot of users recently. Please wait a while before trying to friend any more." remove_friend: heading: "Unfriend %{user}?" button: "Unfriend" @@ -1534,7 +1551,6 @@ 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_html: "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 @@ -1543,6 +1559,9 @@ en: success: "Confirmed your change of email address!" failure: "An email address has already been confirmed with this token." unknown_token: "That confirmation code has expired or does not exist." + resend_success_flash: + confirmation_sent: We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping. + whitelist: 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. messages: inbox: title: "Inbox" @@ -1625,6 +1644,43 @@ en: reset: "Reset Password" flash changed: "Your password has been changed." flash token bad: "Did not find that token, check the URL maybe?" + preferences: + show: + title: My Preferences + preferred_editor: Preferred Editor + preferred_languages: Preferred Languages + edit_preferences: Edit Preferences + edit: + title: Edit Preferences + save: Update Preferences + cancel: Cancel + update: + failure: Couldn't update preferences. + update_success_flash: + message: Preferences updated. + profiles: + edit: + title: Edit Profile + save: Update Profile + cancel: Cancel + image: Image + gravatar: + gravatar: "Use Gravatar" + link: "https://wiki.openstreetmap.org/wiki/Gravatar" + what_is_gravatar: "What is Gravatar?" + disabled: "Gravatar has been disabled." + enabled: "Display of your Gravatar has been enabled." + new image: "Add an image" + keep image: "Keep the current image" + delete image: "Remove the current image" + replace image: "Replace the current image" + image size hint: "(square images at least 100x100 work best)" + home location: "Home Location" + no home location: "You have not entered your home location." + update home location on click: "Update home location when I click on the map?" + update: + success: Profile updated. + failure: Couldn't update profile. sessions: new: title: "Login" @@ -1643,7 +1699,7 @@ en: create account minute: Create an account. It only takes a minute. no account: Don't have an 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 is suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact the webmaster if you wish to discuss this. + account is suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact support if you wish to discuss this. auth failure: "Sorry, could not log in with those details." openid_logo_alt: "Log in with an OpenID" auth_providers: @@ -1665,9 +1721,6 @@ en: wikipedia: title: Login with Wikipedia alt: Login with a Wikipedia Account - yahoo: - title: Login with Yahoo - alt: Login with a Yahoo OpenID wordpress: title: Login with Wordpress alt: Login with a Wordpress OpenID @@ -2220,8 +2273,10 @@ en: tagged_with: " tagged with %{tags}" empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page." upload_trace: "Upload a trace" - see_all_traces: "See all traces" - see_my_traces: "See my traces" + all_traces: "All Traces" + my_traces: "My Traces" + traces_from: "Public Traces from %{user}" + remove_tag_filter: "Remove Tag Filter" destroy: scheduled_for_deletion: "Trace scheduled for deletion" make_public: @@ -2273,6 +2328,14 @@ en: flash: "You've revoked the token for %{application}" permissions: missing: "You have not permitted the application access to this facility" + scopes: + read_prefs: Read user preferences + write_prefs: Modify user preferences + write_diary: Create diary entries, comments and make friends + write_api: Modify the map + read_gpx: Read private GPS traces + write_gpx: Upload GPS traces + write_notes: Modify notes oauth_clients: new: title: "Register a new application" @@ -2312,11 +2375,57 @@ en: flash: "Updated the client information successfully" destroy: flash: "Destroyed the client application registration" + oauth2_applications: + index: + title: "My client applications" + no_applications_html: "Do you have an application you would like to register for use with us using the %{oauth2} standard? You must register your application before it can make OAuth requests to this service." + oauth_2: "OAuth 2" + new: "Register new application" + name: "Name" + permissions: "Permissions" + application: + edit: "Edit" + delete: "Delete" + confirm_delete: "Delete this application?" + new: + title: "Register a new application" + edit: + title: "Edit your application" + show: + edit: "Edit" + delete: "Delete" + confirm_delete: "Delete this application?" + client_id: "Client ID" + client_secret: "Client Secret" + client_secret_warning: "Make sure to save this secret - it will not be accessible again" + permissions: "Permissions" + redirect_uris: "Redirect URIs" + not_found: + sorry: "Sorry, that application could not be found." + oauth2_authorizations: + new: + title: "Authorization required" + introduction: "Authorize %{application} to access your account with the following permissions?" + authorize: "Authorize" + deny: "Deny" + error: + title: "An error has occurred" + show: + title: "Authorization code" + oauth2_authorized_applications: + index: + title: "My authorized applications" + application: "Application" + permissions: "Permissions" + no_applications_html: "You have not yet authorized any %{oauth2} applications." + application: + revoke: "Revoke Access" + confirm_revoke: "Revoke access for this application?" users: new: title: "Sign Up" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." - contact_webmaster_html: '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_support_html: 'Please contact support 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: | @@ -2332,8 +2441,6 @@ en: auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one." 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." - terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: "Terms" heading: "Terms" @@ -2356,6 +2463,10 @@ en: france: "France" italy: "Italy" rest_of_world: "Rest of the world" + terms_declined_flash: + terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}. + terms_declined_link: this wiki page + terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined no_such_user: title: "No such user" heading: "The user %{user} does not exist" @@ -2371,9 +2482,10 @@ en: my profile: My Profile my settings: My Settings my comments: My Comments - oauth settings: oauth settings + my_preferences: My Preferences blocks on me: Blocks on Me blocks by me: Blocks by Me + edit_profile: Edit Profile send message: Send Message diary: Diary edits: Edits @@ -2455,24 +2567,12 @@ en: agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain." link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms" link text: "what is this?" - image: Image - gravatar: - gravatar: "Use Gravatar" - link: "https://wiki.openstreetmap.org/wiki/Gravatar" - what_is_gravatar: "What is Gravatar?" - disabled: "Gravatar has been disabled." - enabled: "Display of your Gravatar has been enabled." - new image: "Add an image" - keep image: "Keep the current image" - delete image: "Remove the current image" - replace image: "Replace the current image" - image size hint: "(square images at least 100x100 work best)" - home location: "Home Location" - no home location: "You have not entered your home location." - update home location on click: "Update home location when I click on the map?" save changes button: Save Changes make edits public button: Make all my edits public return to profile: Return to profile + oauth1 settings: OAuth 1 settings + oauth2 applications: OAuth 2 applications + oauth2 authorizations: OAuth 2 authorizations flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address." flash update success: "User information updated successfully." set_home: @@ -2493,7 +2593,7 @@ en: suspended: title: Account Suspended heading: Account Suspended - webmaster: webmaster + support: support body_html: |

Sorry, your account has been automatically suspended due to @@ -2501,7 +2601,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 %{webmaster} if you wish to discuss this.

auth_failure: connection_failed: Connection to authentication provider failed