Merge pull request #4218 from AntonKhorev/no-user-id-renames

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index e07c9aaab8cb854bfc86c1e523eba033ca4cbed0..5eefc686ff0ae2d0a1158e44a223fa3af50e0f8a 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1597,21 +1597,21 @@ en-GB:
           subway: Subway
           cable_car: Cable car
           chair_lift: chairlift
           subway: Subway
           cable_car: Cable car
           chair_lift: chairlift

-          runway_only: Airport Runway
+          runway: Airport Runway

           taxiway: taxiway
           taxiway: taxiway

-          apron_only: Airport apron
+          apron: Airport apron

           admin: Administrative boundary
           admin: Administrative boundary

-          forest_only: Forest
+          forest: Forest

           wood: Wood
           golf: Golf course
           park: Park
           wood: Wood
           golf: Golf course
           park: Park

-          common_only: Common
+          common: Common

           resident: Residential area
           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
           heathland: Heathland
           resident: Residential area
           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
           heathland: Heathland

-          lake_only: Lake
+          lake: Lake

           reservoir: reservoir
           farm: Farm
           brownfield: Brownfield site
           reservoir: reservoir
           farm: Farm
           brownfield: Brownfield site


@@ -1621,11 +1621,11 @@ en-GB:
           centre: Sports centre
           reserve: Nature reserve
           military: Military area
           centre: Sports centre
           reserve: Nature reserve
           military: Military area

-          school_only: School
+          school: School

           university: university
           building: Significant building
           station: Railway station
           university: university
           building: Significant building
           station: Railway station

-          summit_only: Summit
+          summit: Summit

           peak: peak
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           peak: peak
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge