Make sure custom settings are picked up by tests

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index aac204a73224215b28cca4da953f15f2590f0d61..bba9c7d5a1988cec254d091d2e2742b2d267466e 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Andibing
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Andibing

+# Author: BEANS

 # Author: Bpfhjquevaps
 # Author: Bruce89
 # Author: Caliburn
 # Author: Bpfhjquevaps
 # Author: Bruce89
 # Author: Caliburn


@@ -615,16 +616,19 @@ en-GB:
           bus_guideway: Guided Bus Lane
           bus_stop: Bus Stop
           construction: Highway under construction
           bus_guideway: Guided Bus Lane
           bus_stop: Bus Stop
           construction: Highway under construction

+          corridor: Corridor

           cycleway: Cycle Path
           elevator: Elevator
           emergency_access_point: Emergency Access Point
           footway: Footpath
           ford: Ford
           cycleway: Cycle Path
           elevator: Elevator
           emergency_access_point: Emergency Access Point
           footway: Footpath
           ford: Ford

+          give_way: Give Way Sign

           living_street: Living Street
           milestone: Milestone
           motorway: Motorway
           motorway_junction: Motorway Junction
           motorway_link: Motorway Road
           living_street: Living Street
           milestone: Milestone
           motorway: Motorway
           motorway_junction: Motorway Junction
           motorway_link: Motorway Road

+          passing_place: Passing Place

           path: Path
           pedestrian: Pedestrian Way
           platform: Platform
           path: Path
           pedestrian: Pedestrian Way
           platform: Platform


@@ -641,6 +645,7 @@ en-GB:
           services: Motorway Services
           speed_camera: Speed Camera
           steps: Steps
           services: Motorway Services
           speed_camera: Speed Camera
           steps: Steps

+          stop: Stop Sign

           street_lamp: Street Lamp
           tertiary: Tertiary Road
           tertiary_link: Tertiary Road
           street_lamp: Street Lamp
           tertiary: Tertiary Road
           tertiary_link: Tertiary Road


@@ -649,6 +654,7 @@ en-GB:
           trail: Trail
           trunk: Trunk Road
           trunk_link: Trunk Road
           trail: Trail
           trunk: Trunk Road
           trunk_link: Trunk Road

+          turning_loop: Turning Loop

           unclassified: Unclassified Road
           "yes": Road
         historic:
           unclassified: Unclassified Road
           "yes": Road
         historic:


@@ -668,6 +674,7 @@ en-GB:
           manor: Manor
           memorial: Memorial
           mine: Mine
           manor: Manor
           memorial: Memorial
           mine: Mine

+          mine_shaft: Mine Shaft

           monument: Monument
           roman_road: Roman Road
           ruins: Ruins
           monument: Monument
           roman_road: Roman Road
           ruins: Ruins


@@ -677,6 +684,7 @@ en-GB:
           wayside_cross: Wayside Cross
           wayside_shrine: Wayside Shrine
           wreck: Wreck
           wayside_cross: Wayside Cross
           wayside_shrine: Wayside Shrine
           wreck: Wreck

+          "yes": Historic Site

         junction:
           "yes": Junction
         landuse:
         junction:
           "yes": Junction
         landuse:


@@ -716,6 +724,7 @@ en-GB:
           bird_hide: Bird Hide
           common: Common Land
           dog_park: Dog Park
           bird_hide: Bird Hide
           common: Common Land
           dog_park: Dog Park

+          firepit: Fire Pit

           fishing: Fishing Area
           fitness_centre: Fitness Centre
           fitness_station: Fitness Station
           fishing: Fishing Area
           fitness_centre: Fitness Centre
           fitness_station: Fitness Station


@@ -740,16 +749,46 @@ en-GB:
           water_park: Water Park
           "yes": Leisure
         man_made:
           water_park: Water Park
           "yes": Leisure
         man_made:

+          adit: Adit
+          beacon: Beacon
+          beehive: Bee Hive
+          breakwater: Breakwater
+          bridge: Bridge
+          bunker_silo: Bunker
+          chimney: Chimney
+          crane: Crane
+          dolphin: Mooring Post
+          dyke: Dyke
+          embankment: Embankment
+          flagpole: Flagpole
+          gasometer: Gasometer
+          groyne: Groyne
+          kiln: Kiln

           lighthouse: Lighthouse
           lighthouse: Lighthouse

+          mast: Mast
+          mine: Mine
+          mineshaft: Mine Shaft
+          monitoring_station: Monitoring Station

           petroleum_well: Oil Well
           petroleum_well: Oil Well

+          pier: Pier

           pipeline: Pipeline
           pipeline: Pipeline

