Pull translations from Transifex and prepare for next release

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

1 files changed, 637 insertions, 551 deletions

diff --git a/scripts/po/zh_CN.po b/scripts/po/zh_CN.po
index 219fd701..e1afd0e7 100644
--- a/scripts/po/zh_CN.po
+++ b/scripts/po/zh_CN.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Felix Yan <felixonmars@gmail.com>, 2015
 # Isaac Ge <acgtyrant@gmail.com>, 2014
 # leonfeng <chaofeng111@gmail.com>, 2011
 # leonfeng <chaofeng111@gmail.com>, 2011
@@ -11,810 +12,605 @@
 # leonfeng <chaofeng111@gmail.com>, 2011
 # Yangtse Su <yangtsesu@gmail.com>, 2012-2013
 # ykelvis <ykelvis@users.noreply.github.com>, 2014
+# 张海, 2015
 # 甘 露 <rhythm.gan@gmail.com>, 2011
 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: 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"
+"POT-Creation-Date: 2015-12-09 15:58+1000\n"
+"PO-Revision-Date: 2015-08-09 02:44+0000\n"
+"Last-Translator: 张海\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-"
+"pacman/language/zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: scripts/makepkg.sh.in:120 scripts/makepkg.sh.in:1494
-#: scripts/makepkg.sh.in:1498 scripts/library/output_format.sh:26
-msgid "WARNING:"
-msgstr "警告："
-
-#: scripts/makepkg.sh.in:125 scripts/library/output_format.sh:31
-msgid "ERROR:"
-msgstr "错误："
-
-#: scripts/makepkg.sh.in:163
+#: scripts/makepkg.sh.in:135
 msgid "Cleaning up..."
-msgstr "打扫中..."
+msgstr "清理中..."
 
-#: scripts/makepkg.sh.in:198
+#: scripts/makepkg.sh.in:169
 msgid "Entering %s environment..."
 msgstr "正在进入 %s 环境..."
 
-#: 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: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 "正在放弃..."
-
-#: scripts/makepkg.sh.in:312
-msgid "The download program %s is not installed."
-msgstr "下载程序 %s 没有安装。"
-
-#: scripts/makepkg.sh.in:325 scripts/makepkg.sh.in:338
-msgid "Found %s"
-msgstr "找到 %s"
-
-#: scripts/makepkg.sh.in:328
-msgid "%s was not found in the build directory and is not a URL."
-msgstr "%s 没有在创建目录中找到，也不是一个 URL。"
-
-#: scripts/makepkg.sh.in:357
-msgid "Downloading %s..."
-msgstr "正在下载 %s..."
-
-#: scripts/makepkg.sh.in:376
-msgid "Failure while downloading %s"
-msgstr "无法下载 %s"
-
-#: scripts/makepkg.sh.in:432
-msgid "Extracting %s with %s"
-msgstr "正在解压缩 %s，使用 %s"
-
-#: scripts/makepkg.sh.in:440
-msgid "Failed to extract %s"
-msgstr "无法解压缩 %s"
-
-#: scripts/makepkg.sh.in:467
-msgid "Branching %s ..."
-msgstr "正在取出%s......"
-
-#: scripts/makepkg.sh.in:469
-msgid "Failure while branching %s"
-msgstr "获取%s的最新版本失败"
-
-#: scripts/makepkg.sh.in:474
-msgid "Pulling %s ..."
-msgstr "正在获取%s的最新版本......"
-
-#: scripts/makepkg.sh.in:478
-msgid "Failure while pulling %s"
-msgstr "获取%s的最新版本失败"
-
-#: 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: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:515 scripts/makepkg.sh.in:586
-#: scripts/makepkg.sh.in:688
-msgid "Failure while updating working copy of %s %s repo"
-msgstr "升级 %s %s 仓库的活动拷贝失败"
-
-#: 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:541 scripts/makepkg.sh.in:639
-#: scripts/makepkg.sh.in:734
-msgid "Cloning %s %s repo..."
-msgstr "正在克隆%s %s仓库......"
-
-#: 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:551
-msgid "%s is not a clone of %s"
-msgstr "%s不是%s的克隆"
-
-#: 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: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:799
-msgid "Retrieving sources..."
-msgstr "获取源代码......"
-
-#: scripts/makepkg.sh.in:851
+#: scripts/makepkg.sh.in:178
 msgid "pkgver() generated an invalid version: %s"
 msgstr "pkgver() 生成了无效的版本：%s"
 
-#: scripts/makepkg.sh.in:858
+#: scripts/makepkg.sh.in:185
 msgid "Failed to update %s from %s to %s"
 msgstr "从 %s 升级到 %s 失败"
 
-#: scripts/makepkg.sh.in:865
+#: scripts/makepkg.sh.in:192
 msgid "Updated version: %s"
 msgstr "已升级版本：%s"
 
-#: scripts/makepkg.sh.in:867
+#: scripts/makepkg.sh.in:194
 msgid "%s is not writeable -- pkgver will not be updated"
-msgstr "%s不可写 -- 包版本将不升级"
+msgstr "%s 不可写 -- 包版本将不升级"
 
-#: scripts/makepkg.sh.in:875
+#: scripts/makepkg.sh.in:202
 msgid "Unable to find source file %s."
 msgstr "无法找到源文件 %s。"
 
-#: scripts/makepkg.sh.in:1055
+#: scripts/makepkg.sh.in:203 scripts/makepkg.sh.in:735
+#: scripts/makepkg.sh.in:1174 scripts/makepkg.sh.in:1441
+#: scripts/makepkg.sh.in:1876 scripts/makepkg.sh.in:1910
+#: scripts/makepkg.sh.in:1917 scripts/makepkg.sh.in:1930
+#: scripts/makepkg.sh.in:1938 scripts/makepkg.sh.in:1947
+#: scripts/makepkg.sh.in:1960 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
+#: scripts/libmakepkg/source/file.sh.in:75
+#: scripts/libmakepkg/source/file.sh.in:139
+#: scripts/libmakepkg/source/git.sh.in:47
+#: scripts/libmakepkg/source/git.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:90
+#: scripts/libmakepkg/source/git.sh.in:96
+#: scripts/libmakepkg/source/git.sh.in:113
+#: scripts/libmakepkg/source/git.sh.in:121
+#: scripts/libmakepkg/source/hg.sh.in:47 scripts/libmakepkg/source/hg.sh.in:85
+#: scripts/libmakepkg/source/hg.sh.in:94 scripts/libmakepkg/source/hg.sh.in:99
+#: scripts/libmakepkg/source/svn.sh.in:58
+#: scripts/libmakepkg/source/svn.sh.in:68
+#: scripts/libmakepkg/util/source.sh.in:130
+#: scripts/libmakepkg/util/source.sh.in:139
+msgid "Aborting..."
+msgstr "正在放弃..."
+
+#: scripts/makepkg.sh.in:247
 msgid "'%s' returned a fatal error (%i): %s"
 msgstr "'%s' 返回一个致命错误 (%i)：%s"
 
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:266
 msgid "Installing missing dependencies..."
 msgstr "正在安装缺少的依赖关系..."
 
-#: scripts/makepkg.sh.in:1077
+#: scripts/makepkg.sh.in:269
 msgid "'%s' failed to install missing dependencies."
 msgstr "'%s' 无法安装缺少的依赖关系。"
 
-#: scripts/makepkg.sh.in:1108
+#: scripts/makepkg.sh.in:300
 msgid "Missing dependencies:"
 msgstr "缺少依赖关系："
 
-#: scripts/makepkg.sh.in:1124 scripts/makepkg.sh.in:1138
+#: scripts/makepkg.sh.in:316 scripts/makepkg.sh.in:330
 msgid "Failed to remove installed dependencies."
 msgstr "无法删除已安装的依赖关系。"
 
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:405
 msgid "Generating checksums for source files..."
 msgstr "正在为源代码文件创建完整性检查值..."
 
-#: scripts/makepkg.sh.in:1216
+#: scripts/makepkg.sh.in:408
 msgid "Cannot find the %s binary required for generating sourcefile checksums."
 msgstr "无法找到生成源文件检验值所需的 %s 库。"
 
-#: scripts/makepkg.sh.in:1230
+#: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "指定了无效的完整性算法 '%s'"
 
-#: scripts/makepkg.sh.in:1248
+#: scripts/makepkg.sh.in:440
 msgid "Skipped"
 msgstr "已跳过"
 
-#: scripts/makepkg.sh.in:1253
+#: scripts/makepkg.sh.in:445
 msgid "NOT FOUND"
 msgstr "未找到"
 
-#: scripts/makepkg.sh.in:1260 scripts/makepkg.sh.in:1491
+#: scripts/makepkg.sh.in:452 scripts/makepkg.sh.in:684
 msgid "Passed"
 msgstr "通过"
 
