X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2955fe4d4b5ef2d8c0f0fae850ffda8ab7493253..e9010306c5b4970edf5cb8164feb43719d3bb63a:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index cfe717fe2..6ebeb3746 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" @@ -1665,9 +1684,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 +2236,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 +2291,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,6 +2338,52 @@ 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" @@ -2332,8 +2404,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 +2426,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,7 +2445,6 @@ en: my profile: My Profile my settings: My Settings my comments: My Comments - oauth settings: oauth settings blocks on me: Blocks on Me blocks by me: Blocks by Me send message: Send Message @@ -2473,6 +2546,9 @@ en: 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: