Merge branch 'master' into HEAD

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index eb04059a4677a8a1b7eff1d928e4a2a0466ee56b..ca88099b8e39a3be7c1c3f05f2329f1338a853fb 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -610,17 +610,17 @@ en:
         aeroway:
           aerodrome: "Aerodrome"
           airstrip: "Airstrip"
-          apron: "Apron"
-          gate: "Gate"
+          apron: "Airport Apron"
+          gate: "Airport Gate"
           hangar: "Hangar"
           helipad: "Helipad"
           holding_position: "Holding Position"
-          navigationaid: "Aviation Navigation aid"
+          navigationaid: "Aviation Navigation Aid"
           parking_position: "Parking Position"
           runway: "Runway"
           taxilane: "Taxilane"
           taxiway: "Taxiway"
-          terminal: "Terminal"
+          terminal: "Airport Terminal"
           windsock: "Windsock"
         amenity:
           animal_boarding: "Animal Boarding"
@@ -661,12 +661,12 @@ en:
           driving_school: "Driving School"
           embassy: "Embassy"
           events_venue: "Events Venue"
-          fast_food: "Fast Food"
+          fast_food: "Fast Food Restaurant"
           ferry_terminal: "Ferry Terminal"
           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
-          fuel: "Fuel"
+          fuel: "Filling Station"
           gambling: "Gambling"
           grave_yard: "Grave Yard"
           grit_bin: "Grit Bin"
@@ -675,7 +675,7 @@ en:
           ice_cream: "Ice Cream"
           internet_cafe: "Internet Cafe"
           kindergarten: "Kindergarten"
-          language_school: "Language school"
+          language_school: "Language School"
           library: "Library"
           loading_dock: "Loading Dock"
           love_hotel: "Love Hotel"
@@ -794,7 +794,7 @@ en:
           "yes": "Building"
         club:
           scout: "Scout Group Base"
-          sport: "Sportsclub"
+          sport: "Sports Club"
           "yes": "Club"
         craft:
           beekeeper: "Beekeeper"
@@ -841,7 +841,7 @@ en:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
-          construction: "Highway under Construction"
+          construction: "Road under Construction"
           corridor: "Corridor"
           cycleway: "Cycle Path"
           elevator: "Elevator"
@@ -931,9 +931,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"
@@ -954,7 +954,7 @@ en:
           reservoir: "Reservoir"
           reservoir_watershed: "Reservoir Watershed"
           residential: "Residential Area"
-          retail: "Retail"
+          retail: "Retail Area"
           village_green: "Village Green"
           vineyard: "Vineyard"
           "yes": "Landuse"
@@ -1228,8 +1228,8 @@ en:
           deli: "Deli"
           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"
           e-cigarette: "E-Cigarette Shop"
           electronics: "Electronics Shop"
           erotic: "Erotic Shop"
@@ -1254,7 +1254,7 @@ en:
           health_food: "Health Food Store"
           hearing_aids: "Hearing Aids"
           herbalist: "Herbalist"
-          hifi: "Hi-Fi"
+          hifi: "Hi-Fi Shop"
           houseware: "Houseware Shop"
           ice_cream: "Ice Cream Shop"
           interior_decoration: "Interior Decoration"
@@ -1314,7 +1314,7 @@ en:
           artwork: "Artwork"
           attraction: "Attraction"
           bed_and_breakfast: "Bed and Breakfast"
-          cabin: "Cabin"
+          cabin: "Tourist Cabin"
           camp_pitch: "Camp Pitch"
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
@@ -2066,7 +2066,7 @@ en:
           description: "Extracts for major world cities and their surrounding areas"
         other:
           title: "Other Sources"
-          description: "Additional sources listed on the OpenStreetMap wiki"
+          description: "Additional sources listed on the OpenStreetMap Wiki"
       options: "Options"
       format: "Format"
       scale: "Scale"