Roll back contentious and faulty changes and change "Pre-school" to "Kindergarten".

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4dc7888d216ebcc73df794344aacb821205ec5ac..3841eeb94dee311bf9e99f5cf8f9959d5e325a67 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -456,12 +456,12 @@ en:
       prefix:
         aeroway:
           aerodrome: "Aerodrome"
-          apron: "Apron"
-          gate: "Gate"
+          apron: "Airport Apron"
+          gate: "Airport Gate"
           helipad: "Helipad"
           runway: "Runway"
           taxiway: "Taxiway"
-          terminal: "Terminal"
+          terminal: "Airport Terminal"
         amenity:
           airport: "Airport"
           arts_centre: "Arts Centre"
@@ -498,13 +498,13 @@ en:
           driving_school: "Driving School"
           embassy: "Embassy"
           emergency_phone: "Emergency Phone"
-          fast_food: "Fast Food"
+          fast_food: "Fast Food Restaurant"
           ferry_terminal: "Ferry Terminal"
           fire_hydrant: "Fire Hydrant"
           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
-          fuel: "Fuel"
+          fuel: "Filling Station"
           grave_yard: "Grave Yard"
           gym: "Fitness Centre / Gym"
           hall: "Hall"
@@ -529,7 +529,7 @@ en:
           police: "Police"
           post_box: "Post Box"
           post_office: "Post Office"
-          preschool: "Pre-School"
+          preschool: "Kindergarten"
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"
@@ -580,7 +580,7 @@ en:
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           byway: "Byway"
-          construction: "Highway under Construction"
+          construction: "Road under Construction"
           cycleway: "Cycle Path"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
@@ -597,7 +597,7 @@ en:
           primary: "Primary Road"
           primary_link: "Primary Road"
           raceway: "Raceway"
-          residential: "Residential"
+          residential: "Residential Road"
           rest_area: "Rest Area"
           road: "Road"
           secondary: "Secondary Road"
@@ -641,9 +641,9 @@ en:
           brownfield: "Brownfield Land"
           cemetery: "Cemetery"
           commercial: "Commercial Area"
-          conservation: "Conservation"
-          construction: "Construction"
-          farm: "Farm"
+          conservation: "Conservation Area"
+          construction: "Construction Area"
+          farm: "Farmland"
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"
@@ -665,7 +665,7 @@ en:
           reservoir: "Reservoir"
           reservoir_watershed: "Reservoir Watershed"
           residential: "Residential Area"
-          retail: "Retail"
+          retail: "Retail Area"
           road: "Road Area"
           village_green: "Village Green"
           vineyard: "Vineyard"
@@ -824,8 +824,8 @@ en:
           cosmetics: "Cosmetics Shop"
           department_store: "Department Store"
           discount: "Discount Items Shop"
-          doityourself: "Do-It-Yourself"
-          dry_cleaning: "Dry Cleaning"
+          doityourself: "Do-It-Yourself Shop"
+          dry_cleaning: "Dry Cleaner"
           electronics: "Electronics Shop"
           estate_agent: "Estate Agent"
           farm: "Farm Shop"
@@ -843,7 +843,7 @@ en:
           grocery: "Grocery Shop"
           hairdresser: "Hairdresser"
           hardware: "Hardware Store"
-          hifi: "Hi-Fi"
+          hifi: "Hi-Fi Shop"
           insurance: "Insurance"
           jewelry: "Jewelry Shop"
           kiosk: "Kiosk Shop"
@@ -874,7 +874,7 @@ en:
           artwork: "Artwork"
           attraction: "Attraction"
           bed_and_breakfast: "Bed and Breakfast"
-          cabin: "Cabin"
+          cabin: "Tourist Cabin"
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
           chalet: "Chalet"