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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 9ce428fb50aad5905afce61b6d0f5bad57a2f1d5..162960a024fc564d88de6c390fdcd8cf02c3fcb5 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -241,7 +241,7 @@ sco:
   diary_entry:
     new:
       title: New Diary Entry
   diary_entry:
     new:
       title: New Diary Entry

-    list:
+    index:

       title: Uisers' diaries
       title_friends: Friends' diaries
       title_nearby: Nearbi Uisers' diaries
       title: Uisers' diaries
       title_friends: Friends' diaries
       title_nearby: Nearbi Uisers' diaries


@@ -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
     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_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
     partners_bytemark: Bytemark Hosting
     partners_partners: pairtners
     osm_offline: The OpenStreetMap database is currently offline while essential database


@@ -1064,7 +1062,7 @@ sco:
   traces:
     create:
       upload_trace: Uplaid GPS Trace
   traces:
     create:
       upload_trace: Uplaid GPS Trace

-  user:
+  users:

     login:
       auth_providers:
         google:
     login:
       auth_providers:
         google: