Merge branch 'maint'

1 files changed, 254 insertions, 268 deletions

diff --git a/scripts/po/zh_CN.po b/scripts/po/zh_CN.po
index e06bf9b3..219fd701 100644
--- a/scripts/po/zh_CN.po
+++ b/scripts/po/zh_CN.po
@@ -6,8 +6,8 @@
 # Isaac Ge <acgtyrant@gmail.com>, 2014
 # leonfeng <chaofeng111@gmail.com>, 2011
 # leonfeng <chaofeng111@gmail.com>, 2011
-# mytbk <mytbk920423@gmail.com>, 2013
-# mytbk <mytbk920423@gmail.com>, 2013
+# mytbk <mytbk920423@gmail.com>, 2013,2015
+# mytbk <mytbk920423@gmail.com>, 2013,2015
 # leonfeng <chaofeng111@gmail.com>, 2011
 # Yangtse Su <yangtsesu@gmail.com>, 2012-2013
 # ykelvis <ykelvis@users.noreply.github.com>, 2014
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2014-12-19 13:24+1000\n"
-"PO-Revision-Date: 2014-12-12 14:51+0000\n"
-"Last-Translator: Isaac Ge <acgtyrant@gmail.com>\n"
+"POT-Creation-Date: 2015-02-14 11:18+1000\n"
+"PO-Revision-Date: 2015-02-14 01:24+0000\n"
+"Last-Translator: Allan McRae <allan@archlinux.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "archlinux-pacman/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -27,8 +27,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: scripts/makepkg.sh.in:120 scripts/makepkg.sh.in:1517
-#: scripts/makepkg.sh.in:1521 scripts/library/output_format.sh:26
+#: scripts/makepkg.sh.in:120 scripts/makepkg.sh.in:1494
+#: scripts/makepkg.sh.in:1498 scripts/library/output_format.sh:26
 msgid "WARNING:"
 msgstr "警告："
 
@@ -44,27 +44,26 @@ msgstr "打扫中..."
 msgid "Entering %s environment..."
 msgstr "正在进入 %s 环境..."
 
-#: scripts/makepkg.sh.in:303 scripts/makepkg.sh.in:2890
+#: scripts/makepkg.sh.in:303 scripts/makepkg.sh.in:2873
 msgid "Unknown download protocol: %s"
 msgstr "未知下载协议：%s"
 
 #: scripts/makepkg.sh.in:304 scripts/makepkg.sh.in:313
 #: scripts/makepkg.sh.in:377 scripts/makepkg.sh.in:441
-#: scripts/makepkg.sh.in:470 scripts/makepkg.sh.in:480
-#: scripts/makepkg.sh.in:487 scripts/makepkg.sh.in:518
-#: scripts/makepkg.sh.in:533 scripts/makepkg.sh.in:538
-#: scripts/makepkg.sh.in:561 scripts/makepkg.sh.in:569
-#: scripts/makepkg.sh.in:604 scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:627 scripts/makepkg.sh.in:635
-#: scripts/makepkg.sh.in:659 scripts/makepkg.sh.in:697
-#: scripts/makepkg.sh.in:706 scripts/makepkg.sh.in:711
-#: scripts/makepkg.sh.in:745 scripts/makepkg.sh.in:755
-#: scripts/makepkg.sh.in:893 scripts/makepkg.sh.in:1593
-#: scripts/makepkg.sh.in:1601 scripts/makepkg.sh.in:2208
-#: scripts/makepkg.sh.in:2891 scripts/makepkg.sh.in:3327
-#: scripts/makepkg.sh.in:3375 scripts/makepkg.sh.in:3382
-#: scripts/makepkg.sh.in:3395 scripts/makepkg.sh.in:3403
-#: scripts/makepkg.sh.in:3412 scripts/makepkg.sh.in:3425
+#: scripts/makepkg.sh.in:470 scripts/makepkg.sh.in:501
+#: scripts/makepkg.sh.in:516 scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:544 scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:587 scripts/makepkg.sh.in:593
+#: scripts/makepkg.sh.in:610 scripts/makepkg.sh.in:618
+#: scripts/makepkg.sh.in:642 scripts/makepkg.sh.in:680
+#: scripts/makepkg.sh.in:689 scripts/makepkg.sh.in:694
+#: scripts/makepkg.sh.in:728 scripts/makepkg.sh.in:738
+#: scripts/makepkg.sh.in:876 scripts/makepkg.sh.in:1570
+#: scripts/makepkg.sh.in:1578 scripts/makepkg.sh.in:2188
+#: scripts/makepkg.sh.in:2874 scripts/makepkg.sh.in:3320
+#: scripts/makepkg.sh.in:3368 scripts/makepkg.sh.in:3375
+#: scripts/makepkg.sh.in:3388 scripts/makepkg.sh.in:3396
+#: scripts/makepkg.sh.in:3405 scripts/makepkg.sh.in:3418
 msgid "Aborting..."
 msgstr "正在放弃..."
 
@@ -104,724 +103,716 @@ msgstr "正在取出%s......"
 msgid "Failure while branching %s"
 msgstr "获取%s的最新版本失败"
 
-#: scripts/makepkg.sh.in:479 scripts/makepkg.sh.in:485
-msgid "%s is not a branch of %s"
-msgstr "%s不是%s的分支"
-
-#: scripts/makepkg.sh.in:486
-msgid "The local URL is %s"
-msgstr "本地URL是 %s"
-
-#: scripts/makepkg.sh.in:491
+#: scripts/makepkg.sh.in:474
 msgid "Pulling %s ..."
 msgstr "正在获取%s的最新版本......"
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:478
 msgid "Failure while pulling %s"
 msgstr "获取%s的最新版本失败"
 
-#: scripts/makepkg.sh.in:517 scripts/makepkg.sh.in:626
-#: scripts/makepkg.sh.in:696 scripts/makepkg.sh.in:744
+#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:679 scripts/makepkg.sh.in:727
 msgid "Unrecognized reference: %s"
 msgstr "未知引用：%s"
 
-#: scripts/makepkg.sh.in:526 scripts/makepkg.sh.in:595
-#: scripts/makepkg.sh.in:686 scripts/makepkg.sh.in:777
+#: scripts/makepkg.sh.in:509 scripts/makepkg.sh.in:578
+#: scripts/makepkg.sh.in:669 scripts/makepkg.sh.in:760
 msgid "Creating working copy of %s %s repo..."
 msgstr "正在建立%s %s仓库的拷贝......"
 
-#: scripts/makepkg.sh.in:532 scripts/makepkg.sh.in:603
-#: scripts/makepkg.sh.in:705
+#: scripts/makepkg.sh.in:515 scripts/makepkg.sh.in:586
+#: scripts/makepkg.sh.in:688
 msgid "Failure while updating working copy of %s %s repo"
-msgstr ""
+msgstr "升级 %s %s 仓库的活动拷贝失败"
 
-#: scripts/makepkg.sh.in:537 scripts/makepkg.sh.in:609
-#: scripts/makepkg.sh.in:634 scripts/makepkg.sh.in:710
+#: scripts/makepkg.sh.in:520 scripts/makepkg.sh.in:592
+#: scripts/makepkg.sh.in:617 scripts/makepkg.sh.in:693
 msgid "Failure while creating working copy of %s %s repo"
 msgstr "建立%s %s仓库的拷贝失败"
 
-#: scripts/makepkg.sh.in:558 scripts/makepkg.sh.in:656
-#: scripts/makepkg.sh.in:751
+#: scripts/makepkg.sh.in:541 scripts/makepkg.sh.in:639
+#: scripts/makepkg.sh.in:734
 msgid "Cloning %s %s repo..."
 msgstr "正在克隆%s %s仓库......"
 
-#: scripts/makepkg.sh.in:560 scripts/makepkg.sh.in:658
-#: scripts/makepkg.sh.in:754
+#: scripts/makepkg.sh.in:543 scripts/makepkg.sh.in:641
+#: scripts/makepkg.sh.in:737
 msgid "Failure while downloading %s %s repo"
 msgstr "下载%s %s仓库失败"
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:551
 msgid "%s is not a clone of %s"
 msgstr "%s不是%s的克隆"
 
-#: scripts/makepkg.sh.in:572 scripts/makepkg.sh.in:663
-#: scripts/makepkg.sh.in:759
+#: scripts/makepkg.sh.in:555 scripts/makepkg.sh.in:646
+#: scripts/makepkg.sh.in:742
 msgid "Updating %s %s repo..."
 msgstr "正在升级%s %s仓库......"
 
-#: scripts/makepkg.sh.in:575 scripts/makepkg.sh.in:667
-#: scripts/makepkg.sh.in:763
+#: scripts/makepkg.sh.in:558 scripts/makepkg.sh.in:650
+#: scripts/makepkg.sh.in:746
 msgid "Failure while updating %s %s repo"
 msgstr "升级%s %s仓库失败"
 
-#: scripts/makepkg.sh.in:816
+#: scripts/makepkg.sh.in:799
 msgid "Retrieving sources..."
 msgstr "获取源代码......"
 
-#: scripts/makepkg.sh.in:868
+#: scripts/makepkg.sh.in:851
 msgid "pkgver() generated an invalid version: %s"
 msgstr "pkgver() 生成了无效的版本：%s"
 
-#: scripts/makepkg.sh.in:875
+#: scripts/makepkg.sh.in:858
 msgid "Failed to update %s from %s to %s"
 msgstr "从 %s 升级到 %s 失败"
 
-#: scripts/makepkg.sh.in:882
+#: scripts/makepkg.sh.in:865
 msgid "Updated version: %s"
 msgstr "已升级版本：%s"
 
-#: scripts/makepkg.sh.in:884
+#: scripts/makepkg.sh.in:867
 msgid "%s is not writeable -- pkgver will not be updated"
 msgstr "%s不可写 -- 包版本将不升级"
 
-#: scripts/makepkg.sh.in:892
+#: scripts/makepkg.sh.in:875
 msgid "Unable to find source file %s."
 msgstr "无法找到源文件 %s。"
 
-#: scripts/makepkg.sh.in:1072
+#: scripts/makepkg.sh.in:1055
 msgid "'%s' returned a fatal error (%i): %s"
 msgstr "'%s' 返回一个致命错误 (%i)：%s"
 
-#: scripts/makepkg.sh.in:1091
+#: scripts/makepkg.sh.in:1074
 msgid "Installing missing dependencies..."
 msgstr "正在安装缺少的依赖关系..."
 
-#: scripts/makepkg.sh.in:1094
+#: scripts/makepkg.sh.in:1077
 msgid "'%s' failed to install missing dependencies."
 msgstr "'%s' 无法安装缺少的依赖关系。"
 
-#: scripts/makepkg.sh.in:1125
+#: scripts/makepkg.sh.in:1108
 msgid "Missing dependencies:"
 msgstr "缺少依赖关系："
 
-#: scripts/makepkg.sh.in:1141 scripts/makepkg.sh.in:1155
+#: scripts/makepkg.sh.in:1124 scripts/makepkg.sh.in:1138
 msgid "Failed to remove installed dependencies."
 msgstr "无法删除已安装的依赖关系。"
 
-#: scripts/makepkg.sh.in:1230
+#: scripts/makepkg.sh.in:1213
 msgid "Generating checksums for source files..."
 msgstr "正在为源代码文件创建完整性检查值..."
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1216
 msgid "Cannot find the %s binary required for generating sourcefile checksums."
 msgstr "无法找到生成源文件检验值所需的 %s 库。"
 
-#: scripts/makepkg.sh.in:1247
+#: scripts/makepkg.sh.in:1230
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "指定了无效的完整性算法 '%s'"
 
-#: scripts/makepkg.sh.in:1265
+#: scripts/makepkg.sh.in:1248
 msgid "Skipped"
 msgstr "已跳过"
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1253
 msgid "NOT FOUND"
 msgstr "未找到"
 
-#: scripts/makepkg.sh.in:1277 scripts/makepkg.sh.in:1514
+#: scripts/makepkg.sh.in:1260 scripts/makepkg.sh.in:1491
 msgid "Passed"
 msgstr "通过"
 
-#: scripts/makepkg.sh.in:1279 scripts/makepkg.sh.in:1490
-#: scripts/makepkg.sh.in:1508 scripts/makepkg.sh.in:1511
+#: scripts/makepkg.sh.in:1262 scripts/makepkg.sh.in:1467
+#: scripts/makepkg.sh.in:1485 scripts/makepkg.sh.in:1488
 msgid "FAILED"
 msgstr "失败"
 
-#: scripts/makepkg.sh.in:1302
+#: scripts/makepkg.sh.in:1285
 msgid "Validating source files with %s..."
 msgstr "正在验证源代码文件 %s..."
 
-#: scripts/makepkg.sh.in:1309
+#: scripts/makepkg.sh.in:1292
 msgid "One or more files did not pass the validity check!"
 msgstr "一个或多个文件没有通过有效性检查！"
 