-#: scripts/makepkg.sh.in:1262 scripts/makepkg.sh.in:1467
-#: scripts/makepkg.sh.in:1485 scripts/makepkg.sh.in:1488
+#: scripts/makepkg.sh.in:454 scripts/makepkg.sh.in:660
+#: scripts/makepkg.sh.in:678 scripts/makepkg.sh.in:681
 msgid "FAILED"
 msgstr "失败"
 
-#: scripts/makepkg.sh.in:1285
-msgid "Validating source files with %s..."
+#: scripts/makepkg.sh.in:478
+#, fuzzy
+msgid "Validating %s files with %s..."
 msgstr "正在验证源代码文件 %s..."
 
-#: scripts/makepkg.sh.in:1292
+#: scripts/makepkg.sh.in:485
 msgid "One or more files did not pass the validity check!"
 msgstr "一个或多个文件没有通过有效性检查！"
 
-#: scripts/makepkg.sh.in:1296
+#: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
 msgstr "完整性检查 (%s) 与源阵列大小不一致。"
 
-#: scripts/makepkg.sh.in:1338
-msgid "Integrity checks are missing."
+#: scripts/makepkg.sh.in:531
+#, fuzzy
+msgid "Integrity checks are missing for: %s"
 msgstr "完整性检查 (%s) 缺失。"
 
-#: scripts/makepkg.sh.in:1405
+#: scripts/makepkg.sh.in:598
 msgid "Verifying source file signatures with %s..."
 msgstr "正在使用 %s 验证源文件签名..."
 
-#: scripts/makepkg.sh.in:1430
+#: scripts/makepkg.sh.in:623
 msgid "SIGNATURE NOT FOUND"
 msgstr "未找到签名！"
 
-#: scripts/makepkg.sh.in:1443
+#: scripts/makepkg.sh.in:636
 msgid "SOURCE FILE NOT FOUND"
 msgstr "未找到源文件！"
 
-#: scripts/makepkg.sh.in:1470
+#: scripts/makepkg.sh.in:663
 msgid "unknown public key"
 msgstr "未知的公共密匙"
 
-#: scripts/makepkg.sh.in:1473
+#: scripts/makepkg.sh.in:666
 msgid "public key %s has been revoked"
 msgstr "公钥 %s 已被吊销"
 
-#: scripts/makepkg.sh.in:1476
+#: scripts/makepkg.sh.in:669
 msgid "bad signature from public key"
 msgstr "公钥签名错误"
 
-#: scripts/makepkg.sh.in:1479
+#: scripts/makepkg.sh.in:672
 msgid "error during signature verification"
 msgstr "验证签名时发生错误"
 
-#: scripts/makepkg.sh.in:1485
+#: scripts/makepkg.sh.in:678
 msgid "the public key %s is not trusted"
 msgstr "公钥 %s 不被信任"
 
-#: scripts/makepkg.sh.in:1488
+#: scripts/makepkg.sh.in:681
 msgid "invalid public key"
 msgstr "无效的公共密匙"
 
-#: scripts/makepkg.sh.in:1494
+#: scripts/makepkg.sh.in:687 scripts/makepkg.sh.in:691
+#: scripts/libmakepkg/util/message.sh:63 scripts/library/output_format.sh:26
+msgid "WARNING:"
+msgstr "警告："
+
+#: scripts/makepkg.sh.in:687
 msgid "the signature has expired."
 msgstr "该签名已过期。"
 
-#: scripts/makepkg.sh.in:1498
+#: scripts/makepkg.sh.in:691
 msgid "the key has expired."
 msgstr "该密匙已过期。"
 
-#: scripts/makepkg.sh.in:1510
+#: scripts/makepkg.sh.in:703
 msgid "One or more PGP signatures could not be verified!"
 msgstr "一个或多个 PGP 签名无法校验！"
 
-#: scripts/makepkg.sh.in:1515
+#: scripts/makepkg.sh.in:708
 msgid "Warnings have occurred while verifying the signatures."
 msgstr "校验签名时发生警告。"
 
-#: scripts/makepkg.sh.in:1516
+#: scripts/makepkg.sh.in:709
 msgid "Please make sure you really trust them."
 msgstr "请确认您真的信任对方。"
 
-#: scripts/makepkg.sh.in:1522
+#: scripts/makepkg.sh.in:715
 msgid "Skipping all source file integrity checks."
 msgstr "正在跳过所有源文件完整性检查。"
 
-#: scripts/makepkg.sh.in:1524
+#: scripts/makepkg.sh.in:717
 msgid "Skipping verification of source file checksums."
 msgstr "正在跳过校验源文件校验值。"
 
-#: scripts/makepkg.sh.in:1527
+#: scripts/makepkg.sh.in:720
 msgid "Skipping verification of source file PGP signatures."
 msgstr "正在跳过源文件 PGP 签名校验。"
 
-#: scripts/makepkg.sh.in:1536
-msgid "Extracting sources..."
-msgstr "正在释放源码......"
-
-#: scripts/makepkg.sh.in:1569
+#: scripts/makepkg.sh.in:734
 msgid "A failure occurred in %s()."
 msgstr "在 %s() 中发生一个错误。"
 
-#: scripts/makepkg.sh.in:1577
-msgid "Failed to change to directory %s"
-msgstr "无法切换到目录%s"
-
-#: scripts/makepkg.sh.in:1586
+#: scripts/makepkg.sh.in:743
 msgid "Failed to source %s"
-msgstr "载入%s失败"
+msgstr "载入 %s 失败"
 
-#: scripts/makepkg.sh.in:1651
+#: scripts/makepkg.sh.in:804
 msgid "Starting %s()..."
 msgstr "正在开始 %s()..."
 
-#: scripts/makepkg.sh.in:1776
-msgid "Tidying install..."
-msgstr "正在清理安装..."
-
-#: scripts/makepkg.sh.in:1779
-msgid "Removing doc files..."
-msgstr "正在删除 doc 文件..."
-
-#: scripts/makepkg.sh.in:1784
-msgid "Purging unwanted files..."
-msgstr "正在清除不打算要的文件..."
-
-#: scripts/makepkg.sh.in:1796
-msgid "Removing %s files..."
-msgstr "正在删除 %s 文件..."
-
-#: scripts/makepkg.sh.in:1801
-msgid "Removing static library files..."
-msgstr "正在移除静态库文件……"
-
-#: scripts/makepkg.sh.in:1811
-msgid "Removing empty directories..."
-msgstr "正在删除空目录..."
-
-#: scripts/makepkg.sh.in:1819
-msgid "%s entry file not in package : %s"
-msgstr "%s 条目文件不在软件包内： %s"
-
-#: scripts/makepkg.sh.in:1825 scripts/makepkg.sh.in:1828
-msgid "Package contains reference to %s"
-msgstr "软件包提及含有 %s"
-
-#: scripts/makepkg.sh.in:1832
-msgid "Compressing man and info pages..."
-msgstr "正在压缩 man 及 info 文档..."
-
-#: scripts/makepkg.sh.in:1860
-msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr "正在从二进制文件和库中清除不需要的系统符号..."
-
-#: scripts/makepkg.sh.in:1894
-msgid "Compressing binaries with %s..."
-msgstr "正在使用 %s 压缩二进制文件..."
-
-#: scripts/makepkg.sh.in:1899
-msgid "Could not compress binary : %s"
-msgstr "无法压缩二进制文件：%s"
-
-#: scripts/makepkg.sh.in:1956
+#: scripts/makepkg.sh.in:938
 msgid "Library listed in %s is not required by any files: %s"
-msgstr "%s列出的库不被任何文件要求：%s"
+msgstr "%s 列出的库不被任何文件要求：%s"
 
-#: scripts/makepkg.sh.in:1985
+#: scripts/makepkg.sh.in:967
 msgid "Library listed in %s is not versioned: %s"
-msgstr "%s列出的库没有版本：%s"
+msgstr "%s 列出的库没有版本：%s"
 
-#: scripts/makepkg.sh.in:1998
+#: scripts/makepkg.sh.in:980
 msgid "Library listed in %s is not a shared object: %s"
-msgstr "%s列出的库不是共享对象：%s"
+msgstr "%s 列出的库不是共享对象：%s"
 
-#: scripts/makepkg.sh.in:2013
+#: scripts/makepkg.sh.in:995
 msgid "Cannot find library listed in %s: %s"
 msgstr "无法找到列在 %s 中的库： %s"
 
-#: scripts/makepkg.sh.in:2127 scripts/makepkg.sh.in:2331
+#: scripts/makepkg.sh.in:1109 scripts/makepkg.sh.in:1153
+#: scripts/makepkg.sh.in:1318
 msgid "Generating %s file..."
 msgstr "正在生成 %s 文件..."
 
