Import updated translations from Transifex

Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 241 insertions, 253 deletions

diff --git a/scripts/po/zh_CN.po b/scripts/po/zh_CN.po
index c593fdd9..a5a1f2f1 100644
--- a/scripts/po/zh_CN.po
+++ b/scripts/po/zh_CN.po
@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Felix Yan <felixonmars@gmail.com>, 2015-2016
 # Isaac Ge <acgtyrant@gmail.com>, 2014
-# leonfeng <chaofeng111@gmail.com>, 2011
-# leonfeng <chaofeng111@gmail.com>, 2011
-# mytbk <mytbk920423@gmail.com>, 2013,2015-2016
+# leonfeng <chaofeng111@qq.com>, 2011
+# leonfeng <chaofeng111@qq.com>, 2011
+# mytbk <mytbk920423@gmail.com>, 2013,2015-2017
 # mytbk <mytbk920423@gmail.com>, 2013,2015
-# leonfeng <chaofeng111@gmail.com>, 2011
+# leonfeng <chaofeng111@qq.com>, 2011
 # Yangtse Su <yangtsesu@gmail.com>, 2012-2013
 # ykelvis <ykelvis@users.noreply.github.com>, 2014
 # 张海, 2015
@@ -19,15 +19,14 @@ 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: 2016-02-23 13:08+1000\n"
-"PO-Revision-Date: 2016-02-01 15:41+0000\n"
-"Last-Translator: Felix Yan <felixonmars@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"POT-Creation-Date: 2017-05-22 11:00+1000\n"
+"PO-Revision-Date: 2017-09-19 10:31+0000\n"
+"Last-Translator: mytbk <mytbk920423@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-pacman/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"
 
 #: scripts/makepkg.sh.in:135
@@ -58,12 +57,12 @@ msgstr "%s 不可写 -- 包版本将不升级"
 msgid "Unable to find source file %s."
 msgstr "无法找到源文件 %s。"
 
-#: scripts/makepkg.sh.in:203 scripts/makepkg.sh.in:735
-#: scripts/makepkg.sh.in:1181 scripts/makepkg.sh.in:1448
-#: scripts/makepkg.sh.in:1884 scripts/makepkg.sh.in:1918
-#: scripts/makepkg.sh.in:1925 scripts/makepkg.sh.in:1938
-#: scripts/makepkg.sh.in:1946 scripts/makepkg.sh.in:1955
-#: scripts/makepkg.sh.in:1968 scripts/libmakepkg/source/bzr.sh.in:50
+#: scripts/makepkg.sh.in:203 scripts/makepkg.sh.in:746
+#: scripts/makepkg.sh.in:1192 scripts/makepkg.sh.in:1459
+#: scripts/makepkg.sh.in:1895 scripts/makepkg.sh.in:1929
+#: scripts/makepkg.sh.in:1936 scripts/makepkg.sh.in:1949
+#: scripts/makepkg.sh.in:1957 scripts/makepkg.sh.in:1966
+#: scripts/makepkg.sh.in:1979 scripts/libmakepkg/source/bzr.sh.in:50
 #: scripts/libmakepkg/source/bzr.sh.in:81
 #: scripts/libmakepkg/source/bzr.sh.in:96
 #: scripts/libmakepkg/source/bzr.sh.in:101
@@ -104,624 +103,627 @@ msgstr "缺少依赖关系："
 msgid "Failed to remove installed dependencies."
 msgstr "无法删除已安装的依赖关系。"
 
-#: scripts/makepkg.sh.in:405
+#: scripts/makepkg.sh.in:416
 msgid "Generating checksums for source files..."
 msgstr "正在为源代码文件创建完整性检查值..."
 
-#: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+#: scripts/makepkg.sh.in:419
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr "无法找到生成源文件检验值所需的 %s 库。"
 
-#: scripts/makepkg.sh.in:422
+#: scripts/makepkg.sh.in:433
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "指定了无效的完整性算法 '%s'"
 
-#: scripts/makepkg.sh.in:440
+#: scripts/makepkg.sh.in:451
 msgid "Skipped"
 msgstr "已跳过"
 
-#: scripts/makepkg.sh.in:445
+#: scripts/makepkg.sh.in:456
 msgid "NOT FOUND"
 msgstr "未找到"
 
-#: scripts/makepkg.sh.in:452 scripts/makepkg.sh.in:684
+#: scripts/makepkg.sh.in:463 scripts/makepkg.sh.in:695
 msgid "Passed"
 msgstr "通过"
 
-#: scripts/makepkg.sh.in:454 scripts/makepkg.sh.in:660
-#: scripts/makepkg.sh.in:678 scripts/makepkg.sh.in:681
+#: scripts/makepkg.sh.in:465 scripts/makepkg.sh.in:671
+#: scripts/makepkg.sh.in:689 scripts/makepkg.sh.in:692
 msgid "FAILED"
 msgstr "失败"
 
-#: scripts/makepkg.sh.in:478
+#: scripts/makepkg.sh.in:489
 msgid "Validating %s files with %s..."
 msgstr "正在验证 %s 文件，使用%s..."
 
-#: scripts/makepkg.sh.in:485
+#: scripts/makepkg.sh.in:496
 msgid "One or more files did not pass the validity check!"
 msgstr "一个或多个文件没有通过有效性检查！"
 
-#: scripts/makepkg.sh.in:489
+#: scripts/makepkg.sh.in:500
 msgid "Integrity checks (%s) differ in size from the source array."
 msgstr "完整性检查 (%s) 与源阵列大小不一致。"
 
-#: scripts/makepkg.sh.in:531
+#: scripts/makepkg.sh.in:542
 msgid "Integrity checks are missing for: %s"
 msgstr "对这些文件的完整性检查缺失: %s"
 
-#: scripts/makepkg.sh.in:598
+#: scripts/makepkg.sh.in:609
 msgid "Verifying source file signatures with %s..."
 msgstr "正在使用 %s 验证源文件签名..."
 
-#: scripts/makepkg.sh.in:623
+#: scripts/makepkg.sh.in:634
 msgid "SIGNATURE NOT FOUND"
 msgstr "未找到签名！"
 
-#: scripts/makepkg.sh.in:636
+#: scripts/makepkg.sh.in:647
 msgid "SOURCE FILE NOT FOUND"
 msgstr "未找到源文件！"
 
-#: scripts/makepkg.sh.in:663
+#: scripts/makepkg.sh.in:674
 msgid "unknown public key"
 msgstr "未知的公共密匙"
 
-#: scripts/makepkg.sh.in:666
+#: scripts/makepkg.sh.in:677
 msgid "public key %s has been revoked"
 msgstr "公钥 %s 已被吊销"
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:680
 msgid "bad signature from public key"
 msgstr "公钥签名错误"
 
-#: scripts/makepkg.sh.in:672
+#: scripts/makepkg.sh.in:683
 msgid "error during signature verification"
 msgstr "验证签名时发生错误"
 
-#: scripts/makepkg.sh.in:678
+#: scripts/makepkg.sh.in:689
 msgid "the public key %s is not trusted"
 msgstr "公钥 %s 不被信任"
 
-#: scripts/makepkg.sh.in:681
+#: scripts/makepkg.sh.in:692
 msgid "invalid public key"
 msgstr "无效的公共密匙"
 
-#: scripts/makepkg.sh.in:687 scripts/makepkg.sh.in:691
-#: scripts/libmakepkg/util/message.sh:63 scripts/library/output_format.sh:26
+#: scripts/makepkg.sh.in:698 scripts/makepkg.sh.in:702
+#: scripts/libmakepkg/util/message.sh.in:63
+#: scripts/library/output_format.sh:26
 msgid "WARNING:"
 msgstr "警告："
 
-#: scripts/makepkg.sh.in:687
+#: scripts/makepkg.sh.in:698
 msgid "the signature has expired."
 msgstr "该签名已过期。"
 
-#: scripts/makepkg.sh.in:691
+#: scripts/makepkg.sh.in:702
 msgid "the key has expired."
 msgstr "该密匙已过期。"
 
-#: scripts/makepkg.sh.in:703
+#: scripts/makepkg.sh.in:714
 msgid "One or more PGP signatures could not be verified!"
 msgstr "一个或多个 PGP 签名无法校验！"
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:719
 msgid "Warnings have occurred while verifying the signatures."
 msgstr "校验签名时发生警告。"
 
-#: scripts/makepkg.sh.in:709
+#: scripts/makepkg.sh.in:720
 msgid "Please make sure you really trust them."
 msgstr "请确认您真的信任对方。"
 
-#: scripts/makepkg.sh.in:715
+#: scripts/makepkg.sh.in:726
 msgid "Skipping all source file integrity checks."
 msgstr "正在跳过所有源文件完整性检查。"
 
-#: scripts/makepkg.sh.in:717
+#: scripts/makepkg.sh.in:728
 msgid "Skipping verification of source file checksums."
 msgstr "正在跳过校验源文件校验值。"
 
-#: scripts/makepkg.sh.in:720
+#: scripts/makepkg.sh.in:731
 msgid "Skipping verification of source file PGP signatures."
 msgstr "正在跳过源文件 PGP 签名校验。"
 
-#: scripts/makepkg.sh.in:734
+#: scripts/makepkg.sh.in:745
 msgid "A failure occurred in %s()."
 msgstr "在 %s() 中发生一个错误。"
 
-#: scripts/makepkg.sh.in:743
+#: scripts/makepkg.sh.in:754
 msgid "Failed to source %s"
 msgstr "载入 %s 失败"
 
-#: scripts/makepkg.sh.in:804
+#: scripts/makepkg.sh.in:815
 msgid "Starting %s()..."
 msgstr "正在开始 %s()..."
 
-#: scripts/makepkg.sh.in:938
+#: scripts/makepkg.sh.in:949
 msgid "Library listed in %s is not required by any files: %s"
 msgstr "%s 列出的库不被任何文件要求：%s"
 
