X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/403c8941a6ffeb39bd796c0591ca999b6babc0ca..b1b2b52477cc95f4cb9953e426e111f0b940cfc0:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fcfb2bc89..030fab696 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -152,7 +152,7 @@ en:
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.'
@@ -423,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
@@ -439,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"
@@ -697,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"
@@ -722,7 +722,7 @@ en:
sport: "Sportsclub"
"yes": "Club"
craft:
- beekeper: "Beekeeper"
+ beekeeper: "Beekeeper"
blacksmith: "Blacksmith"
brewery: "Brewery"
carpenter: "Carpenter"
@@ -752,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"
@@ -837,6 +837,7 @@ en:
railway: "Historic Railway"
roman_road: "Roman Road"
ruins: "Ruins"
+ rune_stone: "Rune Stone"
stone: "Stone"
tomb: "Tomb"
tower: "Tower"
@@ -1419,8 +1420,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"
@@ -2059,7 +2061,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
@@ -2217,8 +2219,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:
@@ -2226,8 +2228,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"
@@ -2266,9 +2268,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."
@@ -2303,6 +2305,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"
@@ -2377,7 +2384,7 @@ en:
flash: "Destroyed the client application registration"
oauth2_applications:
index:
- title: "My client applications"
+ 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"
@@ -2404,7 +2411,7 @@ en:
sorry: "Sorry, that application could not be found."
oauth2_authorizations:
new:
- title: "Authorization required"
+ title: "Authorization Required"
introduction: "Authorize %{application} to access your account with the following permissions?"
authorize: "Authorize"
deny: "Deny"
@@ -2414,7 +2421,7 @@ en:
title: "Authorization code"
oauth2_authorized_applications:
index:
- title: "My authorized applications"
+ title: "My Authorized Applications"
application: "Application"
permissions: "Permissions"
no_applications_html: "You have not yet authorized any %{oauth2} applications."
@@ -2504,8 +2511,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"
@@ -2543,7 +2550,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:
@@ -2569,10 +2576,6 @@ en:
link text: "what is this?"
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:
@@ -2701,11 +2704,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}"
@@ -2738,7 +2741,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"
@@ -2934,19 +2937,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"