-#: scripts/makepkg.sh.in:1313
+#: scripts/makepkg.sh.in:1296
 msgid "Integrity checks (%s) differ in size from the source array."
 msgstr "完整性检查 (%s) 与源阵列大小不一致。"
 
-#: scripts/makepkg.sh.in:1361
+#: scripts/makepkg.sh.in:1338
 msgid "Integrity checks are missing."
 msgstr "完整性检查 (%s) 缺失。"
 
-#: scripts/makepkg.sh.in:1428
+#: scripts/makepkg.sh.in:1405
 msgid "Verifying source file signatures with %s..."
 msgstr "正在使用 %s 验证源文件签名..."
 
-#: scripts/makepkg.sh.in:1453
+#: scripts/makepkg.sh.in:1430
 msgid "SIGNATURE NOT FOUND"
 msgstr "未找到签名！"
 
-#: scripts/makepkg.sh.in:1466
+#: scripts/makepkg.sh.in:1443
 msgid "SOURCE FILE NOT FOUND"
 msgstr "未找到源文件！"
 
-#: scripts/makepkg.sh.in:1493
+#: scripts/makepkg.sh.in:1470
 msgid "unknown public key"
 msgstr "未知的公共密匙"
 
-#: scripts/makepkg.sh.in:1496
+#: scripts/makepkg.sh.in:1473
 msgid "public key %s has been revoked"
 msgstr "公钥 %s 已被吊销"
 
-#: scripts/makepkg.sh.in:1499
+#: scripts/makepkg.sh.in:1476
 msgid "bad signature from public key"
 msgstr "公钥签名错误"
 
-#: scripts/makepkg.sh.in:1502
+#: scripts/makepkg.sh.in:1479
 msgid "error during signature verification"
 msgstr "验证签名时发生错误"
 
-#: scripts/makepkg.sh.in:1508
+#: scripts/makepkg.sh.in:1485
 msgid "the public key %s is not trusted"
 msgstr "公钥 %s 不被信任"
 
-#: scripts/makepkg.sh.in:1511
+#: scripts/makepkg.sh.in:1488
 msgid "invalid public key"
 msgstr "无效的公共密匙"
 
-#: scripts/makepkg.sh.in:1517
+#: scripts/makepkg.sh.in:1494
 msgid "the signature has expired."
 msgstr "该签名已过期。"
 
-#: scripts/makepkg.sh.in:1521
+#: scripts/makepkg.sh.in:1498
 msgid "the key has expired."
 msgstr "该密匙已过期。"
 
-#: scripts/makepkg.sh.in:1533
+#: scripts/makepkg.sh.in:1510
 msgid "One or more PGP signatures could not be verified!"
 msgstr "一个或多个 PGP 签名无法校验！"
 
-#: scripts/makepkg.sh.in:1538
+#: scripts/makepkg.sh.in:1515
 msgid "Warnings have occurred while verifying the signatures."
 msgstr "校验签名时发生警告。"
 
-#: scripts/makepkg.sh.in:1539
+#: scripts/makepkg.sh.in:1516
 msgid "Please make sure you really trust them."
 msgstr "请确认您真的信任对方。"
 
-#: scripts/makepkg.sh.in:1545
+#: scripts/makepkg.sh.in:1522
 msgid "Skipping all source file integrity checks."
 msgstr "正在跳过所有源文件完整性检查。"
 
-#: scripts/makepkg.sh.in:1547
+#: scripts/makepkg.sh.in:1524
 msgid "Skipping verification of source file checksums."
 msgstr "正在跳过校验源文件校验值。"
 
-#: scripts/makepkg.sh.in:1550
+#: scripts/makepkg.sh.in:1527
 msgid "Skipping verification of source file PGP signatures."
 msgstr "正在跳过源文件 PGP 签名校验。"
 
-#: scripts/makepkg.sh.in:1559
+#: scripts/makepkg.sh.in:1536
 msgid "Extracting sources..."
 msgstr "正在释放源码......"
 
-#: scripts/makepkg.sh.in:1592
+#: scripts/makepkg.sh.in:1569
 msgid "A failure occurred in %s()."
 msgstr "在 %s() 中发生一个错误。"
 
-#: scripts/makepkg.sh.in:1600
+#: scripts/makepkg.sh.in:1577
 msgid "Failed to change to directory %s"
 msgstr "无法切换到目录%s"
 
-#: scripts/makepkg.sh.in:1609
+#: scripts/makepkg.sh.in:1586
 msgid "Failed to source %s"
 msgstr "载入%s失败"
 
-#: scripts/makepkg.sh.in:1671
+#: scripts/makepkg.sh.in:1651
 msgid "Starting %s()..."
 msgstr "正在开始 %s()..."
 
-#: scripts/makepkg.sh.in:1796
+#: scripts/makepkg.sh.in:1776
 msgid "Tidying install..."
 msgstr "正在清理安装..."
 
-#: scripts/makepkg.sh.in:1799
+#: scripts/makepkg.sh.in:1779
 msgid "Removing doc files..."
 msgstr "正在删除 doc 文件..."
 
-#: scripts/makepkg.sh.in:1804
+#: scripts/makepkg.sh.in:1784
 msgid "Purging unwanted files..."
 msgstr "正在清除不打算要的文件..."
 
-#: scripts/makepkg.sh.in:1816
+#: scripts/makepkg.sh.in:1796
 msgid "Removing %s files..."
 msgstr "正在删除 %s 文件..."
 
-#: scripts/makepkg.sh.in:1821
+#: scripts/makepkg.sh.in:1801
 msgid "Removing static library files..."
 msgstr "正在移除静态库文件……"
 
-#: scripts/makepkg.sh.in:1831
+#: scripts/makepkg.sh.in:1811
 msgid "Removing empty directories..."
 msgstr "正在删除空目录..."
 
-#: scripts/makepkg.sh.in:1839
+#: scripts/makepkg.sh.in:1819
 msgid "%s entry file not in package : %s"
 msgstr "%s 条目文件不在软件包内： %s"
 
-#: scripts/makepkg.sh.in:1845 scripts/makepkg.sh.in:1848
+#: scripts/makepkg.sh.in:1825 scripts/makepkg.sh.in:1828
 msgid "Package contains reference to %s"
 msgstr "软件包提及含有 %s"
 
-#: scripts/makepkg.sh.in:1852
+#: scripts/makepkg.sh.in:1832
 msgid "Compressing man and info pages..."
 msgstr "正在压缩 man 及 info 文档..."
 
-#: scripts/makepkg.sh.in:1880
+#: scripts/makepkg.sh.in:1860
 msgid "Stripping unneeded symbols from binaries and libraries..."
 msgstr "正在从二进制文件和库中清除不需要的系统符号..."
 
-#: scripts/makepkg.sh.in:1914
+#: scripts/makepkg.sh.in:1894
 msgid "Compressing binaries with %s..."
 msgstr "正在使用 %s 压缩二进制文件..."
 
-#: scripts/makepkg.sh.in:1919
+#: scripts/makepkg.sh.in:1899
 msgid "Could not compress binary : %s"
 msgstr "无法压缩二进制文件：%s"
 
-#: scripts/makepkg.sh.in:1976
+#: scripts/makepkg.sh.in:1956
 msgid "Library listed in %s is not required by any files: %s"
 msgstr "%s列出的库不被任何文件要求：%s"
 
-#: scripts/makepkg.sh.in:2005
+#: scripts/makepkg.sh.in:1985
 msgid "Library listed in %s is not versioned: %s"
 msgstr "%s列出的库没有版本：%s"
 
-#: scripts/makepkg.sh.in:2018
+#: scripts/makepkg.sh.in:1998
 msgid "Library listed in %s is not a shared object: %s"
 msgstr "%s列出的库不是共享对象：%s"
 
-#: scripts/makepkg.sh.in:2033
+#: scripts/makepkg.sh.in:2013
 msgid "Cannot find library listed in %s: %s"
 msgstr "无法找到列在 %s 中的库： %s"
 
-#: scripts/makepkg.sh.in:2147 scripts/makepkg.sh.in:2351
+#: scripts/makepkg.sh.in:2127 scripts/makepkg.sh.in:2331
 msgid "Generating %s file..."
 msgstr "正在生成 %s 文件..."
 
-#: scripts/makepkg.sh.in:2207
+#: scripts/makepkg.sh.in:2187
 msgid "Missing %s directory."
 msgstr "缺失 %s 目录。"
 
-#: scripts/makepkg.sh.in:2213
+#: scripts/makepkg.sh.in:2193
 msgid "Creating package \"%s\"..."
 msgstr "正在创建软件包\"%s\"......"
 
-#: scripts/makepkg.sh.in:2225
+#: scripts/makepkg.sh.in:2205
 msgid "Adding %s file..."
 msgstr "正在添加 %s 文件..."
 
-#: scripts/makepkg.sh.in:2227
+#: scripts/makepkg.sh.in:2207
 msgid "Failed to add %s file to package."
 msgstr "无法添加文件 %s 到软件包。"
 
-#: scripts/makepkg.sh.in:2247
+#: scripts/makepkg.sh.in:2227
 msgid "Generating .MTREE file..."
 msgstr "正在生成 .MTREE 文件......"
 
-#: scripts/makepkg.sh.in:2253
+#: scripts/makepkg.sh.in:2233
 msgid "Compressing package..."
 msgstr "正在压缩软件包..."
 
-#: scripts/makepkg.sh.in:2268 scripts/makepkg.sh.in:2394
+#: scripts/makepkg.sh.in:2248 scripts/makepkg.sh.in:2374
 msgid "'%s' is not a valid archive extension."
 msgstr "'%s' 是无效的压缩包扩展名。"
 
-#: scripts/makepkg.sh.in:2276
+#: scripts/makepkg.sh.in:2256
 msgid "Failed to create package file."
 msgstr "无法创建软件包文件。"
 
-#: scripts/makepkg.sh.in:2293
+#: scripts/makepkg.sh.in:2273
 msgid "Failed to create symlink to package file."
 msgstr "创建软件包文件系统链接失败。"
 
-#: scripts/makepkg.sh.in:2325
+#: scripts/makepkg.sh.in:2305
 msgid "Signing package..."
 msgstr "正在签名软件包..."
 
-#: scripts/makepkg.sh.in:2336
+#: scripts/makepkg.sh.in:2316
 msgid "Created signature file %s."
 msgstr "已创建签名文件 %s。"
 
-#: scripts/makepkg.sh.in:2338
+#: scripts/makepkg.sh.in:2318
 msgid "Failed to sign package file."
 msgstr "无法签名软件包文件。"
 
-#: scripts/makepkg.sh.in:2344
+#: scripts/makepkg.sh.in:2324
 msgid "Creating source package..."
 msgstr "正在创建源码包..."
 
-#: scripts/makepkg.sh.in:2348 scripts/makepkg.sh.in:2361
+#: scripts/makepkg.sh.in:2328 scripts/makepkg.sh.in:2341
 msgid "Adding %s..."
 msgstr "正在添加 %s..."
 
-#: scripts/makepkg.sh.in:2379
+#: scripts/makepkg.sh.in:2359
 msgid "Adding %s file (%s)..."
 msgstr "正在添加 %s 文件 (%s) ..."
 
-#: scripts/makepkg.sh.in:2402
+#: scripts/makepkg.sh.in:2382
 msgid "Compressing source package..."
 msgstr "正在压缩源码包..."
 
-#: scripts/makepkg.sh.in:2405
+#: scripts/makepkg.sh.in:2385
 msgid "Failed to create source package file."
 msgstr "创建源码包文件失败。"
 
-#: scripts/makepkg.sh.in:2422
+#: scripts/makepkg.sh.in:2402
 msgid "Failed to create symlink to source package file."
 msgstr "无法创建源软件包文件的系统链接。"
 
-#: scripts/makepkg.sh.in:2434
+#: scripts/makepkg.sh.in:2414
 msgid "Installing package %s with %s..."
 msgstr "正在安装软件包 %s，使用 %s..."
 
-#: scripts/makepkg.sh.in:2436
+#: scripts/makepkg.sh.in:2416
 msgid "Installing %s package group with %s..."
 msgstr "正在安装 %s 软件包组，使用 %s..."
 
-#: scripts/makepkg.sh.in:2454
+#: scripts/makepkg.sh.in:2434
 msgid "Failed to install built package(s)."
 msgstr "安装创建的软件包失败。"
 
-#: scripts/makepkg.sh.in:2546 scripts/makepkg.sh.in:2561
+#: scripts/makepkg.sh.in:2529 scripts/makepkg.sh.in:2544
 msgid "%s is not allowed to start with a hyphen."
 msgstr "%s 不允许以连字号开始。"
 
-#: scripts/makepkg.sh.in:2556 scripts/makepkg.sh.in:2580
-#: scripts/makepkg.sh.in:2869
+#: scripts/makepkg.sh.in:2539 scripts/makepkg.sh.in:2563
+#: scripts/makepkg.sh.in:2852
 msgid "%s is not allowed to be empty."
 msgstr "%s 不允许为空。"
 
-#: scripts/makepkg.sh.in:2565
+#: scripts/makepkg.sh.in:2548
 msgid "%s is not allowed to start with a dot."
 msgstr "%s 不允许以点号开始。"
 
-#: scripts/makepkg.sh.in:2569 scripts/makepkg.sh.in:2615
+#: scripts/makepkg.sh.in:2552 scripts/makepkg.sh.in:2598
 msgid "%s contains invalid characters: '%s'"
 msgstr "%s 包含无效字符： '%s'"
 
-#: scripts/makepkg.sh.in:2585
+#: scripts/makepkg.sh.in:2568
 msgid "%s must be a decimal, not %s."
 msgstr "%s 必须是十进制，不是 %s。"
 
-#: scripts/makepkg.sh.in:2601
+#: scripts/makepkg.sh.in:2584
 msgid "%s must be an integer, not %s."
 msgstr "%s 必须是整数，不是%s。"
 
-#: scripts/makepkg.sh.in:2622 scripts/makepkg.sh.in:2632
+#: scripts/makepkg.sh.in:2605 scripts/makepkg.sh.in:2615
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s 不具备 '%s' 架构。"
 
-#: scripts/makepkg.sh.in:2623
+#: scripts/makepkg.sh.in:2606
 msgid "Note that many packages may need a line added to their %s"
 msgstr "注意许多软件包可能需要在 %s 中添加"
 
-#: scripts/makepkg.sh.in:2624
+#: scripts/makepkg.sh.in:2607
 msgid "such as %s."
 msgstr "诸如 %s。"
 
-#: scripts/makepkg.sh.in:2662
+#: scripts/makepkg.sh.in:2645
 msgid "%s array cannot contain comparison (< or >) operators."
 msgstr "%s 阵列不能包含比较 (< 或 >) 操作符。"
 
-#: scripts/makepkg.sh.in:2682
+#: scripts/makepkg.sh.in:2665
 msgid "%s entry should not contain leading slash : %s"
 msgstr "%s 条目不应当包含前斜杠：%s"
 
-#: scripts/makepkg.sh.in:2715
+#: scripts/makepkg.sh.in:2698
 msgid "Invalid syntax for %s: '%s'"
 msgstr "%s 的语法无效：'%s'"
 
-#: scripts/makepkg.sh.in:2728
+#: scripts/makepkg.sh.in:2711
 msgid "%s file (%s) does not exist or is not a regular file."
 msgstr "文件 %s (%s) 不存在，或者不是一个常规文件。"
 
-#: scripts/makepkg.sh.in:2781
+#: scripts/makepkg.sh.in:2764
 msgid "%s array contains unknown option '%s'"
 msgstr "%s 陈列包含未知的选项 '%s'"
 
-#: scripts/makepkg.sh.in:2792
+#: scripts/makepkg.sh.in:2775
 msgid "Sparse arrays are not allowed for source"
 msgstr "源里不允许使用稀疏数组"
 
-#: scripts/makepkg.sh.in:2802
+#: scripts/makepkg.sh.in:2785
 msgid "Requested package %s is not provided in %s"
 msgstr "要求的软件包 %s 在 %s 中不提供"
 
-#: scripts/makepkg.sh.in:2815
+#: scripts/makepkg.sh.in:2798
 msgid "Missing %s function in %s"
-msgstr "%2$s 中缺少函数 %1$s"
+msgstr ""
 
-#: scripts/makepkg.sh.in:2821
+#: scripts/makepkg.sh.in:2804
 msgid "Missing %s function for split package '%s'"
 msgstr "缺失 %s 功能以分割软件包 '%s'"
 
-#: scripts/makepkg.sh.in:2862
+#: scripts/makepkg.sh.in:2845
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "%s 不允许包含冒号，连字号及空格。"
 
-#: scripts/makepkg.sh.in:2907
+#: scripts/makepkg.sh.in:2890
 msgid "Cannot find the %s binary needed to check VCS source requirements."
 msgstr "找不到用来检查 VCS 源需求的 %s 库"
 
-#: scripts/makepkg.sh.in:2925
+#: scripts/makepkg.sh.in:2918
 msgid "Cannot find the %s package needed to handle %s sources."
 msgstr "找不到 % 软件包以处理 %s 源。"
 
-#: scripts/makepkg.sh.in:2948
+#: scripts/makepkg.sh.in:2941
 msgid "Cannot find the %s binary required for dependency operations."
 msgstr "无法找到依赖操作所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:2956
+#: scripts/makepkg.sh.in:2949
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
 msgstr "无法找到二进制文件%s. 将使用%s获得root权限。"
 
-#: scripts/makepkg.sh.in:2963
+#: scripts/makepkg.sh.in:2956
 msgid "Cannot find the %s binary."
 msgstr "无法找到 %s 的二进制文件。"
 
-#: scripts/makepkg.sh.in:2971
+#: scripts/makepkg.sh.in:2964
 msgid "Cannot find the %s binary required for signing packages."
 msgstr "无法找到签名软件包所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:2979
+#: scripts/makepkg.sh.in:2972
 msgid "Cannot find the %s binary required for verifying source files."
 msgstr "无法找到验证源文件所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:2987
+#: scripts/makepkg.sh.in:2980
 msgid "Cannot find the %s binary required for validating sourcefile checksums."
 msgstr "无法找到验证源文件校验值所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:2995
+#: scripts/makepkg.sh.in:2988
 msgid "Cannot find the %s binary required for compressing binaries."
 msgstr "无法找到压缩二进制文件所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:3003
+#: scripts/makepkg.sh.in:2996
 msgid "Cannot find the %s binary required for distributed compilation."
 msgstr "无法找到分发编译所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:3011
+#: scripts/makepkg.sh.in:3004
 msgid "Cannot find the %s binary required for compiler cache usage."
 msgstr "无法找到编译器缓存使用所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:3019
+#: scripts/makepkg.sh.in:3012
 msgid "Cannot find the %s binary required for object file stripping."
 msgstr "无法找到目标文件分割所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:3027
+#: scripts/makepkg.sh.in:3020
 msgid "Cannot find the %s binary required for compressing man and info pages."
 msgstr "无法找到压缩帮助及信息页面所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:3047
+#: scripts/makepkg.sh.in:3040
 msgid "A package has already been built, installing existing package..."
 msgstr "已有一个编译好的软件包，正在安装现有的软件包..."
 
-#: scripts/makepkg.sh.in:3051
+#: scripts/makepkg.sh.in:3044
 msgid "A package has already been built. (use %s to overwrite)"
 msgstr "软件包已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:3070
+#: scripts/makepkg.sh.in:3063
 msgid ""
 "The package group has already been built, installing existing packages..."
 msgstr "已有一个编译好的软件包组，正在安装现有的软件包..."
 
-#: scripts/makepkg.sh.in:3074
+#: scripts/makepkg.sh.in:3067
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "该软件包组已创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:3079
+#: scripts/makepkg.sh.in:3072
 msgid "Part of the package group has already been built. (use %s to overwrite)"
 msgstr "软件包组的一部分已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:3149
+#: scripts/makepkg.sh.in:3142
 msgid "Make packages compatible for use with pacman"
 msgstr "让软件包兼容于 pacman 的用法"
 
-#: scripts/makepkg.sh.in:3151 scripts/pacman-db-upgrade.sh.in:37
+#: scripts/makepkg.sh.in:3144 scripts/pacman-db-upgrade.sh.in:40
 msgid "Usage: %s [options]"
 msgstr "用法：%s [选项]"
 
-#: scripts/makepkg.sh.in:3153 scripts/pacman-key.sh.in:81
+#: scripts/makepkg.sh.in:3146 scripts/pacman-key.sh.in:81
 msgid "Options:"
 msgstr "选项："
 
-#: scripts/makepkg.sh.in:3154
+#: scripts/makepkg.sh.in:3147
 msgid "  -A, --ignorearch Ignore incomplete %s field in %s"
 msgstr "  -A, --ignorearch 忽略不完整的 %s 字段 (位于 %s 中)"
 
-#: scripts/makepkg.sh.in:3155
+#: scripts/makepkg.sh.in:3148
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      编译后清理工作文件"
 
-#: scripts/makepkg.sh.in:3156
+#: scripts/makepkg.sh.in:3149
 msgid "  -C, --cleanbuild Remove %s dir before building the package"
 msgstr "-C, --cleanbuild 在编译软件包之前删除 %s 文件夹"
 
-#: scripts/makepkg.sh.in:3157
+#: scripts/makepkg.sh.in:3150
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr " -d, --nodeps     跳过所有依赖关系检查"
 
-#: scripts/makepkg.sh.in:3158
+#: scripts/makepkg.sh.in:3151
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
 msgstr "  -e, --noextract  不解压源文件 (使用现存的 %s 目录)"
 
-#: scripts/makepkg.sh.in:3159
+#: scripts/makepkg.sh.in:3152
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      覆盖现存的软件包"
 
-#: scripts/makepkg.sh.in:3160
+#: scripts/makepkg.sh.in:3153
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   为源码文件生成完整性检查值"
 
-#: scripts/makepkg.sh.in:3161
+#: scripts/makepkg.sh.in:3154
 msgid "  -h, --help       Show this help message and exit"
 msgstr "  -h, --help       显示本帮助信息并退出"
 
-#: scripts/makepkg.sh.in:3162
+#: scripts/makepkg.sh.in:3155
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    成功编译后安装软件包"
 
-#: scripts/makepkg.sh.in:3163
+#: scripts/makepkg.sh.in:3156
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        记录软件包编译过程"
 
-#: scripts/makepkg.sh.in:3164
+#: scripts/makepkg.sh.in:3157
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    禁止彩色输出信息"
 
-#: scripts/makepkg.sh.in:3165
+#: scripts/makepkg.sh.in:3158
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    仅下载和解压缩文件"
 
-#: scripts/makepkg.sh.in:3166
+#: scripts/makepkg.sh.in:3159
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
 msgstr "  -p <文件> 使用另外的编译脚本 (而不是 '%s' ) "
 
-#: scripts/makepkg.sh.in:3167
+#: scripts/makepkg.sh.in:3160
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr "  -r, --rmdeps     编译成功后删除安装的依赖关系"
 
-#: scripts/makepkg.sh.in:3168
+#: scripts/makepkg.sh.in:3161
 msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  不编译而重新打包软件包内容"
 
-#: scripts/makepkg.sh.in:3169
+#: scripts/makepkg.sh.in:3162
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   使用 %s 安装缺失的依赖关系"
 
-#: scripts/makepkg.sh.in:3170
+#: scripts/makepkg.sh.in:3163
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr "  -S, --source     不下载源文件只生成仅包含源的包"
 
-#: scripts/makepkg.sh.in:3171
+#: scripts/makepkg.sh.in:3164
 msgid "  -V, --version    Show version information and exit"
 msgstr "  -V, --version             显示版本信息并退出"
 
-#: scripts/makepkg.sh.in:3172
+#: scripts/makepkg.sh.in:3165
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr "    --allsource     只生成源码包 (包括有已下载的源码) "
 
-#: scripts/makepkg.sh.in:3173
+#: scripts/makepkg.sh.in:3166
 msgid "  --check          Run the %s function in the %s"
 msgstr "  --check          运行 %s 函数 (包含于 %s 中)"
 
-#: scripts/makepkg.sh.in:3174
+#: scripts/makepkg.sh.in:3167
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr "  --config <文件> 使用替代的配置文件 (而不是 '%s')"
 
-#: scripts/makepkg.sh.in:3175
+#: scripts/makepkg.sh.in:3168
 msgid "  --holdver        Do not update VCS sources"
 msgstr "--holdver 不升级版本控制系统源"
 
-#: scripts/makepkg.sh.in:3176
+#: scripts/makepkg.sh.in:3169
 msgid ""
 "  --key <key>      Specify a key to use for %s signing instead of the default"
 msgstr "  --key <密匙>      指定签名 %s 使用的密匙而不用默认密匙"
 
-#: scripts/makepkg.sh.in:3177
+#: scripts/makepkg.sh.in:3170
 msgid "  --noarchive      Do not create package archive"
 msgstr "--noarchive 不生成软件包归档"
 
-#: scripts/makepkg.sh.in:3178
+#: scripts/makepkg.sh.in:3171
 msgid "  --nocheck        Do not run the %s function in the %s"
 msgstr "  --nocheck        不运行 %s 功能在 %s 中"
 
-#: scripts/makepkg.sh.in:3179
+#: scripts/makepkg.sh.in:3172
 msgid "  --noprepare      Do not run the %s function in the %s"
-msgstr "--noprepare 不运行 %2$s 中的 %1$s 函数"
+msgstr ""
 
-#: scripts/makepkg.sh.in:3180
+#: scripts/makepkg.sh.in:3173
 msgid "  --nosign         Do not create a signature for the package"
 msgstr "  --nosign         不为该软件包创建签名"
 
