Merge remote-tracking branch 'origin/master'

locale/sl/LC_MESSAGES/djangojs.po

@@ -8,28 +8,28 @@ msgstr ""
 "Project-Id-Version: Weblate\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-04-05 17:11+0200\n"
-"PO-Revision-Date: 2011-03-05 13:57+0000\n"
-"Last-Translator: zejn <zejn@kiberpipa.org>\n"
+"PO-Revision-Date: 2012-04-06 21:07+0200\n"
+"Last-Translator: Domen <dbc334@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
-"X-Generator: Weblate 0.7\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
+"X-Generator: Weblate 0.8\n"
 
 #: media/js/loader.js:36
 msgid "Failed translation"
-msgstr ""
+msgstr "Prevajanje je spodletelo"
 
 #: media/js/loader.js:36
 msgid "The request for machine translation has failed."
-msgstr ""
+msgstr "Zahteva po strojnem prevodu je spodletela."
 
 #: media/js/loader.js:36
 msgid "Error details:"
-msgstr ""
+msgstr "Podrobnosti napake:"
 
 #: media/js/loader.js:55
 msgid "Translate using Apertium"
@@ -49,8 +49,8 @@ msgstr "Razvrsti stolpec"
 
 #: media/js/loader.js:195 media/js/loader.js.c:221
 msgid "AJAX request to load this content has failed!"
-msgstr ""
+msgstr "Zahteva Ajax za nalaganje vsebine je spodletela!"
 
 #: media/js/loader.js:211 media/js/loader.js.c:240
 msgid "Loading..."
-msgstr ""
+msgstr "Nalaganje ..."

locale/zh_CN/LC_MESSAGES/djangojs.po

@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2012-04-05 17:11+0200\n"
 "PO-Revision-Date: 2012-04-06 06:44+0200\n"
 "Last-Translator: Chipong Luo <chipong.luo@yahoo.com>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@l10n.cihar.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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!"