From 5d2e48d17f5a6268c8d290320da85da8dca19b85 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Mon, 7 Oct 2019 18:12:24 +1000
Subject: Pull and push translation changes in preparation for 5.2

Signed-off-by: Allan McRae <allan@archlinux.org>
---
 scripts/po/zh_CN.po | 495 ++++++++++++++++++----------------------------------
 1 file changed, 169 insertions(+), 326 deletions(-)

(limited to 'scripts/po/zh_CN.po')

diff --git a/scripts/po/zh_CN.po b/scripts/po/zh_CN.po
index 49d5190b..b224758a 100644
--- a/scripts/po/zh_CN.po
+++ b/scripts/po/zh_CN.po
@@ -14,15 +14,15 @@
 # leonfeng <chaofeng111@qq.com>, 2011
 # Yangtse Su <yangtsesu@gmail.com>, 2012-2013
 # ykelvis <ykelvis@users.noreply.github.com>, 2014
-# 张海, 2015
 # 张海, 2015,2018
+# 张海, 2015,2018-2019
 # 甘 露 <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: 2019-08-12 11:37+1000\n"
-"PO-Revision-Date: 2019-01-12 07:23+0000\n"
+"POT-Creation-Date: 2019-10-07 18:09+1000\n"
+"PO-Revision-Date: 2019-08-12 06:38+0000\n"
 "Last-Translator: Alimspender Dong <akillcool@outlook.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-"
 "pacman/language/zh_CN/)\n"
@@ -32,42 +32,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: scripts/makepkg.sh.in:136
+#: scripts/makepkg.sh.in:140
 msgid "Cleaning up..."
 msgstr "清理中..."
 
-#: scripts/makepkg.sh.in:176
+#: scripts/makepkg.sh.in:184
 msgid "Entering %s environment..."
 msgstr "正在进入 %s 环境..."
 
-#: scripts/makepkg.sh.in:183 scripts/makepkg.sh.in:402
+#: scripts/makepkg.sh.in:191 scripts/makepkg.sh.in:407
 msgid "Starting %s()..."
 msgstr "正在开始 %s()..."
 
-#: scripts/makepkg.sh.in:189
+#: scripts/makepkg.sh.in:197
 msgid "pkgver() generated an invalid version: %s"
 msgstr "pkgver() 生成了无效的版本：%s"
 
-#: scripts/makepkg.sh.in:196
+#: scripts/makepkg.sh.in:204
 msgid "Failed to update %s from %s to %s"
 msgstr "从 %s 升级到 %s 失败"
 
-#: scripts/makepkg.sh.in:203
+#: scripts/makepkg.sh.in:211
 msgid "Updated version: %s"
 msgstr "已升级版本：%s"
 
-#: scripts/makepkg.sh.in:205
+#: scripts/makepkg.sh.in:213
 msgid "%s is not writeable -- pkgver will not be updated"
 msgstr "%s 不可写 -- 包版本将不升级"
 
-#: scripts/makepkg.sh.in:213
+#: scripts/makepkg.sh.in:221
 msgid "Unable to find source file %s."
 msgstr "无法找到源文件 %s。"
 
-#: scripts/makepkg.sh.in:214 scripts/makepkg.sh.in:352
-#: scripts/makepkg.sh.in:670 scripts/makepkg.sh.in:1136
-#: scripts/makepkg.sh.in:1141 scripts/makepkg.sh.in:1146
-#: scripts/makepkg.sh.in:1152 scripts/makepkg.sh.in:1162
+#: scripts/makepkg.sh.in:222 scripts/makepkg.sh.in:357
+#: scripts/makepkg.sh.in:675 scripts/makepkg.sh.in:1144
+#: scripts/makepkg.sh.in:1149 scripts/makepkg.sh.in:1154
+#: scripts/makepkg.sh.in:1160 scripts/makepkg.sh.in:1170
 #: scripts/libmakepkg/source/bzr.sh.in:55
 #: scripts/libmakepkg/source/bzr.sh.in:86
 #: scripts/libmakepkg/source/bzr.sh.in:101
@@ -92,419 +92,417 @@ msgstr "无法找到源文件 %s。"
 msgid "Aborting..."
 msgstr "正在放弃..."
 
-#: scripts/makepkg.sh.in:232
+#: scripts/makepkg.sh.in:240
 msgid "Pacman is currently in use, please wait..."
-msgstr ""
+msgstr "Pacman 正在被使用，请稍候…"
 
-#: scripts/makepkg.sh.in:253
+#: scripts/makepkg.sh.in:261
 msgid "'%s' returned a fatal error (%i): %s"
 msgstr "'%s' 返回一个致命错误 (%i)：%s"
 
-#: scripts/makepkg.sh.in:272
+#: scripts/makepkg.sh.in:280
 msgid "Installing missing dependencies..."
 msgstr "正在安装缺少的依赖关系..."
 
-#: scripts/makepkg.sh.in:275
+#: scripts/makepkg.sh.in:283
 msgid "'%s' failed to install missing dependencies."
 msgstr "'%s' 无法安装缺少的依赖关系。"
 
-#: scripts/makepkg.sh.in:310
+#: scripts/makepkg.sh.in:318
 msgid "Missing dependencies:"
 msgstr "缺少依赖关系："
 
-#: scripts/makepkg.sh.in:326 scripts/makepkg.sh.in:340
+#: scripts/makepkg.sh.in:334 scripts/makepkg.sh.in:348
 msgid "Failed to remove installed dependencies."
 msgstr "无法删除已安装的依赖关系。"
 
