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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index d5f25c36f455d76e3d6be3cbe1b7dcf6a0252f8e..be400f9acb5f36835ba417926dabacd302943ad0 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -364,9 +364,6 @@ sco:
     search:
       title:
         latlon: Results frae <a href="http://openstreetmap.org/">Internal</a>
-        us_postcode: Results frae <a href="http://geocoder.us/">Geocoder.us</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>
@@ -415,30 +412,23 @@ sco:
           crematorium: Crematorium
           dentist: Dentist
           doctors: Doctors
-          dormitory: Dormitory
           drinking_water: Drinkin Watter
           driving_school: Drivin Schuil
           embassy: Embassy
-          emergency_phone: Emergency Phone
           fast_food: Fast Fuid
           ferry_terminal: Ferry Terminal
-          fire_hydrant: Fire Hydrant
           fire_station: Fire Station
           food_court: Fuid Coort
           fountain: Foontain
           fuel: Fuel
           grave_yard: Grave Yard
-          gym: Fitness Centre / Gym
-          health_centre: Heal Centre
           hospital: Hospital
           hunting_stand: Huntin Staund
           ice_cream: Ice Cream
           kindergarten: Kindergarten
           library: Library
-          market: Mercat
           marketplace: Mercatplace
           nightclub: Nicht Club
-          nursery: Nursery
           nursing_home: Nursin Home
           office: Office
           parking: Pairkin
@@ -451,7 +441,6 @@ sco:
           prison: Prison
           pub: Pub
           public_building: Public Biggin
-          reception_area: Reception Aurie
           recycling: Recyclin Pynt
           restaurant: Restaurant
           retirement_home: Retirement Home
@@ -532,7 +521,6 @@ sco:
           trunk: Trunk Road
           trunk_link: Trunk Road
           unclassified: Unclassified Road
-          unsurfaced: Unsurfaced Road
         historic:
           archaeological_site: Airchaeological Steid
           battlefield: Battlefield
@@ -677,7 +665,6 @@ sco:
           travel_agent: Travel Agency
           "yes": Office
         place:
-          airport: Airport
           city: Ceety
           country: Kintra
           county: Coonty
@@ -689,7 +676,6 @@ sco:
           islet: Islet
           isolated_dwelling: Isolatit Dwellin
           locality: Locality
-          moor: Muir
           municipality: Municipality
           neighbourhood: Neighbourhuid
           postcode: Postcode
@@ -705,10 +691,8 @@ sco:
           abandoned: Abandoned Railway
           construction: Railway unner Construction
           disused: Disuised Railway
-          disused_station: Disuised Railway Station
           funicular: Funicular Railway
           halt: Train Stap
-          historic_station: Historic Railway Station
           junction: Railway Junction
           level_crossing: Level Crossin
           light_rail: Licht Rail
@@ -772,7 +756,6 @@ sco:
           hairdresser: Hairdresser
           hardware: Hairdware Store
           hifi: Hi-Fi
-          insurance: Insurance
           jewelry: Jewelry Shop
           kiosk: Kiosk Shop
           laundry: Laundry
@@ -788,10 +771,8 @@ sco:
           pet: Pet Shop
           pharmacy: Pharmacy
           photo: Photo Shop
-          salon: Salon
           second_hand: Seicont-haund Shop
           shoes: Shoe Shop
-          shopping_centre: Shoppin Centre
           sports: Sports Shop
           stationery: Stationery Shop
           supermarket: Supermercat
@@ -1122,7 +1103,6 @@ sco:
       edits: Eedits
       created from: 'Creautit frae:'
       user location: Uiser location
-      your friends: Yer friends
     account:
       title: Eedit accoont
   javascripts:
@@ -1139,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}
@@ -1149,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}