X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbf35e0cf67ee330cd02c2431e0ed6d08681d184..061b0733b6cc4eaa81dc3970dbcb5d9101c14849:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2e7da718e..d788820e1 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1279,11 +1279,6 @@ en-GB:
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
@@ -1381,6 +1376,22 @@ en-GB:
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
@@ -1404,8 +1415,8 @@ en-GB:
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.
+ 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:
@@ -1427,9 +1438,6 @@ en-GB:
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
@@ -1926,7 +1934,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:
@@ -2028,9 +2035,9 @@ en-GB:
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: |-
@@ -2047,9 +2054,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
@@ -2068,6 +2072,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
@@ -2084,7 +2092,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
@@ -2175,20 +2182,6 @@ 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
@@ -2213,13 +2206,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 @@ -2324,8 +2316,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!