-#: scripts/makepkg.sh.in:2187
+#: scripts/makepkg.sh.in:1173
 msgid "Missing %s directory."
 msgstr "缺失 %s 目录。"
 
-#: scripts/makepkg.sh.in:2193
+#: scripts/makepkg.sh.in:1179
 msgid "Creating package \"%s\"..."
-msgstr "正在创建软件包\"%s\"......"
+msgstr "正在创建软件包\"%s\"..."
 
-#: scripts/makepkg.sh.in:2205
+#: scripts/makepkg.sh.in:1192
 msgid "Adding %s file..."
 msgstr "正在添加 %s 文件..."
 
-#: scripts/makepkg.sh.in:2207
+#: scripts/makepkg.sh.in:1194
 msgid "Failed to add %s file to package."
 msgstr "无法添加文件 %s 到软件包。"
 
-#: scripts/makepkg.sh.in:2227
+#: scripts/makepkg.sh.in:1214
 msgid "Generating .MTREE file..."
-msgstr "正在生成 .MTREE 文件......"
+msgstr "正在生成 .MTREE 文件..."
 
-#: scripts/makepkg.sh.in:2233
+#: scripts/makepkg.sh.in:1220
 msgid "Compressing package..."
 msgstr "正在压缩软件包..."
 
-#: scripts/makepkg.sh.in:2248 scripts/makepkg.sh.in:2374
+#: scripts/makepkg.sh.in:1235 scripts/makepkg.sh.in:1361
 msgid "'%s' is not a valid archive extension."
 msgstr "'%s' 是无效的压缩包扩展名。"
 
-#: scripts/makepkg.sh.in:2256
+#: scripts/makepkg.sh.in:1243
 msgid "Failed to create package file."
 msgstr "无法创建软件包文件。"
 
-#: scripts/makepkg.sh.in:2273
+#: scripts/makepkg.sh.in:1260
 msgid "Failed to create symlink to package file."
 msgstr "创建软件包文件系统链接失败。"
 
-#: scripts/makepkg.sh.in:2305
+#: scripts/makepkg.sh.in:1292
 msgid "Signing package..."
 msgstr "正在签名软件包..."
 
-#: scripts/makepkg.sh.in:2316
+#: scripts/makepkg.sh.in:1303
 msgid "Created signature file %s."
 msgstr "已创建签名文件 %s。"
 
-#: scripts/makepkg.sh.in:2318
+#: scripts/makepkg.sh.in:1305
 msgid "Failed to sign package file."
 msgstr "无法签名软件包文件。"
 
-#: scripts/makepkg.sh.in:2324
+#: scripts/makepkg.sh.in:1311
 msgid "Creating source package..."
 msgstr "正在创建源码包..."
 
-#: scripts/makepkg.sh.in:2328 scripts/makepkg.sh.in:2341
+#: scripts/makepkg.sh.in:1315 scripts/makepkg.sh.in:1328
 msgid "Adding %s..."
 msgstr "正在添加 %s..."
 
-#: scripts/makepkg.sh.in:2359
+#: scripts/makepkg.sh.in:1346
 msgid "Adding %s file (%s)..."
 msgstr "正在添加 %s 文件 (%s) ..."
 
-#: scripts/makepkg.sh.in:2382
+#: scripts/makepkg.sh.in:1369
 msgid "Compressing source package..."
 msgstr "正在压缩源码包..."
 
-#: scripts/makepkg.sh.in:2385
+#: scripts/makepkg.sh.in:1372
 msgid "Failed to create source package file."
 msgstr "创建源码包文件失败。"
 
-#: scripts/makepkg.sh.in:2402
+#: scripts/makepkg.sh.in:1389
 msgid "Failed to create symlink to source package file."
 msgstr "无法创建源软件包文件的系统链接。"
 
-#: scripts/makepkg.sh.in:2414
+#: scripts/makepkg.sh.in:1401
 msgid "Installing package %s with %s..."
 msgstr "正在安装软件包 %s，使用 %s..."
 
-#: scripts/makepkg.sh.in:2416
+#: scripts/makepkg.sh.in:1403
 msgid "Installing %s package group with %s..."
 msgstr "正在安装 %s 软件包组，使用 %s..."
 
-#: scripts/makepkg.sh.in:2434
+#: scripts/makepkg.sh.in:1421
 msgid "Failed to install built package(s)."
 msgstr "安装创建的软件包失败。"
 
-#: 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: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:2548
-msgid "%s is not allowed to start with a dot."
-msgstr "%s 不允许以点号开始。"
-
-#: scripts/makepkg.sh.in:2552 scripts/makepkg.sh.in:2598
-msgid "%s contains invalid characters: '%s'"
-msgstr "%s 包含无效字符： '%s'"
-
-#: scripts/makepkg.sh.in:2568
-msgid "%s must be a decimal, not %s."
-msgstr "%s 必须是十进制，不是 %s。"
-
-#: scripts/makepkg.sh.in:2584
-msgid "%s must be an integer, not %s."
-msgstr "%s 必须是整数，不是%s。"
-
-#: 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:2606
-msgid "Note that many packages may need a line added to their %s"
-msgstr "注意许多软件包可能需要在 %s 中添加"
-
-#: scripts/makepkg.sh.in:2607
-msgid "such as %s."
-msgstr "诸如 %s。"
-
-#: scripts/makepkg.sh.in:2645
-msgid "%s array cannot contain comparison (< or >) operators."
-msgstr "%s 阵列不能包含比较 (< 或 >) 操作符。"
-
-#: scripts/makepkg.sh.in:2665
-msgid "%s entry should not contain leading slash : %s"
-msgstr "%s 条目不应当包含前斜杠：%s"
-
-#: scripts/makepkg.sh.in:2698
-msgid "Invalid syntax for %s: '%s'"
-msgstr "%s 的语法无效：'%s'"
-
-#: 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:2764
-msgid "%s array contains unknown option '%s'"
-msgstr "%s 陈列包含未知的选项 '%s'"
-
-#: scripts/makepkg.sh.in:2775
-msgid "Sparse arrays are not allowed for source"
-msgstr "源里不允许使用稀疏数组"
-
-#: scripts/makepkg.sh.in:2785
-msgid "Requested package %s is not provided in %s"
-msgstr "要求的软件包 %s 在 %s 中不提供"
-
-#: scripts/makepkg.sh.in:2798
-msgid "Missing %s function in %s"
-msgstr ""
-
-#: scripts/makepkg.sh.in:2804
-msgid "Missing %s function for split package '%s'"
-msgstr "缺失 %s 功能以分割软件包 '%s'"
-
-#: scripts/makepkg.sh.in:2845
-msgid "%s is not allowed to contain colons, hyphens or whitespace."
-msgstr "%s 不允许包含冒号，连字号及空格。"
+#: scripts/makepkg.sh.in:1440 scripts/libmakepkg/util/source.sh.in:129
+msgid "Unknown download protocol: %s"
+msgstr "未知下载协议：%s"
 
-#: scripts/makepkg.sh.in:2890
+#: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
 msgstr "找不到用来检查 VCS 源需求的 %s 库"
 
-#: scripts/makepkg.sh.in:2918
+#: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
 msgstr "找不到 % 软件包以处理 %s 源。"
 
-#: scripts/makepkg.sh.in:2941
+#: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
 msgstr "无法找到依赖操作所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:2949
+#: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr "无法找到二进制文件%s. 将使用%s获得root权限。"
+msgstr "无法找到二进制文件 %s。将使用 %s 获得 root 权限。"
 
-#: scripts/makepkg.sh.in:2956
+#: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
 msgstr "无法找到 %s 的二进制文件。"
 
-#: scripts/makepkg.sh.in:2964
+#: scripts/makepkg.sh.in:1531
 msgid "Cannot find the %s binary required for signing packages."
 msgstr "无法找到签名软件包所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:2972
+#: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
 msgstr "无法找到验证源文件所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:2980
-msgid "Cannot find the %s binary required for validating sourcefile checksums."
+#: scripts/makepkg.sh.in:1547
+#, fuzzy
+msgid ""
+"Cannot find the %s binary required for validating source file checksums."
 msgstr "无法找到验证源文件校验值所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:2988
+#: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
 msgstr "无法找到压缩二进制文件所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:2996
+#: scripts/makepkg.sh.in:1563
+#, fuzzy
+msgid "Cannot find the %s binary required for optimizing PNG images."
+msgstr "无法找到签名软件包所需的 %s 二进制文件。"
+
+#: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
 msgstr "无法找到分发编译所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:3004
+#: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
 msgstr "无法找到编译器缓存使用所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:3012
+#: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
 msgstr "无法找到目标文件分割所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:3020
+#: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
 msgstr "无法找到压缩帮助及信息页面所需的 %s 二进制文件。"
 
-#: scripts/makepkg.sh.in:3040
+#: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
 msgstr "已有一个编译好的软件包，正在安装现有的软件包..."
 
