X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/847536c80dbd1f8a0b4e0c0f803e80407e00e4b1..f18baae22e4088af7f252c82f3c4a2576862a438:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 37d6f99e9..e1907b936 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -116,20 +116,36 @@ en:
title: "Subject"
body: "Body"
recipient: "Recipient"
+ redaction:
+ title: Title
+ description: Description
report:
category: Select a reason for your report
details: Please provide some more details about the problem (required).
user:
+ auth_provider: Authentication Provider
+ auth_uid: Authentication UID
email: "Email"
+ email_confirmation: "Email Confirmation"
+ new_email: "New Email Address"
active: "Active"
display_name: "Display Name"
- description: "Description"
- languages: "Languages"
+ description: Profile Description
+ home_lat: Latitude
+ home_lon: Longitude
+ languages: Preferred Languages
+ preferred_editor: Preferred Editor
pass_crypt: "Password"
pass_crypt_confirmation: "Confirm Password"
help:
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.
+ 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.'
+ new_email: "(never displayed publicly)"
datetime:
distance_in_words_ago:
about_x_hours:
@@ -175,18 +191,12 @@ en:
with_name_html: "%{name} (%{id})"
editor:
default: "Default (currently %{name})"
- potlatch:
- name: "Potlatch 1"
- description: "Potlatch 1 (in-browser editor)"
id:
name: "iD"
description: "iD (in-browser editor)"
- potlatch2:
- name: "Potlatch 2"
- description: "Potlatch 2 (in-browser editor)"
remote:
name: "Remote Control"
- description: "Remote Control (JOSM or Merkaartor)"
+ description: "Remote Control (JOSM, Potlatch, Merkaartor)"
auth:
providers:
none: None
@@ -399,13 +409,8 @@ en:
new:
title: New Diary Entry
form:
- subject: "Subject:"
- body: "Body:"
- language: "Language:"
- location: "Location:"
- latitude: "Latitude:"
- longitude: "Longitude:"
- use_map_link: "use map"
+ location: Location
+ use_map_link: Use Map
index:
title: "Users' diaries"
title_friends: "Friends' diaries"
@@ -433,7 +438,8 @@ en:
heading: "No entry with the id: %{id}"
body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
diary_entry:
- posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
+ posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}."
+ updated_at_html: "Last updated on %{updated}."
comment_link: Comment on this entry
reply_link: Send a message to the author
comment_count:
@@ -957,12 +963,14 @@ en:
mountain_pass:
"yes" : "Mountain Pass"
natural:
+ atoll: "Atoll"
bare_rock: "Bare Rock"
bay: "Bay"
beach: "Beach"
cape: "Cape"
cave_entrance: "Cave Entrance"
cliff: "Cliff"
+ coastline: "Coastline"
crater: "Crater"
dune: "Dune"
fell: "Fell"
@@ -980,6 +988,7 @@ en:
moor: "Moor"
mud: "Mud"
peak: "Peak"
+ peninsula: "Peninsula"
point: "Point"
reef: "Reef"
ridge: "Ridge"
@@ -1027,6 +1036,7 @@ en:
"yes": "Office"
place:
allotments: "Allotments"
+ archipelago: "Archipelago"
city: "City"
city_block: "City Block"
country: "Country"
@@ -1244,12 +1254,15 @@ en:
"yes": "Waterway"
admin_levels:
level2: "Country Boundary"
+ level3: "Region Boundary"
level4: "State Boundary"
level5: "Region Boundary"
level6: "County Boundary"
+ level7: "Municipality Boundary"
level8: "City Boundary"
level9: "Village Boundary"
level10: "Suburb Boundary"
+ level11: "Neighbourhood Boundary"
types:
cities: Cities
towns: Towns
@@ -1285,7 +1298,7 @@ en:
open: Open
resolved: Resolved
update:
- new_report: Your report has been registered sucessfully
+ new_report: Your report has been registered successfully
successful_update: Your report has been updated successfully
provide_details: Please provide the required details
show:
@@ -1356,7 +1369,7 @@ en:
abusive_label: This note is abusive
other_label: Other
create:
- successful_report: Your report has been registered sucessfully
+ successful_report: Your report has been registered successfully
provide_details: Please provide the required details
layouts:
project_name:
@@ -1414,35 +1427,39 @@ en:
subject: "[OpenStreetMap] %{user} commented on a diary entry"
hi: "Hi %{to_user},"
header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
+ header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
+ footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
message_notification:
- subject_header: "[OpenStreetMap] %{subject}"
+ subject: "[OpenStreetMap] %{message_title}"
hi: "Hi %{to_user},"
header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
+ header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
+ footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
friendship_notification:
hi: "Hi %{to_user},"
subject: "[OpenStreetMap] %{user} added you as a friend"
had_added_you: "%{user} has added you as a friend on OpenStreetMap."
see_their_profile: "You can see their profile at %{userurl}."
+ see_their_profile_html: "You can see their profile at %{userurl}."
befriend_them: "You can also add them as a friend at %{befriendurl}."
- gpx_notification:
- greeting: "Hi,"
- your_gpx_file: "It looks like your GPX file"
- with_description: "with the description"
- and_the_tags: "and the following tags:"
- and_no_tags: "and no tags."
- failure:
- subject: "[OpenStreetMap] GPX Import failure"
- failed_to_import: "failed to import. Here is the error:"
- more_info_1: "More information about GPX import failures and how to avoid"
- more_info_2: "them can be found at:"
- import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
- success:
- subject: "[OpenStreetMap] GPX Import success"
- loaded_successfully:
- one: loaded successfully with %{trace_points} out of a possible 1 point.
- other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+ befriend_them_html: "You can also add them as a friend at %{befriendurl}."
+ gpx_description:
+ description_with_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+ description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
+ gpx_failure:
+ hi: "Hi %{to_user},"
+ failed_to_import: "failed to import. Here is the error:"
+ more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}."
+ import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+ subject: "[OpenStreetMap] GPX Import failure"
+ gpx_success:
+ hi: "Hi %{to_user},"
+ loaded_successfully:
+ one: loaded successfully with %{trace_points} out of a possible 1 point.
+ other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+ subject: "[OpenStreetMap] GPX Import success"
signup_confirm:
subject: "[OpenStreetMap] Welcome to OpenStreetMap"
greeting: "Hi there!"
@@ -1451,21 +1468,11 @@ en:
welcome: "After you confirm your account, we'll provide you with some additional information to get you started."
email_confirm:
subject: "[OpenStreetMap] Confirm your email address"
- email_confirm_plain:
- greeting: "Hi,"
- hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
- click_the_link: "If this is you, please click the link below to confirm the change."
- email_confirm_html:
greeting: "Hi,"
hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
click_the_link: "If this is you, please click the link below to confirm the change."
lost_password:
subject: "[OpenStreetMap] Password reset request"
- lost_password_plain:
- greeting: "Hi,"
- hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
- click_the_link: "If this is you, please click the link below to reset your password."
- lost_password_html:
greeting: "Hi,"
hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
click_the_link: "If this is you, please click the link below to reset your password."
@@ -1476,18 +1483,25 @@ en:
subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
+ your_note_html: "%{commenter} has left a comment on one of your map notes near %{place}."
commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
+ commented_note_html: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
closed:
subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes"
subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in"
your_note: "%{commenter} has resolved one of your map notes near %{place}."
+ your_note_html: "%{commenter} has resolved one of your map notes near %{place}."
commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."
+ commented_note_html: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."
reopened:
subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes"
subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in"
your_note: "%{commenter} has reactivated one of your map notes near %{place}."
+ your_note_html: "%{commenter} has reactivated one of your map notes near %{place}."
commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
+ commented_note_html: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
details: "More details about the note can be found at %{url}."
+ details_html: "More details about the note can be found at %{url}."
changeset_comment_notification:
hi: "Hi %{to_user},"
greeting: "Hi,"
@@ -1495,16 +1509,21 @@ en:
subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
your_changeset: "%{commenter} left a comment at %{time} on one of your changesets"
+ your_changeset_html: "%{commenter} left a comment at %{time} on one of your changesets"
commented_changeset: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}"
+ commented_changeset_html: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}"
partial_changeset_with_comment: "with comment '%{changeset_comment}'"
+ partial_changeset_with_comment_html: "with comment '%{changeset_comment}'"
partial_changeset_without_comment: "without comment"
details: "More details about the changeset can be found at %{url}."
+ details_html: "More details about the changeset can be found at %{url}."
unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
+ unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
messages:
inbox:
title: "Inbox"
my_inbox: "My Inbox"
- outbox: "outbox"
+ my_outbox: "My Outbox"
messages: "You have %{new_messages} and %{old_messages}"
new_messages:
one: "%{count} new message"
@@ -1537,9 +1556,8 @@ en:
body: "Sorry there is no message with that id."
outbox:
title: "Outbox"
- my_inbox_html: "My %{inbox_link}"
- inbox: "inbox"
- outbox: "outbox"
+ my_inbox: "My Inbox"
+ my_outbox: "My Outbox"
messages:
one: "You have %{count} sent message"
other: "You have %{count} sent messages"
@@ -1568,6 +1586,77 @@ en:
as_unread: "Message marked as unread"
destroy:
destroyed: "Message deleted"
+ sessions:
+ new:
+ title: "Login"
+ heading: "Login"
+ email or username: "Email Address or Username:"
+ password: "Password:"
+ openid_html: "%{logo} OpenID:"
+ remember: "Remember me"
+ lost password link: "Lost your password?"
+ login_button: "Login"
+ register now: Register now
+ with username: "Already have an OpenStreetMap account? Please login with your username and password:"
+ with external: "Alternatively, use a third party to login:"
+ new to osm: New to OpenStreetMap?
+ to make changes: To make changes to the OpenStreetMap data, you must have an account.
+ 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.
+ auth failure: "Sorry, could not log in with those details."
+ openid_logo_alt: "Log in with an OpenID"
+ auth_providers:
+ openid:
+ title: Login with OpenID
+ alt: Login with an OpenID URL
+ google:
+ title: Login with Google
+ alt: Login with a Google OpenID
+ facebook:
+ title: Login with Facebook
+ alt: Login with a Facebook Account
+ windowslive:
+ title: Login with Windows Live
+ alt: Login with a Windows Live Account
+ github:
+ title: Login with GitHub
+ alt: Login with a GitHub Account
+ 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
+ aol:
+ title: Login with AOL
+ alt: Login with an AOL OpenID
+ destroy:
+ title: "Logout"
+ heading: "Logout from OpenStreetMap"
+ logout_button: "Logout"
+ shared:
+ markdown_help:
+ title_html: Parsed with kramdown
+ headings: Headings
+ heading: Heading
+ subheading: Subheading
+ unordered: Unordered list
+ ordered: Ordered list
+ first: First item
+ second: Second item
+ link: Link
+ text: Text
+ image: Image
+ alt: Alt text
+ url: URL
+ richtext_field:
+ edit: Edit
+ preview: Preview
site:
about:
next: Next
@@ -1772,10 +1861,6 @@ en:
anon_edits_html: "(%{link})"
anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
anon_edits_link_text: "Find out why this is the case."
- flash_player_required_html: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.'
- potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
- potlatch2_not_configured: "Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
- potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
id_not_configured: "iD has not been configured"
no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
export:
@@ -1879,6 +1964,10 @@ en:
url: https://wiki.openstreetmap.org/
title: OpenStreetMap Wiki
description: Browse the wiki for in-depth OpenStreetMap documentation.
+ 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.
sidebar:
search_results: Search Results
close: Close
@@ -1962,23 +2051,6 @@ en:
bicycle_shop: "Bicycle shop"
bicycle_parking: "Bicycle parking"
toilets: "Toilets"
- richtext_area:
- edit: Edit
- preview: Preview
- markdown_help:
- title_html: Parsed with kramdown
- headings: Headings
- heading: Heading
- subheading: Subheading
- unordered: Unordered list
- ordered: Ordered list
- first: First item
- second: Second item
- link: Link
- text: Text
- image: Image
- alt: Alt text
- url: URL
welcome:
title: Welcome!
introduction_html: |
@@ -2094,7 +2166,6 @@ en:
more: "more"
trace_details: "View Trace Details"
view_map: "View Map"
- edit: "edit"
edit_map: "Edit Map"
public: "PUBLIC"
identifiable: "IDENTIFIABLE"
@@ -2102,7 +2173,6 @@ en:
trackable: "TRACKABLE"
by: "by"
in: "in"
- map: "map"
index:
public_traces: "Public GPS traces"
my_traces: "My GPS traces"
@@ -2204,58 +2274,6 @@ en:
destroy:
flash: "Destroyed the client application registration"
users:
- login:
- title: "Login"
- heading: "Login"
- email or username: "Email Address or Username:"
- password: "Password:"
- openid_html: "%{logo} OpenID:"
- remember: "Remember me"
- lost password link: "Lost your password?"
- login_button: "Login"
- register now: Register now
- with username: "Already have an OpenStreetMap account? Please login with your username and password:"
- with external: "Alternatively, use a third party to login:"
- new to osm: New to OpenStreetMap?
- to make changes: To make changes to the OpenStreetMap data, you must have an account.
- 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.
- auth failure: "Sorry, could not log in with those details."
- openid_logo_alt: "Log in with an OpenID"
- auth_providers:
- openid:
- title: Login with OpenID
- alt: Login with an OpenID URL
- google:
- title: Login with Google
- alt: Login with a Google OpenID
- facebook:
- title: Login with Facebook
- alt: Login with a Facebook Account
- windowslive:
- title: Login with Windows Live
- alt: Login with a Windows Live Account
- github:
- title: Login with GitHub
- alt: Login with a GitHub Account
- 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
- aol:
- title: Login with AOL
- alt: Login with an AOL OpenID
- logout:
- title: "Logout"
- heading: "Logout from OpenStreetMap"
- logout_button: "Logout"
lost_password:
title: "Lost password"
heading: "Forgotten Password?"
@@ -2282,12 +2300,9 @@ en:
Sign up to get started contributing. We'll send an email to confirm your account.
email address: "Email Address:" confirm email address: "Confirm Email Address:" - not_displayed_publicly_html: 'Your address is not displayed publicly, see our privacy policy for more information' display name: "Display Name:" display name description: "Your publicly displayed username. You can change this later in the preferences." external auth: "Third Party Authentication:" - password: "Password:" - confirm password: "Confirm Password:" use external auth: "Alternatively, use a third party to login" 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 @@ -2392,15 +2407,13 @@ en: account: title: "Edit account" my settings: My settings - current email address: "Current Email Address:" - new email address: "New Email Address:" - email never displayed publicly: "(never displayed publicly)" - external auth: "External Authentication:" + current email address: "Current Email Address" + external auth: "External Authentication" openid: link: "https://wiki.openstreetmap.org/wiki/OpenID" link text: "what is this?" public editing: - heading: "Public editing:" + heading: "Public editing" enabled: "Enabled. Not anonymous and can edit data." enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits" enabled link text: "what is this?" @@ -2410,21 +2423,18 @@ en: heading: "Public editing" html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. Since the 0.6 API changeover, only public users can edit map data. (find out why).