Merge branch '0.9.x' into twitstream

3 files changed, 58 insertions, 1 deletions

diff --git a/plugins/Memcached/locale/Memcached.pot b/plugins/Memcached/locale/Memcached.pot
index 03d62b7cd..c34978679 100644
--- a/plugins/Memcached/locale/Memcached.pot
+++ b/plugins/Memcached/locale/Memcached.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"POT-Creation-Date: 2010-10-09 14:04+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po
new file mode 100644
index 000000000..c6692dd60
--- /dev/null
+++ b/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Memcached to Indonesian (Bahasa Indonesia)
+# Expored from translatewiki.net
+#
+# Author: Farras
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Memcached\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-09 14:04+0000\n"
+"PO-Revision-Date: 2010-10-09 14:07:48+0000\n"
+"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-03 20:58:51+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: id\n"
+"X-Message-Group: #out-statusnet-plugin-memcached\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: MemcachedPlugin.php:218
+msgid ""
+"Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
+msgstr ""
+"Gunakan <a href=\"http://memcached.org/\">Memcached</a> untuk menyinggahkan "
+"hasil pencarian."
diff --git a/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po
new file mode 100644
index 000000000..daf4cb920
--- /dev/null
+++ b/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - Memcached to Simplified Chinese (‪中文(简体)‬)
+# Expored from translatewiki.net
+#
+# Author: ZhengYiFeng
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Memcached\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-09 14:04+0000\n"
+"PO-Revision-Date: 2010-10-09 14:07:48+0000\n"
+"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"hans>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-03 20:58:51+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: zh-hans\n"
+"X-Message-Group: #out-statusnet-plugin-memcached\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: MemcachedPlugin.php:218
+msgid ""
+"Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
+msgstr "使用 <a href=\"http://memcached.org/\">Memcached</a> 来缓存查询结果。"