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 d7917ba2b83e06a5201563fc0487a8fef8f2263f..20d406ebddf84297fdfe5f8ee299d555b4d92f33 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1,11 +1,13 @@
 # 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
@@ -173,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:
@@ -180,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
@@ -265,6 +269,7 @@ en-GB:
   diary_entry:
     new:
       title: New Diary Entry
+      publish_button: Publish
     list:
       title: Users' diaries
       title_friends: Friends' diaries
@@ -402,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
@@ -414,6 +421,7 @@ en-GB:
           taxiway: Taxiway
           terminal: Terminal
         amenity:
+          animal_shelter: Animal Shelter
           arts_centre: Arts Centre
           atm: ATM
           bank: Bank
@@ -423,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
@@ -432,6 +441,7 @@ en-GB:
           car_wash: Car Wash
           casino: Casino
           charging_station: Charging Station
+          childcare: Childcare
           cinema: Cinema
           clinic: Clinic
           clock: Clock
@@ -453,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
@@ -463,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
@@ -501,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
@@ -515,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
@@ -813,6 +844,7 @@ en-GB:
           "yes": Shop
         tourism:
           alpine_hut: Alpine Hut
+          apartment: Apartment
           artwork: Artwork
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
@@ -820,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
@@ -851,6 +884,7 @@ en-GB:
           wadi: Wadi
           waterfall: Waterfall
           weir: Weir
+          "yes": Waterway
       admin_levels:
         level2: Country Boundary
         level4: State Boundary
@@ -1013,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.'
+      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.'
@@ -1032,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>.
+      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
@@ -1433,7 +1477,7 @@ en-GB:
       second: Second item
       link: Link
       text: Text
-      image: Image
+      image: شکیل
       alt: Alt text
       url: URL
   trace: