X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/75edada3510c93b5407d72131c148309b5668dbe..d8aeb7e6537295aa32b1d0da6ca4a9493cbd1f80:/config/locales/en-GB.yml?ds=sidebyside
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 214269316..2e7da718e 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -147,20 +147,29 @@ en-GB:
title: Subject
body: Body
recipient: Recipient
+ redaction:
+ description: Description
report:
category: 'Select a reason for your report:'
details: Please provide some more details about the problem (required).
user:
email: E-mail
+ 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
pass_crypt: Password
pass_crypt_confirmation: Confirm Password
help:
trace:
tagstring: comma delimited
+ user_block:
+ needs_view: Does the user need to log in before this block will be cleared?
+ user:
+ new_email: (never displayed publicly)
datetime:
distance_in_words_ago:
about_x_hours:
@@ -210,7 +219,7 @@ en-GB:
description: iD (in-browser editor)
remote:
name: Remote Control
- description: Remote Control (JOSM or Merkaartor)
+ description: Remote Control (JOSM, Potlatch, Merkaartor)
auth:
providers:
none: None
@@ -417,7 +426,7 @@ en-GB:
new:
title: New Diary Entry
form:
- location: 'Location:'
+ location: Location
use_map_link: Use map
index:
title: Users' diaries
@@ -447,7 +456,7 @@ en-GB:
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
@@ -1256,11 +1265,38 @@ en-GB:
details: More details about the changeset can be found at %{url}.
unsubscribe: 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 e-mail address
+ press confirm button: Press the confirm button below to confirm your new e-mail
+ address.
+ button: Confirm
+ success: Confirmed your change of email address!
+ failure: An e-mail 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
messages: You have %{new_messages} and %{old_messages}
new_messages:
one: '%{count} new message'
@@ -1295,9 +1331,6 @@ en-GB:
body: Sorry, there is no message with that id.
outbox:
title: Outbox
- my_inbox_html: My %{inbox_link}
- inbox: inbox
- outbox: outbox
messages:
one: You have %{count} sent message
other: You have %{count} sent messages
@@ -1331,6 +1364,82 @@ en-GB:
as_unread: Message marked as unread
destroy:
destroyed: Message deleted
+ passwords:
+ lost_password:
+ title: Lost password
+ heading: Forgotten Password?
+ email address: E-mail address
+ new password button: Reset password
+ help_text: Enter the e-mail 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: 'E-mail 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 of OpenStreetMap
+ logout_button: Logout
site:
about:
next: Next
@@ -1691,23 +1800,6 @@ en-GB:
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: Welcome to OpenStreetMap, the free and editable map of the
@@ -1818,7 +1910,6 @@ en-GB:
more: more
trace_details: View Trace Details
view_map: View Map
- edit: edit
edit_map: Edit Map
public: PUBLIC
identifiable: IDENTIFIABLE
@@ -1826,7 +1917,6 @@ en-GB:
trackable: TRACKABLE
by: by
in: in
- map: map
index:
public_traces: Public GPS traces
public_traces_from: Public GPS traces from %{user}
@@ -1934,80 +2024,6 @@ en-GB:
destroy:
flash: Destroyed the client application registration
users:
- login:
- title: Login
- heading: Login
- email or username: 'E-mail 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 of OpenStreetMap
- logout_button: Logout
- lost_password:
- title: Lost password
- heading: Forgotten Password?
- email address: E-mail address
- new password button: Reset password
- help_text: Enter the e-mail 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
@@ -2022,15 +2038,10 @@ en-GB:
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.
@@ -2133,15 +2144,13 @@ en-GB:
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?
@@ -2157,7 +2166,7 @@ en-GB:
public.This action cannot be reversed and all new users are now
public by default.
contributor terms:
- heading: 'Contributor Terms:'
+ heading: Contributor Terms
agreed: You have agreed to the new Contributor Terms.
not yet agreed: You have not yet agreed to the new Contributor Terms.
review link text: Please follow this link at your convenience to review and
@@ -2166,14 +2175,10 @@ en-GB:
in the Public Domain.
link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
link text: what is this?
- profile description: 'Profile Description:'
- preferred languages: 'Preferred Languages:'
- preferred editor: 'Preferred Editor:'
- image: 'Image:'
+ image: Image
gravatar:
gravatar: Use Gravatar
link: https://wiki.openstreetmap.org/wiki/Gravatar
- link text: what is this?
disabled: Gravatar has been disabled.
enabled: Display of your Gravatar has been enabled.
new image: Add an image
@@ -2181,10 +2186,8 @@ en-GB:
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:'
+ home location: Home Location
no home location: You have not entered your home location.
- latitude: 'Latitude:'
- longitude: 'Longitude:'
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
@@ -2192,33 +2195,6 @@ en-GB:
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.
- 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 e-mail address
- press confirm button: Press the confirm button below to confirm your new e-mail
- address.
- button: Confirm
- success: Confirmed your change of email address!
- failure: An e-mail address has already been confirmed with this token.
- unknown_token: That confirmation code has expired or does not exist.
set_home:
flash success: Home location saved successfully
go_public:
@@ -2291,27 +2267,17 @@ en-GB:
new:
title: Creating block on %{name}
heading_html: Creating block on %{name}
- reason: The reason why %{name} 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.
period: How long, starting now, the user will be blocked from the API for.
tried_contacting: I have contacted the user and asked them to stop.
tried_waiting: I have given a reasonable amount of time for the user to respond
to those communications.
- needs_view: User needs to log in before this block will be cleared
back: View all blocks
edit:
title: Editing block on %{name}
heading_html: Editing block on %{name}
- reason: The reason why %{name} is being blocked. Please be as calm and as reasonable
- as possible, giving as much detail as you can about the situation. Bear in
- mind that not all users understand the community jargon, so please try to
- use laymans terms.
period: How long, starting now, the user will be blocked from the API for.
show: View this block
back: View all blocks
- needs_view: Does the user need to log in before this block will be cleared?
filter:
block_expired: The block has already expired and cannot be edited.
block_period: The blocking period must be one of the values selectable in the
@@ -2406,7 +2372,6 @@ en-GB:
custom_dimensions: Set custom dimensions
format: 'Format:'
scale: 'Scale:'
- image_size: Image will show standard layer at
download: Download
short_url: Short URL
include_marker: Include marker
@@ -2562,7 +2527,6 @@ en-GB:
centre_map: Centre map here
redactions:
edit:
- description: Description
heading: Edit redaction
title: Edit redaction
index:
@@ -2570,7 +2534,6 @@ en-GB:
heading: List of redactions
title: List of redactions
new:
- description: Description
heading: Enter information for new redaction
title: Creating new redaction
show: