Merge branch 'maint'HEADmaster

Conflicts:
	UPGRADING
	web/lib/config.inc.php.proto

1 files changed, 25 insertions, 24 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index bc669be5..5d576f2b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # 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-08-13 12:46+0200\n"
-"PO-Revision-Date: 2011-04-10 13:28+0000\n"
-"Last-Translator: cryptocrack <transifex@cryptocrack.de>\n"
+"POT-Creation-Date: 2011-09-05 17:02+0200\n"
+"PO-Revision-Date: 2011-09-05 15:03+0000\n"
+"Last-Translator: Lukas Fleischer <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,9 +24,7 @@ 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 "
@@ -56,7 +55,8 @@ 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."
@@ -199,10 +199,9 @@ 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:"
@@ -211,8 +210,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."
@@ -258,8 +257,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"
@@ -539,6 +538,12 @@ msgstr "查看这个用户提交的包"
 msgid "Bad username or password."
 msgstr "用户名或密码错误。"
 
+msgid "Category"
+msgstr "类别"
+
+msgid "Change category"
+msgstr ""
+
 msgid "Votes"
 msgstr "得票数"
 
@@ -703,7 +708,9 @@ msgstr "登录"
 msgid "Forgot Password"
 msgstr "找回密码"
 
-msgid "HTTP login is disabled. Please switch to HTTPs if you want to login: "
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
 msgstr ""
 
 msgid "Recent Updates"
@@ -751,9 +758,6 @@ msgstr "没有相关的包符合您的搜索条件。"
 msgid "Package Listing"
 msgstr "包列表"
 
-msgid "Category"
-msgstr "类别"
-
 msgid "Name"
 msgstr "名称"
 
@@ -834,6 +838,3 @@ msgstr ""
 
 msgid "Not Flagged"
 msgstr ""
-
-#~ msgid "New Package Notify"
-#~ msgstr "新包通知"