-#: scripts/makepkg.sh.in:351
+#: scripts/makepkg.sh.in:356
 msgid "A failure occurred in %s()."
 msgstr "在 %s() 中发生一个错误。"
 
-#: scripts/makepkg.sh.in:504
+#: scripts/makepkg.sh.in:509
 msgid "Library listed in %s is not required by any files: %s"
 msgstr "%s 列出的库不被任何文件要求：%s"
 
-#: scripts/makepkg.sh.in:533
+#: scripts/makepkg.sh.in:538
 msgid "Library listed in %s is not versioned: %s"
 msgstr "%s 列出的库没有版本：%s"
 
-#: scripts/makepkg.sh.in:546
+#: scripts/makepkg.sh.in:551
 msgid "Library listed in %s is not a shared object: %s"
 msgstr "%s 列出的库不是共享对象：%s"
 
-#: scripts/makepkg.sh.in:561
+#: scripts/makepkg.sh.in:566
 msgid "Cannot find library listed in %s: %s"
 msgstr "无法找到列在 %s 中的库： %s"
 
-#: scripts/makepkg.sh.in:574
+#: scripts/makepkg.sh.in:579
 msgid "Invalid value for %s: %s"
 msgstr "用于 %s 的值无效：%s"
 
-#: scripts/makepkg.sh.in:669
+#: scripts/makepkg.sh.in:674
 msgid "Missing %s directory."
 msgstr "缺失 %s 目录。"
 
-#: scripts/makepkg.sh.in:675
+#: scripts/makepkg.sh.in:680
 msgid "Creating package \"%s\"..."
 msgstr "正在创建软件包\"%s\"..."
 
-#: scripts/makepkg.sh.in:678 scripts/makepkg.sh.in:680
-#: scripts/makepkg.sh.in:765
+#: scripts/makepkg.sh.in:683 scripts/makepkg.sh.in:685
+#: scripts/makepkg.sh.in:770
 msgid "Generating %s file..."
 msgstr "正在生成 %s 文件..."
 
-#: scripts/makepkg.sh.in:688
+#: scripts/makepkg.sh.in:693
 msgid "Adding %s file..."
 msgstr "正在添加 %s 文件..."
 
-#: scripts/makepkg.sh.in:690
+#: scripts/makepkg.sh.in:695
 msgid "Failed to add %s file to package."
 msgstr "无法添加文件 %s 到软件包。"
 
-#: scripts/makepkg.sh.in:708
+#: scripts/makepkg.sh.in:713
 msgid "Generating .MTREE file..."
 msgstr "正在生成 .MTREE 文件..."
 
-#: scripts/makepkg.sh.in:714
+#: scripts/makepkg.sh.in:719
 msgid "Compressing package..."
 msgstr "正在压缩软件包..."
 
-#: scripts/makepkg.sh.in:723
+#: scripts/makepkg.sh.in:728
 msgid "Failed to create package file."
 msgstr "创建软件包文件失败。"
 
-#: scripts/makepkg.sh.in:758
+#: scripts/makepkg.sh.in:763
 msgid "Creating source package..."
 msgstr "正在创建源码包..."
 
-#: scripts/makepkg.sh.in:762 scripts/makepkg.sh.in:775
+#: scripts/makepkg.sh.in:767 scripts/makepkg.sh.in:780
 msgid "Adding %s..."
 msgstr "正在添加 %s..."
 
-#: scripts/makepkg.sh.in:793
+#: scripts/makepkg.sh.in:798
 msgid "Adding %s file (%s)..."
 msgstr "正在添加 %s 文件 (%s) ..."
 
-#: scripts/makepkg.sh.in:803
+#: scripts/makepkg.sh.in:808
 msgid "Compressing source package..."
 msgstr "正在压缩源码包..."
 
-#: scripts/makepkg.sh.in:813
+#: scripts/makepkg.sh.in:818
 msgid "Failed to create source package file."
 msgstr "创建源码包文件失败。"
 
-#: scripts/makepkg.sh.in:825
+#: scripts/makepkg.sh.in:833
 msgid "Installing package %s with %s..."
 msgstr "正在安装软件包 %s，使用 %s..."
 
-#: scripts/makepkg.sh.in:827
+#: scripts/makepkg.sh.in:835
 msgid "Installing %s package group with %s..."
 msgstr "正在安装 %s 软件包组，使用 %s..."
 
-#: scripts/makepkg.sh.in:845
+#: scripts/makepkg.sh.in:853
 msgid "Failed to install built package(s)."
 msgstr "安装创建的软件包失败。"
 
-#: scripts/makepkg.sh.in:857
+#: scripts/makepkg.sh.in:865
 msgid "A package has already been built, installing existing package..."
 msgstr "已有一个编译好的软件包，正在安装现有的软件包..."
 
-#: scripts/makepkg.sh.in:861
+#: scripts/makepkg.sh.in:869
 msgid "A package has already been built. (use %s to overwrite)"
 msgstr "软件包已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:880
+#: scripts/makepkg.sh.in:888
 msgid ""
 "The package group has already been built, installing existing packages..."
 msgstr "已有一个编译好的软件包组，正在安装现有的软件包..."
 
-#: scripts/makepkg.sh.in:884
+#: scripts/makepkg.sh.in:892
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "该软件包组已创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:889
+#: scripts/makepkg.sh.in:897
 msgid "Part of the package group has already been built. (use %s to overwrite)"
 msgstr "软件包组的一部分已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:941
