Merge remote-tracking branch 'upstream/pull/1704'

[rails.git] / config / locales / en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 430af7d456b8e94a0ce06262d7dd96ce581756dd..a2429a22274c20d52d64ee5764d4eeb22d77e185 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -399,7 +399,6 @@ en-GB:
     search:
       title:
         latlon: Results from <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Results from <a href="http://openstreetmap.org/">Internal</a>

-        us_postcode: Results from <a href="http://geocoder.us/">Geocoder.us</a>

         uk_postcode: Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>
         ca_postcode: Results from <a href="http://geocoder.ca/">Geocoder.CA</a>
         uk_postcode: Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>
         ca_postcode: Results from <a href="http://geocoder.ca/">Geocoder.CA</a>


@@ -457,33 +456,26 @@ en-GB:
           crematorium: Crematorium
           dentist: Dentist
           doctors: Doctors
           crematorium: Crematorium
           dentist: Dentist
           doctors: Doctors

-          dormitory: Dormitory

           drinking_water: Drinking Water
           driving_school: Driving School
           embassy: Embassy
           drinking_water: Drinking Water
           driving_school: Driving School
           embassy: Embassy

-          emergency_phone: Emergency Phone

           fast_food: Fast Food
           ferry_terminal: Ferry Terminal
           fast_food: Fast Food
           ferry_terminal: Ferry Terminal

-          fire_hydrant: Fire Hydrant

           fire_station: Fire Station
           food_court: Food Court
           fountain: Fountain
           fuel: Fuel
           gambling: Gambling
           grave_yard: Graveyard
           fire_station: Fire Station
           food_court: Food Court
           fountain: Fountain
           fuel: Fuel
           gambling: Gambling
           grave_yard: Graveyard

-          gym: Fitness Centre/Gym
-          health_centre: Health Centre

           hospital: Hospital
           hunting_stand: Hunting Stand
           ice_cream: Ice Cream
           kindergarten: Nursery School
           library: Library
           hospital: Hospital
           hunting_stand: Hunting Stand
           ice_cream: Ice Cream
           kindergarten: Nursery School
           library: Library

-          market: Market

           marketplace: Marketplace
           monastery: Monastery
           motorcycle_parking: Motorcycle Parking
           nightclub: Night Club
           marketplace: Marketplace
           monastery: Monastery
           motorcycle_parking: Motorcycle Parking
           nightclub: Night Club

-          nursery: Nursery School

           nursing_home: Nursing Home
           office: Office
           parking: Parking
           nursing_home: Nursing Home
           office: Office
           parking: Parking


@@ -497,7 +489,6 @@ en-GB:
           prison: Prison
           pub: Pub
           public_building: Public Building
           prison: Prison
           pub: Pub
           public_building: Public Building

-          reception_area: Reception Area

           recycling: Recycling Point
           restaurant: Restaurant
           retirement_home: Retirement Home
           recycling: Recycling Point
           restaurant: Restaurant
           retirement_home: Retirement Home


@@ -593,7 +584,6 @@ en-GB:
           trunk: Trunk Road
           trunk_link: Trunk Road
           unclassified: Unclassified Road
           trunk: Trunk Road
           trunk_link: Trunk Road
           unclassified: Unclassified Road

-          unsurfaced: Unsurfaced Road

           "yes": Road
         historic:
           archaeological_site: Archaeological Site
           "yes": Road
         historic:
           archaeological_site: Archaeological Site


@@ -658,7 +648,6 @@ en-GB:
         leisure:
           beach_resort: Beach Resort
           bird_hide: Bird Hide
         leisure:
           beach_resort: Beach Resort
           bird_hide: Bird Hide

-          club: Club

           common: Common Land
           dog_park: Dog Park
           fishing: Fishing Area
           common: Common Land
           dog_park: Dog Park
           fishing: Fishing Area


