X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4a45092e27607f37843edbabbeda67919049e11b..06d73857d1fe6e069d006aedcca2c447cce533ad:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 25464bdcf..430836bce 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,10 +146,13 @@ 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:
- reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms.
+ reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms.
needs_view: Does the user need to log in before this block will be cleared?
user:
email_confirmation: 'Your address is not displayed publicly, see our privacy policy for more information.'
@@ -412,10 +423,10 @@ en:
location: Location
use_map_link: Use Map
index:
- title: "Users' diaries"
- title_friends: "Friends' diaries"
- title_nearby: "Nearby Users' diaries"
- user_title: "%{user}'s diary"
+ title: "Users' Diaries"
+ title_friends: "Friends' Diaries"
+ title_nearby: "Nearby Users' Diaries"
+ user_title: "%{user}'s Diary"
in_language_title: "Diary Entries in %{language}"
new: New Diary Entry
new_title: Compose a new entry in my user diary
@@ -428,8 +439,8 @@ en:
title: Edit Diary Entry
marker_text: Diary entry location
show:
- title: "%{user}'s diary | %{title}"
- user_title: "%{user}'s diary"
+ title: "%{user}'s Diary | %{title}"
+ user_title: "%{user}'s Diary"
leave_a_comment: "Leave a comment"
login_to_leave_a_comment_html: "%{login_link} to leave a comment"
login: "Login"
@@ -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?"
@@ -681,7 +697,7 @@ en:
houseboat: "Houseboat"
hut: "Hut"
industrial: "Industrial Building"
- kindergarten: "Kindergarden Building"
+ kindergarten: "Kindergarten Building"
manufacture: "Manufacturing Building"
office: "Office Building"
public: "Public Building"
@@ -706,7 +722,7 @@ en:
sport: "Sportsclub"
"yes": "Club"
craft:
- beekeper: "Beekeeper"
+ beekeeper: "Beekeeper"
blacksmith: "Blacksmith"
brewery: "Brewery"
carpenter: "Carpenter"
@@ -736,7 +752,7 @@ en:
ambulance_station: "Ambulance Station"
assembly_point: "Assembly Point"
defibrillator: "Defibrillator"
- fire_xtinguisher: "Fire Extinguisher"
+ fire_extinguisher: "Fire Extinguisher"
fire_water_pond: "Fire Water Pond"
landing_site: "Emergency Landing Site"
life_ring: "Emergency Life Ring"
@@ -821,6 +837,7 @@ en:
railway: "Historic Railway"
roman_road: "Roman Road"
ruins: "Ruins"
+ rune_stone: "Rune Stone"
stone: "Stone"
tomb: "Tomb"
tower: "Tower"
@@ -1535,7 +1552,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
@@ -1544,6 +1560,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"
@@ -1626,6 +1645,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"
@@ -1644,7 +1700,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:
@@ -2162,8 +2218,8 @@ en:
other: "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."
edit:
cancel: Cancel
- title: "Editing trace %{name}"
- heading: "Editing trace %{name}"
+ title: "Editing Trace %{name}"
+ heading: "Editing Trace %{name}"
visibility_help: "what does this mean?"
visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
update:
@@ -2171,8 +2227,8 @@ en:
trace_optionals:
tags: "Tags"
show:
- title: "Viewing trace %{name}"
- heading: "Viewing trace %{name}"
+ title: "Viewing Trace %{name}"
+ heading: "Viewing Trace %{name}"
pending: "PENDING"
filename: "Filename:"
download: "download"
@@ -2211,9 +2267,9 @@ en:
by: "by"
in: "in"
index:
- public_traces: "Public GPS traces"
- my_traces: "My GPS traces"
- public_traces_from: "Public GPS traces from %{user}"
+ public_traces: "Public GPS Traces"
+ my_traces: "My GPS Traces"
+ public_traces_from: "Public GPS Traces from %{user}"
description: "Browse recent GPS trace uploads"
tagged_with: " tagged with %{tags}"
empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page."
@@ -2273,6 +2329,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 +2376,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 +2442,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 +2464,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 +2483,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
@@ -2392,8 +2505,8 @@ en:
spam score: "Spam Score:"
description: Description
user location: User location
- if_set_location_html: "Set your home location on the %{settings_link} page to see nearby users."
- settings_link_text: settings
+ no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
+ edit_your_profile: Edit your profile
my friends: My friends
no friends: You have not added any friends yet.
km away: "%{count}km away"
@@ -2431,7 +2544,7 @@ en:
friend: "Friend"
account:
title: "Edit account"
- my settings: My settings
+ my settings: My Settings
current email address: "Current Email Address"
external auth: "External Authentication"
openid:
@@ -2455,24 +2568,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 +2594,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 +2602,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 @@ -2601,11 +2702,11 @@ en: other: "%{count} years" blocks_on: title: "Blocks on %{name}" - heading_html: "List of blocks on %{name}" + heading_html: "List of Blocks on %{name}" empty: "%{name} has not been blocked yet." blocks_by: title: "Blocks by %{name}" - heading_html: "List of blocks by %{name}" + heading_html: "List of Blocks by %{name}" empty: "%{name} has not made any blocks yet." show: title: "%{block_on} blocked by %{block_by}" @@ -2638,7 +2739,7 @@ en: notes: index: title: "Notes submitted or commented on by %{user}" - heading: "%{user}'s notes" + heading: "%{user}'s Notes" subheading_html: "Notes submitted or commented on by %{user}" no_notes: No notes id: "Id" @@ -2834,19 +2935,19 @@ en: centre_map: Centre map here redactions: edit: - heading: "Edit redaction" - title: "Edit redaction" + heading: "Edit Redaction" + title: "Edit Redaction" index: empty: "No redactions to show." - heading: "List of redactions" - title: "List of redactions" + heading: "List of Redactions" + title: "List of Redactions" new: - heading: "Enter information for new redaction" - title: "Creating new redaction" + heading: "Enter Information for New Redaction" + title: "Creating New Redaction" show: description: "Description:" - heading: "Showing redaction \"%{title}\"" - title: "Showing redaction" + heading: "Showing Redaction \"%{title}\"" + title: "Showing Redaction" user: "Creator:" edit: "Edit this redaction" destroy: "Remove this redaction"