X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cbea796ef412840af9a3ec2fd26bf08657fc4cd3..374668c7cc06da7e76f5d447056d13022947886c:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2feac5deb..2aca19795 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -17,9 +17,11 @@
# Author: Kosovastar
# Author: Macofe
# Author: Meno25
+# Author: Mvolz
# Author: Sampablokuper
# Author: Shirayuki
# Author: Smsm1
+# Author: TomH
# Author: دÙÙÙد
---
en-GB:
@@ -137,14 +139,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
@@ -160,12 +162,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
@@ -185,9 +187,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:
@@ -263,19 +264,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
@@ -300,7 +297,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.
@@ -314,7 +311,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'
@@ -336,7 +333,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
@@ -389,18 +386,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:
@@ -857,7 +853,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
@@ -908,7 +904,7 @@ en-GB:
level10: Suburb Boundary
description:
title:
- osm_nominatim: Location from OpenStreetMap
+ osm_nominatim: Location from OpenStreetMap
Nominatim
geonames: Location from GeoNames
types:
@@ -1180,13 +1176,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:
@@ -1276,8 +1274,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
@@ -1287,7 +1288,7 @@ 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
page on the OpenStreetMap Wiki.
@@ -1328,13 +1329,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.)
@@ -1453,7 +1454,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
@@ -1531,7 +1532,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
@@ -1582,7 +1583,7 @@ en-GB:
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!
@@ -1666,7 +1667,6 @@ en-GB:
trace:
pending: PENDING
count_points: '%{count} points'
- ago: '%{time_in_words_ago} ago'
more: more
trace_details: View Trace Details
view_map: View Map
@@ -1916,10 +1916,10 @@ en-GB:
Terms. For more information, please see this wiki page.
terms declined url: http://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
@@ -1960,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:'
@@ -2221,7 +2219,7 @@ en-GB:
title: Revoking block on %{block_on}
heading: Revoking block on %{block_on} by %{block_by}
time_future: This block will end in %{time}.
- past: This block ended %{time} ago and cannot be revoked now.
+ past: This block ended %{time} and cannot be revoked now.
confirm: Are you sure you wish to revoke this block?
revoke: Revoke!
flash: This block has been revoked.
@@ -2229,7 +2227,7 @@ en-GB:
time_future: Ends in %{time}.
until_login: Active until the user logs in.
time_future_and_until_login: Ends in %{time} and after the user has logged in.
- time_past: Ended %{time} ago.
+ time_past: Ended %{time}.
block_duration:
hours:
one: 1 hour
@@ -2245,10 +2243,7 @@ en-GB:
show:
title: '%{block_on} blocked by %{block_by}'
heading: '%{block_on} blocked by %{block_by}'
- time_future: Ends in %{time}
- time_past: Ended %{time} ago
created: Created
- ago: '%{time} ago'
status: Status
show: Show
edit: Edit
@@ -2282,7 +2277,6 @@ en-GB:
description: Description
created_at: Created at
last_changed: Last changed
- ago_html: '%{when} ago'
javascripts:
close: Close
share:
@@ -2352,8 +2346,7 @@ en-GB:
new:
intro: Spotted a mistake or something missing? Let other mappers know so we
can fix it. Move the marker to the correct position and type a note to explain
- the problem. (Please don't enter personal information or information from
- copyrighted maps or directory listings.)
+ the problem.
advice: Your note is public and may be used to update the map, so don't enter
personal information or information from copyrighted maps or directory listings.
add: Add Note
@@ -2379,7 +2372,7 @@ en-GB:
distance: Distance
errors:
no_route: Couldn't find a route between those two places.
- no_place: Sorry - couldn't find that place.
+ no_place: Sorry - couldn't locate '%{place}'.
instructions:
continue_without_exit: Continue on %{name}
slight_right_without_exit: Slight right onto %{name}
@@ -2417,7 +2410,7 @@ en-GB:
slight_left_without_exit: Slight left onto %{name}
via_point_without_exit: (via point)
follow_without_exit: Follow %{name}
- roundabout_without_exit: At roundabout take %{name}
+ roundabout_without_exit: At roundabout take exit onto %{name}
leave_roundabout_without_exit: Leave roundabout - %{name}
stay_roundabout_without_exit: Stay on roundabout - %{name}
start_without_exit: Start on %{name}