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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4b4f6b301807fd6cb5198e1ae8d4a8391e127e97..18beafa1355a0062daaf5cf53f6d3008f409e82a 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"
+          pedestrian: "Pedestrian way"
           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
@@ -2293,9 +2294,6 @@ en:
           train: "Train"
           subway: "Subway"
           ferry: "Ferry"
-          tram:
-            - Light rail
-            - tram
           light_rail: "Light rail"
           tram_only: "Tram"
           trolleybus: "Trolleybus"
@@ -2306,26 +2304,40 @@ en:
           runway:
             - Airport Runway
             - taxiway
-          apron:
-            - Airport apron
-            - terminal
+          apron_only: "Airport apron"
           admin: "Administrative boundary"
-          forest: "Forest"
-          wood: "Wood"
+          orchard:
+            - Orchard
+            - vineyard
+          forest:
+            - Forest
+            - wood
+          farmland: "Farmland"
+          grass:
+            - Grass
+            - meadow
+          bare_rock: "Bare rock"
+          sand: "Sand"
           golf: "Golf course"
           park: "Park"
-          resident: "Residential area"
           common:
             - Common
             - meadow
             - garden
+          built_up: "Built-up area"
+          resident: "Residential area"
           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"
+          scrubland: "Scrubland"
           lake:
             - Lake
             - reservoir
+          intermittent_water: "Intermittent waterbody"
+          glacier: "Glacier"
+          reef: "Reef"
+          wetland: "Wetland"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
@@ -2337,6 +2349,7 @@ en:
           school:
             - School
             - university
+            - hospital
           building: "Significant building"
           station: "Railway station"
           summit: