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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index d5a94ee0c1fead75f106a7bc21a4770e03290ce6..a0c54de8f3b96c33f4f059ecd614d348e2ce85e5 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -206,7 +206,7 @@ sco:
       reopened_by_anonymous: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
       hidden_by: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-  changeset:
+  changesets:
     changeset_paging_nav:
       showing_page: Page %{page}
       next: Next »
@@ -221,7 +221,7 @@ sco:
       user: Uiser
       comment: Comment
       area: Aurie
-    list:
+    index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}
       title_friend: Chyngesets bi yer friends
@@ -235,13 +235,13 @@ sco:
       load_more: Load mair
     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.
-    rss:
-      commented_at_html: Updatit %{when} ago
+  changeset_comments:
+    comment:
       commented_at_by_html: Updatit %{when} ago bi %{user}
-  diary_entry:
+  diary_entries:
     new:
       title: New Diary Entry
-    list:
+    index:
       title: Uisers' diaries
       title_friends: Friends' diaries
       title_nearby: Nearbi Uisers' diaries
@@ -264,7 +264,7 @@ sco:
       use_map_link: uise map
       save_button: Hain
       marker_text: Diary entry location
-    view:
+    show:
       title: '%{user}''s diary | %{title}'
       user_title: '%{user}''s diary'
       leave_a_comment: Leave a comment
@@ -821,9 +821,7 @@ sco:
     intro_text: OpenStreetMap is a cairt o the warld, creatit bi fowk lik ye an free
       tae uise unner an open license.
     intro_2_create_account: Create a uiser accoont
-    partners_html: Hostin is supportit bi %{ucl}, %{ic} an %{bytemark}, an ither %{partners}.
     partners_ucl: the UCL VR Centre
-    partners_ic: Imperial College London
     partners_bytemark: Bytemark Hosting
     partners_partners: pairtners
     osm_offline: The OpenStreetMap database is currently offline while essential database
@@ -1061,10 +1059,10 @@ sco:
           Whit it <em>disna</em> include is opinionatit data lik ratins, historical or
           hypothetical featurs, an data frae copyrichtit soorces. Unless ye hae special
           permission, dinna copy frae online or paper cairts.
-  trace:
+  traces:
     create:
       upload_trace: Uplaid GPS Trace
-  user:
+  users:
     login:
       auth_providers:
         google:
@@ -1098,7 +1096,7 @@ sco:
     lost_password:
       title: Lost password
       heading: Forgotten Passwird?
-    view:
+    show:
       edits: Eedits
       created from: 'Creautit frae:'
       user location: Uiser location
@@ -1144,11 +1142,6 @@ sco:
         against_oneway_without_exit: Gae against ane-wey on %{name}
         end_oneway_without_exit: End o ane-wey on %{name}
         roundabout_with_exit: At roondaboot tak exit %{exit} ontae %{name}
-        turn_left_with_exit: At roondaboot turn left ontae %{name}
-        slight_left_with_exit: At roondaboot slicht left ontae %{name}
-        turn_right_with_exit: At roondaboot turn richt ontae %{name}
-        slight_right_with_exit: At roondaboot slicht richt ontae %{name}
-        continue_with_exit: At roondaboot continue straicht ontae %{name}
         unnamed: unnamed road
         courtesy: Directions coortesy o %{link}
       time: Time