Merge branch 'master' of github.com:nijel/weblate

locale/ja/LC_MESSAGES/djangojs.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: Weblate\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-04-11 14:41+0200\n"
-"PO-Revision-Date: 2012-04-09 12:19+0200\n"
+"PO-Revision-Date: 2012-04-11 12:15+0200\n"
 "Last-Translator: Yuichiro Takahashi <yuichiro@pop07.odn.ne.jp>\n"
 "Language-Team: japanese <jp@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: media/js/loader.js:36
 msgid "Failed translation"
@@ -39,7 +39,7 @@ msgstr "Microsoft Translator を使って翻訳する"
 
 #: media/js/loader.js:84
 msgid "Translate using MyMemory"
-msgstr ""
+msgstr "MyMemory を使って翻訳する"
 
 #: media/js/loader.js:165
 msgid "Sort this column"

locale/zh_CN/LC_MESSAGES/djangojs.po

@@ -44,7 +44,7 @@ msgstr "使用 MyMemory 翻译"
 
 #: media/js/loader.js:165
 msgid "Sort this column"
-msgstr "整理此栏"
+msgstr "重新排列"
 
 #: media/js/loader.js:195 media/js/loader.js.c:221
 msgid "AJAX request to load this content has failed!"