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/Memcache/locale/he/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po
new file mode 100644
index 000000000..6cc70c044
--- /dev/null
+++ b/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Memcache to Hebrew (עברית)
+# Expored from translatewiki.net
+#
+# Author: YaronSh
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Memcache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:17+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: he\n"
+"X-Message-Group: #out-statusnet-plugin-memcache\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MemcachePlugin.php:246
+msgid ""
+"Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
+msgstr ""
+"שימוש ב־<a href=\"http://memcached.org/\">Memcached</a> (מטמון בזיכרון) "
+"לשמירת תוצאות השאילתות במטמון."