From: Guttorm Flatabø <post@guttormflatabo.com>
Date: Tue, 10 Jul 2012 20:28:44 +0000 (+0300)
Subject: Roll back contentious and faulty changes and change "Pre-school" to "Kindergarten".
X-Git-Tag: live~1999^2~2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/f730147766ee891fb3d3fd3e3acb151010def20d

Roll back contentious and faulty changes and change "Pre-school" to "Kindergarten".
---

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 245d952ea..3841eeb94 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -504,7 +504,7 @@ en:
           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
-          fuel: "Fuel Station"
+          fuel: "Filling Station"
           grave_yard: "Grave Yard"
           gym: "Fitness Centre / Gym"
           hall: "Hall"
@@ -529,7 +529,7 @@ en:
           police: "Police"
           post_box: "Post Box"
           post_office: "Post Office"
-          preschool: "Pre-School"
+          preschool: "Kindergarten"
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"
@@ -593,7 +593,7 @@ en:
           motorway_link: "Motorway Road"
           path: "Path"
           pedestrian: "Pedestrian Way"
-          platform: "Public Transport Platform"
+          platform: "Platform"
           primary: "Primary Road"
           primary_link: "Primary Road"
           raceway: "Raceway"
@@ -801,7 +801,7 @@ en:
           tram_stop: "Tram Stop"
           yard: "Railway Yard"
         shop:
-          alcohol: "Alcohol Shop"
+          alcohol: "Off License"
           antiques: "Antiques"
           art: "Art Shop"
           bakery: "Bakery"
@@ -868,7 +868,7 @@ en:
           toys: "Toy Shop"
           travel_agency: "Travel Agency"
           video: "Video Shop"
-          wine: "Wine Shop"
+          wine: "Off License"
         tourism:
           alpine_hut: "Alpine Hut"
           artwork: "Artwork"
@@ -903,7 +903,7 @@ en:
           dock: "Dock"
           drain: "Drain"
           lock: "Lock"
-          lock_gate: "Waterway Lock Gate"
+          lock_gate: "Lock Gate"
           mineral_spring: "Mineral Spring"
           mooring: "Mooring"
           rapids: "Rapids"