+#: scripts/makepkg.sh.in:949
 msgid "Make packages compatible for use with pacman"
 msgstr "让软件包兼容于 pacman 的用法"
 
-#: scripts/makepkg.sh.in:943 scripts/pacman-db-upgrade.sh.in:42
+#: scripts/makepkg.sh.in:951 scripts/pacman-db-upgrade.sh.in:42
 msgid "Usage: %s [options]"
 msgstr "用法：%s [选项]"
 
-#: scripts/makepkg.sh.in:945 scripts/pacman-key.sh.in:81
+#: scripts/makepkg.sh.in:953 scripts/pacman-key.sh.in:81
 msgid "Options:"
 msgstr "选项："
 
-#: scripts/makepkg.sh.in:946
+#: scripts/makepkg.sh.in:954
 msgid "  -A, --ignorearch Ignore incomplete %s field in %s"
 msgstr "  -A, --ignorearch 忽略不完整的 %s 字段 (位于 %s 中)"
 
-#: scripts/makepkg.sh.in:947
+#: scripts/makepkg.sh.in:955
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      编译后清理工作文件"
 
-#: scripts/makepkg.sh.in:948
+#: scripts/makepkg.sh.in:956
 msgid "  -C, --cleanbuild Remove %s dir before building the package"
 msgstr "  -C, --cleanbuild 在编译软件包之前删除 %s 文件夹"
 
-#: scripts/makepkg.sh.in:949
+#: scripts/makepkg.sh.in:957
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr " -d, --nodeps     跳过所有依赖关系检查"
 
-#: scripts/makepkg.sh.in:950
+#: scripts/makepkg.sh.in:958
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
 msgstr "  -e, --noextract  不解压源文件 (使用现存的 %s 目录)"
 
-#: scripts/makepkg.sh.in:951
+#: scripts/makepkg.sh.in:959
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      覆盖现存的软件包"
 
-#: scripts/makepkg.sh.in:952
+#: scripts/makepkg.sh.in:960
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   为源码文件生成完整性检查值"
 
-#: scripts/makepkg.sh.in:953
+#: scripts/makepkg.sh.in:961
 msgid "  -h, --help       Show this help message and exit"
 msgstr "  -h, --help       显示本帮助信息并退出"
 
-#: scripts/makepkg.sh.in:954
+#: scripts/makepkg.sh.in:962
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    成功编译后安装软件包"
 
-#: scripts/makepkg.sh.in:955
+#: scripts/makepkg.sh.in:963
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        记录软件包编译过程"
 
-#: scripts/makepkg.sh.in:956
+#: scripts/makepkg.sh.in:964
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    禁止彩色输出信息"
 
-#: scripts/makepkg.sh.in:957
+#: scripts/makepkg.sh.in:965
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    仅下载和解压缩文件"
 
-#: scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:966
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
 msgstr "  -p <文件> 使用另外的编译脚本 (而不是 '%s' ) "
 
-#: scripts/makepkg.sh.in:959
+#: scripts/makepkg.sh.in:967
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr "  -r, --rmdeps     编译成功后删除安装的依赖关系"
 
-#: scripts/makepkg.sh.in:960
+#: scripts/makepkg.sh.in:968
 msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  不编译而重新打包软件包内容"
 
-#: scripts/makepkg.sh.in:961
+#: scripts/makepkg.sh.in:969
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   使用 %s 安装缺失的依赖关系"
 
-#: scripts/makepkg.sh.in:962
+#: scripts/makepkg.sh.in:970
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr "  -S, --source     不下载源文件只生成仅包含源的包"
 
-#: scripts/makepkg.sh.in:963
+#: scripts/makepkg.sh.in:971
 msgid "  -V, --version    Show version information and exit"
 msgstr "  -V, --version             显示版本信息并退出"
 
-#: scripts/makepkg.sh.in:964
+#: scripts/makepkg.sh.in:972
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr "  --allsource      只生成源码包 (包括有已下载的源码)"
 
-#: scripts/makepkg.sh.in:965
+#: scripts/makepkg.sh.in:973
 msgid "  --check          Run the %s function in the %s"
 msgstr "  --check          运行 %s 函数 (包含于 %s 中)"
 
-#: scripts/makepkg.sh.in:966
+#: scripts/makepkg.sh.in:974
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr "  --config <文件> 使用另外的配置文件 (而不是 '%s')"
 
-#: scripts/makepkg.sh.in:967
+#: scripts/makepkg.sh.in:975
 msgid "  --holdver        Do not update VCS sources"
 msgstr "  --holdver        不升级版本控制系统源"
 
-#: scripts/makepkg.sh.in:968
+#: scripts/makepkg.sh.in:976
 msgid ""
 "  --key <key>      Specify a key to use for %s signing instead of the default"
 msgstr "--key <密匙>      指定签名 %s 使用的密匙而不用默认密匙"
 
-#: scripts/makepkg.sh.in:969
+#: scripts/makepkg.sh.in:977
 msgid "  --noarchive      Do not create package archive"
 msgstr "--noarchive 不生成软件包归档"
 
-#: scripts/makepkg.sh.in:970
+#: scripts/makepkg.sh.in:978
 msgid "  --nocheck        Do not run the %s function in the %s"
 msgstr "  --nocheck        不执行 %s 函数在 %s 中"
 
-#: scripts/makepkg.sh.in:971
+#: scripts/makepkg.sh.in:979
 msgid "  --noprepare      Do not run the %s function in the %s"
 msgstr "--noprepare 不执行 %s 函数在 %s 中"
 
