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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 162960a024fc564d88de6c390fdcd8cf02c3fcb5..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>
       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,10 +235,10 @@ 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
     index:
     new:
       title: New Diary Entry
     index: