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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b51f047d708f64f0514dcc872d7fccabffb25580..c06ff3cebdfe40c6151e102c99779d6e7e734d77 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2293,9 +2293,6 @@ en:
           train: "Train"
           subway: "Subway"
           ferry: "Ferry"
-          tram:
-            - Light rail
-            - tram
           light_rail: "Light rail"
           tram_only: "Tram"
           trolleybus: "Trolleybus"
@@ -2306,9 +2303,7 @@ en:
           runway:
             - Airport Runway
             - taxiway
-          apron:
-            - Airport apron
-            - terminal
+          apron_only: "Airport apron"
           admin: "Administrative boundary"
           orchard:
             - Orchard
@@ -2324,11 +2319,12 @@ en:
           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"
@@ -2337,7 +2333,10 @@ en:
           lake:
             - Lake
             - reservoir
+          intermittent_water: "Intermittent waterbody"
           glacier: "Glacier"
+          reef: "Reef"
+          wetland: "Wetland"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
@@ -2349,6 +2348,7 @@ en:
           school:
             - School
             - university
+            - hospital
           building: "Significant building"
           station: "Railway station"
           summit: