X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/92712591c962a0b1c859393a11c61af0629628f7..de8ee536b1e6d511f6d943b2e9afabf778979e6b:/config/locales/en.yml?ds=sidebyside
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 21ea7e106..4e8385e26 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"
@@ -958,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"
@@ -981,6 +988,7 @@ en:
moor: "Moor"
mud: "Mud"
peak: "Peak"
+ peninsula: "Peninsula"
point: "Point"
reef: "Reef"
ridge: "Ridge"
@@ -1028,6 +1036,7 @@ en:
"yes": "Office"
place:
allotments: "Allotments"
+ archipelago: "Archipelago"
city: "City"
city_block: "City Block"
country: "Country"
@@ -1289,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:
@@ -1360,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:
@@ -1510,11 +1519,34 @@ en:
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".'
+ confirmations:
+ confirm:
+ heading: Check your email!
+ introduction_1: |
+ We sent you a confirmation email.
+ introduction_2: |
+ Confirm your account by clicking on the link in the email and you'll be able to start mapping.
+ press confirm button: "Press the confirm button below to activate your account."
+ button: Confirm
+ success: "Confirmed your account, thanks for signing up!"
+ already active: "This account has already been confirmed."
+ 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
+ press confirm button: "Press the confirm button below to confirm your new email address."
+ button: Confirm
+ 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."
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"
@@ -1547,9 +1579,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"
@@ -1578,6 +1609,92 @@ en:
as_unread: "Message marked as unread"
destroy:
destroyed: "Message deleted"
+ passwords:
+ lost_password:
+ title: "Lost password"
+ heading: "Forgotten Password?"
+ email address: "Email Address:"
+ new password button: "Reset password"
+ help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
+ notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+ notice email cannot find: "Could not find that email address, sorry."
+ reset_password:
+ title: "Reset password"
+ heading: "Reset Password for %{user}"
+ reset: "Reset Password"
+ flash changed: "Your password has been changed."
+ flash token bad: "Did not find that token, check the URL maybe?"
+ 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
@@ -1782,10 +1899,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:
@@ -1889,6 +2002,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
@@ -1972,23 +2089,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: |
@@ -2104,7 +2204,6 @@ en:
more: "more"
trace_details: "View Trace Details"
view_map: "View Map"
- edit: "edit"
edit_map: "Edit Map"
public: "PUBLIC"
identifiable: "IDENTIFIABLE"
@@ -2112,7 +2211,6 @@ en:
trackable: "TRACKABLE"
by: "by"
in: "in"
- map: "map"
index:
public_traces: "Public GPS traces"
my_traces: "My GPS traces"
@@ -2214,72 +2312,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?"
- email address: "Email Address:"
- new password button: "Reset password"
- help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
- notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
- notice email cannot find: "Could not find that email address, sorry."
- reset_password:
- title: "Reset password"
- heading: "Reset Password for %{user}"
- reset: "Reset Password"
- flash changed: "Your password has been changed."
- flash token bad: "Did not find that token, check the URL maybe?"
new:
title: "Sign Up"
no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
@@ -2292,12 +2324,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 @@ -2402,15 +2431,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?" @@ -2420,21 +2447,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).