]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en-GB.yml
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Localisation updates from https://translatewiki.net.
[rails.git] / config / locales / en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 9f908a63c41ac19fd3a150af5be10c1744137f6d..20d406ebddf84297fdfe5f8ee299d555b4d92f33 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1,11 +1,17 @@
 # Messages for British English (British English)
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # 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: 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:
 # Author: Shirayuki
 ---
 en-GB:
@@ -169,6 +175,7 @@ en-GB:
         way: way
         relation: relation
         changeset: changeset
         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:
     timeout:
       sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve.
       type:
@@ -176,6 +183,7 @@ en-GB:
         way: way
         relation: relation
         changeset: changeset
         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
     redacted:
       redaction: Redaction %{id}
       message_html: Version %{version} of this %{type} cannot be shown as it has been
@@ -261,6 +269,7 @@ en-GB:
   diary_entry:
     new:
       title: New Diary Entry
   diary_entry:
     new:
       title: New Diary Entry
+      publish_button: Publish
     list:
       title: Users' diaries
       title_friends: Friends' diaries
     list:
       title: Users' diaries
       title_friends: Friends' diaries
@@ -398,8 +407,10 @@ en-GB:
       prefix_format: '%{name}'
       prefix:
         aerialway:
       prefix_format: '%{name}'
       prefix:
         aerialway:
+          cable_car: Cable Car
           chair_lift: Chairlift
           drag_lift: Drag Lift
           chair_lift: Chairlift
           drag_lift: Drag Lift
+          gondola: Gondola Lift
           station: Aerialway Station
         aeroway:
           aerodrome: Aerodrome
           station: Aerialway Station
         aeroway:
           aerodrome: Aerodrome
@@ -410,6 +421,7 @@ en-GB:
           taxiway: Taxiway
           terminal: Terminal
         amenity:
           taxiway: Taxiway
           terminal: Terminal
         amenity:
+          animal_shelter: Animal Shelter
           arts_centre: Arts Centre
           atm: ATM
           bank: Bank
           arts_centre: Arts Centre
           atm: ATM
           bank: Bank
@@ -419,6 +431,7 @@ en-GB:
           bicycle_parking: Cycle Parking
           bicycle_rental: Cycle Rental
           biergarten: Beer Garden
           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
           brothel: Brothel
           bureau_de_change: Bureau de Change
           bus_station: Bus Station
@@ -428,6 +441,7 @@ en-GB:
           car_wash: Car Wash
           casino: Casino
           charging_station: Charging Station
           car_wash: Car Wash
           casino: Casino
           charging_station: Charging Station
+          childcare: Childcare
           cinema: Cinema
           clinic: Clinic
           clock: Clock
           cinema: Cinema
           clinic: Clinic
           clock: Clock
@@ -449,6 +463,7 @@ en-GB:
           food_court: Food Court
           fountain: Fountain
           fuel: Fuel
           food_court: Food Court
           fountain: Fountain
           fuel: Fuel
+          gambling: Gambling
           grave_yard: Graveyard
           gym: Fitness Centre/Gym
           health_centre: Health Centre
           grave_yard: Graveyard
           gym: Fitness Centre/Gym
           health_centre: Health Centre
@@ -459,11 +474,14 @@ en-GB:
           library: Library
           market: Market
           marketplace: Marketplace
           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
           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
           pharmacy: Pharmacy
           place_of_worship: Place of Worship
           police: Police
@@ -497,6 +515,7 @@ en-GB:
           veterinary: Veterinary Surgery
           village_hall: Village Hall
           waste_basket: bin
           veterinary: Veterinary Surgery
           village_hall: Village Hall
           waste_basket: bin
+          waste_disposal: Waste Disposal
           youth_centre: Youth Centre
         boundary:
           administrative: Administrative Boundary
           youth_centre: Youth Centre
         boundary:
           administrative: Administrative Boundary
@@ -511,14 +530,30 @@ en-GB:
           "yes": Bridge
         building:
           "yes": Building
           "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:
         emergency:
+          ambulance_station: Ambulance Station
+          defibrillator: Defibrillator
+          landing_site: Emergency Landing Site
           phone: Emergency Phone
         highway:
           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
           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
           emergency_access_point: Emergency Access Point
           footway: Footpath
           ford: Ford
@@ -809,6 +844,7 @@ en-GB:
           "yes": Shop
         tourism:
           alpine_hut: Alpine Hut
           "yes": Shop
         tourism:
           alpine_hut: Alpine Hut
+          apartment: Apartment
           artwork: Artwork
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
           artwork: Artwork
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
@@ -816,6 +852,7 @@ en-GB:
           camp_site: Camp Site
           caravan_site: Caravan Site
           chalet: Chalet
           camp_site: Camp Site
           caravan_site: Caravan Site
           chalet: Chalet
+          gallery: Gallery
           guest_house: Guest House
           hostel: Hostel
           hotel: Hotel
           guest_house: Guest House
           hostel: Hostel
           hotel: Hotel
@@ -847,6 +884,7 @@ en-GB:
           wadi: Wadi
           waterfall: Waterfall
           weir: Weir
           wadi: Wadi
           waterfall: Waterfall
           weir: Weir