-#: scripts/makepkg.sh.in:3044
+#: scripts/makepkg.sh.in:1619
 msgid "A package has already been built. (use %s to overwrite)"
 msgstr "软件包已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:3063
+#: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
 msgstr "已有一个编译好的软件包组，正在安装现有的软件包..."
 
-#: scripts/makepkg.sh.in:3067
+#: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "该软件包组已创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:3072
+#: scripts/makepkg.sh.in:1647
 msgid "Part of the package group has already been built. (use %s to overwrite)"
 msgstr "软件包组的一部分已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:3142
+#: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
 msgstr "让软件包兼容于 pacman 的用法"
 
-#: scripts/makepkg.sh.in:3144 scripts/pacman-db-upgrade.sh.in:40
+#: scripts/makepkg.sh.in:1698 scripts/pacman-db-upgrade.sh.in:40
 msgid "Usage: %s [options]"
 msgstr "用法：%s [选项]"
 
-#: scripts/makepkg.sh.in:3146 scripts/pacman-key.sh.in:81
+#: scripts/makepkg.sh.in:1700 scripts/pacman-key.sh.in:81
 msgid "Options:"
 msgstr "选项："
 
-#: scripts/makepkg.sh.in:3147
+#: scripts/makepkg.sh.in:1701
 msgid "  -A, --ignorearch Ignore incomplete %s field in %s"
 msgstr "  -A, --ignorearch 忽略不完整的 %s 字段 (位于 %s 中)"
 
-#: scripts/makepkg.sh.in:3148
+#: scripts/makepkg.sh.in:1702
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      编译后清理工作文件"
 
-#: scripts/makepkg.sh.in:3149
+#: scripts/makepkg.sh.in:1703
 msgid "  -C, --cleanbuild Remove %s dir before building the package"
 msgstr "-C, --cleanbuild 在编译软件包之前删除 %s 文件夹"
 
-#: scripts/makepkg.sh.in:3150
+#: scripts/makepkg.sh.in:1704
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr " -d, --nodeps     跳过所有依赖关系检查"
 
-#: scripts/makepkg.sh.in:3151
+#: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
 msgstr "  -e, --noextract  不解压源文件 (使用现存的 %s 目录)"
 
-#: scripts/makepkg.sh.in:3152
+#: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      覆盖现存的软件包"
 
-#: scripts/makepkg.sh.in:3153
+#: scripts/makepkg.sh.in:1707
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   为源码文件生成完整性检查值"
 
-#: scripts/makepkg.sh.in:3154
+#: scripts/makepkg.sh.in:1708
 msgid "  -h, --help       Show this help message and exit"
 msgstr "  -h, --help       显示本帮助信息并退出"
 
-#: scripts/makepkg.sh.in:3155
+#: scripts/makepkg.sh.in:1709
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    成功编译后安装软件包"
 
-#: scripts/makepkg.sh.in:3156
+#: scripts/makepkg.sh.in:1710
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        记录软件包编译过程"
 
-#: scripts/makepkg.sh.in:3157
+#: scripts/makepkg.sh.in:1711
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    禁止彩色输出信息"
 
-#: scripts/makepkg.sh.in:3158
+#: scripts/makepkg.sh.in:1712
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    仅下载和解压缩文件"
 
-#: scripts/makepkg.sh.in:3159
+#: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
 msgstr "  -p <文件> 使用另外的编译脚本 (而不是 '%s' ) "
 
-#: scripts/makepkg.sh.in:3160
+#: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr "  -r, --rmdeps     编译成功后删除安装的依赖关系"
 
-#: scripts/makepkg.sh.in:3161
+#: scripts/makepkg.sh.in:1715
 msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  不编译而重新打包软件包内容"
 
-#: scripts/makepkg.sh.in:3162
+#: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   使用 %s 安装缺失的依赖关系"
 
-#: scripts/makepkg.sh.in:3163
+#: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr "  -S, --source     不下载源文件只生成仅包含源的包"
 
-#: scripts/makepkg.sh.in:3164
+#: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
 msgstr "  -V, --version             显示版本信息并退出"
 
-#: scripts/makepkg.sh.in:3165
+#: scripts/makepkg.sh.in:1719
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr "    --allsource     只生成源码包 (包括有已下载的源码) "
 
-#: scripts/makepkg.sh.in:3166
+#: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
 msgstr "  --check          运行 %s 函数 (包含于 %s 中)"
 
-#: scripts/makepkg.sh.in:3167
+#: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr "  --config <文件> 使用替代的配置文件 (而不是 '%s')"
+msgstr "  --config <文件> 使用另外的配置文件 (而不是 '%s')"
 
-#: scripts/makepkg.sh.in:3168
+#: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
 msgstr "--holdver 不升级版本控制系统源"
 
-#: scripts/makepkg.sh.in:3169
+#: scripts/makepkg.sh.in:1723
 msgid ""
 "  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr "  --key <密匙>      指定签名 %s 使用的密匙而不用默认密匙"
+msgstr "--key <密匙>      指定签名 %s 使用的密匙而不用默认密匙"
 
-#: scripts/makepkg.sh.in:3170
+#: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
 msgstr "--noarchive 不生成软件包归档"
 
-#: scripts/makepkg.sh.in:3171
+#: scripts/makepkg.sh.in:1725
 msgid "  --nocheck        Do not run the %s function in the %s"
-msgstr "  --nocheck        不运行 %s 功能在 %s 中"
+msgstr "  --nocheck        不执行 %s 函数在 %s 中"
 
-#: scripts/makepkg.sh.in:3172
+#: scripts/makepkg.sh.in:1726
 msgid "  --noprepare      Do not run the %s function in the %s"
-msgstr ""
+msgstr "--noprepare 不执行 %s 函数在 %s 中"
 
-#: scripts/makepkg.sh.in:3173
+#: scripts/makepkg.sh.in:1727
 msgid "  --nosign         Do not create a signature for the package"
 msgstr "  --nosign         不为该软件包创建签名"
 
-#: scripts/makepkg.sh.in:3174
-msgid "  --pkg <list>     Only build listed packages from a split package"
-msgstr "  --pkg <清单>     仅从分割软件包中创建清单中所列的软件包"
+#: scripts/makepkg.sh.in:1728
+msgid ""
+"  --packagelist    Only list packages that would be produced, without PKGEXT"
+msgstr ""
 
-#: scripts/makepkg.sh.in:3175
+#: scripts/makepkg.sh.in:1729
+msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
+msgstr ""
+
+#: scripts/makepkg.sh.in:1730
 msgid "  --sign           Sign the resulting package with %s"
 msgstr "  --sign           使用 %s 签名生成的软件包"
 
-#: scripts/makepkg.sh.in:3176
+#: scripts/makepkg.sh.in:1731
 msgid "  --skipchecksums  Do not verify checksums of the source files"
 msgstr "  --skipchecksums  不验证源文件的检验值"
 
-#: scripts/makepkg.sh.in:3177
+#: scripts/makepkg.sh.in:1732
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
 msgstr "  --skipinteg      不对源文件执行任何验证检查"
 
-#: scripts/makepkg.sh.in:3178
+#: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
-msgstr "  --skippgpcheck   不验证有 PGP 签名的源文件"
+msgstr "--skippgpcheck   不验证有 PGP 签名的源文件"
 
-#: scripts/makepkg.sh.in:3179
+#: scripts/makepkg.sh.in:1734
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
 msgstr " --verifysource 下载源文件(如果需要)并进行完整性检查"
 
-#: scripts/makepkg.sh.in:3181
+#: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
 msgstr "这些选项可以传递给 %s："
 
-#: scripts/makepkg.sh.in:3183
+#: scripts/makepkg.sh.in:1738
 msgid "  --asdeps         Install packages as non-explicitly installed"
 msgstr "      --asdeps         作为依赖安装"
 
-#: scripts/makepkg.sh.in:3184
+#: scripts/makepkg.sh.in:1739
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
 msgstr "      --needed         不重装已是最新的目标软件包"
 
-#: scripts/makepkg.sh.in:3185
+#: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr "   --noconfirm      当解决依赖关系时不询问确认"
 
-#: scripts/makepkg.sh.in:3186
+#: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "  --noprogressbar  下载文件时不显示进度条"
 
-#: scripts/makepkg.sh.in:3188
+#: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
 msgstr "如果没有指定 %s，%s 将寻找 '%s'"
 
-#: scripts/makepkg.sh.in:3194 scripts/pacman-optimize.sh.in:53
+#: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
+#, fuzzy
 msgid ""
-"Copyright (c) 2006-2014 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2006-2015 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"
@@ -823,124 +619,124 @@ msgstr ""
 "\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n本程序是自"
 "由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。 \\n"
 
