Localisation updates from https://translatewiki.net.

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index feb0c4f2fab6a219b8ceeeefd5b94aa79b395f44..d7917ba2b83e06a5201563fc0487a8fef8f2263f 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -6,6 +6,10 @@
 # Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry
 # Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry

+# Author: Jagwar
+# Author: Kosovastar
+# Author: Macofe
+# Author: Meno25

 # Author: Shirayuki
 ---
 en-GB:
 # Author: Shirayuki
 ---
 en-GB:


@@ -1360,9 +1364,7 @@ en-GB:
           primary: Primary road
           secondary: Secondary road
           unclassified: Unclassified road
           primary: Primary road
           secondary: Secondary road
           unclassified: Unclassified road

-          unsurfaced: Unsurfaced road

           track: Track
           track: Track

-          byway: Byway

           bridleway: Bridleway
           cycleway: Cycleway
           footway: Footway
           bridleway: Bridleway
           cycleway: Cycleway
           footway: Footway


@@ -1386,7 +1388,6 @@ en-GB:
           golf: Golf course
           park: Park
           resident: Residential area
           golf: Golf course
           park: Park
           resident: Residential area

-          tourist: Tourist attraction

           common:
           - Common
           - meadow
           common:
           - Common
           - meadow


@@ -1416,7 +1417,6 @@ en-GB:
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access

-          permissive: Permissive access

           destination: Destination access
           construction: Roads under construction
     richtext_area:
           destination: Destination access
           construction: Roads under construction
     richtext_area:


@@ -1812,7 +1812,7 @@ en-GB:
       create_block: block this user
       activate_user: activate this user
       deactivate_user: deactivate this user
       create_block: block this user
       activate_user: activate this user
       deactivate_user: deactivate this user

-      confirm_user: confirm this user
+      confirm_user: Confirm this user

       hide_user: hide this user
       unhide_user: unhide this user
       delete_user: delete this user
       hide_user: hide this user
       unhide_user: unhide this user
       delete_user: delete this user