X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7e5bbce23dcd72876c9947d232813efb48fe83eb..041aa35939f9a93553812054a7dc7e0f05222cce:/config/locales/en-GB.yml?ds=sidebyside
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 97ddaac4b..704054e7b 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
@@ -34,12 +35,9 @@
# Author: دÙÙÙد
---
en-GB:
- html:
- dir: ltr
time:
formats:
friendly: '%e %B %Y at %H:%M'
- blog: '%e %B %Y'
helpers:
file:
prompt: Choose file
@@ -209,9 +207,6 @@ en-GB:
x_years:
one: 1 year ago
other: '%{count} years ago'
- printable_name:
- with_version: '%{id}, v%{version}'
- with_name_html: '%{name} (%{id})'
editor:
default: Default (currently %{name})
id:
@@ -252,6 +247,44 @@ 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 text: what is this?
+ public editing:
+ heading: Public editing
+ enabled: Enabled. Not anonymous and can edit data.
+ 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 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
@@ -270,8 +303,6 @@ en-GB:
view_history: View History
view_details: View Details
location: 'Location:'
- common_details:
- coordinates_html: '%{latitude}, %{longitude}'
changeset:
title: 'Changeset: %{id}'
belongs_to: Author
@@ -308,7 +339,6 @@ en-GB:
history_title_html: 'Relation History: %{name}'
members: Members
relation_member:
- entry_html: '%{type} %{name}'
entry_role_html: '%{type} %{name} as %{role}'
type:
node: Node
@@ -374,8 +404,6 @@ en-GB:
reopened_by_html: Reactivated by %{user} %{when}
reopened_by_anonymous_html: Reactivated by anonymous %{when}
hidden_by_html: Hidden by %{user} %{when}
- report: Report this note
- coordinates_html: '%{latitude}, %{longitude}'
query:
title: Query Features
introduction: Click on the map to find nearby features.
@@ -422,6 +450,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 +534,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
@@ -520,7 +563,6 @@ en-GB:
Nominatim
geonames_reverse_html: Results from GeoNames
search_osm_nominatim:
- prefix_format: '%{name}'
prefix:
aerialway:
cable_car: Cable Car
@@ -596,7 +638,6 @@ en-GB:
ice_cream: Ice Cream
internet_cafe: Internet Cafe
kindergarten: Nursery School
- language_school: Language school
library: Library
loading_dock: Loading Dock
love_hotel: Love Hotel
@@ -689,7 +730,6 @@ en-GB:
landing_site: Emergency Landing Site
phone: Emergency Phone
water_tank: Emergency Water Tank
- "yes": Emergency
highway:
abandoned: Abandoned Highway
bridleway: Bridleway
@@ -773,7 +813,6 @@ en-GB:
commercial: Commercial Area
conservation: Conservation
construction: Construction
- farm: Farm
farmland: Farmland
farmyard: Farmyard
forest: Forest
@@ -1126,9 +1165,6 @@ en-GB:
index:
reports: Reports
layouts:
- project_name:
- title: OpenStreetMap
- h1: OpenStreetMap
logo:
alt_text: OpenStreetMap logo
home: Go to Home Location
@@ -1196,7 +1232,6 @@ en-GB:
befriend_them: You can also add them as a friend at %{befriendurl}.
gpx_failure:
failed_to_import: 'failed to import. Here is the error:'
- import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
subject: '[OpenStreetMap] GPX Import failure'
gpx_success:
loaded_successfully:
@@ -1279,11 +1314,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 +1411,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 +1450,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 +1473,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
@@ -1609,7 +1652,6 @@ en-GB:
not_public_description_html: You can no longer edit the map unless you do so.
You can set your edits as public from your %{user_page}.
user_page_link: user page
- anon_edits_html: (%{link})
anon_edits_link_text: Find out why this is the case.
id_not_configured: iD has not been configured
no_iframe_support: Your browser doesn't support HTML iframes, which are necessary
@@ -1690,11 +1732,9 @@ en-GB:
title: Welcome to OpenStreetMap
description: Start with this quick guide covering the OpenStreetMap basics.
beginners_guide:
- url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
title: Beginners' Guide
description: Community maintained guide for beginners.
help:
- url: https://help.openstreetmap.org/
title: Help Forum
description: Ask a question or look up answers on OpenStreetMap's question-and-answer
site.
@@ -1714,7 +1754,6 @@ en-GB:
description: Help for companies and organisations switching to OpenStreetMap
based maps and other services.
wiki:
- url: https://wiki.openstreetmap.org/
title: OpenStreetMap Wiki
description: Browse the wiki for in-depth OpenStreetMap documentation.
sidebar:
@@ -1857,7 +1896,6 @@ en-GB:
points with timestamps)
new:
visibility_help: what does this mean?
- visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
help: Help
help_url: https://wiki.openstreetmap.org/wiki/Upload
create:
@@ -1876,7 +1914,6 @@ en-GB:
title: Editing trace %{name}
heading: Editing trace %{name}
visibility_help: what does this mean?
- visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
trace_optionals:
tags: Tags
show:
@@ -1926,7 +1963,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:
@@ -2023,14 +2059,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: |-
@@ -2047,9 +2086,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
@@ -2059,7 +2095,6 @@ en-GB:
consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
guidance_html: 'Information to help understand these terms: a human
readable summary and some informal translations'
- declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
decline: Decline
you need to accept or decline: Please read and then either accept or decline
the new Contributor Terms to continue.
@@ -2068,6 +2103,9 @@ 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}.
no_such_user:
title: No such user
heading: The user %{user} does not exist
@@ -2084,7 +2122,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
@@ -2105,14 +2142,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
@@ -2133,68 +2162,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:
@@ -2213,13 +2180,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