-#: scripts/makepkg.sh.in:3295 scripts/repo-add.sh.in:612
+#: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
 msgstr "发现 %s 信号。退出中..."
 
-#: scripts/makepkg.sh.in:3319
+#: scripts/makepkg.sh.in:1875
 msgid "%s not found."
 msgstr "%s 未找到。"
 
-#: scripts/makepkg.sh.in:3367 scripts/makepkg.sh.in:3374
+#: scripts/makepkg.sh.in:1909 scripts/makepkg.sh.in:1916
 msgid "You do not have write permission to create packages in %s."
 msgstr "您没有在 %s 中创建软件包需要的写入许可。"
 
-#: scripts/makepkg.sh.in:3387
+#: scripts/makepkg.sh.in:1929
 msgid "You do not have write permission to store packages in %s."
 msgstr "你没有写入权限来保存软件包到 %s。"
 
-#: scripts/makepkg.sh.in:3395
+#: scripts/makepkg.sh.in:1937
 msgid "You do not have write permission to store downloads in %s."
 msgstr "你没有权限将下载数据写入 %s。"
 
-#: scripts/makepkg.sh.in:3404
+#: scripts/makepkg.sh.in:1946
 msgid "You do not have write permission to store source tarballs in %s."
 msgstr "您没有在 %s 内保存源码包所需的写入权限。"
 
-#: scripts/makepkg.sh.in:3417
+#: scripts/makepkg.sh.in:1959
 msgid "You do not have write permission to store logs in %s."
 msgstr "你没有权限将日志保存至 %s。"
 
-#: scripts/makepkg.sh.in:3430
+#: scripts/makepkg.sh.in:1972
 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:3436
+#: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
 msgstr "请不要使用 %s 选项。该选项仅供 %s 使用。"
 
-#: scripts/makepkg.sh.in:3447
+#: scripts/makepkg.sh.in:1989
 msgid "%s does not exist."
 msgstr "%s 不存在。"
 
-#: scripts/makepkg.sh.in:3451
+#: scripts/makepkg.sh.in:1993
 msgid "%s contains %s characters and cannot be sourced."
 msgstr "%s 包含 %s 字符，无法供源。"
 
-#: scripts/makepkg.sh.in:3456
+#: scripts/makepkg.sh.in:1998
 msgid "%s must be in the current working directory."
 msgstr "%s 必须在当前工作目录。"
 
-#: scripts/makepkg.sh.in:3537
+#: scripts/makepkg.sh.in:2078
 msgid "The key %s does not exist in your keyring."
 msgstr "在您的密匙环中不存在密匙 %s。"
 
-#: scripts/makepkg.sh.in:3539 scripts/repo-add.sh.in:635
+#: scripts/makepkg.sh.in:2080 scripts/repo-add.sh.in:225
 msgid "There is no key in your keyring."
 msgstr "您密匙环中无密匙。"
 
-#: scripts/makepkg.sh.in:3553 scripts/makepkg.sh.in:3571
+#: scripts/makepkg.sh.in:2104 scripts/makepkg.sh.in:2123
 msgid "Leaving %s environment."
 msgstr "正在离开 %s 环境。"
 
-#: scripts/makepkg.sh.in:3575
+#: scripts/makepkg.sh.in:2127
 msgid "Making package: %s"
 msgstr "正在创建软件包：%s"
 
-#: scripts/makepkg.sh.in:3581
+#: scripts/makepkg.sh.in:2133
 msgid "A source package has already been built. (use %s to overwrite)"
 msgstr "源软件包已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:3600
+#: scripts/makepkg.sh.in:2152
 msgid "Source package created: %s"
 msgstr "源代码包已创建：%s"
 
-#: scripts/makepkg.sh.in:3607
+#: scripts/makepkg.sh.in:2158
 msgid "Skipping dependency checks."
 msgstr "跳过依赖关系检查。"
 
-#: scripts/makepkg.sh.in:3615
+#: scripts/makepkg.sh.in:2166
 msgid "Checking runtime dependencies..."
 msgstr "正在检查运行时依赖关系..."
 
-#: scripts/makepkg.sh.in:3622
+#: scripts/makepkg.sh.in:2173
 msgid "Checking buildtime dependencies..."
 msgstr "正在检查编译时依赖关系"
 
-#: scripts/makepkg.sh.in:3634
+#: scripts/makepkg.sh.in:2185
 msgid "Could not resolve all dependencies."
 msgstr "无法解决所有的依赖关系。"
 
-#: scripts/makepkg.sh.in:3645
+#: scripts/makepkg.sh.in:2196
 msgid "Using existing %s tree"
-msgstr "使用现存的%s树"
+msgstr "使用现存的 %s 树"
 
-#: scripts/makepkg.sh.in:3652 scripts/makepkg.sh.in:3673
+#: scripts/makepkg.sh.in:2203 scripts/makepkg.sh.in:2224
 msgid "Removing existing %s directory..."
 msgstr "正在删除现存的 %s 目录..."
 
-#: scripts/makepkg.sh.in:3668
+#: scripts/makepkg.sh.in:2219
 msgid "Sources are ready."
 msgstr "源代码已就绪。"
 
-#: scripts/makepkg.sh.in:3691
+#: scripts/makepkg.sh.in:2245
 msgid "Package directory is ready."
 msgstr "软件包目录已准备好。"
 
-#: scripts/makepkg.sh.in:3695
+#: scripts/makepkg.sh.in:2249
 msgid "Finished making: %s"
 msgstr "完成创建：%s"
 
 #: scripts/makepkg-template.pl.in:55
 #, perl-format
 msgid "can't create '%s': %s"
-msgstr "无法创建 '%s': %s"
+msgstr "无法创建 '%s'：%s"
 
 #: scripts/makepkg-template.pl.in:73
 msgid "invalid key/value pair\n"
-msgstr ""
+msgstr "无效的键值对\n"
 
 #: scripts/makepkg-template.pl.in:82
 msgid "invalid template line: can't find template name\n"
@@ -949,70 +745,76 @@ msgstr "无效的模板行： 找不到模板名\n"
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr "名字 `%s` 中使用了无效的字符。有效字符： [:alnum:]+_.@-\n"
+msgstr "名字 '%s' 中使用了无效的字符。有效字符： [:alnum:]+_.@-\n"
 
-#: scripts/makepkg-template.pl.in:112
-#, perl-format
-msgid "Couldn't detect version for template '%s'"
+#: scripts/makepkg-template.pl.in:114
+#, fuzzy, perl-format
+msgid "Couldn't detect version for template '%s'\n"
 msgstr "检测不到模板版本 '%s'"
 
-#: scripts/makepkg-template.pl.in:131
+#: scripts/makepkg-template.pl.in:125
 #, perl-format
-msgid "failed to open '%s': %s"
+msgid "Failed to find template file matching '%s'\n"
+msgstr ""
+
+#: scripts/makepkg-template.pl.in:136
+#, fuzzy, perl-format
+msgid "failed to open '%s': %s\n"
 msgstr "打开 '%s': %s 失败"
 
-#: scripts/makepkg-template.pl.in:148
+#: scripts/makepkg-template.pl.in:153
 #, perl-format
 msgid "Unknown template marker '%s'\n"
 msgstr "不明模板标识 '%s'\n"
 
-#: scripts/makepkg-template.pl.in:170
+#: scripts/makepkg-template.pl.in:175
 msgid "makepkg-template [options]\n"
 msgstr "makepkg-template [选项]\n"
 
-#: scripts/makepkg-template.pl.in:172
+#: scripts/makepkg-template.pl.in:177
 msgid "Options:\n"
 msgstr "选项：\n"
 
-#: scripts/makepkg-template.pl.in:173
+#: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
 msgstr "--input, -p <file> 创建脚本以读取 (默认：%s)\n"
 
-#: scripts/makepkg-template.pl.in:174
+#: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
 msgstr "--output, -o <file> 输出到某文件 (默认：input file)\n"
 
-#: scripts/makepkg-template.pl.in:175
+#: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
 msgstr "--newest, -n 更新模板到最新版本\n"
 
-#: scripts/makepkg-template.pl.in:176
+#: scripts/makepkg-template.pl.in:181
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
 msgstr "（默认：使用模板标识中指定的版本）\n"
 
-#: scripts/makepkg-template.pl.in:177
+#: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
 msgstr "--template-dir <目录> 在指定目录中搜索模板\n"
 
-#: scripts/makepkg-template.pl.in:178
+#: scripts/makepkg-template.pl.in:183
 #, perl-format
 msgid "                        (default: %s)\n"
 msgstr "(默认：%s)\n"
 
-#: scripts/makepkg-template.pl.in:179
+#: scripts/makepkg-template.pl.in:184
 msgid "  --help, -h            This help message\n"
 msgstr "-h, --help 显示帮助信息\n"
 
