X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/27e0084e8f18744e065a75e60b9b7a684470ffca..bb489ed5a3c5f2bc0de73b36f516d417095bfed5:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 9e46ca07c..20d406ebd 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1,10 +1,17 @@
# Messages for British English (British English)
# Exported from translatewiki.net
# Export driver: phpyaml
+# Author: Andibing
# Author: Bpfhjquevaps
# Author: Bruce89
+# Author: Caliburn
# Author: Captaindogfish
# Author: Chase me ladies, I'm the Cavalry
+# Author: E THP
+# Author: Jagwar
+# Author: Kosovastar
+# Author: Macofe
+# Author: Meno25
# Author: Shirayuki
---
en-GB:
@@ -168,6 +175,7 @@ en-GB:
way: way
relation: relation
changeset: changeset
+ note: note
timeout:
sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve.
type:
@@ -175,6 +183,7 @@ en-GB:
way: way
relation: relation
changeset: changeset
+ note: note
redacted:
redaction: Redaction %{id}
message_html: Version %{version} of this %{type} cannot be shown as it has been
@@ -260,6 +269,7 @@ en-GB:
diary_entry:
new:
title: New Diary Entry
+ publish_button: Publish
list:
title: Users' diaries
title_friends: Friends' diaries
@@ -397,8 +407,10 @@ en-GB:
prefix_format: '%{name}'
prefix:
aerialway:
+ cable_car: Cable Car
chair_lift: Chairlift
drag_lift: Drag Lift
+ gondola: Gondola Lift
station: Aerialway Station
aeroway:
aerodrome: Aerodrome
@@ -409,6 +421,7 @@ en-GB:
taxiway: Taxiway
terminal: Terminal
amenity:
+ animal_shelter: Animal Shelter
arts_centre: Arts Centre
atm: ATM
bank: Bank
@@ -418,6 +431,7 @@ en-GB:
bicycle_parking: Cycle Parking
bicycle_rental: Cycle Rental
biergarten: Beer Garden
+ boat_rental: Boat Rental
brothel: Brothel
bureau_de_change: Bureau de Change
bus_station: Bus Station
@@ -427,8 +441,10 @@ en-GB:
car_wash: Car Wash
casino: Casino
charging_station: Charging Station
+ childcare: Childcare
cinema: Cinema
clinic: Clinic
+ clock: Clock
college: College
community_centre: Community Centre
courthouse: Courthouse
@@ -447,6 +463,7 @@ en-GB:
food_court: Food Court
fountain: Fountain
fuel: Fuel
+ gambling: Gambling
grave_yard: Graveyard
gym: Fitness Centre/Gym
health_centre: Health Centre
@@ -457,11 +474,14 @@ en-GB:
library: Library
market: Market
marketplace: Marketplace
+ monastery: Monastery
+ motorcycle_parking: Motorcycle Parking
nightclub: Night Club
nursery: Nursery School
nursing_home: Nursing Home
office: Office
parking: Parking
+ parking_entrance: Parking Entrance
pharmacy: Pharmacy
place_of_worship: Place of Worship
police: Police
@@ -495,6 +515,7 @@ en-GB:
veterinary: Veterinary Surgery
village_hall: Village Hall
waste_basket: bin
+ waste_disposal: Waste Disposal
youth_centre: Youth Centre
boundary:
administrative: Administrative Boundary
@@ -509,14 +530,30 @@ en-GB:
"yes": Bridge
building:
"yes": Building
+ craft:
+ brewery: Brewery
+ carpenter: Carpenter
+ electrician: Electrician
+ gardener: Gardener
+ painter: Painter
+ photographer: Photographer
+ plumber: Plumber
+ shoemaker: Shoemaker
+ tailor: Tailor
+ "yes": Craft Shop
emergency:
+ ambulance_station: Ambulance Station
+ defibrillator: Defibrillator
+ landing_site: Emergency Landing Site
phone: Emergency Phone
highway:
+ abandoned: Abandoned Highway
bridleway: Bridleway
bus_guideway: Guided Bus Lane
bus_stop: Bus Stop
construction: Highway under construction
cycleway: Cycle Path
+ elevator: Elevator
emergency_access_point: Emergency Access Point
footway: Footpath
ford: Ford
@@ -554,7 +591,7 @@ en-GB:
archaeological_site: Archaeological Site
battlefield: Battlefield
boundary_stone: Boundary Stone
- building: Building
+ building: Historic Building
castle: Castle
church: Church
citywalls: City Walls
@@ -807,6 +844,7 @@ en-GB:
"yes": Shop
tourism:
alpine_hut: Alpine Hut
+ apartment: Apartment
artwork: Artwork
attraction: Attraction
bed_and_breakfast: Bed and Breakfast
@@ -814,6 +852,7 @@ en-GB:
camp_site: Camp Site
caravan_site: Caravan Site
chalet: Chalet
+ gallery: Gallery
guest_house: Guest House
hostel: Hostel
hotel: Hotel
@@ -845,6 +884,7 @@ en-GB:
wadi: Wadi
waterfall: Waterfall
weir: Weir
+ "yes": Waterway
admin_levels:
level2: Country Boundary
level4: State Boundary
@@ -865,19 +905,6 @@ en-GB:
results:
no_results: No results found
more_results: More results
- distance:
- zero: less than 1km
- one: about 1km
- other: about %{count}km
- direction:
- south_west: south-west
- south: south
- south_east: south-east
- east: east
- north_east: north-east
- north: north
- north_west: north-west
- west: west
layouts:
project_name:
title: OpenStreetMap
@@ -947,9 +974,10 @@ en-GB:
legal_babble:
title_html: Copyright and Licence
intro_1_html: |-
- OpenStreetMap is open data, licenced under the open data, licensed under the Open Data
- Commons Open Database Licence (ODbL).
+ Commons Open Database Licence (ODbL) by the 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.
@@ -983,6 +1011,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.
more_2_html: Although OpenStreetMap is open data, we cannot provide a free-of-charge
@@ -1018,6 +1047,11 @@ en-GB:
2007 (www.and.com)'
contributors_nz_html: 'New Zealand: Contains data sourced from
Land Information New Zealand. Crown Copyright reserved.'
+ contributors_si_html: |-
+ Slovenia: Contains data from the
+ Surveying and Mapping Authority and
+ Ministry of Agriculture, Forestry and Food
+ (public information of Slovenia).
contributors_za_html: 'South Africa: Contains data sourced
from Chief Directorate: National Geo-Spatial
Information, State copyright reserved.'
@@ -1037,6 +1071,11 @@ en-GB:
added to the OpenStreetMap database or this site, please refer to our takedown
procedure or file directly at our on-line
filing page.
+ trademarks_title_html: Trademarks
+ trademarks_1_html: OpenStreetMap and the magnifying glass logo 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.
welcome_page:
title: Welcome!
introduction_html: Welcome to OpenStreetMap, the free and editable map of the
@@ -1369,9 +1408,7 @@ en-GB:
primary: Primary road
secondary: Secondary road
unclassified: Unclassified road
- unsurfaced: Unsurfaced road
track: Track
- byway: Byway
bridleway: Bridleway
cycleway: Cycleway
footway: Footway
@@ -1395,7 +1432,6 @@ en-GB:
golf: Golf course
park: Park
resident: Residential area
- tourist: Tourist attraction
common:
- Common
- meadow
@@ -1425,7 +1461,6 @@ en-GB:
tunnel: Dashed casing = tunnel
bridge: Black casing = bridge
private: Private access
- permissive: Permissive access
destination: Destination access
construction: Roads under construction
richtext_area:
@@ -1442,7 +1477,7 @@ en-GB:
second: Second item
link: Link
text: Text
- image: Image
+ image: Ø´Ú©ÛÙ
alt: Alt text
url: URL
trace:
@@ -1674,7 +1709,6 @@ en-GB:
register now: Register now
with username: 'Already have an OpenStreetMap account? Please login with your
username and password:'
- with openid: 'Alternatively, use OpenID to login:'
new to osm: New to OpenStreetMap?
to make changes: To make changes to the OpenStreetMap data, you must have an
account.
@@ -1687,25 +1721,7 @@ en-GB:
activity.
Please contact the webmaster if
you wish to discuss this.
auth failure: Sorry, could not log in with those details.
- openid missing provider: Sorry, could not contact your OpenID provider
- openid invalid: Sorry, your OpenID seems to be malformed
openid_logo_alt: Log in with an OpenID
- openid_providers:
- openid:
- title: Login with OpenID
- alt: Login with an OpenID URL
- google:
- title: Login with Google
- alt: Login with a Google OpenID
- yahoo:
- title: Login with Yahoo
- alt: Login with a Yahoo OpenID
- wordpress:
- title: Login with Wordpress
- alt: Login with a Wordpress OpenID
- aol:
- title: Login with AOL
- alt: Login with an AOL OpenID
logout:
title: Logout
heading: Logout of OpenStreetMap
@@ -1750,20 +1766,8 @@ en-GB:
display name: 'Display Name:'
display name description: Your publicly displayed username. You can change this
later in the preferences.
- openid: '%{logo} OpenID:'
password: 'Password:'
confirm password: 'Confirm Password:'
- use openid: Alternatively, use %{logo} OpenID to login
- openid no password: With OpenID a password is not required, but some extra tools
- or server may still need one.
- openid association: |-
-
Your OpenID is not associated with a OpenStreetMap account yet.
-