-#: scripts/makepkg.sh.in:972
+#: scripts/makepkg.sh.in:980
 msgid "  --nosign         Do not create a signature for the package"
 msgstr "  --nosign         不为该软件包创建签名"
 
-#: scripts/makepkg.sh.in:973
+#: scripts/makepkg.sh.in:981
 msgid "  --packagelist    Only list package filepaths that would be produced"
 msgstr "  --packagelist    仅列出将会产生的软件包文件路径"
 
-#: scripts/makepkg.sh.in:974
+#: scripts/makepkg.sh.in:982
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
 msgstr "--printsrcinfo 打印出生成的SRCINFO并退出"
 
-#: scripts/makepkg.sh.in:975
+#: scripts/makepkg.sh.in:983
 msgid "  --sign           Sign the resulting package with %s"
 msgstr "  --sign           使用 %s 签名生成的软件包"
 
-#: scripts/makepkg.sh.in:976
+#: scripts/makepkg.sh.in:984
 msgid "  --skipchecksums  Do not verify checksums of the source files"
 msgstr "  --skipchecksums  不验证源文件的检验值"
 
-#: scripts/makepkg.sh.in:977
+#: scripts/makepkg.sh.in:985
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
 msgstr "  --skipinteg      不对源文件执行任何验证检查"
 
-#: scripts/makepkg.sh.in:978
+#: scripts/makepkg.sh.in:986
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
 msgstr "--skippgpcheck   不验证有 PGP 签名的源文件"
 
-#: scripts/makepkg.sh.in:979
+#: scripts/makepkg.sh.in:987
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
 msgstr " --verifysource 下载源文件(如果需要)并进行完整性检查"
 
-#: scripts/makepkg.sh.in:981
+#: scripts/makepkg.sh.in:989
 msgid "These options can be passed to %s:"
 msgstr "这些选项可以传递给 %s："
 
-#: scripts/makepkg.sh.in:983
+#: scripts/makepkg.sh.in:991
 msgid "  --asdeps         Install packages as non-explicitly installed"
 msgstr "      --asdeps         作为依赖安装"
 
-#: scripts/makepkg.sh.in:984
+#: scripts/makepkg.sh.in:992
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
 msgstr "      --needed         不重装已是最新的目标软件包"
 
-#: scripts/makepkg.sh.in:985
+#: scripts/makepkg.sh.in:993
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr "   --noconfirm      当解决依赖关系时不询问确认"
 
-#: scripts/makepkg.sh.in:986
+#: scripts/makepkg.sh.in:994
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "  --noprogressbar  下载文件时不显示进度条"
 
-#: scripts/makepkg.sh.in:988
+#: scripts/makepkg.sh.in:996
 msgid "If %s is not specified, %s will look for '%s'"
 msgstr "如果没有指定 %s，%s 将寻找 '%s'"
 
-#: scripts/makepkg.sh.in:997 scripts/pacman-db-upgrade.sh.in:58
+#: scripts/makepkg.sh.in:1005 scripts/pacman-db-upgrade.sh.in:58
 #: scripts/pacman-key.sh.in:96 scripts/repo-add.sh.in:101
-#, fuzzy
 msgid ""
 "This 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"
+"本程序是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
-#: scripts/makepkg.sh.in:1098 scripts/repo-add.sh.in:607
+#: scripts/makepkg.sh.in:1106 scripts/repo-add.sh.in:607
 msgid "%s signal caught. Exiting..."
 msgstr "发现 %s 信号。退出中..."
 
-#: scripts/makepkg.sh.in:1168
+#: scripts/makepkg.sh.in:1176
 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:1174
+#: scripts/makepkg.sh.in:1182
 msgid "Do not use the %s option. This option is only for internal use by %s."
 msgstr "不要使用 %s 选项。这个选项只用于 %s 的内部使用。"
 
-#: scripts/makepkg.sh.in:1189
+#: scripts/makepkg.sh.in:1197
 msgid "%s does not exist."
 msgstr "%s 不存在。"
 
-#: scripts/makepkg.sh.in:1194
+#: scripts/makepkg.sh.in:1202
 msgid "%s contains %s characters and cannot be sourced."
 msgstr "%s 包含 %s 字符，无法供源。"
 
-#: scripts/makepkg.sh.in:1199
+#: scripts/makepkg.sh.in:1207
 msgid "%s must be in the current working directory."
 msgstr "%s 必须在当前工作目录。"
 
-#: scripts/makepkg.sh.in:1277
+#: scripts/makepkg.sh.in:1285
 msgid "The key %s does not exist in your keyring."
 msgstr "在您的密匙环中不存在密匙 %s。"
 
-#: scripts/makepkg.sh.in:1279 scripts/repo-add.sh.in:145
+#: scripts/makepkg.sh.in:1287 scripts/repo-add.sh.in:145
 msgid "There is no key in your keyring."
 msgstr "您密匙环中无密匙。"
 
-#: scripts/makepkg.sh.in:1303 scripts/makepkg.sh.in:1318
+#: scripts/makepkg.sh.in:1311 scripts/makepkg.sh.in:1326
 msgid "Leaving %s environment."
 msgstr "正在离开 %s 环境。"
 
-#: scripts/makepkg.sh.in:1322
+#: scripts/makepkg.sh.in:1330
 msgid "Making package: %s"
 msgstr "正在创建软件包：%s"
 
-#: scripts/makepkg.sh.in:1328
+#: scripts/makepkg.sh.in:1336
 msgid "A source package has already been built. (use %s to overwrite)"
 msgstr "源软件包已经创建过。(使用 %s 覆盖)"
 
