X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aefcc52411c577fe75e537a54db8f4a6c9252e3f..f67ac3c4326a13a296fea88f58b5fc54c3342790:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 730ab9b14..6a7f2eb8d 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -11,6 +11,7 @@
# Author: Caliburn
# Author: Captaindogfish
# Author: Chase me ladies, I'm the Cavalry
+# Author: Danieldegroot2
# Author: E THP
# Author: EdLoach
# Author: Eduard Popov
@@ -252,6 +253,47 @@ en-GB:
entry:
comment: Comment
full: Full note
+ accounts:
+ edit:
+ title: Edit account
+ my settings: My settings
+ 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
+ enabled: Enabled. Not anonymous and can edit data.
+ enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+ enabled link text: what is this?
+ disabled: Disabled and cannot edit data, all previous edits are anonymous.
+ disabled link text: why can't I edit?
+ public editing note:
+ 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).
- Your e-mail address will not be revealed by becoming
+ public.
- This action cannot be reversed and all new users are now
+ public by default.
+ 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
+ accept the new Contributor Terms.
+ agreed_with_pd: You have also declared that you consider your edits to be
+ in the Public Domain.
+ link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
+ link text: what is this?
+ save changes button: Save Changes
+ make edits public button: Make all my edits public
+ update:
+ success_confirm_needed: User information updated successfully. Check your email
+ for a note to confirm your new email address.
+ success: User information updated successfully.
browse:
created: Created
closed: Closed
@@ -422,6 +464,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
@@ -490,7 +548,6 @@ en-GB:
title: OpenStreetMap diary entries
description: Recent diary entries from users of OpenStreetMap
comments:
- has_commented_on: '%{display_name} has commented on the following diary entries'
post: Post
when: When
comment: Comment
@@ -689,7 +746,6 @@ en-GB:
landing_site: Emergency Landing Site
phone: Emergency Phone
water_tank: Emergency Water Tank
- "yes": Emergency
highway:
abandoned: Abandoned Highway
bridleway: Bridleway
@@ -1279,11 +1335,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 +1432,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 +1471,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:
@@ -2019,14 +2086,17 @@ en-GB:
flash: Updated the client information successfully
destroy:
flash: Destroyed the client application registration
+ oauth2_applications:
+ new:
+ title: Register a new application
users:
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: |-
@@ -2043,9 +2113,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
@@ -2064,6 +2131,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
@@ -2080,7 +2151,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
@@ -2101,14 +2171,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
@@ -2129,68 +2191,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
- 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
- enabled: Enabled. Not anonymous and can edit data.
- enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
- enabled link text: what is this?
- disabled: Disabled and cannot edit data, all previous edits are anonymous.
- disabled link text: why can't I edit?
- public editing note:
- 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).- Your e-mail address will not be revealed by becoming
- public.
- This action cannot be reversed and all new users are now
- public by default.
- 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
- accept the new Contributor Terms.
- agreed_with_pd: You have also declared that you consider your edits to be
- 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.
set_home:
flash success: Home location saved successfully
go_public:
@@ -2209,13 +2209,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