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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a3c99d024216f526011530823dc9cc38b123b4ce..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,9 +2304,7 @@ en:
           runway:
             - Airport Runway
             - taxiway
-          apron:
-            - Airport apron
-            - terminal
+          apron_only: "Airport apron"
           admin: "Administrative boundary"
           orchard:
             - Orchard