Converted roundabouts to take "1st, 2nd, 3rd" exit etc

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index ee1b21fe3afe1b0fde777b43c9579aaba87062a2..5183e5f4910ab6b44999a7ff4c9bd45be75160b6 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -400,8 +400,6 @@ en-GB:
     search:
       title:
         latlon: Results from <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Results from <a href="http://openstreetmap.org/">Internal</a>

-        uk_postcode: Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Results from <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Results from <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -1597,7 +1595,6 @@ en-GB:
     trace_header:
       upload_trace: Upload a trace
       see_all_traces: See all traces
     trace_header:
       upload_trace: Upload a trace
       see_all_traces: See all traces

-      see_your_traces: See your traces

       traces_waiting:
         one: You have %{count} trace waiting for upload. Please consider waiting for
           these to finish before uploading any more, so as not to block the queue
       traces_waiting:
         one: You have %{count} trace waiting for upload. Please consider waiting for
           these to finish before uploading any more, so as not to block the queue


@@ -1648,7 +1645,6 @@ en-GB:
       map: map
     list:
       public_traces: Public GPS traces
       map: map
     list:
       public_traces: Public GPS traces

-      your_traces: Your GPS traces

       public_traces_from: Public GPS traces from %{user}
       description: Browse recent GPS track uploads
       tagged_with: ' tagged with %{tags}'
       public_traces_from: Public GPS traces from %{user}
       description: Browse recent GPS track uploads
       tagged_with: ' tagged with %{tags}'


@@ -1948,7 +1944,6 @@ en-GB:
       if set location: Set your home location on the %{settings_link} page to see
         nearby users.
       settings_link_text: settings
       if set location: Set your home location on the %{settings_link} page to see
         nearby users.
       settings_link_text: settings

-      your friends: Your friends

       no friends: You have not added any friends yet.
       km away: '%{count}km away'
       m away: '%{count}m away'
       no friends: You have not added any friends yet.
       km away: '%{count}km away'
       m away: '%{count}m away'


@@ -2386,14 +2381,14 @@ en-GB:
       instructions:
         continue_without_exit: Continue on %{name}
         slight_right_without_exit: Slight right onto %{name}
       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}
+        offramp_right: Take the sliproad on the right
+        offramp_right_with_name: Take the sliproad on the right onto %{name}

         offramp_right_with_directions: Take the sliproad on the right towards %{directions}
         offramp_right_with_directions: Take the sliproad on the right towards %{directions}

-        offramp_right_with_name_and_directions: Take the sliproad on the right onto
-          %{name}, towards %{directions}
-        offramp_right_without_directions: Take the sliproad on the right
+        offramp_right_with_name_directions: Take the sliproad on the right onto %{name},
+          towards %{directions}

         onramp_right_without_exit: Turn right on the sliproad onto %{name}
         onramp_right_with_directions: Turn right onto the sliproad towards %{directions}
         onramp_right_without_exit: Turn right on the sliproad onto %{name}
         onramp_right_with_directions: Turn right onto the sliproad towards %{directions}

-        onramp_right_with_name_and_directions: Turn right on the sliproad onto %{name},
+        onramp_right_with_name_directions: Turn right on the sliproad onto %{name},

           towards %{directions}
         onramp_right_without_directions: Turn right onto the sliproad
         endofroad_right_without_exit: At the end of the road turn right onto %{name}
           towards %{directions}
         onramp_right_without_directions: Turn right onto the sliproad
         endofroad_right_without_exit: At the end of the road turn right onto %{name}


@@ -2404,14 +2399,14 @@ en-GB:
         uturn_without_exit: U-turn along %{name}
         sharp_left_without_exit: Sharp left onto %{name}
         turn_left_without_exit: Turn left 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}
+        offramp_left: Take the sliproad on the left
+        offramp_left_with_name: Take the sliproad on the left onto %{name}

         offramp_left_with_directions: Take the sliproad on the left towards %{directions}
         offramp_left_with_directions: Take the sliproad on the left towards %{directions}

-        offramp_left_with_name_and_directions: Take the sliproad on the left onto
-          %{name}, towards %{directions}
-        offramp_left_without_directions: Take the sliproad on the left
+        offramp_left_with_name_directions: Take the sliproad on the left onto %{name},
+          towards %{directions}

         onramp_left_without_exit: Turn left on the sliproad onto %{name}
         onramp_left_with_directions: Turn left onto the sliproad towards %{directions}
         onramp_left_without_exit: Turn left on the sliproad onto %{name}
         onramp_left_with_directions: Turn left onto the sliproad towards %{directions}

-        onramp_left_with_name_and_directions: Turn left on the sliproad onto %{name},
+        onramp_left_with_name_directions: Turn left on the sliproad onto %{name},

           towards %{directions}
         onramp_left_without_directions: Turn left onto the sliproad
         endofroad_left_without_exit: At the end of the road turn left onto %{name}
           towards %{directions}
         onramp_left_without_directions: Turn left onto the sliproad
         endofroad_left_without_exit: At the end of the road turn left onto %{name}