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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 162960a024fc564d88de6c390fdcd8cf02c3fcb5..5f448f4f16a1c225c0b24525a37afae5d5022004 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1,6 +1,7 @@
 # Messages for Scots (Scots)
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Messages for Scots (Scots)
 # Exported from translatewiki.net
 # Export driver: phpyaml

+# Author: Abijeet Patro

 # Author: AmaryllisGardener
 # Author: John Reid
 ---
 # Author: AmaryllisGardener
 # Author: John Reid
 ---


@@ -8,6 +9,10 @@ sco:
   time:
     formats:
       friendly: '%e %B %Y at %H:%M'
   time:
     formats:
       friendly: '%e %B %Y at %H:%M'

+  helpers:
+    submit:
+      diary_comment:
+        create: Hain

   activerecord:
     models:
       acl: Access Control Leet
   activerecord:
     models:
       acl: Access Control Leet


@@ -206,7 +211,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>
       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 »
     changeset_paging_nav:
       showing_page: Page %{page}
       next: Next »


@@ -235,12 +240,20 @@ sco:
       load_more: Load mair
     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.
       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}
       commented_at_by_html: Updatit %{when} ago bi %{user}

-  diary_entry:
+  diary_entries:

     new:
       title: New Diary Entry
     new:
       title: New Diary Entry

+    form:
+      subject: 'Subject:'
+      body: 'Body:'
+      language: 'Leid:'
+      location: 'Location:'
+      latitude: 'Latitude:'
+      longitude: 'Longitude:'
+      use_map_link: uise map

     index:
       title: Uisers' diaries
       title_friends: Friends' diaries
     index:
       title: Uisers' diaries
       title_friends: Friends' diaries


@@ -255,14 +268,6 @@ sco:
       newer_entries: Newer Entries
     edit:
       title: Eedit diary entry
       newer_entries: Newer Entries
     edit:
       title: Eedit diary entry

-      subject: 'Subject:'
-      body: 'Body:'
-      language: 'Leid:'
-      location: 'Location:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
-      use_map_link: uise map
-      save_button: Hain

       marker_text: Diary entry location
     show:
       title: '%{user}''s diary | %{title}'
       marker_text: Diary entry location
     show:
       title: '%{user}''s diary | %{title}'


@@ -270,7 +275,6 @@ sco:
       leave_a_comment: Leave a comment
       login_to_leave_a_comment: '%{login_link} tae leave a comment'
       login: Login
       leave_a_comment: Leave a comment
       login_to_leave_a_comment: '%{login_link} tae leave a comment'
       login: Login

-      save_button: Hain

     no_such_entry:
       title: No such diary entry
       heading: 'No entry wi the id: %{id}'
     no_such_entry:
       title: No such diary entry
       heading: 'No entry wi the id: %{id}'