-#: scripts/makepkg.sh.in:967
+#: scripts/makepkg.sh.in:978
 msgid "Library listed in %s is not versioned: %s"
 msgstr "%s 列出的库没有版本：%s"
 
-#: scripts/makepkg.sh.in:980
+#: scripts/makepkg.sh.in:991
 msgid "Library listed in %s is not a shared object: %s"
 msgstr "%s 列出的库不是共享对象：%s"
 
-#: scripts/makepkg.sh.in:995
+#: scripts/makepkg.sh.in:1006
 msgid "Cannot find library listed in %s: %s"
 msgstr "无法找到列在 %s 中的库： %s"
 
-#: scripts/makepkg.sh.in:1116 scripts/makepkg.sh.in:1160
-#: scripts/makepkg.sh.in:1325
+#: scripts/makepkg.sh.in:1127 scripts/makepkg.sh.in:1171
+#: scripts/makepkg.sh.in:1336
 msgid "Generating %s file..."
 msgstr "正在生成 %s 文件..."
 
-#: scripts/makepkg.sh.in:1180
+#: scripts/makepkg.sh.in:1191
 msgid "Missing %s directory."
 msgstr "缺失 %s 目录。"
 
-#: scripts/makepkg.sh.in:1186
+#: scripts/makepkg.sh.in:1197
 msgid "Creating package \"%s\"..."
 msgstr "正在创建软件包\"%s\"..."
 
-#: scripts/makepkg.sh.in:1199
+#: scripts/makepkg.sh.in:1210
 msgid "Adding %s file..."
 msgstr "正在添加 %s 文件..."
 
-#: scripts/makepkg.sh.in:1201
+#: scripts/makepkg.sh.in:1212
 msgid "Failed to add %s file to package."
 msgstr "无法添加文件 %s 到软件包。"
 
-#: scripts/makepkg.sh.in:1221
+#: scripts/makepkg.sh.in:1232
 msgid "Generating .MTREE file..."
 msgstr "正在生成 .MTREE 文件..."
 
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1238
 msgid "Compressing package..."
 msgstr "正在压缩软件包..."
 
-#: scripts/makepkg.sh.in:1242 scripts/makepkg.sh.in:1368
+#: scripts/makepkg.sh.in:1253 scripts/makepkg.sh.in:1379
 msgid "'%s' is not a valid archive extension."
 msgstr "'%s' 是无效的压缩包扩展名。"
 
-#: scripts/makepkg.sh.in:1250
+#: scripts/makepkg.sh.in:1261
 msgid "Failed to create package file."
 msgstr "无法创建软件包文件。"
 
-#: scripts/makepkg.sh.in:1267
+#: scripts/makepkg.sh.in:1278
 msgid "Failed to create symlink to package file."
 msgstr "创建软件包文件系统链接失败。"
 
-#: scripts/makepkg.sh.in:1299
+#: scripts/makepkg.sh.in:1310
 msgid "Signing package..."
 msgstr "正在签名软件包..."
 
-#: scripts/makepkg.sh.in:1310
+#: scripts/makepkg.sh.in:1321
 msgid "Created signature file %s."
 msgstr "已创建签名文件 %s。"
 
-#: scripts/makepkg.sh.in:1312
+#: scripts/makepkg.sh.in:1323
 msgid "Failed to sign package file."
 msgstr "无法签名软件包文件。"
 
-#: scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1329
 msgid "Creating source package..."
 msgstr "正在创建源码包..."
 
-#: scripts/makepkg.sh.in:1322 scripts/makepkg.sh.in:1335
+#: scripts/makepkg.sh.in:1333 scripts/makepkg.sh.in:1346
 msgid "Adding %s..."
 msgstr "正在添加 %s..."
 
-#: scripts/makepkg.sh.in:1353
+#: scripts/makepkg.sh.in:1364
 msgid "Adding %s file (%s)..."
 msgstr "正在添加 %s 文件 (%s) ..."
 
-#: scripts/makepkg.sh.in:1376
+#: scripts/makepkg.sh.in:1387
 msgid "Compressing source package..."
 msgstr "正在压缩源码包..."
 
-#: scripts/makepkg.sh.in:1379
+#: scripts/makepkg.sh.in:1390
 msgid "Failed to create source package file."
 msgstr "创建源码包文件失败。"
 
-#: scripts/makepkg.sh.in:1396
+#: scripts/makepkg.sh.in:1407
 msgid "Failed to create symlink to source package file."
 msgstr "无法创建源软件包文件的系统链接。"
 
-#: scripts/makepkg.sh.in:1408
+#: scripts/makepkg.sh.in:1419
 msgid "Installing package %s with %s..."
 msgstr "正在安装软件包 %s，使用 %s..."
 
-#: scripts/makepkg.sh.in:1410
+#: scripts/makepkg.sh.in:1421
 msgid "Installing %s package group with %s..."
 msgstr "正在安装 %s 软件包组，使用 %s..."
 
-#: scripts/makepkg.sh.in:1428
+#: scripts/makepkg.sh.in:1439
 msgid "Failed to install built package(s)."
 msgstr "安装创建的软件包失败。"
 
-#: scripts/makepkg.sh.in:1447 scripts/libmakepkg/util/source.sh.in:129
+#: scripts/makepkg.sh.in:1458 scripts/libmakepkg/util/source.sh.in:129
 msgid "Unknown download protocol: %s"
 msgstr "未知下载协议：%s"
 
-#: scripts/makepkg.sh.in:1464
+#: scripts/makepkg.sh.in:1475
 msgid "Cannot find the %s binary needed to check VCS source requirements."
 msgstr "找不到用来检查 VCS 源需求的 %s 库"
 
-#: scripts/makepkg.sh.in:1492
+#: scripts/makepkg.sh.in:1503
 msgid "Cannot find the %s package needed to handle %s sources."
 msgstr "找不到 %s 软件包以处理 %s 源。"
 
-#: scripts/makepkg.sh.in:1515
+#: scripts/makepkg.sh.in:1526
 msgid "Cannot find the %s binary required for dependency operations."
 msgstr "无法找到依赖操作所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:1523
+#: scripts/makepkg.sh.in:1534
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
 msgstr "无法找到二进制文件 %s。将使用 %s 获得 root 权限。"
 
-#: scripts/makepkg.sh.in:1530
+#: scripts/makepkg.sh.in:1541
 msgid "Cannot find the %s binary."
 msgstr "无法找到 %s 的二进制文件。"
 
-#: scripts/makepkg.sh.in:1538
+#: scripts/makepkg.sh.in:1549
 msgid "Cannot find the %s binary required for signing packages."
 msgstr "无法找到签名软件包所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:1546
+#: scripts/makepkg.sh.in:1557
 msgid "Cannot find the %s binary required for verifying source files."
 msgstr "无法找到验证源文件所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:1554
+#: scripts/makepkg.sh.in:1565
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
 msgstr "无法找到验证源文件校验值所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:1562
+#: scripts/makepkg.sh.in:1573
 msgid "Cannot find the %s binary required for compressing binaries."
 msgstr "无法找到压缩二进制文件所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:1570
+#: scripts/makepkg.sh.in:1581
 msgid "Cannot find the %s binary required for optimizing PNG images."
 msgstr "无法找到优化PNG图像所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:1578
+#: scripts/makepkg.sh.in:1589
 msgid "Cannot find the %s binary required for distributed compilation."
 msgstr "无法找到分发编译所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:1586
+#: scripts/makepkg.sh.in:1597
 msgid "Cannot find the %s binary required for compiler cache usage."
 msgstr "无法找到编译器缓存使用所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:1594
+#: scripts/makepkg.sh.in:1605
 msgid "Cannot find the %s binary required for object file stripping."
 msgstr "无法找到目标文件分割所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:1602
+#: scripts/makepkg.sh.in:1613
 msgid "Cannot find the %s binary required for compressing man and info pages."
 msgstr "无法找到压缩帮助及信息页面所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:1622
+#: scripts/makepkg.sh.in:1633
 msgid "A package has already been built, installing existing package..."
 msgstr "已有一个编译好的软件包，正在安装现有的软件包..."
 
-#: scripts/makepkg.sh.in:1626
+#: scripts/makepkg.sh.in:1637
 msgid "A package has already been built. (use %s to overwrite)"
 msgstr "软件包已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:1645
+#: scripts/makepkg.sh.in:1656
 msgid ""
 "The package group has already been built, installing existing packages..."
 msgstr "已有一个编译好的软件包组，正在安装现有的软件包..."
 
-#: scripts/makepkg.sh.in:1649
+#: scripts/makepkg.sh.in:1660
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "该软件包组已创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:1654
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+#: scripts/makepkg.sh.in:1665
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "软件包组的一部分已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:1703
+#: scripts/makepkg.sh.in:1714
 msgid "Make packages compatible for use with pacman"
 msgstr "让软件包兼容于 pacman 的用法"
 
-#: scripts/makepkg.sh.in:1705 scripts/pacman-db-upgrade.sh.in:40
+#: scripts/makepkg.sh.in:1716 scripts/pacman-db-upgrade.sh.in:40
 msgid "Usage: %s [options]"
 msgstr "用法：%s [选项]"
 
-#: scripts/makepkg.sh.in:1707 scripts/pacman-key.sh.in:81
+#: scripts/makepkg.sh.in:1718 scripts/pacman-key.sh.in:81
 msgid "Options:"
 msgstr "选项："
 
-#: scripts/makepkg.sh.in:1708
+#: scripts/makepkg.sh.in:1719
 msgid "  -A, --ignorearch Ignore incomplete %s field in %s"
 msgstr "  -A, --ignorearch 忽略不完整的 %s 字段 (位于 %s 中)"
 
-#: scripts/makepkg.sh.in:1709
+#: scripts/makepkg.sh.in:1720
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      编译后清理工作文件"
 
-#: scripts/makepkg.sh.in:1710
+#: scripts/makepkg.sh.in:1721
 msgid "  -C, --cleanbuild Remove %s dir before building the package"
 msgstr "-C, --cleanbuild 在编译软件包之前删除 %s 文件夹"
 
-#: scripts/makepkg.sh.in:1711
+#: scripts/makepkg.sh.in:1722
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr " -d, --nodeps     跳过所有依赖关系检查"
 
-#: scripts/makepkg.sh.in:1712
+#: scripts/makepkg.sh.in:1723
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
 msgstr "  -e, --noextract  不解压源文件 (使用现存的 %s 目录)"
 
-#: scripts/makepkg.sh.in:1713
+#: scripts/makepkg.sh.in:1724
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      覆盖现存的软件包"
 
-#: scripts/makepkg.sh.in:1714
+#: scripts/makepkg.sh.in:1725
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   为源码文件生成完整性检查值"
 
-#: scripts/makepkg.sh.in:1715
+#: scripts/makepkg.sh.in:1726
 msgid "  -h, --help       Show this help message and exit"
 msgstr "  -h, --help       显示本帮助信息并退出"
 
-#: scripts/makepkg.sh.in:1716
+#: scripts/makepkg.sh.in:1727
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    成功编译后安装软件包"
 
-#: scripts/makepkg.sh.in:1717
+#: scripts/makepkg.sh.in:1728
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        记录软件包编译过程"
 
-#: scripts/makepkg.sh.in:1718
+#: scripts/makepkg.sh.in:1729
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    禁止彩色输出信息"
 
-#: scripts/makepkg.sh.in:1719
+#: scripts/makepkg.sh.in:1730
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    仅下载和解压缩文件"
 
-#: scripts/makepkg.sh.in:1720
+#: scripts/makepkg.sh.in:1731
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
 msgstr "  -p <文件> 使用另外的编译脚本 (而不是 '%s' ) "
 
-#: scripts/makepkg.sh.in:1721
+#: scripts/makepkg.sh.in:1732
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr "  -r, --rmdeps     编译成功后删除安装的依赖关系"
 
-#: scripts/makepkg.sh.in:1722
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+#: scripts/makepkg.sh.in:1733
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  不编译而重新打包软件包内容"
 
-#: scripts/makepkg.sh.in:1723
+#: scripts/makepkg.sh.in:1734
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   使用 %s 安装缺失的依赖关系"
 
-#: scripts/makepkg.sh.in:1724
+#: scripts/makepkg.sh.in:1735
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr "  -S, --source     不下载源文件只生成仅包含源的包"
 
-#: scripts/makepkg.sh.in:1725
+#: scripts/makepkg.sh.in:1736
 msgid "  -V, --version    Show version information and exit"
 msgstr "  -V, --version             显示版本信息并退出"
 
-#: scripts/makepkg.sh.in:1726
+#: scripts/makepkg.sh.in:1737
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr "    --allsource     只生成源码包 (包括有已下载的源码) "
 
-#: scripts/makepkg.sh.in:1727
+#: scripts/makepkg.sh.in:1738
 msgid "  --check          Run the %s function in the %s"
 msgstr "  --check          运行 %s 函数 (包含于 %s 中)"
 
-#: scripts/makepkg.sh.in:1728
+#: scripts/makepkg.sh.in:1739
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr "  --config <文件> 使用另外的配置文件 (而不是 '%s')"
 
-#: scripts/makepkg.sh.in:1729
+#: scripts/makepkg.sh.in:1740
 msgid "  --holdver        Do not update VCS sources"
 msgstr "--holdver 不升级版本控制系统源"
 
-#: scripts/makepkg.sh.in:1730
+#: scripts/makepkg.sh.in:1741
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr "--key <密匙>      指定签名 %s 使用的密匙而不用默认密匙"
 
-#: scripts/makepkg.sh.in:1731
+#: scripts/makepkg.sh.in:1742
 msgid "  --noarchive      Do not create package archive"
 msgstr "--noarchive 不生成软件包归档"
 
-#: scripts/makepkg.sh.in:1732
+#: scripts/makepkg.sh.in:1743
 msgid "  --nocheck        Do not run the %s function in the %s"
 msgstr "  --nocheck        不执行 %s 函数在 %s 中"
 
-#: scripts/makepkg.sh.in:1733
+#: scripts/makepkg.sh.in:1744
 msgid "  --noprepare      Do not run the %s function in the %s"
 msgstr "--noprepare 不执行 %s 函数在 %s 中"
 
-#: scripts/makepkg.sh.in:1734
+#: scripts/makepkg.sh.in:1745
 msgid "  --nosign         Do not create a signature for the package"
 msgstr "  --nosign         不为该软件包创建签名"
 
-#: scripts/makepkg.sh.in:1735
+#: scripts/makepkg.sh.in:1746
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
 msgstr "--packagelist 只列出将会产生的包，不带PKGEXT"
 
-#: scripts/makepkg.sh.in:1736
+#: scripts/makepkg.sh.in:1747
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
 msgstr "--printsrcinfo 打印出生成的SRCINFO并退出"
 