-#: scripts/makepkg.sh.in:1348
+#: scripts/makepkg.sh.in:1356
 msgid "Signing package..."
 msgstr "正在签名软件包..."
 
-#: scripts/makepkg.sh.in:1352
+#: scripts/makepkg.sh.in:1360
 msgid "Source package created: %s"
 msgstr "源代码包已创建：%s"
 
-#: scripts/makepkg.sh.in:1358
+#: scripts/makepkg.sh.in:1366
 msgid "Skipping dependency checks."
 msgstr "跳过依赖关系检查。"
 
-#: scripts/makepkg.sh.in:1366
+#: scripts/makepkg.sh.in:1374
 msgid "Checking runtime dependencies..."
 msgstr "正在检查运行时依赖关系..."
 
-#: scripts/makepkg.sh.in:1373
+#: scripts/makepkg.sh.in:1381
 msgid "Checking buildtime dependencies..."
 msgstr "正在检查编译时依赖关系"
 
-#: scripts/makepkg.sh.in:1385
+#: scripts/makepkg.sh.in:1393
 msgid "Could not resolve all dependencies."
 msgstr "无法解决所有的依赖关系。"
 
-#: scripts/makepkg.sh.in:1397
+#: scripts/makepkg.sh.in:1405
 msgid "Using existing %s tree"
 msgstr "使用现存的 %s 树"
 
-#: scripts/makepkg.sh.in:1404 scripts/makepkg.sh.in:1432
+#: scripts/makepkg.sh.in:1412 scripts/makepkg.sh.in:1440
 msgid "Removing existing %s directory..."
 msgstr "正在删除现存的 %s 目录..."
 
-#: scripts/makepkg.sh.in:1427
+#: scripts/makepkg.sh.in:1435
 msgid "Sources are ready."
 msgstr "源代码已就绪。"
 
-#: scripts/makepkg.sh.in:1454
+#: scripts/makepkg.sh.in:1462
 msgid "Package directory is ready."
 msgstr "软件包目录已准备好。"
 
-#: scripts/makepkg.sh.in:1458
+#: scripts/makepkg.sh.in:1466
 msgid "Finished making: %s"
 msgstr "完成创建：%s"
 
@@ -787,154 +785,153 @@ msgstr "关键字有歧义："
 msgid "The key identified by %s could not be found locally."
 msgstr "本地没有找到由 %s 认定的密匙。"
 
-#: scripts/pacman-key.sh.in:229
+#: scripts/pacman-key.sh.in:235
 msgid "You do not have sufficient permissions to read the %s keyring."
 msgstr "您没有足够的许可权来读取 %s 密匙环。"
 
-#: scripts/pacman-key.sh.in:230 scripts/pacman-key.sh.in:237
+#: scripts/pacman-key.sh.in:236 scripts/pacman-key.sh.in:243
 msgid "Use '%s' to correct the keyring permissions."
 msgstr "使用 '%s' 更正密匙环许可。"
 
-#: scripts/pacman-key.sh.in:236
+#: scripts/pacman-key.sh.in:242
 msgid "You do not have sufficient permissions to run this command."
 msgstr "您没有足够的许可权来运行该命令。"
 
-#: scripts/pacman-key.sh.in:244
+#: scripts/pacman-key.sh.in:250
 msgid "There is no secret key available to sign with."
 msgstr "没有签名可用的机密密匙。"
 
-#: scripts/pacman-key.sh.in:245
+#: scripts/pacman-key.sh.in:251
 msgid "Use '%s' to generate a default secret key."
 msgstr "使用 '%s' 来生成默认的机密密匙。"
 
-#: scripts/pacman-key.sh.in:264
+#: scripts/pacman-key.sh.in:270
 msgid "No keyring files exist in %s."
 msgstr "在 %s 中没有密匙环文件。"
 
-#: scripts/pacman-key.sh.in:271
+#: scripts/pacman-key.sh.in:277
 msgid "The keyring file %s does not exist."
 msgstr "密匙环文件 %s 不存在。"
 
-#: scripts/pacman-key.sh.in:286
+#: scripts/pacman-key.sh.in:292
 msgid "Appending keys from %s.gpg..."
 msgstr "正在从 %s.gpg 添加密匙..."
 
-#: scripts/pacman-key.sh.in:309
+#: scripts/pacman-key.sh.in:315
 msgid "Locally signing trusted keys in keyring..."
 msgstr "正在本地签名密匙环中的可信密匙..."
 
-#: scripts/pacman-key.sh.in:311
+#: scripts/pacman-key.sh.in:317
 msgid "Importing owner trust values..."
 msgstr "正在导入拥有者信任值..."
 
-#: scripts/pacman-key.sh.in:329
+#: scripts/pacman-key.sh.in:335
 msgid "Disabling revoked keys in keyring..."
 msgstr "正在密匙环中禁用已激活密匙..."
 
-#: scripts/pacman-key.sh.in:331
+#: scripts/pacman-key.sh.in:337
 msgid "Disabling key %s..."
 msgstr "正在禁用密匙 %s..."
 
-#: scripts/pacman-key.sh.in:339
+#: scripts/pacman-key.sh.in:345
 msgid "A specified keyfile could not be added to the keyring."
 msgstr "指定的键文件无法添加到密钥环。"
 
-#: scripts/pacman-key.sh.in:347
+#: scripts/pacman-key.sh.in:353
 msgid "A specified key could not be removed from the keyring."
 msgstr "无法从密钥环删除指定的键。"
 
