X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d8b9b6dd58cf049acc6cf647f80ceb5e3e200cd6..22377cbdd48a19473feff45d18e57e9501a3aceb:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 968247b2b..c29c3be4e 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -422,6 +422,22 @@ en-GB:
timeout:
sorry: Sorry, the list of changeset comments you requested took too long to
retrieve.
+ dashboards:
+ contact:
+ km away: '%{count}km away'
+ m away: '%{count}m away'
+ popup:
+ your location: Your location
+ nearby mapper: Nearby mapper
+ friend: Friend
+ show:
+ no friends: You have not added any friends yet.
+ nearby users: Other nearby users
+ no nearby users: There are no other users who admit to mapping nearby yet.
+ friends_changesets: friends' changesets
+ friends_diaries: friends' diary entries
+ nearby_changesets: nearby user changesets
+ nearby_diaries: nearby user diary entries
diary_entries:
new:
title: New Diary Entry
@@ -1265,11 +1281,33 @@ 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:
+ 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'
@@ -1304,9 +1342,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
@@ -1340,6 +1375,95 @@ 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?
+ profiles:
+ edit:
+ image: Image
+ gravatar:
+ gravatar: Use Gravatar
+ link: https://wiki.openstreetmap.org/wiki/Gravatar
+ disabled: Gravatar has been disabled.
+ enabled: Display of your Gravatar has been enabled.
+ new image: Add an image
+ keep image: Keep the current image
+ 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
+ no home location: You have not entered your home location.
+ update home location on click: Update home location when I click on the map?
+ 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 support 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
+ 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
@@ -1810,7 +1934,6 @@ en-GB:
more: more
trace_details: View Trace Details
view_map: View Map
- edit: edit
edit_map: Edit Map
public: PUBLIC
identifiable: IDENTIFIABLE
@@ -1818,7 +1941,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}
@@ -1828,7 +1950,6 @@ en-GB:
or learn more about GPS tracing on the wiki
page.
upload_trace: Upload a trace
- see_all_traces: See all traces
destroy:
scheduled_for_deletion: Trace scheduled for deletion
make_public:
@@ -1926,87 +2047,13 @@ 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
account for you automatically.
- contact_webmaster_html: Please contact the webmaster
- to arrange for an account to be created - we will try and deal with the request
- as quickly as possible.
+ contact_support_html: Please contact support to arrange
+ for an account to be created - we will try and deal with the request as quickly
+ as possible.
about:
header: Free and editable
html: |-
@@ -2023,9 +2070,6 @@ en-GB:
but some extra tools or server may still need one.
continue: Sign Up
terms accepted: Thanks for accepting the new contributor terms!
- terms declined: We are sorry that you have decided to not accept the new Contributor
- Terms. For more information, please see this wiki page.
- terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
terms:
title: Terms
heading: Terms
@@ -2044,6 +2088,10 @@ en-GB:
france: France
italy: Italy
rest_of_world: Rest of the world
+ terms_declined_flash:
+ terms_declined_html: We are sorry that you have decided to not accept the new
+ Contributor Terms. For more information, please see %{terms_declined_link}.
+ terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
no_such_user:
title: No such user
heading: The user %{user} does not exist
@@ -2060,7 +2108,6 @@ en-GB:
my profile: My Profile
my settings: My Settings
my comments: My Comments
- oauth settings: oauth settings
blocks on me: Blocks on Me
blocks by me: Blocks by Me
send message: Send Message
@@ -2081,14 +2128,6 @@ en-GB:
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 friends: You have not added any friends yet.
- km away: '%{count}km away'
- m away: '%{count}m away'
- nearby users: Other nearby users
- no nearby users: There are no other users who admit to mapping nearby yet.
role:
administrator: This user is an administrator
moderator: This user is a moderator
@@ -2109,14 +2148,6 @@ en-GB:
unhide_user: Unhide this User
delete_user: Delete this User
confirm: Confirm
- friends_changesets: friends' changesets
- friends_diaries: friends' diary entries
- nearby_changesets: nearby user changesets
- nearby_diaries: nearby user diary entries
- popup:
- your location: Your location
- nearby mapper: Nearby mapper
- friend: Friend
account:
title: Edit account
my settings: My settings
@@ -2151,53 +2182,11 @@ en-GB:
in the Public Domain.
link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
link text: what is this?
- image: Image
- gravatar:
- gravatar: Use Gravatar
- link: https://wiki.openstreetmap.org/wiki/Gravatar
- disabled: Gravatar has been disabled.
- enabled: Display of your Gravatar has been enabled.
- new image: Add an image
- keep image: Keep the current image
- 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
- no home location: You have not entered your home location.
- 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
- return to profile: Return to profile
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:
@@ -2216,13 +2205,12 @@ en-GB:
suspended:
title: Account Suspended
heading: Account Suspended
- webmaster: webmaster
body_html: |-
Sorry, your account has been automatically suspended due to suspicious activity.
- This decision will be reviewed by an administrator shortly, or you may contact the %{webmaster} if you wish to discuss this. + This decision will be reviewed by an administrator shortly, or you may contact %{webmaster} if you wish to discuss this.
auth_failure: connection_failed: Connection to authentication provider failed @@ -2327,8 +2315,8 @@ en-GB: show: title: '%{block_on} blocked by %{block_by}' heading_html: '%{block_on} blocked by %{block_by}' - created: Created - status: Status + created: 'Created:' + status: 'Status:' show: Show edit: Edit revoke: Revoke!