Rebuild message catalog and translations

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>

po/zh_CN.po

@@ -1,20 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch User Repository (AUR)\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
-"POT-Creation-Date: 2011-04-07 13:52+0200\n"
+"POT-Creation-Date: 2011-08-13 12:46+0200\n"
 "PO-Revision-Date: 2011-04-10 13:28+0000\n"
 "Last-Translator: cryptocrack <transifex@cryptocrack.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 msgid "Home"
@@ -23,7 +23,9 @@ msgstr "首页"
 msgid ""
 "Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU "
 "Guidelines%h for more information."
-msgstr "欢迎来到AUR！请阅读 %hAUR User Repository%h 和 %hAUR TU Guidelines%h 获取更多信息。"
+msgstr ""
+"欢迎来到AUR！请阅读 %hAUR User Repository%h 和 %hAUR TU Guidelines%h 获取更多"
+"信息。"
 
 msgid ""
 "Contributed PKGBUILDs %hmust%h conform to the %hArch Packaging Standards%h "
@@ -50,9 +52,11 @@ msgstr "搜索"
 msgid "Packages"
 msgstr "所有包"
 
+msgid "Cannot find package to merge votes and comments into."
+msgstr ""
+
 msgid ""
-"The selected packages have not been deleted, check the confirmation "
-"checkbox."
+"The selected packages have not been deleted, check the confirmation checkbox."
 msgstr ""
 
 msgid "Error trying to retrieve package details."
@@ -195,9 +199,10 @@ msgid "Continue"
 msgstr "继续"
 
 msgid ""
-"If you have forgotten the e-mail address you used to register, please send a"
-" message to the %haur-general%h mailing list."
-msgstr "如果您忘记了注册账号时使用的Email，请向 %haur-general%h 邮件列表寻求帮助。"
+"If you have forgotten the e-mail address you used to register, please send a "
+"message to the %haur-general%h mailing list."
+msgstr ""
+"如果您忘记了注册账号时使用的Email，请向 %haur-general%h 邮件列表寻求帮助。"
 
 msgid "Enter your e-mail address:"
 msgstr "输入您的Email:"
@@ -206,8 +211,8 @@ msgid "Error - No file uploaded"
 msgstr "发生错误: 没有文件被上传"
 
 msgid ""
-"Error - unsupported file format (please submit gzip'ed tarballs generated by"
-" makepkg(8) only)."
+"Error - unsupported file format (please submit gzip'ed tarballs generated by "
+"makepkg(8) only)."
 msgstr ""
 
 msgid "Error - uncompressed file size too large."
@@ -253,8 +258,8 @@ msgid "Could not change directory to %s."
 msgstr "无法切换目录至 %s。"
 
 msgid ""
-"Upload your source packages here. Create source packages with `makepkg "
-"--source`."
+"Upload your source packages here. Create source packages with `makepkg --"
+"source`."
 msgstr "在此上传包。使用`makepkg --source`创建包。"
 
 msgid "Package Category"
@@ -385,10 +390,10 @@ msgstr "非法的类别标识"
 msgid "Missing package ID."
 msgstr "丢失包标识。"
 
-msgid "Package category changed."
+msgid "You are not allowed to change this package category."
 msgstr ""
 
-msgid "You are not allowed to change this package category."
+msgid "Package category changed."
 msgstr ""
 
 msgid "Username"
@@ -430,9 +435,6 @@ msgstr "IRC昵称"
 msgid "Language"
 msgstr "语言"
 
-msgid "New Package Notify"
-msgstr "新包通知"
-
 msgid "Update"
 msgstr "更新"
 
@@ -661,6 +663,9 @@ msgstr "弃置包"
 msgid "Delete Packages"
 msgstr "删除包"
 
+msgid "Merge into"
+msgstr ""
+
 msgid "Confirm"
 msgstr "确认"
 
@@ -698,6 +703,9 @@ msgstr "登录"
 msgid "Forgot Password"
 msgstr "找回密码"
 
+msgid "HTTP login is disabled. Please switch to HTTPs if you want to login: "
+msgstr ""
+
 msgid "Recent Updates"
 msgstr "最新更新"
 
@@ -827,4 +835,5 @@ msgstr ""
 msgid "Not Flagged"
 msgstr ""
 
-
+#~ msgid "New Package Notify"
+#~ msgstr "新包通知"