summaryrefslogtreecommitdiffstats
path: root/src/pacman/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'src/pacman/po/zh_CN.po')
-rw-r--r--src/pacman/po/zh_CN.po399
1 files changed, 192 insertions, 207 deletions
diff --git a/src/pacman/po/zh_CN.po b/src/pacman/po/zh_CN.po
index d074f623..c232253e 100644
--- a/src/pacman/po/zh_CN.po
+++ b/src/pacman/po/zh_CN.po
@@ -8,14 +8,17 @@
# Blask <blaskyy@gmail.com>, 2013
# leonfeng <chaofeng111@qq.com>, 2018
# Felix Yan <felixonmars@gmail.com>, 2015
+# Jiachen YANG <farseerfc@gmail.com>, 2018-2019
# leonfeng <chaofeng111@qq.com>, 2011,2013
# leonfeng <chaofeng111@qq.com>, 2011,2013,2018
# leonfeng <chaofeng111@qq.com>, 2011,2013
# mytbk <mytbk920423@gmail.com>, 2013-2018
# mytbk <mytbk920423@gmail.com>, 2013
-# Nicholas Wang <wck963@gmail.com>, 2018
+# Nicholas Wang <wck963@gmail.com>, 2018-2019
# leonfeng <chaofeng111@qq.com>, 2013
# leonfeng <chaofeng111@qq.com>, 2011
+# liushuyu011 <liushuyu011@gmail.com>, 2018
+# Tian Yunhao <t123yh@outlook.com>, 2018
# ykelvis <ykelvis@users.noreply.github.com>, 2014
# 张海, 2015,2018
# 张海, 2015,2018
@@ -26,9 +29,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2018-07-19 14:06+1000\n"
-"PO-Revision-Date: 2018-07-19 04:15+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2019-08-12 11:37+1000\n"
+"PO-Revision-Date: 2019-07-10 09:15+0000\n"
+"Last-Translator: Jiachen YANG <farseerfc@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-"
"pacman/language/zh_CN/)\n"
"Language: zh_CN\n"
@@ -60,7 +63,7 @@ msgstr "正在检查文件冲突...\n"
#: src/pacman/callback.c:205
#, c-format
msgid "resolving dependencies...\n"
-msgstr "正在解决依赖关系...\n"
+msgstr "正在解析依赖关系...\n"
#: src/pacman/callback.c:208
#, c-format
@@ -90,7 +93,7 @@ msgstr "正在重新安装 %s...\n"
#: src/pacman/callback.c:227
#, c-format
msgid "downgrading %s...\n"
-msgstr "正在下载 %s...\n"
+msgstr "正在降级 %s...\n"
#: src/pacman/callback.c:230
#, c-format
@@ -117,78 +120,52 @@ msgstr "正在下载所需的密钥......\n"
msgid "loading package files...\n"
msgstr "正在加载软件包文件...\n"
-#: src/pacman/callback.c:271
-#, c-format
-msgid "checking delta integrity...\n"
-msgstr "正在检查增量包完整性...\n"
-
#: src/pacman/callback.c:274
#, c-format
-msgid "applying deltas...\n"
-msgstr "正在应用增量包...\n"
-
-#: src/pacman/callback.c:277
-#, c-format
-msgid "generating %s with %s... "
-msgstr "正在生成 %s (使用 %s)... "
-
-#: src/pacman/callback.c:282
-#, c-format
-msgid "success!\n"
-msgstr "成功完成!\n"
-
-#: src/pacman/callback.c:285
-#, c-format
-msgid "failed.\n"
-msgstr "失败。\n"
-
-#: src/pacman/callback.c:291
-#, c-format
msgid "Retrieving packages...\n"
msgstr "正在获取软件包......\n"
-#: src/pacman/callback.c:295
+#: src/pacman/callback.c:278
#, c-format
msgid "checking available disk space...\n"
-msgstr "正在检查可用磁盘空间...\n"
+msgstr "正在检查可用存储空间...\n"
-#: src/pacman/callback.c:302
+#: src/pacman/callback.c:285
#, c-format
msgid "%s optionally requires %s\n"
-msgstr "%s可选依赖%s\n"
+msgstr "%s可选依赖于%s\n"
-#: src/pacman/callback.c:321 src/pacman/callback.c:327
+#: src/pacman/callback.c:304 src/pacman/callback.c:310
#, c-format
msgid "%s installed as %s.pacnew\n"
msgstr "%s 已被安装为 %s.pacnew\n"
-#: src/pacman/callback.c:337 src/pacman/callback.c:343
+#: src/pacman/callback.c:320 src/pacman/callback.c:326
#, c-format
msgid "%s saved as %s.pacsave\n"
msgstr "%s 已被保存为 %s.pacsave\n"
-#: src/pacman/callback.c:395
+#: src/pacman/callback.c:376
#, c-format
msgid "%s is in IgnorePkg/IgnoreGroup. Install anyway?"
-msgstr ""
-"%s 位于 IgnorePkg/IgnoreGroup (忽略软件包/忽略软件包组) 中。确定要安装吗?"
+msgstr "%s 在忽略软件包/忽略软件包组中。确定要安装吗?"
-#: src/pacman/callback.c:405
+#: src/pacman/callback.c:386
#, c-format
msgid "Replace %s with %s/%s?"
-msgstr "替换 %s 吗 (使用 %s/%s )?"
+msgstr "替换 %s 为 %s/%s 吗 ?"
-#: src/pacman/callback.c:417
+#: src/pacman/callback.c:398
#, c-format
msgid "%s and %s are in conflict. Remove %s?"
msgstr "%s 与 %s 有冲突。删除 %s 吗?"
-#: src/pacman/callback.c:422
+#: src/pacman/callback.c:403
#, c-format
msgid "%s and %s are in conflict (%s). Remove %s?"
msgstr "%s 与 %s 有冲突 (%s)。删除 %s 吗?"
-#: src/pacman/callback.c:441
+#: src/pacman/callback.c:422
#, c-format
msgid ""
"The following package cannot be upgraded due to unresolvable dependencies:\n"
@@ -196,19 +173,19 @@ msgid_plural ""
"The following packages cannot be upgraded due to unresolvable dependencies:\n"
msgstr[0] "因为无法解决依赖关系,以下软件包无法进行更新:\n"
-#: src/pacman/callback.c:447
+#: src/pacman/callback.c:428
#, c-format
msgid "Do you want to skip the above package for this upgrade?"
msgid_plural "Do you want to skip the above packages for this upgrade?"
msgstr[0] "您想在本次更新中跳过上述软件包吗?"
-#: src/pacman/callback.c:458
+#: src/pacman/callback.c:439
#, c-format
msgid "There is %zu provider available for %s\n"
msgid_plural "There are %zu providers available for %s:\n"
msgstr[0] "有 %zu 个软件包可提供 %s :\n"
-#: src/pacman/callback.c:469
+#: src/pacman/callback.c:450
#, c-format
msgid ""
"File %s is corrupted (%s).\n"
@@ -217,67 +194,67 @@ msgstr ""
"文件 %s 已损坏 (%s).\n"
"打算删除吗?"
-#: src/pacman/callback.c:483
+#: src/pacman/callback.c:464
#, c-format
msgid "Import PGP key %u%c/%s, \"%s\", created: %s (revoked)?"
msgstr "导入 PGP 密匙 %u%c/%s,\"%s\",创建 %s (已吊销) 吗?"
-#: src/pacman/callback.c:486
+#: src/pacman/callback.c:467
#, c-format
msgid "Import PGP key %u%c/%s, \"%s\", created: %s?"
msgstr "导入 PGP 密匙 %u%c/%s,\"%s\",创建 %s 吗?"
-#: src/pacman/callback.c:545
+#: src/pacman/callback.c:526
#, c-format
msgid "installing"
msgstr "正在安装"
-#: src/pacman/callback.c:548
+#: src/pacman/callback.c:529
#, c-format
msgid "upgrading"
msgstr "正在更新"
-#: src/pacman/callback.c:551
+#: src/pacman/callback.c:532
#, c-format
msgid "downgrading"
-msgstr "降级中"
+msgstr "正在降级"
-#: src/pacman/callback.c:554
+#: src/pacman/callback.c:535
#, c-format
msgid "reinstalling"
msgstr "正在重新安装"
-#: src/pacman/callback.c:557
+#: src/pacman/callback.c:538
#, c-format
msgid "removing"
msgstr "正在删除"
-#: src/pacman/callback.c:560
+#: src/pacman/callback.c:541
#, c-format
msgid "checking for file conflicts"
msgstr "正在检查文件冲突"
-#: src/pacman/callback.c:563
+#: src/pacman/callback.c:544
#, c-format
msgid "checking available disk space"
-msgstr "正在检查可用硬盘空间"
+msgstr "正在检查可用存储空间"
-#: src/pacman/callback.c:566
+#: src/pacman/callback.c:547
#, c-format
msgid "checking package integrity"
msgstr "正在检查软件包完整性"
-#: src/pacman/callback.c:569
+#: src/pacman/callback.c:550
#, c-format
msgid "checking keys in keyring"
msgstr "正在检查密钥环里的密钥"
-#: src/pacman/callback.c:572
+#: src/pacman/callback.c:553
#, c-format
msgid "loading package files"
msgstr "正在加载软件包文件"
-#: src/pacman/callback.c:689
+#: src/pacman/callback.c:670
#, c-format
msgid "downloading %s...\n"
msgstr "正在下载 %s...\n"
@@ -300,7 +277,7 @@ msgstr "%s: %s (用户组标识符GID不匹配)\n"
#: src/pacman/check.c:101
#, c-format
msgid "%s: %s (Permissions mismatch)\n"
-msgstr "%s: %s (许可不匹配)\n"
+msgstr "%s: %s (权限不匹配)\n"
#: src/pacman/check.c:115 src/pacman/check.c:162
#, c-format
@@ -366,69 +343,69 @@ msgid "%jd altered file\n"
msgid_plural "%jd altered files\n"
msgstr[0] "%jd 变化的文件\n"
-#: src/pacman/conf.c:98
+#: src/pacman/conf.c:97
#, c-format
msgid "malloc failure: could not allocate %zu byte\n"
msgid_plural "malloc failure: could not allocate %zu bytes\n"
msgstr[0] "malloc 失败:无法分配 %zu 字节\n"
-#: src/pacman/conf.c:252
+#: src/pacman/conf.c:250
#, c-format
msgid "could not get current working directory\n"
msgstr "无法获取当前的工作目录\n"
-#: src/pacman/conf.c:257
+#: src/pacman/conf.c:255
#, c-format
msgid "could not chdir to download directory %s\n"
msgstr "无法 chdir 到下载目录 %s\n"
-#: src/pacman/conf.c:266
+#: src/pacman/conf.c:264
#, c-format
msgid "running XferCommand: fork failed!\n"
-msgstr "正在运行 XferCommand: fork失败!\n"
+msgstr "运行 XferCommand 创建进程失败!\n"
-#: src/pacman/conf.c:278
+#: src/pacman/conf.c:276
#, c-format
msgid "could not rename %s to %s (%s)\n"
-msgstr "无法重命名 %s 为 %s (%s)\n"
+msgstr "无法将 %s 重命名为 %s (%s)\n"
-#: src/pacman/conf.c:289
+#: src/pacman/conf.c:287
#, c-format
msgid "could not restore working directory (%s)\n"
msgstr "无法恢复工作目录 (%s)\n"
-#: src/pacman/conf.c:398 src/pacman/conf.c:447 src/pacman/conf.c:543
+#: src/pacman/conf.c:396 src/pacman/conf.c:445
#, c-format
msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
msgstr "配置文件 %s,第 %d 行:无有效值 '%s':'%s'\n"
-#: src/pacman/conf.c:412
+#: src/pacman/conf.c:410
#, c-format
msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
msgstr "配置文件 %s,第 %d 行:'%s' 选项无效,无签名支持\n"
-#: src/pacman/conf.c:506 src/pacman/conf.c:611 src/pacman/conf.c:881
+#: src/pacman/conf.c:501 src/pacman/conf.c:586 src/pacman/conf.c:855
#, c-format
msgid ""
"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
msgstr "配置文件 %s,第 %d 行:指令 '%s'(位于章节 '%s' 中) 无法识别。\n"
-#: src/pacman/conf.c:623
+#: src/pacman/conf.c:598
#, c-format
msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
msgstr "镜像 '%s' 包含可变参数 '%s' ,但是没有定义 '%s'。\n"
-#: src/pacman/conf.c:647
+#: src/pacman/conf.c:622
#, c-format
msgid "could not add server URL to database '%s': %s (%s)\n"
msgstr "无法添加服务器 URL 到数据库 '%s':%s (%s)\n"
-#: src/pacman/conf.c:662
+#: src/pacman/conf.c:637
#, c-format
msgid "could not register '%s' database (%s)\n"
msgstr "无法注册 '%s' 数据库 (%s)\n"
-#: src/pacman/conf.c:698
+#: src/pacman/conf.c:673
#, c-format
msgid ""
"failed to initialize alpm library\n"
@@ -437,63 +414,63 @@ msgstr ""
"初始化 alpm 库失败\n"
"(%s: %s)\n"
-#: src/pacman/conf.c:701
+#: src/pacman/conf.c:676
#, c-format
msgid "try running pacman-db-upgrade\n"
msgstr "请尝试运行 pacman-db-upgrade\n"
-#: src/pacman/conf.c:719
+#: src/pacman/conf.c:694
#, c-format
msgid "problem setting logfile '%s' (%s)\n"
msgstr "设定日志文件 '%s' (%s) 时出现问题\n"
-#: src/pacman/conf.c:728
+#: src/pacman/conf.c:703
#, c-format
msgid "problem setting gpgdir '%s' (%s)\n"
msgstr "设定 gpgdir '%s' 时出现问题 (%s)\n"
-#: src/pacman/conf.c:738
+#: src/pacman/conf.c:713
#, c-format
msgid "problem adding hookdir '%s' (%s)\n"
msgstr "添加 hookdir '%s' 时出现问题 (%s)\n"
-#: src/pacman/conf.c:760
+#: src/pacman/conf.c:735
#, c-format
msgid "no '%s' configured\n"
msgstr "没有配置 '%s' \n"
-#: src/pacman/conf.c:790
+#: src/pacman/conf.c:764
#, c-format
msgid "Failed to pass %s entry to libalpm"
msgstr "传递 %s 条目至 libalpm 失败"
-#: src/pacman/conf.c:830
+#: src/pacman/conf.c:804
#, c-format
msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
msgstr "配置文件 %s,第 %d 行:'%s' 选项 '%s' 无法识别\n"
-#: src/pacman/conf.c:850 src/pacman/conf.c:858 src/pacman/conf.c:901
+#: src/pacman/conf.c:824 src/pacman/conf.c:877
#, c-format
msgid "config file %s, line %d: directive '%s' needs a value\n"
msgstr "配置文件 %s,第 %d 行:指令 '%s' 需要赋值\n"
-#: src/pacman/conf.c:908
+#: src/pacman/conf.c:884
#, c-format
msgid "config parsing exceeded max recursion depth of %d.\n"
msgstr "配置解析时超过最大 %d 的递归深度。\n"
-#: src/pacman/conf.c:956
+#: src/pacman/conf.c:932
#, c-format
msgid "config file %s could not be read: %s\n"
msgstr "无法读取配置文件 %s: %s\n"
-#: src/pacman/conf.c:979
+#: src/pacman/conf.c:955
#, c-format
msgid "config file %s, line %d: All directives must belong to a section.\n"
msgstr "配置文件 %s,第 %d 行:所有的命令必须属于同一章节。\n"
-#: src/pacman/database.c:50 src/pacman/files.c:300 src/pacman/query.c:426
-#: src/pacman/remove.c:91 src/pacman/sync.c:938 src/pacman/upgrade.c:47
+#: src/pacman/database.c:50 src/pacman/files.c:304 src/pacman/query.c:430
+#: src/pacman/remove.c:85 src/pacman/sync.c:943 src/pacman/upgrade.c:47
#, c-format
msgid "no targets specified (use -h for help)\n"
msgstr "没有指定目标 (使用 -h 获取帮助) \n"
@@ -518,36 +495,31 @@ msgstr "%s:安装原因设定为“作为依赖关系安装”\n"
msgid "%s: install reason has been set to 'explicitly installed'\n"
msgstr "%s:安装原因设定为“单独指定安装”\n"
-#: src/pacman/database.c:293
+#: src/pacman/database.c:295
#, c-format
msgid "No database errors have been found!\n"
-msgstr "未发现数据库错误!\n"
+msgstr "数据库正常!\n"
-#: src/pacman/files.c:81
+#: src/pacman/files.c:55
#, c-format
msgid "%s is owned by %s%s/%s%s %s%s%s\n"
msgstr "%s 由 %s%s/%s%s %s%s%s 所拥有\n"
-#: src/pacman/files.c:223
+#: src/pacman/files.c:222
#, c-format
msgid "invalid package: '%s'\n"
msgstr "无效软件包:'%s'\n"
-#: src/pacman/files.c:255 src/pacman/query.c:480 src/pacman/sync.c:429
+#: src/pacman/files.c:254 src/pacman/query.c:484 src/pacman/sync.c:427
#, c-format
msgid "package '%s' was not found\n"
msgstr "软件包 '%s' 未找到\n"
-#: src/pacman/files.c:291 src/pacman/sync.c:898
+#: src/pacman/files.c:290 src/pacman/sync.c:903
#, c-format
msgid "Synchronizing package databases...\n"
msgstr "正在同步软件包数据库...\n"
-#: src/pacman/files.c:320
-#, c-format
-msgid "no options specified (use -h for help)\n"
-msgstr "没有指定选项(使用 -h 查看帮助)\n"
-
#: src/pacman/package.c:99
#, c-format
msgid "Architecture"
@@ -571,7 +543,7 @@ msgstr "压缩后大小"
#: src/pacman/package.c:103
#, c-format
msgid "Conflicts With"
-msgstr "冲突与"
+msgstr "与它冲突"
#: src/pacman/package.c:104
#, c-format
@@ -661,7 +633,7 @@ msgstr "软件库"
#: src/pacman/package.c:121
#, c-format
msgid "Required By"
-msgstr "要求被"
+msgstr "依赖它"
#: src/pacman/package.c:122 src/pacman/package.c:242
#, c-format
@@ -878,7 +850,7 @@ msgid ""
"[filter]\n"
msgstr " -n, --native 列出只在(同步)数据库中的已安装软件包 [过滤]\n"
-#: src/pacman/pacman.c:146 src/pacman/pacman.c:180
+#: src/pacman/pacman.c:146
#, c-format
msgid " -o, --owns <file> query the package that owns <file>\n"
msgstr " -o, --owns <文件> 查询哪个软件包拥有<文件>\n"
@@ -888,7 +860,7 @@ msgstr " -o, --owns <文件> 查询哪个软件包拥有<文件>\n"
msgid " -p, --file <package> query a package file instead of the database\n"
msgstr " -p, --file <软件包> 从某个软件包而不是数据库查询\n"
-#: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:181
+#: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
#, c-format
msgid " -q, --quiet show less information for query and search\n"
msgstr " -q, --quiet 在查询或搜索时显示较少的信息\n"
@@ -961,7 +933,7 @@ msgid ""
"anything\n"
msgstr " -w, --downloadonly 下载但不安装/升级软件包\n"
-#: src/pacman/pacman.c:165 src/pacman/pacman.c:184
+#: src/pacman/pacman.c:165 src/pacman/pacman.c:182
#, c-format
msgid ""
" -y, --refresh download fresh package databases from the server\n"
@@ -992,17 +964,12 @@ msgstr " -k, --check 检查本地数据库有效性 (-kk 以同步数
msgid " -q, --quiet suppress output of success messages\n"
msgstr " -q, --quiet 不显示成功消息的输出\n"
-#: src/pacman/pacman.c:182
-#, c-format
-msgid " -s, --search <file> search package file names for matching strings\n"
-msgstr " -s, --search <文件> 搜索符合指定字符串的软件包文件名\n"
-
-#: src/pacman/pacman.c:183
+#: src/pacman/pacman.c:181
#, c-format
msgid " -x, --regex enable searching using regular expressions\n"
msgstr " -x, --regex 启用正则表达式进行搜索\n"
-#: src/pacman/pacman.c:186
+#: src/pacman/pacman.c:184
#, c-format
msgid ""
" --machinereadable\n"
@@ -1011,7 +978,7 @@ msgstr ""
" --machinereadable\n"
" 产生机器可读输出\n"
-#: src/pacman/pacman.c:192
+#: src/pacman/pacman.c:190
#, c-format
msgid ""
" --overwrite <path>\n"
@@ -1021,24 +988,24 @@ msgstr ""
" --overwrite <path>\n"
" 覆盖冲突的文件(可以使用多次)\n"
-#: src/pacman/pacman.c:194
+#: src/pacman/pacman.c:192
#, c-format
msgid " --asdeps install packages as non-explicitly installed\n"
msgstr " --asdeps 作为非单独指定安装的软件包安装\n"
-#: src/pacman/pacman.c:195
+#: src/pacman/pacman.c:193
#, c-format
msgid " --asexplicit install packages as explicitly installed\n"
msgstr " --asexplicit 作为单独指定安装的软件包安装\n"
-#: src/pacman/pacman.c:196
+#: src/pacman/pacman.c:194
#, c-format
msgid ""
" --ignore <pkg> ignore a package upgrade (can be used more than "
"once)\n"
msgstr " --ignore <软件包> 升级时忽略某个软件包 (可多次使用) \n"
-#: src/pacman/pacman.c:197
+#: src/pacman/pacman.c:195
#, c-format
msgid ""
" --ignoregroup <grp>\n"
@@ -1047,14 +1014,14 @@ msgstr ""
" --ignoregroup <软件包组>\n"
" 升级时忽略某个软件包组 (可多次使用) \n"
-#: src/pacman/pacman.c:201
+#: src/pacman/pacman.c:199
#, c-format
msgid ""
" -d, --nodeps skip dependency version checks (-dd to skip all "
"checks)\n"
msgstr " -d, --nodeps 跳过依赖关系的版本检查 (-dd 跳过所有检查)\n"
-#: src/pacman/pacman.c:202
+#: src/pacman/pacman.c:200
#, c-format
msgid ""
" --assume-installed <package=version>\n"
@@ -1063,32 +1030,32 @@ msgstr ""
" --assume-installed <package=version>\n"
" 添加一个虚拟包用以满足依赖要求\n"
-#: src/pacman/pacman.c:204
+#: src/pacman/pacman.c:202
#, c-format
msgid ""
" --dbonly only modify database entries, not package files\n"
msgstr " --dbonly 仅修改数据库条目,而非软件包文件\n"
-#: src/pacman/pacman.c:205
+#: src/pacman/pacman.c:203
#, c-format
msgid ""
" --noprogressbar do not show a progress bar when downloading files\n"
msgstr " --noprogressbar 下载文件时不显示进度条\n"
-#: src/pacman/pacman.c:206
+#: src/pacman/pacman.c:204
#, c-format
msgid ""
" --noscriptlet do not execute the install scriptlet if one exists\n"
msgstr " --noscriptlet 不执行安装小脚本\n"
-#: src/pacman/pacman.c:207
+#: src/pacman/pacman.c:205
#, c-format
msgid ""
" -p, --print print the targets instead of performing the "
"operation\n"
msgstr " -p, --print 打印目标而不是执行操作\n"
-#: src/pacman/pacman.c:208
+#: src/pacman/pacman.c:206
#, c-format
msgid ""
" --print-format <string>\n"
@@ -1097,77 +1064,77 @@ msgstr ""
" --print-format <字符串>\n"
" 指定如何打印目标\n"
-#: src/pacman/pacman.c:213
+#: src/pacman/pacman.c:211
#, c-format
msgid " -b, --dbpath <path> set an alternate database location\n"
msgstr " -b, --dbpath <路径> 指定另外的数据库位置\n"
-#: src/pacman/pacman.c:214
+#: src/pacman/pacman.c:212
#, c-format
msgid " -r, --root <path> set an alternate installation root\n"
msgstr " -r, --root <路径> 指定另外的安装根目录\n"
-#: src/pacman/pacman.c:215
+#: src/pacman/pacman.c:213
#, c-format
msgid " -v, --verbose be verbose\n"
msgstr " -v, --verbose 显示详细信息\n"
-#: src/pacman/pacman.c:216
+#: src/pacman/pacman.c:214
#, c-format
msgid " --arch <arch> set an alternate architecture\n"
msgstr " --arch <架构> 设定另外的架构\n"
-#: src/pacman/pacman.c:217
+#: src/pacman/pacman.c:215
#, c-format
msgid " --sysroot operate on a mounted guest system (root-only)\n"
msgstr " --sysroot 在一个已挂载的 guest 系统操作(仅 root)\n"
-#: src/pacman/pacman.c:218
+#: src/pacman/pacman.c:216
#, c-format
msgid " --cachedir <dir> set an alternate package cache location\n"
msgstr " --cachedir <dir> 指定另外的软件包缓存位置\n"
-#: src/pacman/pacman.c:219
+#: src/pacman/pacman.c:217
#, c-format
msgid " --hookdir <dir> set an alternate hook location\n"
msgstr " --hookdir <目录> 指定另外的钩子位置\n"
-#: src/pacman/pacman.c:220
+#: src/pacman/pacman.c:218
#, c-format
msgid " --color <when> colorize the output\n"
msgstr " --color <when> 彩色化输出\n"
-#: src/pacman/pacman.c:221
+#: src/pacman/pacman.c:219
#, c-format
msgid " --config <path> set an alternate configuration file\n"
msgstr " --config <路径> 指定另外的配置文件\n"
-#: src/pacman/pacman.c:222
+#: src/pacman/pacman.c:220
#, c-format
msgid " --debug display debug messages\n"
msgstr " --debug 显示调试信息\n"
-#: src/pacman/pacman.c:223
+#: src/pacman/pacman.c:221
#, c-format
msgid " --gpgdir <path> set an alternate home directory for GnuPG\n"
msgstr " --gpgdir <路径> 设定 GnuPG 的其他主目录\n"
-#: src/pacman/pacman.c:224
+#: src/pacman/pacman.c:222
#, c-format
msgid " --logfile <path> set an alternate log file\n"
msgstr " --logfile <路径> 指定另外的日志文件\n"
-#: src/pacman/pacman.c:225
+#: src/pacman/pacman.c:223
#, c-format
msgid " --noconfirm do not ask for any confirmation\n"
msgstr " --noconfirm 不询问确认\n"
-#: src/pacman/pacman.c:226
+#: src/pacman/pacman.c:224
#, c-format
msgid " --confirm always ask for confirmation\n"
msgstr " --confirm 总是询问确认\n"
-#: src/pacman/pacman.c:227
+#: src/pacman/pacman.c:225
#, c-format
msgid ""
" --disable-download-timeout\n"
@@ -1176,7 +1143,7 @@ msgstr ""
" --disable-download-timeout\n"
" 下载时用宽松的超时\n"
-#: src/pacman/pacman.c:247
+#: src/pacman/pacman.c:245
#, c-format
msgid ""
" This program may be freely redistributed under\n"
@@ -1185,77 +1152,72 @@ msgstr ""
" 本程序可以在GNU一般公众许可条款下\n"
" 自由分发\n"
-#: src/pacman/pacman.c:280
+#: src/pacman/pacman.c:278
#, c-format
msgid "HTTP_USER_AGENT truncated\n"
msgstr "HTTP_USER_AGENT 被截断\n"
-#: src/pacman/pacman.c:312
+#: src/pacman/pacman.c:310
#, c-format
msgid "invalid option: '%s' and '%s' may not be used together\n"
msgstr "无效选项: 选项 '%s' 和 '%s' 不可以同时使用\n"
-#: src/pacman/pacman.c:396
+#: src/pacman/pacman.c:394
#, c-format
msgid "invalid argument '%s' for %s\n"
msgstr "'%s' 不是 %s 的合法参数\n"
-#: src/pacman/pacman.c:419
+#: src/pacman/pacman.c:417
#, c-format
msgid "'%s' is not a valid debug level\n"
msgstr "'%s' 不是有效的调试级别\n"
-#: src/pacman/pacman.c:721
-#, c-format
-msgid "option --force is deprecated; use --overwrite instead\n"
-msgstr "不再建议使用选项 --force,请用 --overwrite\n"
-
-#: src/pacman/pacman.c:981
+#: src/pacman/pacman.c:961
#, c-format
msgid "only one operation may be used at a time\n"
msgstr "一次只能运行一个操作\n"
-#: src/pacman/pacman.c:1039
+#: src/pacman/pacman.c:1019
#, c-format
msgid "invalid option '-%c'\n"
msgstr "无效选项 '-%c'\n"
-#: src/pacman/pacman.c:1041
+#: src/pacman/pacman.c:1021
#, c-format
msgid "invalid option '--%s'\n"
msgstr "无效选项 '--%s'\n"
-#: src/pacman/pacman.c:1166
+#: src/pacman/pacman.c:1146
#, c-format
msgid "you cannot perform this operation unless you are root.\n"
msgstr "非 root (根用户) 无法执行指定操作。\n"
-#: src/pacman/pacman.c:1172
+#: src/pacman/pacman.c:1152
#, c-format
msgid "chroot to '%s' failed: (%s)\n"
msgstr "chroot 到 '%s' 失败:(%s)\n"
-#: src/pacman/pacman.c:1206
+#: src/pacman/pacman.c:1186
#, c-format
msgid "failed to read arguments from stdin: (%s)\n"
msgstr "从标准输入读取参数失败:(%s)\n"
-#: src/pacman/pacman.c:1211
+#: src/pacman/pacman.c:1191
#, c-format
msgid "failed to reopen stdin for reading: (%s)\n"
msgstr "无法打开 stdin 以读取:(%s)\n"
-#: src/pacman/pacman.c:1216
+#: src/pacman/pacman.c:1196
#, c-format
msgid "argument '-' specified with empty stdin\n"
-msgstr "有参数 '-' 但标准输入中没有数据\n"
+msgstr "有参数 '-' 但标准输入流为空\n"
-#: src/pacman/pacman.c:1221
+#: src/pacman/pacman.c:1201
#, c-format
msgid "argument '-' specified without input on stdin\n"
-msgstr "有参数'-'但标准输入中没有数据\n"
+msgstr "有参数 '-' 但标准输入流中没有输入\n"
-#: src/pacman/pacman.c:1298
+#: src/pacman/pacman.c:1278
#, c-format
msgid "no operation specified (use -h for help)\n"
msgstr "没有指定操作 (使用 -h 获取帮助) \n"
@@ -1285,67 +1247,62 @@ msgstr "没有软件包拥有 %s\n"
msgid "path too long: %s/\n"
msgstr "路径过长:%s\n"
-#: src/pacman/query.c:332
+#: src/pacman/query.c:336
#, c-format
msgid "[ignored]"
msgstr "[被忽略的]"
-#: src/pacman/query.c:383
+#: src/pacman/query.c:387
#, c-format
msgid "group '%s' was not found\n"
msgstr "软件组 '%s' 未找到\n"
-#: src/pacman/query.c:469
+#: src/pacman/query.c:473
#, c-format
msgid "could not load package '%s': %s\n"
msgstr "无法加载软件包 '%s': %s\n"
-#: src/pacman/query.c:483
+#: src/pacman/query.c:487
#, c-format
msgid "'%s' is a file, you might want to use %s.\n"
msgstr "'%s' 是一个文件,您可能打算使用 %s。\n"
-#: src/pacman/remove.c:49 src/pacman/sync.c:526 src/pacman/sync.c:611
-#, c-format
-msgid "skipping target: %s\n"
-msgstr "正在跳过软件包:%s\n"
-
-#: src/pacman/remove.c:63 src/pacman/sync.c:546
+#: src/pacman/remove.c:57 src/pacman/sync.c:555
#, c-format
msgid "target not found: %s\n"
msgstr "未找到目标:%s\n"
-#: src/pacman/remove.c:118 src/pacman/sync.c:742
+#: src/pacman/remove.c:112 src/pacman/sync.c:751
#, c-format
msgid "failed to prepare transaction (%s)\n"
msgstr "无法准备事务处理 (%s)\n"
-#: src/pacman/remove.c:125
+#: src/pacman/remove.c:119
#, c-format
msgid "%s: removing %s breaks dependency '%s'\n"
msgstr "%s:移除 %s 将破坏依赖关系 '%s'\n"
-#: src/pacman/remove.c:144
+#: src/pacman/remove.c:138
#, c-format
msgid "%s is designated as a HoldPkg.\n"
msgstr "%s 被指定为 HoldPkg (保留软件包) 。\n"
-#: src/pacman/remove.c:149
+#: src/pacman/remove.c:143
#, c-format
msgid "HoldPkg was found in target list. Do you want to continue?"
msgstr "在目标清单中发现 HoldPkg 指定的软件包。你确定要继续吗?"
-#: src/pacman/remove.c:157 src/pacman/sync.c:785
+#: src/pacman/remove.c:151 src/pacman/sync.c:794
#, c-format
msgid " there is nothing to do\n"
msgstr " 今日无事可做\n"
-#: src/pacman/remove.c:169
+#: src/pacman/remove.c:163
#, c-format
msgid "Do you want to remove these packages?"
msgstr "打算删除这些软件包吗?"
-#: src/pacman/remove.c:175 src/pacman/sync.c:812
+#: src/pacman/remove.c:169 src/pacman/sync.c:821
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr "无法提交处理 (%s)\n"
@@ -1420,103 +1377,103 @@ msgstr "正在从缓存中删除所有文件...\n"
msgid "could not access cache directory %s\n"
msgstr "无法访问缓存目录 %s\n"
-#: src/pacman/sync.c:424
+#: src/pacman/sync.c:422
#, c-format
msgid "repository '%s' does not exist\n"
msgstr "软件库 '%s' 不存在\n"
-#: src/pacman/sync.c:470
+#: src/pacman/sync.c:468
#, c-format
msgid "repository \"%s\" was not found.\n"
msgstr "软件库 \"%s\" 未找到\n"
-#: src/pacman/sync.c:561
+#: src/pacman/sync.c:570
#, c-format
msgid "There is %d member in group %s%s%s:\n"
msgid_plural "There are %d members in group %s%s%s:\n"
msgstr[0] "在组 %2$s%3$s%4$s 中有 %1$d 成员:\n"
-#: src/pacman/sync.c:640
+#: src/pacman/sync.c:620
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "正在跳过软件包:%s\n"
+
+#: src/pacman/sync.c:649
#, c-format
msgid "database not found: %s\n"
msgstr "未找到数据库:%s\n"
-#: src/pacman/sync.c:668
+#: src/pacman/sync.c:677
#, c-format
msgid "'%s' is a file, did you mean %s instead of %s?\n"
msgstr "'%s' 是一个文件,您是否想要 %s 而不是 %s?\n"
-#: src/pacman/sync.c:699
+#: src/pacman/sync.c:708
#, c-format
msgid "Starting full system upgrade...\n"
msgstr "正在进行全面系统更新...\n"
-#: src/pacman/sync.c:720
+#: src/pacman/sync.c:729
#, c-format
msgid "unable to satisfy dependency '%s' required by %s\n"
msgstr "无法满足依赖 '%s' (%s 需要)\n"
-#: src/pacman/sync.c:724
+#: src/pacman/sync.c:733
#, c-format
msgid "installing %s (%s) breaks dependency '%s' required by %s\n"
msgstr "安装 %s (%s) 破坏依赖 '%s' (%s 需要)\n"
-#: src/pacman/sync.c:728
+#: src/pacman/sync.c:737
#, c-format
msgid "removing %s breaks dependency '%s' required by %s\n"
msgstr "删除 %s 破坏依赖 '%s' (%s 需要)\n"
-#: src/pacman/sync.c:748
+#: src/pacman/sync.c:757
#, c-format
msgid "package %s does not have a valid architecture\n"
msgstr "软件包 '%s' 未包含一个有效的架构\n"
-#: src/pacman/sync.c:763
+#: src/pacman/sync.c:772
#, c-format
msgid "%s and %s are in conflict\n"
msgstr "%s 与 %s 有冲突\n"
-#: src/pacman/sync.c:767
+#: src/pacman/sync.c:776
#, c-format
msgid "%s and %s are in conflict (%s)\n"
msgstr "%s: 与 %s 冲突 (%s)\n"
-#: src/pacman/sync.c:801
+#: src/pacman/sync.c:810
#, c-format
msgid "Proceed with download?"
msgstr "进行下载吗?"
-#: src/pacman/sync.c:803
+#: src/pacman/sync.c:812
#, c-format
msgid "Proceed with installation?"
msgstr "进行安装吗?"
-#: src/pacman/sync.c:817
-#, c-format
-msgid "unable to %s directory-file conflicts\n"
-msgstr "无法%s目录-文件冲突\n"
-
-#: src/pacman/sync.c:823
+#: src/pacman/sync.c:829
#, c-format
msgid "%s exists in both '%s' and '%s'\n"
msgstr "%s 同时存在于 '%s' 和 '%s'\n"
-#: src/pacman/sync.c:828
+#: src/pacman/sync.c:834
#, c-format
msgid "%s: %s exists in filesystem (owned by %s)\n"
msgstr "%s: 文件系统中存在 %s (由 %s 所有)\n"
-#: src/pacman/sync.c:831
+#: src/pacman/sync.c:837
#, c-format
msgid "%s: %s exists in filesystem\n"
msgstr "%s: 文件系统中已存在 %s \n"
-#: src/pacman/sync.c:845
+#: src/pacman/sync.c:850
#, c-format
msgid "%s is invalid or corrupted\n"
msgstr "%s 无效或已损坏\n"
-#: src/pacman/sync.c:853
+#: src/pacman/sync.c:858
#, c-format
msgid "Errors occurred, no packages were upgraded.\n"
msgstr "发生错误,没有软件包被更新。\n"
@@ -1578,12 +1535,12 @@ msgstr " %s 已经是最新版本\n"
#: src/pacman/util.c:170
#, c-format
msgid "failed to synchronize all databases\n"
-msgstr "同步所有数据库失败\n"
+msgstr "未能成功同步所有数据库\n"
#: src/pacman/util.c:636
#, c-format
msgid "insufficient columns available for table display\n"
-msgstr "栏数不足以使用表格显示视图\n"
+msgstr "屏幕宽度不足,无法使用表格视图\n"
#: src/pacman/util.c:757
#, c-format
@@ -1779,3 +1736,31 @@ msgstr "错误:"
#, c-format
msgid "warning: "
msgstr "警告:"
+
+#~ msgid "checking delta integrity...\n"
+#~ msgstr "正在检查增量包完整性...\n"
+
+#~ msgid "applying deltas...\n"
+#~ msgstr "正在应用增量包...\n"
+
+#~ msgid "generating %s with %s... "
+#~ msgstr "正在生成 %s (使用 %s)... "
+
+#~ msgid "success!\n"
+#~ msgstr "成功完成!\n"
+
+#~ msgid "failed.\n"
+#~ msgstr "失败。\n"
+
+#~ msgid "no options specified (use -h for help)\n"
+#~ msgstr "没有指定选项(使用 -h 查看帮助)\n"
+
+#~ msgid ""
+#~ " -s, --search <file> search package file names for matching strings\n"
+#~ msgstr " -s, --search <文件> 搜索符合指定字符串的软件包文件名\n"
+
+#~ msgid "option --force is deprecated; use --overwrite instead\n"
+#~ msgstr "不再建议使用选项 --force,请用 --overwrite\n"
+
+#~ msgid "unable to %s directory-file conflicts\n"
+#~ msgstr "无法%s目录-文件冲突\n"