Use user factories for some changeset_controller tests.

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 63e1c41d8e6ec2dc30de8d590cf1f951b2abd451..c3eca7447d930f9244741fb60785b9e18ce0a2f5 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -8,11 +8,16 @@
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry
 # Author: E THP
+# Author: EdLoach
+# Author: Eduard Popov
+# Author: IknowJoseph
 # Author: Jagwar
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25
+# Author: Sampablokuper
 # Author: Shirayuki
+# Author: ديفيد
 ---
 en-GB:
   html:
@@ -968,7 +973,6 @@ en-GB:
     partners_ic: Imperial College London
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
-    partners_url: http://wiki.openstreetmap.org/wiki/Partners
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance work is carried out.
     osm_read_only: The OpenStreetMap database is currently in read-only mode while
@@ -1101,9 +1105,10 @@ en-GB:
         procedure</a> or file directly at our <a href="http://dmca.openstreetmap.org/">on-line
         filing page</a>.
       trademarks_title_html: <span id="trademarks"></span>Trademarks
-      trademarks_1_html: OpenStreetMap and the magnifying glass logo are registered
-        trademarks of the OpenStreetMap Foundation. If you have questions about your
-        use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
+      trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of the
+        Map are registered trademarks of the OpenStreetMap Foundation. If you have
+        questions about your use of the marks, please send your questions to the <a
+        href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
         Working Group</a>.
   welcome_page:
     title: Welcome!
@@ -1478,6 +1483,9 @@ en-GB:
           track: Track
           bridleway: Bridleway
           cycleway: Cycleway
+          cycleway_national: National cycleway
+          cycleway_regional: Regional cycleway
+          cycleway_local: Local cycleway
           footway: Footway
           rail: Railway
           subway: Subway
@@ -1530,6 +1538,9 @@ en-GB:
           private: Private access
           destination: Destination access
           construction: Roads under construction
+          bicycle_shop: Bicycle shop
+          bicycle_parking: Bicycle parking
+          toilets: Toilets
     richtext_area:
       edit: Edit
       preview: Preview
@@ -1544,7 +1555,7 @@ en-GB:
       second: Second item
       link: Link
       text: Text
-      image: شکیل
+      image: Image
       alt: Alt text
       url: URL
   trace:
@@ -1804,6 +1815,9 @@ en-GB:
         windowslive:
           title: Login with Windows Live
           alt: Login with a Windows Live Account
+        github:
+          title: Login with GitHub
+          alt: Login with a GitHub Account
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
@@ -2009,6 +2023,8 @@ en-GB:
         gravatar: Use Gravatar
         link: http://wiki.openstreetmap.org/wiki/Gravatar
         link text: what is this?
+        disabled: Gravatar has been disabled.
+        enabled: Display of your Gravatar has been enabled.
       new image: Add an image
       keep image: Keep the current image
       delete image: Remove the current image
@@ -2363,11 +2379,21 @@ en-GB:
       instructions:
         continue_without_exit: Continue on %{name}
         slight_right_without_exit: Slight right onto %{name}
+        offramp_right_without_exit: Take the sliproad on the right onto %{name}
+        onramp_right_without_exit: Turn right on the sliproad onto %{name}
+        endofroad_right_without_exit: At the end of the road turn right onto %{name}
+        merge_right_without_exit: Merge right onto %{name}
+        fork_right_without_exit: At the fork turn right onto %{name}
         turn_right_without_exit: Turn right onto %{name}
         sharp_right_without_exit: Sharp right onto %{name}
         uturn_without_exit: U-turn along %{name}
         sharp_left_without_exit: Sharp left onto %{name}
         turn_left_without_exit: Turn left onto %{name}
+        offramp_left_without_exit: Take the sliproad on the left onto %{name}
+        onramp_left_without_exit: Turn left on the sliproad onto %{name}
+        endofroad_left_without_exit: At the end of the road turn left onto %{name}
+        merge_left_without_exit: Merge left onto %{name}
+        fork_left_without_exit: At the fork turn left onto %{name}
         slight_left_without_exit: Slight left onto %{name}
         via_point_without_exit: (via point)
         follow_without_exit: Follow %{name}