-#: scripts/makepkg.sh.in:3181
+#: scripts/makepkg.sh.in:3174
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr "  --pkg <清单>     仅从分割软件包中创建清单中所列的软件包"
 
-#: scripts/makepkg.sh.in:3182
+#: scripts/makepkg.sh.in:3175
 msgid "  --sign           Sign the resulting package with %s"
 msgstr "  --sign           使用 %s 签名生成的软件包"
 
-#: scripts/makepkg.sh.in:3183
+#: scripts/makepkg.sh.in:3176
 msgid "  --skipchecksums  Do not verify checksums of the source files"
 msgstr "  --skipchecksums  不验证源文件的检验值"
 
-#: scripts/makepkg.sh.in:3184
+#: scripts/makepkg.sh.in:3177
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
 msgstr "  --skipinteg      不对源文件执行任何验证检查"
 
-#: scripts/makepkg.sh.in:3185
+#: scripts/makepkg.sh.in:3178
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
 msgstr "  --skippgpcheck   不验证有 PGP 签名的源文件"
 
-#: scripts/makepkg.sh.in:3186
+#: scripts/makepkg.sh.in:3179
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
 msgstr " --verifysource 下载源文件(如果需要)并进行完整性检查"
 
-#: scripts/makepkg.sh.in:3188
+#: scripts/makepkg.sh.in:3181
 msgid "These options can be passed to %s:"
 msgstr "这些选项可以传递给 %s："
 
-#: scripts/makepkg.sh.in:3190
+#: scripts/makepkg.sh.in:3183
 msgid "  --asdeps         Install packages as non-explicitly installed"
 msgstr "      --asdeps         作为依赖安装"
 
-#: scripts/makepkg.sh.in:3191
+#: scripts/makepkg.sh.in:3184
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
 msgstr "      --needed         不重装已是最新的目标软件包"
 
-#: scripts/makepkg.sh.in:3192
+#: scripts/makepkg.sh.in:3185
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr "   --noconfirm      当解决依赖关系时不询问确认"
 
-#: scripts/makepkg.sh.in:3193
+#: scripts/makepkg.sh.in:3186
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "  --noprogressbar  下载文件时不显示进度条"
 
-#: scripts/makepkg.sh.in:3195
+#: scripts/makepkg.sh.in:3188
 msgid "If %s is not specified, %s will look for '%s'"
 msgstr "如果没有指定 %s，%s 将寻找 '%s'"
 
-#: scripts/makepkg.sh.in:3201 scripts/pacman-optimize.sh.in:53
+#: scripts/makepkg.sh.in:3194 scripts/pacman-optimize.sh.in:53
 msgid ""
 "Copyright (c) 2006-2014 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
@@ -832,113 +823,113 @@ msgstr ""
 "\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n本程序是自"
 "由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。 \\n"
 
-#: scripts/makepkg.sh.in:3302 scripts/repo-add.sh.in:612
+#: scripts/makepkg.sh.in:3295 scripts/repo-add.sh.in:612
 msgid "%s signal caught. Exiting..."
 msgstr "发现 %s 信号。退出中..."
 
-#: scripts/makepkg.sh.in:3326
+#: scripts/makepkg.sh.in:3319
 msgid "%s not found."
 msgstr "%s 未找到。"
 
-#: scripts/makepkg.sh.in:3374 scripts/makepkg.sh.in:3381
+#: scripts/makepkg.sh.in:3367 scripts/makepkg.sh.in:3374
 msgid "You do not have write permission to create packages in %s."
 msgstr "您没有在 %s 中创建软件包需要的写入许可。"
 
-#: scripts/makepkg.sh.in:3394
+#: scripts/makepkg.sh.in:3387
 msgid "You do not have write permission to store packages in %s."
 msgstr "你没有写入权限来保存软件包到 %s。"
 
-#: scripts/makepkg.sh.in:3402
+#: scripts/makepkg.sh.in:3395
 msgid "You do not have write permission to store downloads in %s."
 msgstr "你没有权限将下载数据写入 %s。"
 
-#: scripts/makepkg.sh.in:3411
+#: scripts/makepkg.sh.in:3404
 msgid "You do not have write permission to store source tarballs in %s."
 msgstr "您没有在 %s 内保存源码包所需的写入权限。"
 
-#: scripts/makepkg.sh.in:3424
+#: scripts/makepkg.sh.in:3417
 msgid "You do not have write permission to store logs in %s."
 msgstr "你没有权限将日志保存至 %s。"
 
-#: scripts/makepkg.sh.in:3437
+#: scripts/makepkg.sh.in:3430
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
 msgstr "不能使用 root 用户运行 %s，\\n因为可能会系统造成灾难性的损坏。"
 
-#: scripts/makepkg.sh.in:3443
+#: scripts/makepkg.sh.in:3436
 msgid "Do not use the %s option. This option is only for use by %s."
 msgstr "请不要使用 %s 选项。该选项仅供 %s 使用。"
 
-#: scripts/makepkg.sh.in:3454
+#: scripts/makepkg.sh.in:3447
 msgid "%s does not exist."
 msgstr "%s 不存在。"
 
-#: scripts/makepkg.sh.in:3458
+#: scripts/makepkg.sh.in:3451
 msgid "%s contains %s characters and cannot be sourced."
 msgstr "%s 包含 %s 字符，无法供源。"
 
-#: scripts/makepkg.sh.in:3463
+#: scripts/makepkg.sh.in:3456
 msgid "%s must be in the current working directory."
 msgstr "%s 必须在当前工作目录。"
 
-#: scripts/makepkg.sh.in:3544
+#: scripts/makepkg.sh.in:3537
 msgid "The key %s does not exist in your keyring."
 msgstr "在您的密匙环中不存在密匙 %s。"
 
-#: scripts/makepkg.sh.in:3546 scripts/repo-add.sh.in:635
+#: scripts/makepkg.sh.in:3539 scripts/repo-add.sh.in:635
 msgid "There is no key in your keyring."
 msgstr "您密匙环中无密匙。"
 
-#: scripts/makepkg.sh.in:3560 scripts/makepkg.sh.in:3578
+#: scripts/makepkg.sh.in:3553 scripts/makepkg.sh.in:3571
 msgid "Leaving %s environment."
 msgstr "正在离开 %s 环境。"
 
-#: scripts/makepkg.sh.in:3582
+#: scripts/makepkg.sh.in:3575
 msgid "Making package: %s"
 msgstr "正在创建软件包：%s"
 
-#: scripts/makepkg.sh.in:3588
+#: scripts/makepkg.sh.in:3581
 msgid "A source package has already been built. (use %s to overwrite)"
 msgstr "源软件包已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:3607
