X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0876ea0beece91be4cbd603e13951cfe6bc8e773..5966acc207874f3196a43700cb9306411c77fe47:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 094a6e9c1..7a2aba1aa 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.'
@@ -405,6 +416,26 @@ en:
title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
timeout:
sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
+ dashboards:
+ contact:
+ km away: "%{count}km away"
+ m away: "%{count}m away"
+ popup:
+ your location: "Your location"
+ nearby mapper: "Nearby mapper"
+ friend: "Friend"
+ show:
+ title: My Dashboard
+ 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.
+ nearby users: "Other nearby users"
+ no nearby users: "There are no other users who admit to mapping nearby yet."
+ friends_changesets: "friends' changesets"
+ friends_diaries: "friends' diary entries"
+ nearby_changesets: "nearby user changesets"
+ nearby_diaries: "nearby user diary entries"
diary_entries:
new:
title: New Diary Entry
@@ -412,10 +443,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 +459,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 +511,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 +717,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 +742,7 @@ en:
sport: "Sportsclub"
"yes": "Club"
craft:
- beekeper: "Beekeeper"
+ beekeeper: "Beekeeper"
blacksmith: "Blacksmith"
brewery: "Brewery"
carpenter: "Carpenter"
@@ -731,12 +767,13 @@ en:
window_construction: "Window Construction"
winery: "Winery"
"yes": "Craft Shop"
+ crossing: "Crossing"
emergency:
access_point: "Access Point"
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 +858,7 @@ en:
railway: "Historic Railway"
roman_road: "Roman Road"
ruins: "Ruins"
+ rune_stone: "Rune Stone"
stone: "Stone"
tomb: "Tomb"
tower: "Tower"
@@ -985,6 +1023,7 @@ en:
hill: "Hill"
hot_spring: "Hot Spring"
island: "Island"
+ isthmus: "Isthmus"
land: "Land"
marsh: "Marsh"
moor: "Moor"
@@ -999,10 +1038,13 @@ en:
sand: "Sand"
scree: "Scree"
scrub: "Scrub"
+ shingle: "Shingle"
spring: "Spring"
stone: "Stone"
strait: "Strait"
tree: "Tree"
+ tree_row: "Tree Row"
+ tundra: "Tundra"
valley: "Valley"
volcano: "Volcano"
water: "Water"
@@ -1403,8 +1445,9 @@ en:
intro_header: Welcome to OpenStreetMap!
intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
intro_2_create_account: "Create a user account"
- hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."
+ hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."
partners_ucl: "UCL"
+ partners_fastly: "Fastly"
partners_bytemark: "Bytemark Hosting"
partners_partners: "partners"
tou: "Terms of Use"
@@ -1628,6 +1671,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"
@@ -1646,7 +1726,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:
@@ -1784,9 +1864,8 @@ en:
credit_3_1_html: |
The map tiles in the “standard style” at www.openstreetmap.org are a
Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
- under the Open Database License. If you are using these tiles please use
- the following attribution:
- “Base map and data from OpenStreetMap and OpenStreetMap Foundation”.
+ under the Open Database License. When using this map style, the same attribution is
+ required as for the map data.
credit_4_html: |
For a browsable electronic map, the credit should appear in the corner of the map.
For example:
@@ -1815,10 +1894,10 @@ en:
Land Vorarlberg and
Land Tirol (under CC BY AT with amendments).
contributors_au_html: |
- Australia: Contains data sourced from
- PSMA Australia Limited
+ Australia: Incorporates or developed using Administrative Boundaries ©
+ Geoscape Australia
licensed by the Commonwealth of Australia under
- CC BY 4.0.
+ Creative Commons Attribution 4.0 International licence (CC BY 4.0).
contributors_ca_html: |
Canada: Contains data from
GeoBase®, GeoGratis (© Department of Natural
@@ -2006,7 +2085,7 @@ en:
potlatch:
removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
desktop_html: You can still use Potlatch by downloading the desktop application for Mac and Windows.
- id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your user settings here.
+ id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your preferences here.
sidebar:
search_results: Search Results
close: Close
@@ -2164,8 +2243,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:
@@ -2173,8 +2252,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"
@@ -2213,9 +2292,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."
@@ -2250,6 +2329,11 @@ en:
blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
+ settings_menu:
+ account_settings: Account Settings
+ oauth1_settings: OAuth 1 settings
+ oauth2_applications: OAuth 2 applications
+ oauth2_authorizations: OAuth 2 authorizations
oauth:
authorize:
title: "Authorize access to your account"
@@ -2275,6 +2359,16 @@ 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
+ read_email: Read user email address
+ skip_authorization: Auto approve application
oauth_clients:
new:
title: "Register a new application"
@@ -2314,11 +2408,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: |
@@ -2375,9 +2515,11 @@ en:
my profile: My Profile
my settings: My Settings
my comments: My Comments
- oauth settings: oauth settings
+ my_preferences: My Preferences
+ my_dashboard: My Dashboard
blocks on me: Blocks on Me
blocks by me: Blocks by Me
+ edit_profile: Edit Profile
send message: Send Message
diary: Diary
edits: Edits
@@ -2396,14 +2538,6 @@ 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
- my friends: My friends
- no friends: You have not added any friends yet.
- km away: "%{count}km away"
- m away: "%{count}m away"
- nearby users: "Other nearby users"
- no nearby users: "There are no other users who admit to mapping nearby yet."
role:
administrator: "This user is an administrator"
moderator: "This user is a moderator"
@@ -2424,18 +2558,10 @@ en:
unhide_user: "Unhide this User"
delete_user: "Delete this User"
confirm: "Confirm"
- friends_changesets: "friends' changesets"
- friends_diaries: "friends' diary entries"
- nearby_changesets: "nearby user changesets"
- nearby_diaries: "nearby user diary entries"
report: Report this User
- popup:
- your location: "Your location"
- nearby mapper: "Nearby mapper"
- 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:
@@ -2459,24 +2585,8 @@ 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
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:
@@ -2497,7 +2607,7 @@ en:
suspended:
title: Account Suspended
heading: Account Suspended
- webmaster: webmaster
+ support: support
body_html: |
Sorry, your account has been automatically suspended due to @@ -2505,7 +2615,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 @@ -2605,11 +2715,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}" @@ -2642,7 +2752,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" @@ -2838,19 +2948,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"