-#: scripts/pacman-key.sh.in:357
+#: scripts/pacman-key.sh.in:363
 msgid "The key identified by %s could not be edited."
 msgstr "由 %s 认定的密匙不能编辑。"
 
-#: scripts/pacman-key.sh.in:369
+#: scripts/pacman-key.sh.in:375
 msgid "A specified key could not be exported from the keyring."
 msgstr "无法从密钥环导出指定的键。"
 
-#: scripts/pacman-key.sh.in:377
+#: scripts/pacman-key.sh.in:383
 msgid "The fingerprint of a specified key could not be determined."
 msgstr "无法确定指定密匙的指纹。"
 
-#: scripts/pacman-key.sh.in:390 scripts/pacman-key.sh.in:409
+#: scripts/pacman-key.sh.in:396 scripts/pacman-key.sh.in:415
 msgid "%s could not be imported."
 msgstr "%s 无法导入。"
 
-#: scripts/pacman-key.sh.in:394 scripts/pacman-key.sh.in:413
+#: scripts/pacman-key.sh.in:400 scripts/pacman-key.sh.in:419
 msgid "File %s does not exist and could not be imported."
 msgstr "文件 %s 不存在且无法导入。"
 
-#: scripts/pacman-key.sh.in:425
+#: scripts/pacman-key.sh.in:431
 msgid "A specified key could not be listed."
 msgstr "指定密匙无法列出。"
 
-#: scripts/pacman-key.sh.in:433
+#: scripts/pacman-key.sh.in:439
 msgid "A specified signature could not be listed."
 msgstr "指定签名无法列出。"
 
-#: scripts/pacman-key.sh.in:443
+#: scripts/pacman-key.sh.in:449
 msgid "Locally signing key %s..."
 msgstr "正在本地签名密匙 %s..."
 
-#: scripts/pacman-key.sh.in:447
+#: scripts/pacman-key.sh.in:453
 msgid "%s could not be locally signed."
 msgstr "%s无法在本地签署。"
 
-#: scripts/pacman-key.sh.in:474
+#: scripts/pacman-key.sh.in:480
 msgid "Remote key not fetched correctly from keyserver."
 msgstr "无法从密匙服务器中正确取回远端密匙。"
 
-#: scripts/pacman-key.sh.in:482
+#: scripts/pacman-key.sh.in:488
 msgid "A specified local key could not be updated from a keyserver."
 msgstr "指定的本地密匙无法从密匙服务器中更新。"
 
-#: scripts/pacman-key.sh.in:500 scripts/repo-add.sh.in:273
+#: scripts/pacman-key.sh.in:506 scripts/repo-add.sh.in:273
 msgid "Cannot use armored signatures for packages: %s"
 msgstr "无法对这些软件包使用明文签名: %s"
 
-#: scripts/pacman-key.sh.in:504
+#: scripts/pacman-key.sh.in:510
 msgid "The signature identified by %s could not be verified."
 msgstr "由 %s 认定的签名无法验证。"
 
-#: scripts/pacman-key.sh.in:511
+#: scripts/pacman-key.sh.in:517
 msgid "Updating trust database..."
 msgstr "正在更新可信数据库..."
 
-#: scripts/pacman-key.sh.in:513
+#: scripts/pacman-key.sh.in:519
 msgid "Trust database could not be updated."
 msgstr "信任数据库无法更新。"
 
-#: scripts/pacman-key.sh.in:580
+#: scripts/pacman-key.sh.in:586
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr "无法找到所需的 %s 二进制文件以进行所有 %s 操作。"
 
-#: scripts/pacman-key.sh.in:585
+#: scripts/pacman-key.sh.in:591
 msgid "%s needs to be run as root for this operation."
 msgstr "%s 需要以 root 运行来完成此操作。"
 
-#: scripts/pacman-key.sh.in:591
+#: scripts/pacman-key.sh.in:597
 msgid "%s configuration file '%s' not found."
 msgstr "%s 配置文件 '%s' 没有找到"
 
-#: scripts/pacman-key.sh.in:612
+#: scripts/pacman-key.sh.in:618
 msgid "no operation specified (use -h for help)"
 msgstr "没有指定的操作 (使用 -h 获取帮助)"
 
-#: scripts/pacman-key.sh.in:617
+#: scripts/pacman-key.sh.in:623
 msgid "Multiple operations specified."
 msgstr "多个操作已指定。"
 
-#: scripts/pacman-key.sh.in:618
+#: scripts/pacman-key.sh.in:624
 msgid "Please run %s with each operation separately."
 msgstr "请分别加 %s 每个操作运行。"
 
-#: scripts/pacman-key.sh.in:626
+#: scripts/pacman-key.sh.in:632
 msgid "No targets specified"
 msgstr "没有指定目标"
 
 #: scripts/repo-add.sh.in:58
-#, fuzzy
 msgid "Usage: repo-add [options] <path-to-db> <package> ...\\n"
-msgstr "用法：repo-add [选项] <到数据库路径> <软件包|delta增量包> ...\\n"
+msgstr "用法：repo-add [选项]  <path-to-db> <package> ...\\n"
 
 #: scripts/repo-add.sh.in:60
 msgid ""
@@ -964,11 +961,12 @@ msgid ""
 "  -p, --prevent-downgrade  do not add package to database if a newer version "
 "is already present\\n"
 msgstr ""
+"  -p, --prevent-downgrade  阻止降级，如果数据库中已有一个更高的版本的软件包存"
+"在\\n"
 
 #: scripts/repo-add.sh.in:69