+#: scripts/makepkg.sh.in:3600
 msgid "Source package created: %s"
 msgstr "源代码包已创建：%s"
 
-#: scripts/makepkg.sh.in:3614
+#: scripts/makepkg.sh.in:3607
 msgid "Skipping dependency checks."
 msgstr "跳过依赖关系检查。"
 
-#: scripts/makepkg.sh.in:3622
+#: scripts/makepkg.sh.in:3615
 msgid "Checking runtime dependencies..."
 msgstr "正在检查运行时依赖关系..."
 
-#: scripts/makepkg.sh.in:3629
+#: scripts/makepkg.sh.in:3622
 msgid "Checking buildtime dependencies..."
 msgstr "正在检查编译时依赖关系"
 
-#: scripts/makepkg.sh.in:3641
+#: scripts/makepkg.sh.in:3634
 msgid "Could not resolve all dependencies."
 msgstr "无法解决所有的依赖关系。"
 
-#: scripts/makepkg.sh.in:3652
+#: scripts/makepkg.sh.in:3645
 msgid "Using existing %s tree"
 msgstr "使用现存的%s树"
 
-#: scripts/makepkg.sh.in:3659 scripts/makepkg.sh.in:3680
+#: scripts/makepkg.sh.in:3652 scripts/makepkg.sh.in:3673
 msgid "Removing existing %s directory..."
 msgstr "正在删除现存的 %s 目录..."
 
-#: scripts/makepkg.sh.in:3675
+#: scripts/makepkg.sh.in:3668
 msgid "Sources are ready."
 msgstr "源代码已就绪。"
 
-#: scripts/makepkg.sh.in:3698
+#: scripts/makepkg.sh.in:3691
 msgid "Package directory is ready."
 msgstr "软件包目录已准备好。"
 
-#: scripts/makepkg.sh.in:3702
+#: scripts/makepkg.sh.in:3695
 msgid "Finished making: %s"
 msgstr "完成创建：%s"
 
@@ -948,13 +939,8 @@ msgid "can't create '%s': %s"
 msgstr "无法创建 '%s': %s"
 
 #: scripts/makepkg-template.pl.in:73
-#, perl-format
-msgid ""
-"invalid key/value pair\n"
-"%s:%s: %s"
+msgid "invalid key/value pair\n"
 msgstr ""
-"无效的 key/value\n"
-"%s:%s: %s"
 
 #: scripts/makepkg-template.pl.in:82
 msgid "invalid template line: can't find template name\n"
@@ -1034,39 +1020,39 @@ msgstr ""
 "本程序是自由软件；版权情况请详见源代码。\n"
 "无法律所允许范围内的任何担保。\n"
 
-#: scripts/pacman-db-upgrade.sh.in:35
+#: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
 msgstr "升级本地 pacman 数据库到更新的格式"
 
-#: scripts/pacman-db-upgrade.sh.in:39
+#: scripts/pacman-db-upgrade.sh.in:42
 msgid "options:"
 msgstr "选项："
 
-#: scripts/pacman-db-upgrade.sh.in:40
+#: scripts/pacman-db-upgrade.sh.in:43
 msgid "  -b, --dbpath <path>  set an alternate database location"
 msgstr "-b, --dbpath <路径> 指定另外的数据库位置"
 
-#: scripts/pacman-db-upgrade.sh.in:41
+#: scripts/pacman-db-upgrade.sh.in:44
 msgid "  -h, --help           show this help message and exit"
 msgstr "-h, --help 显示本帮助信息并退出"
 
-#: scripts/pacman-db-upgrade.sh.in:42
+#: scripts/pacman-db-upgrade.sh.in:45
 msgid "  -r, --root <path>    set an alternate installation root"
 msgstr "-r, --root <路径> 指定另外的安装根目录"
 
-#: scripts/pacman-db-upgrade.sh.in:43
+#: scripts/pacman-db-upgrade.sh.in:46
 msgid "  -V, --version        show version information and exit"
 msgstr "  -V, --version 显示版本信息并退出"
 
-#: scripts/pacman-db-upgrade.sh.in:44
+#: scripts/pacman-db-upgrade.sh.in:47
 msgid "  --config <path>      set an alternate configuration file"
 msgstr "--config <路径> 指定另外的配置文件"
 
-#: scripts/pacman-db-upgrade.sh.in:45
+#: scripts/pacman-db-upgrade.sh.in:48
 msgid "  --nocolor            disable colorized output messages"
 msgstr "--nocolor 禁止彩色输出信息"
 
-#: scripts/pacman-db-upgrade.sh.in:51 scripts/pacman-key.sh.in:94
+#: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
 "Copyright (c) 2010-2014 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
@@ -1075,38 +1061,38 @@ msgstr ""
 "Copyright (c) 2010-2014 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序"
 "是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
-#: scripts/pacman-db-upgrade.sh.in:129 scripts/pacman-optimize.sh.in:105
+#: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:459
 msgid "%s does not exist or is not a directory."
 msgstr "%s 不存在或不是一个目录。"
 
-#: scripts/pacman-db-upgrade.sh.in:133
+#: scripts/pacman-db-upgrade.sh.in:136
 msgid "%s is not a pacman database directory."
 msgstr "%s 不是一个 pacman 的数据库目录。"
 
-#: scripts/pacman-db-upgrade.sh.in:137
+#: scripts/pacman-db-upgrade.sh.in:140
 msgid "You must have correct permissions to upgrade the database."
 msgstr "您必须有相应的权限才可升级数据库。"
 
-#: scripts/pacman-db-upgrade.sh.in:147 scripts/pacman-optimize.sh.in:119
+#: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
 msgstr "发现 Pacman 锁文件。不能在 pacman 运行时再次运行。"
 
-#: scripts/pacman-db-upgrade.sh.in:159
+#: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
 msgstr "探测到 3.5 版本以前的数据库格式 - 正在升级中..."
 
-#: scripts/pacman-db-upgrade.sh.in:166
+#: scripts/pacman-db-upgrade.sh.in:169
 msgid "Done."
 msgstr "完成。"
 
-#: scripts/pacman-db-upgrade.sh.in:183
+#: scripts/pacman-db-upgrade.sh.in:173
 msgid "Pre-4.2 database format detected - upgrading..."
 msgstr "探测到 4.2 版本以前的数据库格式 - 正在升级中..."
 
-#: scripts/pacman-db-upgrade.sh.in:192
+#: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
+msgstr "符号链接 '%s' 指向pacman根路径外，需要手动修复"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"