+          silo: Silo
+          storage_tank: Storage Tank
+          surveillance: Surveillance

           tower: Tower
           tower: Tower

+          wastewater_plant: Wastewater Plant
+          watermill: Water Mill
+          water_tower: Water Tower
+          water_well: Well
+          water_works: Water Works
+          windmill: Windmill

           works: Factory
           "yes": Man-made
         military:
           airfield: Military Airfield
           barracks: Barracks
           bunker: Bunker
           works: Factory
           "yes": Man-made
         military:
           airfield: Military Airfield
           barracks: Barracks
           bunker: Bunker

+          "yes": Military

         mountain_pass:
           "yes": Mountain Pass
         natural:
         mountain_pass:
           "yes": Mountain Pass
         natural:


@@ -795,11 +834,14 @@ en-GB:
           accountant: Accountant
           administrative: Administration
           architect: Architect
           accountant: Accountant
           administrative: Administration
           architect: Architect

+          association: Association

           company: Company
           company: Company

+          educational_institution: Educational Institution

           employment_agency: Employment Agency
           estate_agent: Estate Agent
           government: Governmental Office
           insurance: Insurance Office
           employment_agency: Employment Agency
           estate_agent: Estate Agent
           government: Governmental Office
           insurance: Insurance Office

+          it: IT Office

           lawyer: Lawyer
           ngo: NGO Office
           telecommunication: Telecommunication Office
           lawyer: Lawyer
           ngo: NGO Office
           telecommunication: Telecommunication Office


@@ -808,6 +850,7 @@ en-GB:
         place:
           allotments: Allotments
           city: City
         place:
           allotments: Allotments
           city: City

+          city_block: City Block

           country: Country
           county: County
           farm: Farm
           country: Country
           county: County
           farm: Farm


@@ -821,8 +864,10 @@ en-GB:
           municipality: Municipality
           neighbourhood: Neighbourhood
           postcode: Postcode
           municipality: Municipality
           neighbourhood: Neighbourhood
           postcode: Postcode

+          quarter: Quarter

           region: Region
           sea: Sea
           region: Region
           sea: Sea

+          square: Square

           state: State
           subdivision: Subdivision
           suburb: Suburb
           state: State
           subdivision: Subdivision
           suburb: Suburb


@@ -861,6 +906,7 @@ en-GB:
           beauty: Beauty Shop
           beverages: Beverages Shop
           bicycle: Bicycle Shop
           beauty: Beauty Shop
           beverages: Beverages Shop
           bicycle: Bicycle Shop

+          bookmaker: Bookmaker

           books: Book Shop
           boutique: Boutique
           butcher: Butcher
           books: Book Shop
           boutique: Boutique
           butcher: Butcher


@@ -899,11 +945,16 @@ en-GB:
           hairdresser: Hairdresser
           hardware: Hardware Store
           hifi: Hi-Fi
           hairdresser: Hairdresser
           hardware: Hardware Store
           hifi: Hi-Fi

+          houseware: Houseware Shop
+          interior_decoration: Interior Decoration

           jewelry: Jewellers
           kiosk: Kiosk Shop
           jewelry: Jewellers
           kiosk: Kiosk Shop

+          kitchen: Kitchen Shop

           laundry: Laundry
           laundry: Laundry

+          lottery: Lottery

           mall: Mall
           market: Market
           mall: Mall
           market: Market

+          massage: Massage

           mobile_phone: Mobile Phone Shop
           motorcycle: Motorcycle Shop
           music: Music Shop
           mobile_phone: Mobile Phone Shop
           motorcycle: Motorcycle Shop
           music: Music Shop


@@ -911,15 +962,20 @@ en-GB:
           optician: Optician
           organic: Organic Food Shop
           outdoor: Outdoor Shop
           optician: Optician
           organic: Organic Food Shop
           outdoor: Outdoor Shop

+          paint: Paint Shop
+          pawnbroker: Pawnbroker

           pet: Pet Shop
           pharmacy: Pharmacy
           photo: Photo Shop
           pet: Pet Shop
           pharmacy: Pharmacy
           photo: Photo Shop

+          seafood: Seafood

           second_hand: Second-hand Shop
           shoes: Shoe Shop
           sports: Sports Shop
           stationery: Stationers
           supermarket: Supermarket
           tailor: Tailor
           second_hand: Second-hand Shop
           shoes: Shoe Shop
           sports: Sports Shop
           stationery: Stationers
           supermarket: Supermarket
           tailor: Tailor

+          ticket: Ticket Shop
+          tobacco: Tobacconist

           toys: Toy Shop
           travel_agency: Travel Agency
           video: Video Shop
           toys: Toy Shop
           travel_agency: Travel Agency
           video: Video Shop