X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f1935b1c5786de8f27bee9b6b2da2f28f650468f..19d8b2a41c3c421d060ec5281305a75ee09ceb1f:/config/locales/en.yml?ds=inline
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 83b697e8c..4f1edfab4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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"
@@ -1838,9 +1838,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:
@@ -2060,7 +2059,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
@@ -2218,8 +2217,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:
@@ -2227,8 +2226,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"
@@ -2267,9 +2266,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."
@@ -2304,6 +2303,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"
@@ -2378,7 +2382,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"
@@ -2405,7 +2409,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"
@@ -2415,7 +2419,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."
@@ -2505,8 +2509,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"
@@ -2544,7 +2548,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:
@@ -2570,10 +2574,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:
@@ -2702,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}"
@@ -2739,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"
@@ -2935,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"