X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2145480a00739c3add27eb4569fb03ac8b8cd6f1..82d7c959c1159646478a6676573fd36573440d7c:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 4cec17f77..3da8d38ab 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -5,6 +5,7 @@
# Author: Alefar
# Author: Andibing
# Author: BEANS
+# Author: Back ache
# Author: Bjh21
# Author: Bpfhjquevaps
# Author: Bruce89
@@ -220,7 +221,6 @@ en-GB:
openid: OpenID
google: Google
facebook: Facebook
- windowslive: Windows Live
github: GitHub
wikipedia: Wikipedia
api:
@@ -280,12 +280,6 @@ en-GB:
browse:
created: Created
closed: Closed
- 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
@@ -305,8 +299,6 @@ en-GB:
relation: Relations (%{count})
relation_paginated: Relations (%{x}-%{y} of %{count})
comment: Comments (%{count})
- hidden_commented_by_html: Hidden comment from %{user} %{when}
- commented_by_html: Comment from %{user} %{when}
changesetxml: Changeset XML
osmchangexml: osmChange XML
feed:
@@ -430,6 +422,7 @@ en-GB:
contact:
km away: '%{count}km away'
m away: '%{count}m away'
+ latest_edit_html: 'Latest edit (%{ago}):'
popup:
your location: Your location
nearby mapper: Nearby mapper
@@ -515,6 +508,14 @@ en-GB:
comment: Comment
newer_comments: Newer Comments
older_comments: Older Comments
+ doorkeeper:
+ errors:
+ messages:
+ account_selection_required: The authorisation server requires end-user account
+ selection
+ consent_required: The authorisation server requires end-user consent
+ interaction_required: The authorisation server requires end-user interaction
+ login_required: The authorisation server requires end-user authentication
friendships:
make_friend:
heading: Add %{user} as a friend?
@@ -528,13 +529,6 @@ en-GB:
success: '%{name} was removed from your friends.'
not_a_friend: '%{name} is not one of your friends.'
geocoder:
- search:
- title:
- latlon_html: Results from Internal
- osm_nominatim_html: Results from OpenStreetMap
- Nominatim
- osm_nominatim_reverse_html: Results from OpenStreetMap
- Nominatim
search_osm_nominatim:
prefix:
aerialway:
@@ -1280,7 +1274,6 @@ en-GB:
messages:
inbox:
title: Inbox
- my_inbox: My Inbox
messages: You have %{new_messages} and %{old_messages}
new_messages:
one: '%{count} new message'
@@ -1288,12 +1281,14 @@ en-GB:
old_messages:
one: '%{count} old message'
other: '%{count} old messages'
- from: From
- subject: Subject
- date: Date
no_messages_yet_html: You have no messages yet. Why not get in touch with some
of the %{people_mapping_nearby_link}?
people_mapping_nearby: people mapping nearby
+ messages_table:
+ from: From
+ to: To
+ subject: Subject
+ date: Date
message_summary:
unread_button: Mark as unread
read_button: Mark as read
@@ -1316,9 +1311,6 @@ en-GB:
messages:
one: You have %{count} sent message
other: You have %{count} sent messages
- to: To
- subject: Subject
- date: Date
no_sent_messages_html: You have no sent messages yet. Why not get in touch with
some of the %{people_mapping_nearby_link}?
people_mapping_nearby: people mapping nearby
@@ -1337,34 +1329,37 @@ en-GB:
order to read it.
sent_message_summary:
destroy_button: Delete
+ heading:
+ my_inbox: My Inbox
mark:
as_read: Message marked as read
as_unread: Message marked as unread
destroy:
destroyed: Message deleted
passwords:
- lost_password:
+ new:
title: Lost password
heading: Forgotten Password?
email address: E-mail address
new password button: Reset password
help_text: Enter the e-mail address you used to sign up, we will send a link
to it that you can use to reset your password.
+ create:
notice email on way: Sorry you lost it :-( but an email is on its way so you
can reset it soon.
notice email cannot find: Could not find that email address, sorry.
- reset_password:
+ edit:
title: Reset password
heading: Reset Password for %{user}
reset: Reset Password
- flash changed: Your password has been changed.
flash token bad: Did not find that token, check the URL maybe?
+ update:
+ flash changed: Your password has been changed.
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
@@ -1400,7 +1395,7 @@ en-GB:
facebook:
title: Login with Facebook
alt: Login with a Facebook Account
- windowslive:
+ microsoft:
title: Login with Windows Live
alt: Login with a Windows Live Account
github:
@@ -1422,7 +1417,6 @@ en-GB:
site:
about:
next: Next
- copyright_html: ©OpenStreetMap
contributors
lede_text: OpenStreetMap is built by a community of mappers that contribute
and maintain data about roads, trails, cafés, railway stations, and much more,
all over the world.
@@ -1432,24 +1426,8 @@ en-GB:
aerial imagery, GPS devices, and low-tech field maps to verify that OSM
is accurate and up to date.
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 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
- as long as you credit OpenStreetMap and its contributors. If you alter or
- build upon the data in certain ways, you may distribute the result only
- under the same licence. See the Copyright and
- Licence page for details.
legal_title: Legal
- legal_1_html: "This site and many other related services are formally operated
- by the \nOpenStreetMap Foundation
- (OSMF) \non behalf of the community. Use of all OSMF operated services is
- subject \nto our Terms
- of Use, \nAcceptable
- Use Policies and our Privacy
- Policy."
partners_title: Partners
copyright:
foreign:
@@ -1504,12 +1482,7 @@ en-GB:
for this feature.
export:
title: Export
- area_to_export: Area to Export
manually_select: Manually select a different area
- format_to_export: Format to Export
- osm_xml_data: OpenStreetMap XML Data
- map_image: Map Image (shows standard layer)
- embeddable_html: Embeddable HTML
licence: Licence
too_large:
advice: 'If the above export fails, please consider using one of the sources
@@ -1531,17 +1504,6 @@ en-GB:
other:
title: Other Sources
description: Additional sources listed on the OpenStreetMap wiki
- options: Options
- format: Format
- scale: Scale
- max: max
- image_size: Image Size
- zoom: Zoom
- add_marker: Add a marker to the map
- latitude: 'Lat:'
- longitude: 'Lon:'
- output: Output
- paste_html: Paste HTML to embed in website
export_button: Export
fixthemap:
title: Report a problem/Fix the map
@@ -1552,11 +1514,6 @@ en-GB:
explanation_html: If you have noticed a problem with our map data, for example
a road is missing or your address, the best way to proceed is to join
the OpenStreetMap community and add or repair the data yourself.
- add_a_note:
- instructions_html: Just click or the same icon
- on the map display. This will add a marker to the map, which you can move
- by dragging. Add your message, then click save, and other mappers will
- investigate.
other_concerns:
title: Other concerns
help:
@@ -1622,34 +1579,24 @@ en-GB:
footway: Footway
rail: Railway
subway: Subway
- tram:
- - Light rail
- - tram
- cable:
- - Cable car
- - chairlift
- runway:
- - Airport Runway
- - taxiway
- apron:
- - Airport apron
- - terminal
+ cable_car: Cable car
+ chair_lift: chairlift
+ runway: Airport Runway
+ taxiway: taxiway
+ apron: Airport apron
admin: Administrative boundary
forest: Forest
wood: Wood
golf: Golf course
park: Park
+ common: Common
resident: Residential area
- common:
- - Common
- - meadow
retail: Retail area
industrial: Industrial area
commercial: Commercial area
heathland: Heathland
- lake:
- - Lake
- - reservoir
+ lake: Lake
+ reservoir: reservoir
farm: Farm
brownfield: Brownfield site
cemetery: Cemetery
@@ -1658,14 +1605,12 @@ en-GB:
centre: Sports centre
reserve: Nature reserve
military: Military area
- school:
- - School
- - university
+ school: School
+ university: university
building: Significant building
station: Railway station
- summit:
- - Summit
- - peak
+ summit: Summit
+ peak: peak
tunnel: Dashed casing = tunnel
bridge: Black casing = bridge
private: Private access
@@ -1741,7 +1686,6 @@ en-GB:
trace_not_found: Trace not found!
visibility: 'Visibility:'
trace_paging_nav:
- showing_page: Page %{page}
older: Older Traces
newer: Newer Traces
trace:
@@ -1923,7 +1867,6 @@ en-GB:
ct status: 'Contributor terms:'
ct undecided: Undecided
ct declined: Declined
- latest edit: 'Latest edit (%{ago}):'
email address: 'Email address:'
created from: 'Created from:'
status: 'Status:'
@@ -2033,8 +1976,8 @@ en-GB:
revoke:
title: Revoking block on %{block_on}
heading_html: Revoking block on %{block_on} by %{block_by}
- time_future: This block will end in %{time}.
- past: This block ended %{time} and cannot be revoked now.
+ time_future_html: This block will end in %{time}.
+ past_html: 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.
@@ -2099,15 +2042,6 @@ en-GB:
open_title: 'Unresolved note #%{note_name}'
closed_title: 'Resolved note #%{note_name}'
hidden_title: 'Hidden note #%{note_name}'
- opened_by_html: Created by %{user} %{when}
- opened_by_anonymous_html: Created by anonymous %{when}
- commented_by_html: Comment from %{user} %{when}
- commented_by_anonymous_html: Comment from anonymous %{when}
- closed_by_html: Resolved by %{user} %{when}
- closed_by_anonymous_html: Resolved by anonymous %{when}
- reopened_by_html: Reactivated by %{user} %{when}
- reopened_by_anonymous_html: Reactivated by anonymous %{when}
- hidden_by_html: Hidden by %{user} %{when}
anonymous_warning: This note includes comments from anonymous users which should
be independently verified.
hide: Hide
@@ -2168,8 +2102,6 @@ en-GB:
gps: Public GPS Traces
overlays: Enable overlays for troubleshooting the map
title: Layers
- copyright: © OpenStreetMap contributors
- donate_link_text: Make a Donation
site:
edit_tooltip: Edit the map
edit_disabled_tooltip: Zoom in to edit the map