-#: scripts/makepkg-template.pl.in:180
+#: scripts/makepkg-template.pl.in:185
 msgid "  --version             Version information\n"
 msgstr "--version 显示版本信息\n"
 
-#: scripts/makepkg-template.pl.in:189
+#: scripts/makepkg-template.pl.in:194
+#, fuzzy
 msgid ""
-"Copyright (c) 2013-2014 Pacman Development Team <pacman-dev@archlinux.org>.\n"
+"Copyright (c) 2013-2015 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 ""
@@ -1053,8 +855,9 @@ msgid "  --nocolor            disable colorized output messages"
 msgstr "--nocolor 禁止彩色输出信息"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
+#, fuzzy
 msgid ""
-"Copyright (c) 2010-2014 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2010-2015 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 ""
@@ -1062,7 +865,7 @@ msgstr ""
 "是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
-#: scripts/repo-add.sh.in:459
+#: scripts/repo-add.sh.in:514
 msgid "%s does not exist or is not a directory."
 msgstr "%s 不存在或不是一个目录。"
 
@@ -1076,7 +879,7 @@ msgstr "您必须有相应的权限才可升级数据库。"
 
 #: 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 运行时再次运行。"
+msgstr "发现 pacman 锁文件。不能在 pacman 运行时再次运行。"
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -1183,9 +986,7 @@ msgstr "  --refresh-keys            从密匙服务器中更新指定的或所�
 msgid ""
 "  --config <file>           Use an alternate config file (instead of"
 "\\n                            '%s')"
-msgstr ""
-"  --config <file>           使用另外的配置文件 (而不是"
-"\\n                            '%s')"
+msgstr "--config <file>           使用另外的配置文件(而不是\\n '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
@@ -1434,11 +1235,11 @@ msgstr "正在把数据库放置到位..."
 
 #: scripts/pacman-optimize.sh.in:175
 msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr "替换新数据库失败。请检查%s, %s和%s目录。"
+msgstr "替换新数据库失败。请检查 %s、%s 和 %s 目录。"
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
-msgstr "完毕。你的 pacman 数据库已经优化。"
+msgstr "完成。你的 pacman 数据库已经优化。"
 
 #: scripts/pkgdelta.sh.in:51
 msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
@@ -1456,12 +1257,12 @@ msgstr ""
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "例子：pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
-#: scripts/pkgdelta.sh.in:59 scripts/repo-add.sh.in:59
-#: scripts/repo-add.sh.in:72
+#: scripts/pkgdelta.sh.in:59 scripts/repo-add.sh.in:61
+#: scripts/repo-add.sh.in:73
 msgid "Options:\\n"
 msgstr "选项：\\n"
 
-#: scripts/pkgdelta.sh.in:60 scripts/repo-add.sh.in:78
+#: scripts/pkgdelta.sh.in:60 scripts/repo-add.sh.in:79
 msgid "  -q, --quiet       minimize output\\n"
 msgstr "  -q, --quiet       最小化输出信息\\n"
 
@@ -1488,7 +1289,7 @@ msgstr ""
 "版权所有 (c)  2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n本程序是自由软"
 "件；请参阅版权条款。\\n没有任何担保，在法律允许的范围内。\\n"
 
-#: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:293
+#: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
 msgstr "无效的软件包文件 '%s'。"
 
@@ -1528,15 +1329,15 @@ msgstr "已创建好增量软件包：'%s'"
 msgid "File '%s' does not exist"
 msgstr "文件 '%s' 不存在"
 
-#: scripts/pkgdelta.sh.in:220 scripts/repo-add.sh.in:513
+#: scripts/pkgdelta.sh.in:220 scripts/repo-add.sh.in:250
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr "无法找到 xdelta 执行文件！是否已安装 xdelta3？"
 
-#: scripts/repo-add.sh.in:53
+#: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
 msgstr "用法：repo-add [选项] <到数据库路径> <软件包|delta增量包> ...\\n"
 
-#: scripts/repo-add.sh.in:55
+#: 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"
@@ -1544,30 +1345,27 @@ msgstr ""
 "repo-add 会通过读取某个软件包来更新软件包数据库。\\n可以在命令行中添加多个指"
 "定的软件包。\\n"
 
-#: scripts/repo-add.sh.in:60
+#: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr "  -d, --delta       生成并添加软件包更新所用的 delta 增量包\\n"
 
-#: scripts/repo-add.sh.in:61
+#: scripts/repo-add.sh.in:63
 msgid ""
 "  -n, --new         only add packages that are not already in the database\\n"
 msgstr " -n, --new 只增加数据库中没有的包\\n"
 
-#: scripts/repo-add.sh.in:62
+#: scripts/repo-add.sh.in:64
+#, fuzzy
 msgid ""
-"  -R, --remove      remove package file from disk when updating database "
-"entry\\n"
+"  -R, --remove      remove old package file from disk after updating database"
+"\\n"
 msgstr "-R, --remove 当更新数据库条目时，删除软件包\\n"
 
-#: scripts/repo-add.sh.in:63
-msgid "  -f, --files       update database's file list\\n"
-msgstr "  -f, --files       更新数据库的文件列表\\n"
-
-#: scripts/repo-add.sh.in:65
+#: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr "用法：repo-remove [选项] <数据库路径> <软件包名|增量包> ...\\n"
 
-#: scripts/repo-add.sh.in:67
+#: 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"
@@ -1576,210 +1374,480 @@ msgstr ""
 "repo-remove 会通过移除从给定的软件库数据库的命令行中\\n指定的软件包名来更新软"
 "件包数据库。\\n可以在命令行中移除多个指定的软件包。\\n"
 
-#: scripts/repo-add.sh.in:74
+#: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr "请自便，此处无须人盯。\\n"
 
-#: scripts/repo-add.sh.in:77
+#: scripts/repo-add.sh.in:78
 msgid "  --nocolor         turn off color in output\\n"
 msgstr " --nocolor 关闭颜色输出\\n"
 
-#: scripts/repo-add.sh.in:79
+#: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr "  -s, --sign        更新后使用 GnuPG 签名数据库\\n"
 
-#: scripts/repo-add.sh.in:80
+#: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
 msgstr "  -k, --key <密匙>   使用指定的密匙签名该数据库\\n"
 
-#: scripts/repo-add.sh.in:81
+#: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
 msgstr "  -v, --verify      更新前验证数据库签名\\n"
 
-#: scripts/repo-add.sh.in:82
+#: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
 msgstr "\\n更多可用选项的描述及细节请参见 %s(8)。\\n"
 
-#: scripts/repo-add.sh.in:86
+#: 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"
 
-#: scripts/repo-add.sh.in:88
+#: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 msgstr "示例：repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
-#: scripts/repo-add.sh.in:95
+#: scripts/repo-add.sh.in:96
+#, fuzzy
 msgid ""
-"Copyright (c) 2006-2014 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"Copyright (c) 2006-2015 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-2014 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序"
 "是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
-#: scripts/repo-add.sh.in:143
+#: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
 msgstr "没有软件包 '%s' 的数据库条目。"
 
-#: scripts/repo-add.sh.in:161
+#: scripts/repo-add.sh.in:164
 msgid "Adding 'deltas' entry : %s -> %s"
 msgstr "正在添加 'deltas' 增量包条目：%s -> %s"
 
-#: scripts/repo-add.sh.in:184 scripts/repo-add.sh.in:429
+#: scripts/repo-add.sh.in:192 scripts/repo-add.sh.in:479
 msgid "Removing existing entry '%s'..."
 msgstr "正在删除现有的条目 '%s'..."
 
-#: scripts/repo-add.sh.in:187
-msgid "Removing empty deltas file ..."
-msgstr "正在删除空增量包文件......"
+#: scripts/repo-add.sh.in:195
+#, fuzzy
+msgid "Removing empty deltas file..."
+msgstr "正在删除空增量包文件..."
 
-#: scripts/repo-add.sh.in:198
+#: scripts/repo-add.sh.in:216
 msgid "Cannot find the gpg binary! Is GnuPG installed?"
 msgstr "无法找到 gpg 运行文件！已安装 GnuPG了吗？"
 
-#: scripts/repo-add.sh.in:208
-msgid "Signing database..."
+#: scripts/repo-add.sh.in:261
+#, fuzzy
+msgid "Signing database '%s'..."
 msgstr "正在签名数据库..."
 
-#: scripts/repo-add.sh.in:217
+#: scripts/repo-add.sh.in:270
 msgid "Created signature file '%s'"
 msgstr "已创建签名文件 '%s'"
 
-#: scripts/repo-add.sh.in:219
-msgid "Failed to sign package database."
+#: scripts/repo-add.sh.in:272
+#, fuzzy
+msgid "Failed to sign package database file '%s'"
 msgstr "无法签名软件包数据库。"
 
