Merge branch 'master' into trace-description-maxlength

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 6a7f2eb8d3105ab4b7baba618574cc1d605a9904..55aeb8d72606c8e18d9e9bb7467e0f30e315e1a3 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -653,7 +653,6 @@ en-GB:
           ice_cream: Ice Cream
           internet_cafe: Internet Cafe
           kindergarten: Nursery School
           ice_cream: Ice Cream
           internet_cafe: Internet Cafe
           kindergarten: Nursery School

-          language_school: Language school

           library: Library
           loading_dock: Loading Dock
           love_hotel: Love Hotel
           library: Library
           loading_dock: Loading Dock
           love_hotel: Love Hotel


@@ -829,7 +828,6 @@ en-GB:
           commercial: Commercial Area
           conservation: Conservation
           construction: Construction
           commercial: Commercial Area
           conservation: Conservation
           construction: Construction

-          farm: Farm

           farmland: Farmland
           farmyard: Farmyard
           forest: Forest
           farmland: Farmland
           farmyard: Farmyard
           forest: Forest