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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 4fc666e5da408dd933517f7df8ad56c644dc59e8..162960a024fc564d88de6c390fdcd8cf02c3fcb5 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -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
@@ -241,7 +241,7 @@ sco:
   diary_entry:
     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