-#: scripts/makepkg.sh.in:1737
+#: scripts/makepkg.sh.in:1748
 msgid "  --sign           Sign the resulting package with %s"
 msgstr "  --sign           使用 %s 签名生成的软件包"
 
-#: scripts/makepkg.sh.in:1738
+#: scripts/makepkg.sh.in:1749
 msgid "  --skipchecksums  Do not verify checksums of the source files"
 msgstr "  --skipchecksums  不验证源文件的检验值"
 
-#: scripts/makepkg.sh.in:1739
+#: scripts/makepkg.sh.in:1750
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
 msgstr "  --skipinteg      不对源文件执行任何验证检查"
 
-#: scripts/makepkg.sh.in:1740
+#: scripts/makepkg.sh.in:1751
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
 msgstr "--skippgpcheck   不验证有 PGP 签名的源文件"
 
-#: scripts/makepkg.sh.in:1741
+#: scripts/makepkg.sh.in:1752
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
 msgstr " --verifysource 下载源文件(如果需要)并进行完整性检查"
 
-#: scripts/makepkg.sh.in:1743
+#: scripts/makepkg.sh.in:1754
 msgid "These options can be passed to %s:"
 msgstr "这些选项可以传递给 %s："
 
-#: scripts/makepkg.sh.in:1745
+#: scripts/makepkg.sh.in:1756
 msgid "  --asdeps         Install packages as non-explicitly installed"
 msgstr "      --asdeps         作为依赖安装"
 
-#: scripts/makepkg.sh.in:1746
+#: scripts/makepkg.sh.in:1757
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
 msgstr "      --needed         不重装已是最新的目标软件包"
 
-#: scripts/makepkg.sh.in:1747
+#: scripts/makepkg.sh.in:1758
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr "   --noconfirm      当解决依赖关系时不询问确认"
 
-#: scripts/makepkg.sh.in:1748
+#: scripts/makepkg.sh.in:1759
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "  --noprogressbar  下载文件时不显示进度条"
 
-#: scripts/makepkg.sh.in:1750
+#: scripts/makepkg.sh.in:1761
 msgid "If %s is not specified, %s will look for '%s'"
 msgstr "如果没有指定 %s，%s 将寻找 '%s'"
 
-#: scripts/makepkg.sh.in:1756 scripts/pacman-optimize.sh.in:53
+#: scripts/makepkg.sh.in:1767 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman 开发小组 <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n本程序是自"
-"由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。 \\n"
-
-#: scripts/makepkg.sh.in:1859 scripts/repo-add.sh.in:743
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman 开发小组 <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n本程序是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。 \\n"
+
+#: scripts/makepkg.sh.in:1870 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
 msgstr "发现 %s 信号。退出中..."
 
-#: scripts/makepkg.sh.in:1883
+#: scripts/makepkg.sh.in:1894
 msgid "%s not found."
 msgstr "%s 未找到。"
 
-#: scripts/makepkg.sh.in:1917 scripts/makepkg.sh.in:1924
+#: scripts/makepkg.sh.in:1928 scripts/makepkg.sh.in:1935
 msgid "You do not have write permission to create packages in %s."
 msgstr "您没有在 %s 中创建软件包需要的写入许可。"
 
-#: scripts/makepkg.sh.in:1937
+#: scripts/makepkg.sh.in:1948
 msgid "You do not have write permission to store packages in %s."
 msgstr "你没有写入权限来保存软件包到 %s。"
 
-#: scripts/makepkg.sh.in:1945
+#: scripts/makepkg.sh.in:1956
 msgid "You do not have write permission to store downloads in %s."
 msgstr "你没有权限将下载数据写入 %s。"
 
-#: scripts/makepkg.sh.in:1954
+#: scripts/makepkg.sh.in:1965
 msgid "You do not have write permission to store source tarballs in %s."
 msgstr "您没有在 %s 内保存源码包所需的写入权限。"
 
-#: scripts/makepkg.sh.in:1967
+#: scripts/makepkg.sh.in:1978
 msgid "You do not have write permission to store logs in %s."
 msgstr "你没有权限将日志保存至 %s。"
 
-#: scripts/makepkg.sh.in:1980
+#: scripts/makepkg.sh.in:1991
 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:1986
+#: scripts/makepkg.sh.in:1997
 msgid "Do not use the %s option. This option is only for use by %s."
 msgstr "请不要使用 %s 选项。该选项仅供 %s 使用。"
 
-#: scripts/makepkg.sh.in:1997
+#: scripts/makepkg.sh.in:2008
 msgid "%s does not exist."
 msgstr "%s 不存在。"
 
-#: scripts/makepkg.sh.in:2001
+#: scripts/makepkg.sh.in:2012
 msgid "%s contains %s characters and cannot be sourced."
 msgstr "%s 包含 %s 字符，无法供源。"
 
-#: scripts/makepkg.sh.in:2006
+#: scripts/makepkg.sh.in:2017
 msgid "%s must be in the current working directory."
 msgstr "%s 必须在当前工作目录。"
 