-#, fuzzy
 msgid "Usage: repo-remove [options] <path-to-db> <packagename> ...\\n"
-msgstr "用法：repo-remove [选项] <数据库路径> <软件包名|增量包> ...\\n"
+msgstr "用法：repo-remove [选项] <path-to-db> <packagename> ...\\n"
 
 #: scripts/repo-add.sh.in:71
 msgid ""
@@ -1063,9 +1061,8 @@ msgid "An entry for '%s' already existed"
 msgstr "已存在条目 '%s'"
 
 #: scripts/repo-add.sh.in:258
-#, fuzzy
 msgid "A newer version for '%s' is already present in database"
-msgstr "已存在条目 '%s'"
+msgstr "一个 '%s' 的新版本已存在于数据库中"
 
 #: scripts/repo-add.sh.in:278
 msgid "Invalid package signature file '%s'."
@@ -1104,9 +1101,8 @@ msgid "Repository file '%s' is not a proper pacman database."
 msgstr "库文件 '%s' 不是一个有效的 pacman 数据库。"
 
 #: scripts/repo-add.sh.in:427
-#, fuzzy
 msgid "Extracting %s to a temporary location..."
-msgstr "正在解压缩数据库到一个临时目录..."
+msgstr "正在将%s提取到临时位置…"
 
 #: scripts/repo-add.sh.in:435
 msgid "Repository file '%s' was not found."
@@ -1181,9 +1177,8 @@ msgid "Created signature file %s."
 msgstr "已创建签名文件 %s。"
 
 #: scripts/libmakepkg/integrity/generate_signature.sh.in:43
-#, fuzzy
 msgid "Failed to sign package file %s."
-msgstr "无法签名软件包文件。"
+msgstr "签名软件包文件%s失败。"
 
 #: scripts/libmakepkg/integrity/generate_signature.sh.in:58
 msgid "Signing package(s)..."
@@ -1308,6 +1303,10 @@ msgstr "%s 应该是个数组"
 msgid "%s should not be an array"
 msgstr "%s 不应该是个数组"
 
+#: scripts/libmakepkg/lint_config/variable.sh.in:66
+msgid "PACKAGER should have the format 'Example Name <email@address.invalid>'"
+msgstr ""
+
 #: scripts/libmakepkg/lint_package.sh.in:41
 msgid "Checking for packaging issues..."
 msgstr "正在检查打包问题..."
@@ -1330,7 +1329,7 @@ msgstr "%s 条目文件不在软件包内： %s"
 
 #: scripts/libmakepkg/lint_pkgbuild/arch.sh.in:40
 msgid "Can not use '%s' architecture with other architectures"
-msgstr ""
+msgstr "无法将 '%s' 架构和其他架构同时使用"
 
 #: scripts/libmakepkg/lint_pkgbuild/arch.sh.in:54
 #: scripts/libmakepkg/lint_pkgbuild/arch.sh.in:62
@@ -1350,18 +1349,16 @@ msgid "%s array contains unknown option '%s'"
 msgstr "%s 陈列包含未知的选项 '%s'"
 
 #: scripts/libmakepkg/lint_pkgbuild/package_function.sh.in:38
-#, fuzzy
 msgid "Conflicting %s and %s functions in %s"
-msgstr "缺少函数 %s 于 %s 中"
+msgstr "函数 %s 和 %s 冲突于 %s"
 
 #: scripts/libmakepkg/lint_pkgbuild/package_function.sh.in:41
 msgid "Missing %s function in %s"
 msgstr "缺少函数 %s 于 %s 中"
 
 #: scripts/libmakepkg/lint_pkgbuild/package_function.sh.in:46
-#, fuzzy
 msgid "Extra %s function for split package '%s'"
-msgstr "缺失 %s 功能以分割软件包 '%s'"
+msgstr "多余 %s 函数以分割软件包 '%s'"
 
 #: scripts/libmakepkg/lint_pkgbuild/package_function.sh.in:51
 msgid "Missing %s function for split package '%s'"
@@ -1388,14 +1385,12 @@ msgstr "%s 不允许以点号开始。"
 
 #: scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in:49
 #: scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in:46
-#, fuzzy
 msgid "%s may only contain ascii characters."
-msgstr "%s 包含无效字符： '%s'"
+msgstr "%s 只可能包含ascii字符"
 
 #: scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in:40
-#, fuzzy
 msgid "%s must be of the form 'integer[.integer]', not %s."
-msgstr "%s 必须是整数，不是%s。"
+msgstr "%s 必须是'integer[.integer]'格式，不是%s。"
 
 #: scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in:41
 msgid ""
@@ -1600,155 +1595,3 @@ msgstr "你没有目录 $%s 的写权限 (%s)."
 #: scripts/libmakepkg/util/util.sh.in:109
 msgid "Failed to source %s"
 msgstr "载入 %s 失败"