+          "yes": Waterway
       admin_levels:
         level2: Country Boundary
         level4: State Boundary
       admin_levels:
         level2: Country Boundary
         level4: State Boundary
@@ -936,9 +974,10 @@ en-GB:
     legal_babble:
       title_html: Copyright and Licence
       intro_1_html: |-
     legal_babble:
       title_html: Copyright and Licence
       intro_1_html: |-
-        OpenStreetMap is <i>open data</i>, licenced under the <a
+        OpenStreetMap is <i>open data</i>, licensed under the <a
         href="http://opendatacommons.org/licenses/odbl/">Open Data
         href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database Licence</a> (ODbL).
+        Commons Open Database Licence</a> (ODbL) by the  <a
+        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (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.
       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.
@@ -972,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 <a
       more_title_html: Finding out more
       more_1_html: |-
         Read more about using our data, and how to credit us, at the <a
+        href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
       more_2_html: Although OpenStreetMap is open data, we cannot provide a free-of-charge
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
       more_2_html: Although OpenStreetMap is open data, we cannot provide a free-of-charge
@@ -1007,6 +1047,11 @@ en-GB:
         2007 (<a href="http://www.and.com">www.and.com</a>)'
       contributors_nz_html: '<strong>New Zealand</strong>: Contains data sourced from
         Land Information New Zealand. Crown Copyright reserved.'
         2007 (<a href="http://www.and.com">www.and.com</a>)'
       contributors_nz_html: '<strong>New Zealand</strong>: Contains data sourced from
         Land Information New Zealand. Crown Copyright reserved.'
+      contributors_si_html: |-
+        <strong>Slovenia</strong>: Contains data from the
+        <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
+        <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
+        (public information of Slovenia).
       contributors_za_html: '<strong>South Africa</strong>: Contains data sourced
         from <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-Spatial
         Information</a>, State copyright reserved.'
       contributors_za_html: '<strong>South Africa</strong>: Contains data sourced
         from <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-Spatial
         Information</a>, State copyright reserved.'
@@ -1026,6 +1071,11 @@ en-GB:
         added to the OpenStreetMap database or this site, please refer to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
         procedure</a> or file directly at our <a href="http://dmca.openstreetmap.org/">on-line
         filing page</a>.
         added to the OpenStreetMap database or this site, please refer to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
         procedure</a> or file directly at our <a href="http://dmca.openstreetmap.org/">on-line
         filing page</a>.
+      trademarks_title_html: <span id="trademarks"></span>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 <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
+        Working Group</a>.
   welcome_page:
     title: Welcome!
     introduction_html: Welcome to OpenStreetMap, the free and editable map of the
   welcome_page:
     title: Welcome!
     introduction_html: Welcome to OpenStreetMap, the free and editable map of the
@@ -1358,9 +1408,7 @@ en-GB:
           primary: Primary road
           secondary: Secondary road
           unclassified: Unclassified road
           primary: Primary road
           secondary: Secondary road
           unclassified: Unclassified road
-          unsurfaced: Unsurfaced road
           track: Track
           track: Track
-          byway: Byway
           bridleway: Bridleway
           cycleway: Cycleway
           footway: Footway
           bridleway: Bridleway
           cycleway: Cycleway
           footway: Footway
@@ -1384,7 +1432,6 @@ en-GB:
           golf: Golf course
           park: Park
           resident: Residential area
           golf: Golf course
           park: Park
           resident: Residential area
-          tourist: Tourist attraction
           common:
           - Common
           - meadow
           common:
           - Common
           - meadow
@@ -1414,7 +1461,6 @@ en-GB:
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
-          permissive: Permissive access
           destination: Destination access
           construction: Roads under construction
     richtext_area:
           destination: Destination access
           construction: Roads under construction
     richtext_area:
@@ -1431,7 +1477,7 @@ en-GB:
       second: Second item
       link: Link
       text: Text
       second: Second item
       link: Link
       text: Text
-      image: Image
+      image: شکیل
       alt: Alt text
       url: URL
   trace:
       alt: Alt text
       url: URL
   trace:
@@ -1810,7 +1856,7 @@ en-GB:
       create_block: block this user
       activate_user: activate this user
       deactivate_user: deactivate this user
       create_block: block this user
       activate_user: activate this user
       deactivate_user: deactivate this user
-      confirm_user: confirm this user
+      confirm_user: Confirm this user
       hide_user: hide this user
       unhide_user: unhide this user
       delete_user: delete this user
       hide_user: hide this user
       unhide_user: unhide this user
       delete_user: delete this user
@@ -1905,7 +1951,7 @@ en-GB:
       press confirm button: Press the confirm button below to confirm your new e-mail
         address.
       button: Confirm
       press confirm button: Press the confirm button below to confirm your new e-mail
         address.
       button: Confirm
-      success: Confirmed your e-mail address, thanks for signing up!
+      success: Confirmed your change of email address!
       failure: An e-mail address has already been confirmed with this token.
     set_home:
       flash success: Home location saved successfully
       failure: An e-mail address has already been confirmed with this token.
     set_home:
       flash success: Home location saved successfully
The OpenStreetMap web site