-#: scripts/makepkg.sh.in:2086
+#: scripts/makepkg.sh.in:2097
 msgid "The key %s does not exist in your keyring."
 msgstr "在您的密匙环中不存在密匙 %s。"
 
-#: scripts/makepkg.sh.in:2088 scripts/repo-add.sh.in:225
+#: scripts/makepkg.sh.in:2099 scripts/repo-add.sh.in:225
 msgid "There is no key in your keyring."
 msgstr "您密匙环中无密匙。"
 
-#: scripts/makepkg.sh.in:2112 scripts/makepkg.sh.in:2131
+#: scripts/makepkg.sh.in:2123 scripts/makepkg.sh.in:2142
 msgid "Leaving %s environment."
 msgstr "正在离开 %s 环境。"
 
-#: scripts/makepkg.sh.in:2135
+#: scripts/makepkg.sh.in:2146
 msgid "Making package: %s"
 msgstr "正在创建软件包：%s"
 
-#: scripts/makepkg.sh.in:2141
+#: scripts/makepkg.sh.in:2152
 msgid "A source package has already been built. (use %s to overwrite)"
 msgstr "源软件包已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:2160
+#: scripts/makepkg.sh.in:2171
 msgid "Source package created: %s"
 msgstr "源代码包已创建：%s"
 
-#: scripts/makepkg.sh.in:2166
+#: scripts/makepkg.sh.in:2177
 msgid "Skipping dependency checks."
 msgstr "跳过依赖关系检查。"
 
-#: scripts/makepkg.sh.in:2174
+#: scripts/makepkg.sh.in:2185
 msgid "Checking runtime dependencies..."
 msgstr "正在检查运行时依赖关系..."
 
-#: scripts/makepkg.sh.in:2181
+#: scripts/makepkg.sh.in:2192
 msgid "Checking buildtime dependencies..."
 msgstr "正在检查编译时依赖关系"
 
-#: scripts/makepkg.sh.in:2193
+#: scripts/makepkg.sh.in:2204
 msgid "Could not resolve all dependencies."
 msgstr "无法解决所有的依赖关系。"
 
-#: scripts/makepkg.sh.in:2205
+#: scripts/makepkg.sh.in:2216
 msgid "Using existing %s tree"
 msgstr "使用现存的 %s 树"
 
-#: scripts/makepkg.sh.in:2212 scripts/makepkg.sh.in:2235
+#: scripts/makepkg.sh.in:2223 scripts/makepkg.sh.in:2246
 msgid "Removing existing %s directory..."
 msgstr "正在删除现存的 %s 目录..."
 
-#: scripts/makepkg.sh.in:2230
+#: scripts/makepkg.sh.in:2241
 msgid "Sources are ready."
 msgstr "源代码已就绪。"
 
-#: scripts/makepkg.sh.in:2253
+#: scripts/makepkg.sh.in:2264
 msgid "Package directory is ready."
 msgstr "软件包目录已准备好。"
 
-#: scripts/makepkg.sh.in:2257
+#: scripts/makepkg.sh.in:2268
 msgid "Finished making: %s"
 msgstr "完成创建：%s"
 
@@ -812,10 +814,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Pacman 开发小组 <pacman-dev@archlinux.org>。\n"
-"本程序是自由软件；版权情况请详见源代码。\n"
-"无法律所允许范围内的任何担保。\n"
+msgstr "Copyright (c) 2013-2016 Pacman 开发小组 <pacman-dev@archlinux.org>。\n本程序是自由软件；版权情况请详见源代码。\n无法律所允许范围内的任何担保。\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -826,8 +825,8 @@ msgid "options:"
 msgstr "选项："
 
 #: scripts/pacman-db-upgrade.sh.in:43
-msgid "  -b, --dbpath <path>  set an alternate database location"
-msgstr "-b, --dbpath <路径> 指定另外的数据库位置"
+msgid "  -d, --dbpath <path>  set an alternate database location"
+msgstr "-d, --dbpath <路径> 指定另外的数据库位置"
 
 #: scripts/pacman-db-upgrade.sh.in:44
 msgid "  -h, --help           show this help message and exit"