-
-#~ msgid "Cannot find the %s binary needed to check VCS source requirements."
-#~ msgstr "找不到用来检查版本控制系统源所需的 %s 二进制文件。"
-
-#~ msgid "Cannot find the %s package needed to handle %s sources."
-#~ msgstr "找不到 %s 软件包以处理 %s 源。"
-
-#~ msgid "Cannot find the %s binary required for dependency operations."
-#~ msgstr "无法找到依赖操作所需的 %s 二进制文件。"
-
-#~ msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-#~ msgstr "无法找到二进制文件 %s。将使用 %s 获得 root 权限。"
-
-#~ msgid "Cannot find the %s binary."
-#~ msgstr "无法找到 %s 的二进制文件。"
-
-#~ msgid "Cannot find the %s binary required for signing packages."
-#~ msgstr "无法找到签名软件包所需的 %s 二进制文件。"
-
-#~ msgid "Cannot find the %s binary required for verifying source files."
-#~ msgstr "无法找到验证源文件所需的 %s 二进制文件。"
-
-#~ msgid ""
-#~ "Cannot find the %s binary required for source file checksums operations."
-#~ msgstr "无法找到需要用于源文件校验和操作的 %s 二进制文件。"
-
-#~ msgid "Cannot find the %s binary required for distributed compilation."
-#~ msgstr "无法找到分发编译所需的 %s 二进制文件。"
-
-#~ msgid "Cannot find the %s binary required for compiler cache usage."
-#~ msgstr "无法找到编译器缓存使用所需的 %s 二进制文件。"
-
-#~ msgid "Cannot find the %s binary required for object file stripping."
-#~ msgstr "无法找到目标文件分割所需的 %s 二进制文件。"
-
-#~ msgid ""
-#~ "Cannot find the %s binary required for compressing man and info pages."
-#~ msgstr "无法找到压缩帮助及信息页面所需的 %s 二进制文件。"
-
-#~ msgid ""
-#~ "Copyright (c) 2006-2018 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-2018 Pacman 开发小组 <pacman-dev@archlinux.org>."
-#~ "\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n这是自由"
-#~ "软件; 请查看源码以获得版权条款。\\n在法律允许的范围内没有担保。\\n"
-
-#~ msgid "%s not found."
-#~ msgstr "%s 未找到。"
-
-#~ msgid ""
-#~ "Copyright (c) 2010-2018 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-2018 Pacman 开发小组 <pacman-dev@archlinux.org>\\n这是"
-#~ "自由软件; 请查看源码以获得版权条款。\\n在法律允许的范围内没有担保。\\n"
-
-#~ msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
-#~ 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"
-
-#~ 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"
-
-#~ msgid "  --nocolor         remove color from output\\n"
-#~ msgstr " --nocolor 从输出中去除颜色\\n"
-
-#~ msgid ""
-#~ "  --min-pkg-size    minimum package size before deltas are generated\\n"
-#~ msgstr "  --min-pkg-size    生成增量包之前的最小包大小\\n"
-
-#~ msgid ""
-#~ "  --max-delta-size  percent of new package above which the delta will be "
-#~ "discarded\\n"
-#~ msgstr "  --max-delta-size  新包的百分比，超过此百分比增量包将被丢弃\\n"
-
-#~ msgid "Skipping delta creation for small package: %s - size %s"
-#~ msgstr "跳过小软件包的增量文件创建：%s - size %s"
-
-#~ msgid "The package names don't match : '%s' and '%s'"
-#~ msgstr "软件包名称不一致：'%s' 和 '%s'"
-
-#~ msgid "The package architectures don't match : '%s' and '%s'"
-#~ msgstr "软件包架构不一致：'%s' 和 '%s'"
-
-#~ msgid "Both packages have the same version : '%s'"
-#~ msgstr "两个软件包为同一版本：'%s'"
-
-#~ msgid "Generating delta from version %s to version %s"
-#~ msgstr "正在创建从版本 %s 到版本 %s 的增量包"
-
-#~ msgid "Delta could not be created."
-#~ msgstr "无法创建增量软件包。"
-
-#~ msgid "Delta package larger than maximum size. Removing."
-#~ msgstr "增量包大于最大大小，删除。"
-
-#~ msgid "Generated delta : '%s'"
-#~ msgstr "已创建好增量软件包：'%s'"
-
-#~ msgid "File '%s' does not exist"
-#~ msgstr "文件 '%s' 不存在"
-
-#~ msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
-#~ msgstr "无法找到 xdelta 执行文件！是否已安装 xdelta3？"
-
-#~ msgid "  -d, --delta       generate and add delta for package update\\n"
-#~ msgstr "  -d, --delta       生成并添加软件包更新所用的 delta 增量包\\n"
-
-#~ msgid ""
-#~ "Copyright (c) 2006-2018 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-2018 Pacman 开发小组 <pacman-dev@archlinux.org>\\n\\n这"
-#~ "是自由软件; 请查看源码以获得版权条款。\\n在法律允许的范围内没有担保。\\n"
-
-#~ msgid "No database entry for package '%s'."
-#~ msgstr "没有软件包 '%s' 的数据库条目。"
-
-#~ msgid "Adding 'deltas' entry : %s -> %s"
-#~ msgstr "正在添加 'deltas' 增量包条目：%s -> %s"
-
-#~ msgid "Removing empty deltas file..."
-#~ msgstr "正在删除空增量包文件..."
-
-#~ msgid "Old package file not found: %s"
-#~ msgstr "没有找到旧的软件包：%s"
-
-#~ msgid "Adding delta '%s'"
-#~ msgstr "正在添加增量包 '%s'"
-
-#~ msgid "Searching for delta '%s'..."
-#~ msgstr "正在搜索增量包 '%s'..."
-
-#~ msgid "Delta matching '%s' not found."
-#~ msgstr "未找到符合 '%s' 的增量包。"
-
-#~ msgid "%s must be a decimal, not %s."
-#~ msgstr "%s 必须是十进制，不是 %s。"
-
-#~ msgid "%s_%s should be an array"
-#~ msgstr "%s_%s 应该是个数组"
-- 
cgit v1.2.3-24-g4f1b