@@ -751,8 +740,6 @@ en-GB:
           "yes": Office
         place:
           allotments: Allotments
           "yes": Office
         place:
           allotments: Allotments

-          block: Block
-          airport: Airport

           city: City
           country: Country
           county: County
           city: City
           country: Country
           county: County


@@ -764,7 +751,6 @@ en-GB:
           islet: Islet
           isolated_dwelling: Isolated Dwelling
           locality: Locality
           islet: Islet
           isolated_dwelling: Isolated Dwelling
           locality: Locality

-          moor: Moor

           municipality: Municipality
           neighbourhood: Neighbourhood
           postcode: Postcode
           municipality: Municipality
           neighbourhood: Neighbourhood
           postcode: Postcode


@@ -781,10 +767,8 @@ en-GB:
           abandoned: Abandoned Railway
           construction: Railway under construction
           disused: Disused Railway
           abandoned: Abandoned Railway
           construction: Railway under construction
           disused: Disused Railway

-          disused_station: Disused Railway Station

           funicular: Funicular Railway
           halt: Train Stop
           funicular: Funicular Railway
           halt: Train Stop

-          historic_station: Historic Railway Station

           junction: Railway Junction
           level_crossing: Level Crossing
           light_rail: Light Rail
           junction: Railway Junction
           level_crossing: Level Crossing
           light_rail: Light Rail


@@ -848,7 +832,6 @@ en-GB:
           hairdresser: Hairdresser
           hardware: Hardware Store
           hifi: Hi-Fi
           hairdresser: Hairdresser
           hardware: Hardware Store
           hifi: Hi-Fi

-          insurance: Insurance

           jewelry: Jewellers
           kiosk: Kiosk Shop
           laundry: Laundry
           jewelry: Jewellers
           kiosk: Kiosk Shop
           laundry: Laundry


@@ -864,10 +847,8 @@ en-GB:
           pet: Pet Shop
           pharmacy: Pharmacy
           photo: Photo Shop
           pet: Pet Shop
           pharmacy: Pharmacy
           photo: Photo Shop

-          salon: Salon

           second_hand: Second-hand Shop
           shoes: Shoe Shop
           second_hand: Second-hand Shop
           shoes: Shoe Shop

-          shopping_centre: Shopping Centre

           sports: Sports Shop
           stationery: Stationers
           supermarket: Supermarket
           sports: Sports Shop
           stationery: Stationers
           supermarket: Supermarket


@@ -1423,6 +1404,7 @@ en-GB:
       date: Date
       reply_button: Reply
       unread_button: Mark as unread
       date: Date
       reply_button: Reply
       unread_button: Mark as unread

+      delete_button: Delete

       back: Back
       to: To
       wrong_user: You are logged in as `%{user}' but the message you have asked to
       back: Back
       to: To
       wrong_user: You are logged in as `%{user}' but the message you have asked to


@@ -2383,14 +2365,12 @@ en-GB:
       ascend: Ascend
       engines:
         graphhopper_bicycle: Bicycle (GraphHopper)
       ascend: Ascend
       engines:
         graphhopper_bicycle: Bicycle (GraphHopper)

+        graphhopper_car: Car (GraphHopper)

         graphhopper_foot: Foot (GraphHopper)
         mapquest_bicycle: Bicycle (MapQuest)
         mapquest_car: Car (MapQuest)
         mapquest_foot: Foot (MapQuest)
         osrm_car: Car (OSRM)
         graphhopper_foot: Foot (GraphHopper)
         mapquest_bicycle: Bicycle (MapQuest)
         mapquest_car: Car (MapQuest)
         mapquest_foot: Foot (MapQuest)
         osrm_car: Car (OSRM)

-        mapzen_bicycle: Bicycle (Mapzen)
-        mapzen_car: Car (Mapzen)
-        mapzen_foot: Foot (Mapzen)

       descend: Descend
       directions: Directions
       distance: Distance
       descend: Descend
       directions: Directions
       distance: Distance