X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f4e848d9ea2ea476ab5cdba5ad407cad39a59a01..7f9dacbada0dcda8918d930945de327f504612a2:/config/locales/en-GB.yml?ds=sidebyside
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 928e877a3..a5157a12d 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -11,15 +11,19 @@
# Author: E THP
# Author: EdLoach
# Author: Eduard Popov
+# Author: Gravitystorm
# Author: IknowJoseph
# Author: Jagwar
# Author: Jguthrie100
+# Author: Jlrb+
# Author: Kosovastar
# Author: Macofe
# Author: Meno25
+# Author: Mvolz
# Author: Sampablokuper
# Author: Shirayuki
# Author: Smsm1
+# Author: TomH
# Author: دÙÙÙد
---
en-GB:
@@ -31,8 +35,24 @@ en-GB:
blog: '%e %B %Y'
helpers:
submit:
+ diary_comment:
+ create: Save
diary_entry:
create: Publish
+ message:
+ create: Send
+ client_application:
+ create: Register
+ update: Edit
+ redaction:
+ create: Create redaction
+ update: Save redaction
+ trace:
+ create: Upload
+ update: Save Changes
+ user_block:
+ create: Create block
+ update: Update block
activerecord:
models:
acl: Access Control List
@@ -121,14 +141,14 @@ en-GB:
api:
notes:
comment:
- opened_at_html: Created %{when} ago
- opened_at_by_html: Created %{when} ago by %{user}
- commented_at_html: Updated %{when} ago
- commented_at_by_html: Updated %{when} ago by %{user}
- closed_at_html: Resolved %{when} ago
- closed_at_by_html: Resolved %{when} ago by %{user}
- reopened_at_html: Reactivated %{when} ago
- reopened_at_by_html: Reactivated %{when} ago by %{user}
+ opened_at_html: Created %{when}
+ opened_at_by_html: Created %{when} by %{user}
+ commented_at_html: Updated %{when}
+ commented_at_by_html: Updated %{when} by %{user}
+ closed_at_html: Resolved %{when}
+ closed_at_by_html: Resolved %{when} by %{user}
+ reopened_at_html: Reactivated %{when}
+ reopened_at_by_html: Reactivated %{when} by %{user}
rss:
title: OpenStreetMap Notes
description_area: A list of notes, reported, commented on or closed in your
@@ -144,12 +164,12 @@ en-GB:
browse:
created: Created
closed: Closed
- created_html: Created %{time} ago
- closed_html: Closed %{time} ago
- created_by_html: Created %{time} ago by %{user}
- deleted_by_html: Deleted %{time} ago by %{user}
- edited_by_html: Edited %{time} ago by %{user}
- closed_by_html: Closed %{time} ago by %{user}
+ created_html: Created %{time}
+ closed_html: Closed %{time}
+ created_by_html: Created %{time} by %{user}
+ deleted_by_html: Deleted %{time} by %{user}
+ edited_by_html: Edited %{time} by %{user}
+ closed_by_html: Closed %{time} by %{user}
version: Version
in_changeset: Changeset
anonymous: anonymous
@@ -169,9 +189,8 @@ en-GB:
relation: Relations (%{count})
relation_paginated: Relations (%{x}-%{y} of %{count})
comment: Comments (%{count})
- hidden_commented_by: Hidden comment from %{user} %{when}
- ago
- commented_by: Comment from %{user} %{when} ago
+ hidden_commented_by: Hidden comment from %{user} %{when}
+ commented_by: Comment from %{user} %{when}
changesetxml: Changeset XML
osmchangexml: osmChange XML
feed:
@@ -247,19 +266,15 @@ en-GB:
open_title: 'Unresolved note #%{note_name}'
closed_title: 'Resolved note #%{note_name}'
hidden_title: 'Hidden note #%{note_name}'
- open_by: Created by %{user} %{when} ago
- open_by_anonymous: Created by anonymous %{when}
- ago
- commented_by: Comment from %{user} %{when} ago
- commented_by_anonymous: Comment from anonymous %{when}
- ago
- closed_by: Resolved by %{user} %{when} ago
- closed_by_anonymous: Resolved by anonymous %{when}
- ago
- reopened_by: Reactivated by %{user} %{when} ago
- reopened_by_anonymous: Reactivated by anonymous %{when}
- ago
- hidden_by: Hidden by %{user} %{when} ago
+ open_by: Created by %{user} %{when}
+ open_by_anonymous: Created by anonymous %{when}
+ commented_by: Comment from %{user} %{when}
+ commented_by_anonymous: Comment from anonymous %{when}
+ closed_by: Resolved by %{user} %{when}
+ closed_by_anonymous: Resolved by anonymous %{when}
+ reopened_by: Reactivated by %{user} %{when}
+ reopened_by_anonymous: Reactivated by anonymous %{when}
+ hidden_by: Hidden by %{user} %{when}
report: Report this note
query:
title: Query Features
@@ -284,7 +299,7 @@ en-GB:
index:
title: Changesets
title_user: Changesets by %{user}
- title_friend: Changesets by your friends
+ title_friend: Changesets by my friends
title_nearby: Changesets by nearby users
empty: No changesets found.
empty_area: No changesets in this area.
@@ -298,7 +313,7 @@ en-GB:
changeset_comments:
comment:
comment: 'New comment on changeset #%{changeset_id} by %{author}'
- commented_at_by_html: Updated %{when} ago by %{user}
+ commented_at_by_html: Updated %{when} by %{user}
index:
title_all: OpenStreetMap changeset discussion
title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
@@ -320,7 +335,7 @@ en-GB:
user_title: '%{user}''s diary'
in_language_title: Diary Entries in %{language}
new: New Diary Entry
- new_title: Compose a new entry in your user diary
+ new_title: Compose a new entry in my user diary
no_entries: No diary entries
recent_entries: Recent diary entries
older_entries: Older Entries
@@ -334,7 +349,6 @@ en-GB:
leave_a_comment: Leave a comment
login_to_leave_a_comment: '%{login_link} to leave a comment'
login: Login
- save_button: Save
no_such_entry:
title: No such diary entry
heading: 'No entry with the id: %{id}'
@@ -374,18 +388,17 @@ en-GB:
post: Post
when: When
comment: Comment
- ago: '%{ago} ago'
newer_comments: Newer Comments
older_comments: Older Comments
geocoder:
search:
title:
- latlon: Results from Internal
- ca_postcode: Results from Geocoder.CA
- osm_nominatim: Results from OpenStreetMap
+ latlon: Results from Internal
+ ca_postcode: Results from Geocoder.CA
+ osm_nominatim: Results from OpenStreetMap
Nominatim
geonames: Results from GeoNames
- osm_nominatim_reverse: Results from OpenStreetMap
+ osm_nominatim_reverse: Results from OpenStreetMap
Nominatim
geonames_reverse: Results from GeoNames
search_osm_nominatim:
@@ -842,7 +855,7 @@ en-GB:
"yes": Shop
tourism:
alpine_hut: Alpine Hut
- apartment: Apartment
+ apartment: Holiday Flat
artwork: Artwork
attraction: Attraction
bed_and_breakfast: Bed and Breakfast
@@ -893,7 +906,7 @@ en-GB:
level10: Suburb Boundary
description:
title:
- osm_nominatim: Location from OpenStreetMap
+ osm_nominatim: Location from OpenStreetMap
Nominatim
geonames: Location from GeoNames
types:
@@ -1054,10 +1067,9 @@ en-GB:
subject_own: '[OpenStreetMap] %{commenter} has commented on one of your changesets'
subject_other: '[OpenStreetMap] %{commenter} has commented on a changeset
you are interested in'
- your_changeset: '%{commenter} has left a comment on one of your changesets
- created at %{time}'
- commented_changeset: '%{commenter} has left a comment on a map changeset you
- are watching created by %{changeset_author} at %{time}'
+ your_changeset: '%{commenter} left a comment at %{time} on one of your changesets'
+ commented_changeset: '%{commenter} left a comment at %{time} on a changeset
+ you are watching created by %{changeset_author}'
partial_changeset_with_comment: with comment '%{changeset_comment}'
partial_changeset_without_comment: without comment
details: More details about the changeset can be found at %{url}.
@@ -1091,7 +1103,6 @@ en-GB:
send_message_to: Send a new message to %{name}
subject: Subject
body: Body
- send_button: Send
back_to_inbox: Back to inbox
create:
message_sent: Message sent
@@ -1156,7 +1167,7 @@ en-GB:
community_driven_title: Community Driven
community_driven_html: |-
OpenStreetMap's community is diverse, passionate, and growing every day. Our contributors include enthusiast mappers, GIS professionals, engineers running the OSM servers, humanitarians mapping disaster-affected areas, and many more.
- To learn more about the community, see the user diaries, community blogs, and the OSM Foundation website.
+ To learn more about the community, see the OpenStreetMap Blog, user diaries, community blogs, and the OSM Foundation website.
open_data_title: Open Data
open_data_html: |-
OpenStreetMap is open data: you are free to use it for any purpose
@@ -1166,13 +1177,15 @@ en-GB:
Licence page for details.
legal_title: Legal
legal_html: "This site and many other related services are formally operated
- by the \nOpenStreetMap Foundation
+ by the \nOpenStreetMap Foundation
(OSMF) \non behalf of the community. Use of all OSMF operated services is
- subject \nto our \nAcceptable
- Use Policies and our Privacy
- Policy\n
\nPlease contact
- the OSMF \nif you have licensing, copyright or other legal questions and
- issues."
+ subject \nto our Terms
+ of Use, \nAcceptable
+ Use Policies and our Privacy
+ Policy\n
\nPlease contact
+ the OSMF \nif you have licensing, copyright or other legal questions.\n
\nOpenStreetMap,
+ the magnifying glass logo and State of the Map are registered
+ trademarks of the OSMF."
partners_title: Partners
copyright:
foreign:
@@ -1191,17 +1204,17 @@ en-GB:
title_html: Copyright and Licence
intro_1_html: |-
OpenStreetMap® is open data, licensed under the Open Data
+ href="https://opendatacommons.org/licenses/odbl/">Open Data
Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF).
+ href="https://osmfoundation.org/">OpenStreetMap Foundation (OSMF).
intro_2_html: You are free to copy, distribute, transmit and adapt our data,
as long as you credit OpenStreetMap and its contributors. If you alter or
build upon our data, you may distribute the result only under the same licence.
- The full legal code
- explains your rights and responsibilities.
+ The full legal
+ code explains your rights and responsibilities.
intro_3_html: |-
The cartography in our map tiles, and our documentation, are
- licenced under the Creative
+ licenced under the Creative
Commons Attribution-ShareAlike 2.0 licence (CC BY-SA).
credit_title_html: How to credit OpenStreetMap
credit_1_html: |-
@@ -1211,7 +1224,7 @@ en-GB:
You must also make it clear that the data is available under the Open
Database Licence, and if using our map tiles, that the cartography is
licenced as CC BY-SA. You may do this by linking to
- this copyright page.
+ this copyright page.
Alternatively, and as a requirement if you are distributing OSM in a
data form, you can name and link directly to the licence(s). In media
where links are not possible (e.g. printed works), we suggest you
@@ -1227,9 +1240,7 @@ en-GB:
more_title_html: Finding out more
more_1_html: |-
Read more about using our data, and how to credit us, at the OSMF Licence page and the community Legal
- FAQ.
+ href="https://osmfoundation.org/Licence">OSMF Licence page.
more_2_html: |-
Although OpenStreetMap is open data, we cannot provide a
free-of-charge map API for third-parties.
@@ -1262,8 +1273,11 @@ en-GB:
Direction Générale des Impôts.'
contributors_nl_html: 'Netherlands: Contains © AND data,
2007 (www.and.com)'
- contributors_nz_html: 'New Zealand: Contains data sourced
- from Land Information New Zealand. Crown Copyright reserved.'
+ contributors_nz_html: |-
+ New Zealand: Contains data sourced from the
+ LINZ Data Service and
+ licensed for reuse under
+ CC BY 4.0.
contributors_si_html: |-
Slovenia: Contains data from the
Surveying and Mapping Authority and
@@ -1273,9 +1287,9 @@ en-GB:
from Chief Directorate: National Geo-Spatial
Information, State copyright reserved.'
contributors_gb_html: 'United Kingdom: Contains Ordnance
- Survey data © Crown copyright and database right 2010-12.'
+ Survey data © Crown copyright and database right 2010-19.'
contributors_footer_1_html: For further details of these, and other sources
- that have been used to help improve OpenStreetMap, please see the Contributors
+ that have been used to help improve OpenStreetMap, please see the Contributors
page on the OpenStreetMap Wiki.
contributors_footer_2_html: Inclusion of data in OpenStreetMap does not imply
that the original data provider endorses OpenStreetMap, provides any warranty,
@@ -1286,15 +1300,14 @@ en-GB:
permission from the copyright holders.
infringement_2_html: If you believe that copyrighted material has been inappropriately
added to the OpenStreetMap database or this site, please refer to our takedown
- procedure or file directly at our on-line
+ href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
+ procedure or file directly at our on-line
filing page.
trademarks_title_html: Trademarks
trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of
the Map are registered trademarks of the OpenStreetMap Foundation. If you
- have questions about your use of the marks, please send your questions to
- the Licence
- Working Group.
+ have questions about your use of the marks, please see our Trademark
+ Policy.
index:
js_1: You are either using a browser that does not support JavaScript, or you
have disabled JavaScript.
@@ -1314,13 +1327,13 @@ en-GB:
anon_edits: (%{link})
anon_edits_link_text: Find out why this is the case.
flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap
- Flash editor. You can download
- Flash Player from Adobe.com. Several
+ Flash editor. You can download
+ Flash Player from Adobe.com. Several
other options are also available for editing OpenStreetMap.
potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you
should deselect the current way or point, if editing in live mode, or click
save if you have a save button.)
- potlatch2_not_configured: Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
+ potlatch2_not_configured: Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
for more information
potlatch2_unsaved_changes: You have unsaved changes. (To save in Potlatch 2,
you should click save.)
@@ -1391,7 +1404,7 @@ en-GB:
title: Other concerns
explanation_html: "If you have concerns about how our data is being used or
about the contents please consult our\ncopyright page
- for more legal information, or contact the appropriate \nOSMF
+ for more legal information, or contact the appropriate \nOSMF
working group."
help:
title: Getting Help
@@ -1400,16 +1413,16 @@ en-GB:
mapping topics.
welcome:
url: /welcome
- title: Welcome to OSM
+ title: Welcome to OpenStreetMap
description: Start with this quick guide covering the OpenStreetMap basics.
beginners_guide:
- url: http://wiki.openstreetmap.org/wiki/Beginners%27_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.openstreetmap.org
- description: Ask a question or look up answers on OSM's question-and-answer
+ title: Help Forum
+ description: Ask a question or look up answers on OpenStreetMap's question-and-answer
site.
mailing_lists:
title: Mailing Lists
@@ -1427,9 +1440,9 @@ en-GB:
description: Help for companies and organisations switching to OpenStreetMap
based maps and other services.
wiki:
- url: http://wiki.openstreetmap.org/
- title: wiki.openstreetmap.org
- description: Browse the wiki for in-depth OSM documentation.
+ url: https://wiki.openstreetmap.org/
+ title: OpenStreetMap Wiki
+ description: Browse the wiki for in-depth OpenStreetMap documentation.
sidebar:
search_results: Search Results
close: Close
@@ -1439,7 +1452,7 @@ en-GB:
get_directions_title: Find directions between two points
from: From
to: To
- where_am_i: Where am I?
+ where_am_i: Where is this?
where_am_i_title: Describe the current location using the search engine
submit_text: Go
reverse_directions_text: Reverse Directions
@@ -1517,7 +1530,7 @@ en-GB:
edit: Edit
preview: Preview
markdown_help:
- title_html: Parsed with Markdown
+ title_html: Parsed with kramdown
headings: Headings
heading: Heading
subheading: Subheading
@@ -1561,14 +1574,14 @@ en-GB:
paragraph_1_html: "OpenStreetMap has few formal rules but we expect all participants
to collaborate\nwith, and communicate with, the community. If you are considering\nany
activities other than editing by hand, please read and follow the guidelines
- on \nImports
- and \nAutomated
+ on \nImports
+ and \nAutomated
Edits."
questions:
title: Any questions?
paragraph_1_html: |-
OpenStreetMap has several resources for learning about the project, asking and answering questions, and collaboratively discussing and documenting mapping topics.
- Get help here.
+ Get help here. With an organization making plans for OpenStreetMap? Check out the Welcome Mat.
start_mapping: Start Mapping
add_a_note:
title: No Time To Edit? Add a Note!
@@ -1592,10 +1605,9 @@ en-GB:
tags_help: comma delimited
visibility: 'Visibility:'
visibility_help: what does this mean?
- visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
- upload_button: Upload
+ visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
help: Help
- help_url: http://wiki.openstreetmap.org/wiki/Upload
+ help_url: https://wiki.openstreetmap.org/wiki/Upload
create:
upload_trace: Upload GPS Trace
trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in
@@ -1603,8 +1615,8 @@ en-GB:
will be sent to you on completion.
traces_waiting:
one: You have %{count} trace waiting for upload. Please consider waiting for
- these to finish before uploading any more, so as not to block the queue
- for other users.
+ this to finish before uploading any more, so as not to block the queue for
+ other users.
other: You have %{count} traces waiting for upload. Please consider waiting
for these to finish before uploading any more, so as not to block the queue
for other users.
@@ -1622,7 +1634,6 @@ en-GB:
description: 'Description:'
tags: 'Tags:'
tags_help: comma delimited
- save_button: Save Changes
visibility: 'Visibility:'
visibility_help: what does this mean?
visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
@@ -1653,8 +1664,9 @@ en-GB:
newer: Newer Traces
trace:
pending: PENDING
- count_points: '%{count} points'
- ago: '%{time_in_words_ago} ago'
+ count_points:
+ one: 1 point
+ other: '%{count} points'
more: more
trace_details: View Trace Details
view_map: View Map
@@ -1673,7 +1685,7 @@ en-GB:
description: Browse recent GPS track uploads
tagged_with: ' tagged with %{tags}'
empty_html: Nothing here yet. Upload a new trace
- or learn more about GPS tracing on the wiki
+ or learn more about GPS tracing on the wiki
page.
upload_trace: Upload a trace
see_all_traces: See all traces
@@ -1735,10 +1747,8 @@ en-GB:
oauth_clients:
new:
title: Register a new application
- submit: Register
edit:
title: Edit your application
- submit: Edit
show:
title: OAuth details for %{app_name}
key: 'Consumer Key:'
@@ -1888,7 +1898,7 @@ en-GB:
terms.
email address: 'Email Address:'
confirm email address: 'Confirm Email Address:'
- not displayed publicly: Your address is not displayed publicly, see our privacy policy
for more information
display name: 'Display Name:'
@@ -1904,17 +1914,17 @@ en-GB:
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: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+ terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
terms:
- title: Contributor terms
- heading: Contributor terms
- consider_pd: In addition to the above agreement, I consider my contributions
- to be in the Public Domain
+ title: Terms
+ heading: Terms
+ consider_pd: In addition to the above, I consider my contributions to be in
+ the Public Domain
consider_pd_why: what's this?
consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
guidance: 'Information to help understand these terms: a human
readable summary and some informal translations'
- declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+ 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.
@@ -1950,12 +1960,10 @@ en-GB:
remove as friend: Unfriend
add as friend: Add Friend
mapper since: 'Mapper since:'
- ago: (%{time_in_words_ago} ago)
ct status: 'Contributor terms:'
ct undecided: Undecided
ct declined: Declined
- ct accepted: Accepted %{ago} ago
- latest edit: 'Latest edit %{ago}:'
+ latest edit: 'Latest edit (%{ago}):'
email address: 'Email address:'
created from: 'Created from:'
status: 'Status:'
@@ -2006,12 +2014,12 @@ en-GB:
email never displayed publicly: (never displayed publicly)
external auth: 'External Authentication:'
openid:
- link: http://wiki.openstreetmap.org/wiki/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: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+ 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?
@@ -2020,7 +2028,7 @@ en-GB:
text: 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
+ only public users can edit map data. (find
out why).