Allow arrays of names in map key entries

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2e13fe13c0b787081f66a38a6916020d055975e3..1fecd2a241247a59218c212367621a5fdfbde6c1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2282,6 +2282,7 @@ en:
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"

+          pedestrian: "Pedestrian way"

           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"


@@ -2293,41 +2294,28 @@ en:
           train: "Train"
           subway: "Subway"
           ferry: "Ferry"
           train: "Train"
           subway: "Subway"
           ferry: "Ferry"

-          tram:
-            - Light rail
-            - tram

           light_rail: "Light rail"
           tram_only: "Tram"
           trolleybus: "Trolleybus"
           bus: "Bus"
           light_rail: "Light rail"
           tram_only: "Tram"
           trolleybus: "Trolleybus"
           bus: "Bus"

-          cable:
-            - Cable car
-            - chair lift
-          runway:
-            - Airport Runway
-            - taxiway
-          apron:
-            - Airport apron
-            - terminal
+          cable_car: "Cable car"
+          chair_lift: "Chair lift"
+          runway_only: "Airport Runway"
+          taxiway: "Taxiway"
+          apron_only: "Airport apron"

           admin: "Administrative boundary"
           admin: "Administrative boundary"

-          orchard:
-            - Orchard
-            - vineyard
-          forest:
-            - Forest
-            - wood
+          orchard_only: "Orchard"
+          vineyard: "Vineyard"
+          forest_only: "Forest"
+          wood: "Wood"

           farmland: "Farmland"
           farmland: "Farmland"

-          grass:
-            - Grass
-            - meadow
+          grass_only: "Grass"
+          meadow: "Meadow"

           bare_rock: "Bare rock"
           sand: "Sand"
           golf: "Golf course"
           park: "Park"
           bare_rock: "Bare rock"
           sand: "Sand"
           golf: "Golf course"
           park: "Park"

-          common:
-            - Common
-            - meadow
-            - garden
+          common_only: "Common"

           built_up: "Built-up area"
           resident: "Residential area"
           retail: "Retail area"
           built_up: "Built-up area"
           resident: "Residential area"
           retail: "Retail area"


@@ -2335,10 +2323,12 @@ en:
           commercial: "Commercial area"
           heathland: "Heathland"
           scrubland: "Scrubland"
           commercial: "Commercial area"
           heathland: "Heathland"
           scrubland: "Scrubland"

-          lake:
-            - Lake
-            - reservoir
+          lake_only: "Lake"
+          reservoir: "Reservoir"
+          intermittent_water: "Intermittent waterbody"

           glacier: "Glacier"
           glacier: "Glacier"

+          reef: "Reef"
+          wetland: "Wetland"

           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"


@@ -2347,15 +2337,13 @@ en:
           centre: "Sports centre"
           reserve: "Nature reserve"
           military: "Military area"
           centre: "Sports centre"
           reserve: "Nature reserve"
           military: "Military area"

-          school:
-            - School
-            - university
-            - hospital
+          school_only: "School"
+          university: "University"
+          hospital: "Hospital"

           building: "Significant building"
           station: "Railway station"
           building: "Significant building"
           station: "Railway station"

-          summit:
-            - Summit
-            - peak
+          summit_only: "Summit"
+          peak: "Peak"

           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"