-#: scripts/repo-add.sh.in:228
+#: scripts/repo-add.sh.in:281
 msgid "Verifying database signature..."
 msgstr "正在验证数据库签名..."
 
-#: scripts/repo-add.sh.in:231
+#: scripts/repo-add.sh.in:284
 msgid "No existing signature found, skipping verification."
 msgstr "未发现已有签名，正在跳过验证。"
 
-#: scripts/repo-add.sh.in:236
+#: scripts/repo-add.sh.in:289
 msgid "Database signature file verified."
 msgstr "数据库签名文件已验证。"
 
-#: scripts/repo-add.sh.in:238
+#: scripts/repo-add.sh.in:291
 msgid "Database signature was NOT valid!"
 msgstr "数据库签名无效！"
 
-#: scripts/repo-add.sh.in:252
-msgid "'%s' does not have a valid archive extension."
+#: scripts/repo-add.sh.in:305
+#, fuzzy
+msgid "'%s' does not have a valid database archive extension."
 msgstr "'%s' 未包含有效的压缩包扩展名。"
 
-#: scripts/repo-add.sh.in:298
+#: scripts/repo-add.sh.in:351
 msgid "An entry for '%s' already existed"
 msgstr "已存在条目 '%s'"
 
-#: scripts/repo-add.sh.in:315
-msgid "Removing existing package '%s'"
-msgstr "正在删除现有的软件 '%s'"
+#: scripts/repo-add.sh.in:368
+msgid "Cannot use armored signatures for packages: %s"
+msgstr ""
 
-#: scripts/repo-add.sh.in:325
+#: scripts/repo-add.sh.in:373
 msgid "Invalid package signature file '%s'."
 msgstr "无效的软件包签名文件 '%s'。"
 
-#: scripts/repo-add.sh.in:328
+#: scripts/repo-add.sh.in:376
 msgid "Adding package signature..."
 msgstr "正在添加软件包签名..."
 
-#: scripts/repo-add.sh.in:335
+#: scripts/repo-add.sh.in:383
 msgid "Computing checksums..."
 msgstr "正在计算校验值..."
 
-#: scripts/repo-add.sh.in:353 scripts/repo-add.sh.in:380
-#: scripts/repo-add.sh.in:395
+#: scripts/repo-add.sh.in:401 scripts/repo-add.sh.in:455
 msgid "Creating '%s' db entry..."
 msgstr "正在创建 '%s' 数据库条目..."
 
-#: scripts/repo-add.sh.in:410
+#: scripts/repo-add.sh.in:446
 msgid "Old package file not found: %s"
 msgstr "没有找到旧的软件包：%s"
 
-#: scripts/repo-add.sh.in:467
+#: scripts/repo-add.sh.in:461
+#, fuzzy
+msgid "Removing old package file '%s'"
+msgstr "无效的软件包文件 '%s'。"
+
+#: scripts/repo-add.sh.in:522
 msgid "Failed to acquire lockfile: %s."
 msgstr "无法要求锁定文件：%s。"
 
-#: scripts/repo-add.sh.in:468
+#: scripts/repo-add.sh.in:523
 msgid "Held by process %s"
 msgstr "被过程 %s 保留"
 
-#: scripts/repo-add.sh.in:478
+#: scripts/repo-add.sh.in:536
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "库文件 '%s' 不是一个有效的 pacman 数据库。"
 
-#: scripts/repo-add.sh.in:483
+#: scripts/repo-add.sh.in:541
 msgid "Extracting database to a temporary location..."
 msgstr "正在解压缩数据库到一个临时目录..."
 
-#: scripts/repo-add.sh.in:488
+#: scripts/repo-add.sh.in:549
 msgid "Repository file '%s' was not found."
 msgstr "软件库文件 '%s' 未找到"
 
-#: scripts/repo-add.sh.in:494
+#: scripts/repo-add.sh.in:556
 msgid "Repository file '%s' could not be created."
 msgstr "库文件 %s 无法创建。"
 
-#: scripts/repo-add.sh.in:505
+#: scripts/repo-add.sh.in:568
 msgid "File '%s' not found."
 msgstr "文件 '%s' 未找到。"
 
-#: scripts/repo-add.sh.in:511
+#: scripts/repo-add.sh.in:574
 msgid "Adding delta '%s'"
 msgstr "正在添加增量包 '%s'"
 
-#: scripts/repo-add.sh.in:525
+#: scripts/repo-add.sh.in:584
 msgid "'%s' is not a package file, skipping"
 msgstr "'%s' 不是一个软件包文件，跳过"
 
-#: scripts/repo-add.sh.in:529
+#: scripts/repo-add.sh.in:588
 msgid "Adding package '%s'"
 msgstr "正在添加软件包 '%s'"
 
-#: scripts/repo-add.sh.in:537
+#: scripts/repo-add.sh.in:596
 msgid "Searching for delta '%s'..."
 msgstr "正在搜索增量包 '%s'..."
 
-#: scripts/repo-add.sh.in:541
+#: scripts/repo-add.sh.in:600
 msgid "Delta matching '%s' not found."
 msgstr "未找到符合 '%s' 的增量包。"
 
-#: scripts/repo-add.sh.in:547
+#: scripts/repo-add.sh.in:606
 msgid "Searching for package '%s'..."
 msgstr "正在搜索软件包 '%s'..."
 
-#: scripts/repo-add.sh.in:553
+#: scripts/repo-add.sh.in:612
 msgid "Package matching '%s' not found."
 msgstr "未找到符合 '%s' 的软件包。"
 
-#: scripts/repo-add.sh.in:601
+#: scripts/repo-add.sh.in:676
+msgid "No packages remain, creating empty database."
+msgstr "没有包含软件包，正在创建空数据库。"
+
+#: scripts/repo-add.sh.in:729
 msgid "Invalid command name '%s' specified."
 msgstr "指定了无效的命令名 '%s'"
 
-#: scripts/repo-add.sh.in:606
+#: scripts/repo-add.sh.in:734
 msgid "Cannot create temp directory for database building."
 msgstr "无法为建立数据库而创建临时目录。"
 
-#: scripts/repo-add.sh.in:686
+#: scripts/repo-add.sh.in:812
 msgid "Creating updated database file '%s'"
 msgstr "正在生成更新的数据库文件 '%s'"
 
-#: scripts/repo-add.sh.in:700
-msgid "No packages remain, creating empty database."
-msgstr "没有包含软件包，正在创建空数据库。"
-
-#: scripts/repo-add.sh.in:737
+#: scripts/repo-add.sh.in:816
 msgid "No packages modified, nothing to do."
 msgstr "没有软件包被修改，无事可做。"
 