@@ -851,12 +850,10 @@ msgstr "--nocolor 禁止彩色输出信息"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序"
-"是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -966,10 +963,9 @@ msgstr "  --lsign-key                  在本地签名指定的密匙识别号"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate              从 (给定的) 密匙环中重新加载默认密匙\\n（在'%s'中）"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate              从 (给定的) 密匙环中重新加载默认密匙\\n（在'%s'中）"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
@@ -978,17 +974,15 @@ msgstr "  --refresh-keys            从密匙服务器中更新指定的或所�
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr "--config <file>           使用另外的配置文件(而不是\\n '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            为 GnuPG 设定的另外目录 (而"
-"\\n                            非 '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            为 GnuPG 设定的另外目录 (而\\n                            非 '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1162,22 +1156,17 @@ msgstr "用法： %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize 是一个小 hack，用于提高 pacman\\n读/写基于文件系统的数据库时"
-"的性能。\\n\\n"
+msgstr "pacman-optimize 是一个小 hack，用于提高 pacman\\n读/写基于文件系统的数据库时的性能。\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"因为 pacman 使用许多小文件来跟踪软件包。\\n久而久之这些文件有倾向变得零"
-"碎。\\n本脚本尝试把这些小文件重新放置到硬盘上的一个连续的位置。\\n结果是硬盘"
-"磁头由于不用再在碟片上移来移去，从而可以读取得更快。\\n"
+msgstr "因为 pacman 使用许多小文件来跟踪软件包。\\n久而久之这些文件有倾向变得零碎。\\n本脚本尝试把这些小文件重新放置到硬盘上的一个连续的位置。\\n结果是硬盘磁头由于不用再在碟片上移来移去，从而可以读取得更快。\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1228,7 +1217,8 @@ msgid "Rotating database into place..."
 msgstr "正在把数据库放置到位..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "替换新数据库失败。请检查 %s、%s 和 %s 目录。"
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1243,9 +1233,7 @@ msgstr "用法： pkgdelta [options] <package1> <package2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta 将在两个软件包中创建增量文件。\\n该增量文件可通过使用 repo-add 添加"
-"到数据库中。\\n"
+msgstr "pkgdelta 将在两个软件包中创建增量文件。\\n该增量文件可通过使用 repo-add 添加到数据库中。\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1279,9 +1267,7 @@ msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"版权所有 (c)  2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n本程序是自由软"
-"件；请参阅版权条款。\\n没有任何担保，在法律允许的范围内。\\n"
+msgstr "版权所有 (c)  2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n本程序是自由软件；请参阅版权条款。\\n没有任何担保，在法律允许的范围内。\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1333,11 +1319,9 @@ msgstr "用法：repo-add [选项] <到数据库路径> <软件包|delta增量�
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add 会通过读取某个软件包来更新软件包数据库。\\n可以在命令行中添加多个指"
-"定的软件包。\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add 会通过读取某个软件包来更新软件包数据库。\\n可以在命令行中添加多个指定的软件包。\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1345,13 +1329,14 @@ msgstr "  -d, --delta       生成并添加软件包更新所用的 delta 增量
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr " -n, --new 只增加数据库中没有的包\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr "-R, --remove 在更新数据库之后，删除旧的软件包文件\\n"
 
 #: scripts/repo-add.sh.in:66
@@ -1360,12 +1345,10 @@ msgstr "用法：repo-remove [选项] <数据库路径> <软件包名|增量包>
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove 会通过移除从给定的软件库数据库的命令行中\\n指定的软件包名来更新软"
-"件包数据库。\\n可以在命令行中移除多个指定的软件包。\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove 会通过移除从给定的软件库数据库的命令行中\\n指定的软件包名来更新软件包数据库。\\n可以在命令行中移除多个指定的软件包。\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1395,8 +1378,7 @@ msgstr "\\n更多可用选项的描述及细节请参见 %s(8)。\\n"
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"示例：repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "示例：repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1404,12 +1386,10 @@ msgstr "示例：repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序"
-"是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1563,11 +1543,11 @@ msgstr "指定了无效的命令名 '%s'"
 msgid "Cannot create temp directory for database building."
 msgstr "无法为建立数据库而创建临时目录。"
 
-#: scripts/repo-add.sh.in:812
+#: scripts/repo-add.sh.in:823
 msgid "Creating updated database file '%s'"
 msgstr "正在生成更新的数据库文件 '%s'"
 
-#: scripts/repo-add.sh.in:816
+#: scripts/repo-add.sh.in:827
 msgid "No packages modified, nothing to do."
 msgstr "没有软件包被修改，无事可做。"
 
@@ -1700,18 +1680,21 @@ msgstr "获取 %s 的最新版本失败"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "未知引用：%s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "正在建立 %s %s 仓库的拷贝..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "升级 %s %s 仓库的活动拷贝失败"
 
@@ -1743,12 +1726,14 @@ msgstr "正在解压缩 %s，使用 %s"
 msgid "Failed to extract %s"
 msgstr "无法解压缩 %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "正在克隆 %s %s 仓库..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "下载 %s %s 仓库失败"
@@ -1757,12 +1742,14 @@ msgstr "下载 %s %s 仓库失败"
 msgid "%s is not a clone of %s"
 msgstr "%s 不是 %s 的克隆"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "正在升级 %s %s 仓库..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "升级 %s %s 仓库失败"
@@ -1819,7 +1806,8 @@ msgstr "无法压缩二进制文件：%s"
 msgid "Compressing man and info pages..."
 msgstr "正在压缩 man 及 info 文档..."
 
-#: scripts/libmakepkg/util/message.sh:68 scripts/library/output_format.sh:31
+#: scripts/libmakepkg/util/message.sh.in:68
+#: scripts/library/output_format.sh:31
 msgid "ERROR:"
 msgstr "错误："