Merge remote-tracking branch 'openstreetmap/pull/1082'

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index feb0c4f2fab6a219b8ceeeefd5b94aa79b395f44..ebbc14dd79e26c20daef19d0e27d858a4b841c42 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -6,6 +6,9 @@
 # Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry
+# Author: Jagwar
+# Author: Kosovastar
+# Author: Meno25
 # Author: Shirayuki
 ---
 en-GB:
@@ -1360,9 +1363,7 @@ en-GB:
           primary: Primary road
           secondary: Secondary road
           unclassified: Unclassified road
-          unsurfaced: Unsurfaced road
           track: Track
-          byway: Byway
           bridleway: Bridleway
           cycleway: Cycleway
           footway: Footway
@@ -1386,7 +1387,6 @@ en-GB:
           golf: Golf course
           park: Park
           resident: Residential area
-          tourist: Tourist attraction
           common:
           - Common
           - meadow
@@ -1416,7 +1416,6 @@ en-GB:
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
-          permissive: Permissive access
           destination: Destination access
           construction: Roads under construction
     richtext_area: