Merge branch '0.9.x' into 1.0.x

Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po

1 files changed, 29 insertions, 0 deletions

diff --git a/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
new file mode 100644
index 000000000..be4d2cf40
--- /dev/null
+++ b/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - EmailSummary to Ukrainian (Українська)
+# Expored from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailSummary\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:44+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-emailsummary\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#: EmailSummaryPlugin.php:120
+msgid "Send an email summary of the inbox to users."
+msgstr ""
+"Надсилає електронною поштою перелік вхідних приватних повідомлень, "
+"адресованих користувачеві."