Merge remote-tracking branch 'upstream/pull/1814'

[rails.git] / config / locales / sco.yml

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 809ae90031f2118bc00ea214954d926067fac207..be400f9acb5f36835ba417926dabacd302943ad0 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -364,8 +364,6 @@ sco:
     search:
       title:
         latlon: Results frae <a href="http://openstreetmap.org/">Internal</a>
-        uk_postcode: Results frae <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>
         ca_postcode: Results frae <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
@@ -1105,7 +1103,6 @@ sco:
       edits: Eedits
       created from: 'Creautit frae:'
       user location: Uiser location
-      your friends: Yer friends
     account:
       title: Eedit accoont
   javascripts:
@@ -1122,7 +1119,7 @@ sco:
       instructions:
         continue_without_exit: Conteena on %{name}
         slight_right_without_exit: Slicht richt ontae %{name}
-        offramp_right_without_exit: Tak the ramp on the richt ontae %{name}
+        offramp_right_with_name: Tak the ramp on the richt ontae %{name}
         onramp_right_without_exit: Turn richt on the ramp ontae %{name}
         endofroad_right_without_exit: At the end o the road turn richt ontae %{name}
         merge_right_without_exit: Merge richt ontae %{name}
@@ -1132,7 +1129,7 @@ sco:
         uturn_without_exit: U-turn alang %{name}
         sharp_left_without_exit: Shairp left ontae %{name}
         turn_left_without_exit: Turn left ontae %{name}
-        offramp_left_without_exit: Tak the ramp on the left ontae %{name}
+        offramp_left_with_name: Tak the ramp on the left ontae %{name}
         onramp_left_without_exit: Turn left on the ramp ontae %{name}
         endofroad_left_without_exit: At the end o the road turn left ontae %{name}
         merge_left_without_exit: Merge left ontae %{name}