+#: scripts/libmakepkg/lint_package.sh.in:41
+#, fuzzy
+msgid "Checking for packaging issue..."
+msgstr "正在搜索软件包 '%s'..."
+
+#: scripts/libmakepkg/lint_package/build_references.sh.in:33
+#: scripts/libmakepkg/lint_package/build_references.sh.in:36
+msgid "Package contains reference to %s"
+msgstr "软件包含有对 %s 的引用"
+
+#: scripts/libmakepkg/lint_package/missing_backup.sh.in:35
+msgid "%s entry file not in package : %s"
+msgstr "%s 条目文件不在软件包内： %s"
+
+#: scripts/libmakepkg/lint_pkgbuild/arch.sh.in:42
+#: scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in:44
+#: scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in:50
+msgid "%s contains invalid characters: '%s'"
+msgstr "%s 包含无效字符： '%s'"
+
+#: scripts/libmakepkg/lint_pkgbuild/arch.sh.in:49
+#: scripts/libmakepkg/lint_pkgbuild/arch.sh.in:57
+msgid "%s is not available for the '%s' architecture."
+msgstr "%s 不具备 '%s' 架构。"
+
+#: scripts/libmakepkg/lint_pkgbuild/backup.sh.in:45
+msgid "%s entry should not contain leading slash : %s"
+msgstr "%s 条目不应当包含前斜杠：%s"
+
+#: scripts/libmakepkg/lint_pkgbuild/epoch.sh.in:34
+msgid "%s must be an integer, not %s."
+msgstr "%s 必须是整数，不是%s。"
+
+#: scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in:58
+msgid "Invalid syntax for %s: '%s'"
+msgstr "%s 的语法无效：'%s'"
+
+#: scripts/libmakepkg/lint_pkgbuild/options.sh.in:52
+msgid "%s array contains unknown option '%s'"
+msgstr "%s 陈列包含未知的选项 '%s'"
+
+#: scripts/libmakepkg/lint_pkgbuild/package_function.sh.in:38
+msgid "Missing %s function in %s"
+msgstr "缺少函数 %s 于 %s 中"
+
+#: scripts/libmakepkg/lint_pkgbuild/package_function.sh.in:44
+msgid "Missing %s function for split package '%s'"
+msgstr "缺失 %s 功能以分割软件包 '%s'"
+
+#: scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in:36
+#: scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in:42
+msgid "%s is not allowed to start with a hyphen."
+msgstr "%s 不允许以连字号开始。"
+
+#: scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in:40
+#: scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in:46
+msgid "%s is not allowed to start with a dot."
+msgstr "%s 不允许以点号开始。"
+
+#: scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in:38
+msgid "Requested package %s is not provided in %s"
+msgstr "要求的软件包 %s 在 %s 中不提供"
+
+#: scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in:37
+#: scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in:34
+#: scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in:34
+msgid "%s is not allowed to be empty."
+msgstr "%s 不允许为空。"
+
+#: scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in:39
+msgid "%s must be a decimal, not %s."
+msgstr "%s 必须是十进制，不是 %s。"
+
+#: scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in:39
+msgid "%s is not allowed to contain colons, hyphens or whitespace."
+msgstr "%s 不允许包含冒号，连字号及空格。"
+
+#: scripts/libmakepkg/lint_pkgbuild/provides.sh.in:56
+msgid "%s array cannot contain comparison (< or >) operators."
+msgstr "%s 阵列不能包含比较 (< 或 >) 操作符。"
+
+#: scripts/libmakepkg/lint_pkgbuild/source.sh.in:36
+msgid "Sparse arrays are not allowed for source"
+msgstr "源里不允许使用稀疏数组"
+
+#: scripts/libmakepkg/lint_pkgbuild/util.sh.in:34
+msgid "%s file (%s) does not exist or is not a regular file."
+msgstr "文件 %s (%s) 不存在，或者不是一个常规文件。"
+
+#: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:47
+#: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:82
+msgid "%s should be an array"
+msgstr ""
+
+#: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:61
+#: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:92
+msgid "%s_%s should be an array"
+msgstr ""
+
+#: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:72
+#: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:100
+#, fuzzy
+msgid "%s should not be an array"
+msgstr "%s 无法导入。"
+
+#: scripts/libmakepkg/source.sh.in:40
+msgid "Retrieving sources..."
+msgstr "获取源代码..."
+
+#: scripts/libmakepkg/source.sh.in:88
+msgid "Extracting sources..."
+msgstr "正在释放源码..."
+
+#: scripts/libmakepkg/source/bzr.sh.in:47
+#, fuzzy
+msgid "Branching %s..."
+msgstr "正在取出 %s..."
+
+#: scripts/libmakepkg/source/bzr.sh.in:49
+msgid "Failure while branching %s"
+msgstr "获取 %s 的最新版本失败"
+
+#: scripts/libmakepkg/source/bzr.sh.in:54
+#, fuzzy
+msgid "Pulling %s..."
+msgstr "正在获取 %s 的最新版本..."
+
+#: scripts/libmakepkg/source/bzr.sh.in:58
+msgid "Failure while pulling %s"
+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
+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/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
+msgid "Failure while updating working copy of %s %s repo"
+msgstr "升级 %s %s 仓库的活动拷贝失败"
+
+#: scripts/libmakepkg/source/bzr.sh.in:100
+#: scripts/libmakepkg/source/git.sh.in:95
+#: scripts/libmakepkg/source/git.sh.in:120
+#: scripts/libmakepkg/source/hg.sh.in:98
+msgid "Failure while creating working copy of %s %s repo"
+msgstr "建立 %s %s 仓库的拷贝失败"
+
+#: scripts/libmakepkg/source/file.sh.in:36
+#: scripts/libmakepkg/source/local.sh.in:36
+msgid "Found %s"
+msgstr "找到 %s"
+
+#: scripts/libmakepkg/source/file.sh.in:55
+msgid "Downloading %s..."
+msgstr "正在下载 %s..."
+
+#: scripts/libmakepkg/source/file.sh.in:74
+msgid "Failure while downloading %s"
+msgstr "无法下载 %s"
+
+#: scripts/libmakepkg/source/file.sh.in:130
+msgid "Extracting %s with %s"
+msgstr "正在解压缩 %s，使用 %s"
+
+#: scripts/libmakepkg/source/file.sh.in:138
+msgid "Failed to extract %s"
+msgstr "无法解压缩 %s"
+
+#: 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/svn.sh.in:67
+msgid "Failure while downloading %s %s repo"
+msgstr "下载 %s %s 仓库失败"
+
+#: scripts/libmakepkg/source/git.sh.in:54
+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/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/svn.sh.in:76
+msgid "Failure while updating %s %s repo"
+msgstr "升级 %s %s 仓库失败"
+
+#: scripts/libmakepkg/source/local.sh.in:39
+msgid "%s was not found in the build directory and is not a URL."
+msgstr "%s 没有在创建目录中找到，也不是一个 URL。"
+
+#: scripts/libmakepkg/tidy.sh.in:41
+msgid "Tidying install..."
+msgstr "正在清理安装..."
+
+#: scripts/libmakepkg/tidy/docs.sh.in:34
+msgid "Removing doc files..."
+msgstr "正在删除 doc 文件..."
+
+#: scripts/libmakepkg/tidy/emptydirs.sh.in:35
+msgid "Removing empty directories..."
+msgstr "正在删除空目录..."
+
+#: scripts/libmakepkg/tidy/libtool.sh.in:35
+msgid "Removing %s files..."
+msgstr "正在删除 %s 文件..."
+
+#: scripts/libmakepkg/tidy/optipng.sh.in:35
+msgid "Optimizing PNG images..."
+msgstr ""
+
+#: scripts/libmakepkg/tidy/optipng.sh.in:40
+#, fuzzy
+msgid "Could not optimize PNG image : %s"
+msgstr "无法压缩二进制文件：%s"
+
+#: scripts/libmakepkg/tidy/purge.sh.in:35
+msgid "Purging unwanted files..."
+msgstr "正在清除不打算要的文件..."
+
+#: scripts/libmakepkg/tidy/staticlibs.sh.in:35
+msgid "Removing static library files..."
+msgstr "正在移除静态库文件..."
+
+#: scripts/libmakepkg/tidy/strip.sh.in:85
+msgid "Stripping unneeded symbols from binaries and libraries..."
+msgstr "正在从二进制文件和库中清除不需要的系统符号..."
+
+#: scripts/libmakepkg/tidy/upx.sh.in:35
+msgid "Compressing binaries with %s..."
+msgstr "正在使用 %s 压缩二进制文件..."
+
+#: scripts/libmakepkg/tidy/upx.sh.in:41
+msgid "Could not compress binary : %s"
+msgstr "无法压缩二进制文件：%s"
+
+#: scripts/libmakepkg/tidy/zipman.sh.in:35
+msgid "Compressing man and info pages..."
+msgstr "正在压缩 man 及 info 文档..."
+
+#: scripts/libmakepkg/util/message.sh:68 scripts/library/output_format.sh:31
+msgid "ERROR:"
+msgstr "错误："
+
+#: scripts/libmakepkg/util/source.sh.in:138
+msgid "The download program %s is not installed."
+msgstr "下载程序 %s 没有安装。"
+
 #: scripts/library/parseopts.sh:37
 msgid "option '%s' is ambiguous; possibilities:"
-msgstr "'%s'选项有歧义；可能为："
+msgstr "'%s' 选项有歧义；可能为："
 
 #: scripts/library/parseopts.sh:56 scripts/library/parseopts.sh:119
 msgid "invalid option"
@@ -1787,12 +1855,30 @@ msgstr "无效选项"
 
 #: scripts/library/parseopts.sh:75
 msgid "option requires an argument"
-msgstr "选项要求接一个参数"
+msgstr "选项要求带一个参数"
 
 #: scripts/library/parseopts.sh:89
 msgid "option '%s' does not allow an argument"
-msgstr "选项'%s'不能带参数"
+msgstr "选项 '%s' 不能带参数"
 
 #: scripts/library/parseopts.sh:107
 msgid "option '%s' requires an argument"
-msgstr "选项 %s 要求接一个参数"
+msgstr "选项 '%s' 要求带一个参数"
+
+#~ msgid "Failed to change to directory %s"
+#~ msgstr "无法切换到目录 %s"
+
+#~ msgid "Note that many packages may need a line added to their %s"
+#~ msgstr "注意许多软件包可能需要在 %s 中添加"
+
+#~ msgid "such as %s."
+#~ msgstr "诸如 %s。"
+
+#~ msgid "  --pkg <list>     Only build listed packages from a split package"
+#~ msgstr "  --pkg <清单>     仅从分割软件包中创建清单中所列的软件包"
+
+#~ msgid "  -f, --files       update database's file list\\n"
+#~ msgstr "  -f, --files       更新数据库的文件列表\\n"
+
+#~ msgid "Removing existing package '%s'"
+#~ msgstr "正在删除现有的软件 '%s'"