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.po620
1 files changed, 363 insertions, 257 deletions
diff --git a/src/pacman/po/zh_CN.po b/src/pacman/po/zh_CN.po
index 9e0818f5..0bf783bc 100644
--- a/src/pacman/po/zh_CN.po
+++ b/src/pacman/po/zh_CN.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# Allan McRae <allan@archlinux.org>, 2014
# Blask <blaskyy@gmail.com>, 2013
@@ -23,14 +23,15 @@ 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: 2017-05-22 11:01+1000\n"
+"POT-Creation-Date: 2018-04-29 23:49+1000\n"
"PO-Revision-Date: 2018-03-02 06:37+0000\n"
"Last-Translator: leonfeng <chaofeng111@qq.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-pacman/language/zh_CN/)\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"
-"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: src/pacman/callback.c:182
@@ -153,125 +154,127 @@ msgstr "正在检查可用磁盘空间...\n"
msgid "%s optionally requires %s\n"
msgstr "%s可选依赖%s\n"
-#: src/pacman/callback.c:320 src/pacman/callback.c:326
+#: src/pacman/callback.c:321 src/pacman/callback.c:327
#, c-format
msgid "%s installed as %s.pacnew\n"
msgstr "%s 已被安装为 %s.pacnew\n"
-#: src/pacman/callback.c:336 src/pacman/callback.c:342
+#: src/pacman/callback.c:337 src/pacman/callback.c:343
#, c-format
msgid "%s saved as %s.pacsave\n"
msgstr "%s 已被保存为 %s.pacsave\n"
-#: src/pacman/callback.c:390
+#: src/pacman/callback.c:395
#, c-format
msgid "%s is in IgnorePkg/IgnoreGroup. Install anyway?"
-msgstr "%s 位于 IgnorePkg/IgnoreGroup (忽略软件包/忽略软件包组) 中。确定要安装吗?"
+msgstr ""
+"%s 位于 IgnorePkg/IgnoreGroup (忽略软件包/忽略软件包组) 中。确定要安装吗?"
-#: src/pacman/callback.c:400
+#: src/pacman/callback.c:405
#, c-format
msgid "Replace %s with %s/%s?"
msgstr "替换 %s 吗 (使用 %s/%s )?"
-#: src/pacman/callback.c:412
+#: src/pacman/callback.c:417
#, c-format
msgid "%s and %s are in conflict. Remove %s?"
msgstr "%s 与 %s 有冲突。删除 %s 吗?"
-#: src/pacman/callback.c:417
+#: src/pacman/callback.c:422
#, c-format
msgid "%s and %s are in conflict (%s). Remove %s?"
msgstr "%s 与 %s 有冲突 (%s)。删除 %s 吗?"
-#: src/pacman/callback.c:436
+#: src/pacman/callback.c:441
#, c-format
msgid ""
"The following package cannot be upgraded due to unresolvable dependencies:\n"
msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable "
-"dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable dependencies:\n"
msgstr[0] "因为无法解决依赖关系,以下软件包无法进行更新:\n"
-#: src/pacman/callback.c:442
+#: src/pacman/callback.c:447
#, 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:453
+#: src/pacman/callback.c:458
#, 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:464
+#: src/pacman/callback.c:469
#, c-format
msgid ""
"File %s is corrupted (%s).\n"
"Do you want to delete it?"
-msgstr "文件 %s 已损坏 (%s).\n打算删除吗?"
+msgstr ""
+"文件 %s 已损坏 (%s).\n"
+"打算删除吗?"
-#: src/pacman/callback.c:478
+#: src/pacman/callback.c:483
#, c-format
msgid "Import PGP key %u%c/%s, \"%s\", created: %s (revoked)?"
msgstr "导入 PGP 密匙 %u%c/%s,\"%s\",创建 %s (已吊销) 吗?"
-#: src/pacman/callback.c:481
+#: src/pacman/callback.c:486
#, c-format
msgid "Import PGP key %u%c/%s, \"%s\", created: %s?"
msgstr "导入 PGP 密匙 %u%c/%s,\"%s\",创建 %s 吗?"
-#: src/pacman/callback.c:540
+#: src/pacman/callback.c:545
#, c-format
msgid "installing"
msgstr "正在安装"
-#: src/pacman/callback.c:543
+#: src/pacman/callback.c:548
#, c-format
msgid "upgrading"
msgstr "正在更新"
-#: src/pacman/callback.c:546
+#: src/pacman/callback.c:551
#, c-format
msgid "downgrading"
msgstr "降级中"
-#: src/pacman/callback.c:549
+#: src/pacman/callback.c:554
#, c-format
msgid "reinstalling"
msgstr "正在重新安装"
-#: src/pacman/callback.c:552
+#: src/pacman/callback.c:557
#, c-format
msgid "removing"
msgstr "正在删除"
-#: src/pacman/callback.c:555
+#: src/pacman/callback.c:560
#, c-format
msgid "checking for file conflicts"
msgstr "正在检查文件冲突"
-#: src/pacman/callback.c:558
+#: src/pacman/callback.c:563
#, c-format
msgid "checking available disk space"
msgstr "正在检查可用硬盘空间"
-#: src/pacman/callback.c:561
+#: src/pacman/callback.c:566
#, c-format
msgid "checking package integrity"
msgstr "正在检查软件包完整性"
-#: src/pacman/callback.c:564
+#: src/pacman/callback.c:569
#, c-format
msgid "checking keys in keyring"
msgstr "正在检查密钥环里的密钥"
-#: src/pacman/callback.c:567
+#: src/pacman/callback.c:572
#, c-format
msgid "loading package files"
msgstr "正在加载软件包文件"
-#: src/pacman/callback.c:679
+#: src/pacman/callback.c:689
#, c-format
msgid "downloading %s...\n"
msgstr "正在下载 %s...\n"
@@ -327,7 +330,7 @@ msgstr "%s: %s (大小不匹配)\n"
msgid "path too long: %s%s\n"
msgstr "路径过长:%s%s\n"
-#: src/pacman/check.c:242 src/pacman/check.c:386
+#: src/pacman/check.c:242 src/pacman/check.c:385
#, c-format
msgid "%s: %jd total file, "
msgid_plural "%s: %jd total files, "
@@ -354,7 +357,7 @@ msgstr "路径过长:%slocal/%s-%s/%s\n"
msgid "file type not recognized: %s%s\n"
msgstr "文件类型无法识别: %s%s\n"
-#: src/pacman/check.c:388
+#: src/pacman/check.c:387
#, c-format
msgid "%jd altered file\n"
msgid_plural "%jd altered files\n"
@@ -366,131 +369,128 @@ 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:251
+#: src/pacman/conf.c:252
#, c-format
msgid "could not get current working directory\n"
msgstr "无法获取当前的工作目录\n"
-#: src/pacman/conf.c:256
+#: src/pacman/conf.c:257
#, c-format
msgid "could not chdir to download directory %s\n"
msgstr "无法 chdir 到下载目录 %s\n"
-#: src/pacman/conf.c:265
+#: src/pacman/conf.c:266
#, c-format
msgid "running XferCommand: fork failed!\n"
msgstr "正在运行 XferCommand: fork失败!\n"
-#: src/pacman/conf.c:277
+#: src/pacman/conf.c:278
#, c-format
msgid "could not rename %s to %s (%s)\n"
msgstr "无法重命名 %s 为 %s (%s)\n"
-#: src/pacman/conf.c:288
+#: src/pacman/conf.c:289
#, c-format
msgid "could not restore working directory (%s)\n"
msgstr "无法恢复工作目录 (%s)\n"
-#: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
+#: src/pacman/conf.c:398 src/pacman/conf.c:447 src/pacman/conf.c:543
#, c-format
msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
msgstr "配置文件 %s,第 %d 行:无有效值 '%s':'%s'\n"
-#: src/pacman/conf.c:411
+#: src/pacman/conf.c:412
#, c-format
msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
msgstr "配置文件 %s,第 %d 行:'%s' 选项无效,无签名支持\n"
-#: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
+#: src/pacman/conf.c:506 src/pacman/conf.c:611 src/pacman/conf.c:881
#, 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:632
+#: src/pacman/conf.c:623
#, c-format
msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
msgstr "镜像 '%s' 包含可变参数 '%s' ,但是没有定义 '%s'。\n"
-#: src/pacman/conf.c:641
+#: src/pacman/conf.c:647
#, c-format
msgid "could not add server URL to database '%s': %s (%s)\n"
msgstr "无法添加服务器 URL 到数据库 '%s':%s (%s)\n"
-#: src/pacman/conf.c:661
+#: src/pacman/conf.c:662
#, c-format
msgid "could not register '%s' database (%s)\n"
msgstr "无法注册 '%s' 数据库 (%s)\n"
-#: src/pacman/conf.c:676
-#, c-format
-msgid "could not add mirror '%s' to database '%s' (%s)\n"
-msgstr "无法添加 '%s' 镜像到数据库 '%s' (%s)\n"
-
-#: src/pacman/conf.c:722
+#: src/pacman/conf.c:698
#, c-format
msgid ""
"failed to initialize alpm library\n"
"(%s: %s)\n"
-msgstr "初始化 alpm 库失败\n(%s: %s)\n"
+msgstr ""
+"初始化 alpm 库失败\n"
+"(%s: %s)\n"
-#: src/pacman/conf.c:725
+#: src/pacman/conf.c:701
#, c-format
msgid "try running pacman-db-upgrade\n"
msgstr "请尝试运行 pacman-db-upgrade\n"
-#: src/pacman/conf.c:744
+#: src/pacman/conf.c:719
#, c-format
msgid "problem setting logfile '%s' (%s)\n"
msgstr "设定日志文件 '%s' (%s) 时出现问题\n"
-#: src/pacman/conf.c:754
+#: src/pacman/conf.c:728
#, c-format
msgid "problem setting gpgdir '%s' (%s)\n"
msgstr "设定 gpgdir '%s' 时出现问题 (%s)\n"
-#: src/pacman/conf.c:763 src/pacman/conf.c:771
+#: src/pacman/conf.c:738
#, c-format
msgid "problem adding hookdir '%s' (%s)\n"
msgstr "添加 hookdir '%s' 时出现问题 (%s)\n"
-#: src/pacman/conf.c:802
+#: src/pacman/conf.c:760
#, c-format
msgid "no '%s' configured\n"
msgstr "没有配置 '%s' \n"
-#: src/pacman/conf.c:830
+#: src/pacman/conf.c:790
#, c-format
msgid "Failed to pass %s entry to libalpm"
msgstr "传递 %s 条目至 libalpm 失败"
-#: src/pacman/conf.c:870
+#: src/pacman/conf.c:830
#, c-format
msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
msgstr "配置文件 %s,第 %d 行:'%s' 选项 '%s' 无法识别\n"
-#: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
+#: src/pacman/conf.c:850 src/pacman/conf.c:858 src/pacman/conf.c:901
#, c-format
msgid "config file %s, line %d: directive '%s' needs a value\n"
msgstr "配置文件 %s,第 %d 行:指令 '%s' 需要赋值\n"
-#: src/pacman/conf.c:948
+#: src/pacman/conf.c:908
#, c-format
msgid "config parsing exceeded max recursion depth of %d.\n"
msgstr "配置解析时超过最大 %d 的递归深度。\n"
-#: src/pacman/conf.c:996
+#: src/pacman/conf.c:956
#, c-format
msgid "config file %s could not be read: %s\n"
msgstr "无法读取配置文件 %s: %s\n"
-#: src/pacman/conf.c:1019
+#: src/pacman/conf.c:979
#, 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/query.c:423 src/pacman/remove.c:91
-#: src/pacman/sync.c:929 src/pacman/upgrade.c:47
+#: 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
#, c-format
msgid "no targets specified (use -h for help)\n"
msgstr "没有指定目标 (使用 -h 获取帮助) \n"
@@ -505,16 +505,46 @@ msgstr "没有指定安装原因 ( 使用 -h 获取帮助)\n"
msgid "could not set install reason for package %s (%s)\n"
msgstr "无法为软件包 %s 指定安装原因 (%s)\n"
-#: src/pacman/database.c:78
+#: src/pacman/database.c:79
#, c-format
msgid "%s: install reason has been set to 'installed as dependency'\n"
msgstr "%s:安装原因设定为“作为依赖关系安装”\n"
-#: src/pacman/database.c:80
+#: src/pacman/database.c:81
#, c-format
msgid "%s: install reason has been set to 'explicitly installed'\n"
msgstr "%s:安装原因设定为“单独指定安装”\n"
+#: src/pacman/database.c:293
+#, c-format
+msgid "No database errors have been found!\n"
+msgstr ""
+
+#: src/pacman/files.c:81
+#, fuzzy, c-format
+msgid "%s is owned by %s%s/%s%s %s%s%s\n"
+msgstr "%s 属于 %s %s\n"
+
+#: src/pacman/files.c:223
+#, fuzzy, 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
+#, c-format
+msgid "package '%s' was not found\n"
+msgstr "软件包 '%s' 未找到\n"
+
+#: src/pacman/files.c:291 src/pacman/sync.c:898
+#, c-format
+msgid "Synchronizing package databases...\n"
+msgstr "正在同步软件包数据库...\n"
+
+#: src/pacman/files.c:320
+#, fuzzy, c-format
+msgid "no options specified (use -h for help)\n"
+msgstr "没有指定的操作 (使用 -h 获取帮助) \n"
+
#: src/pacman/package.c:99
#, c-format
msgid "Architecture"
@@ -550,7 +580,7 @@ msgstr "依赖于"
msgid "Description"
msgstr "描述"
-#: src/pacman/package.c:106 src/pacman/util.c:822
+#: src/pacman/package.c:106 src/pacman/util.c:818
#, c-format
msgid "Download Size"
msgstr "下载大小"
@@ -655,7 +685,7 @@ msgstr "验证者"
msgid "Version"
msgstr "版本"
-#: src/pacman/package.c:174 src/pacman/util.c:1206
+#: src/pacman/package.c:174 src/pacman/util.c:1223
#, c-format
msgid " [installed]"
msgstr "[已安装]"
@@ -676,8 +706,8 @@ msgid "Unknown"
msgstr "未知的"
#: src/pacman/package.c:236 src/pacman/package.c:321 src/pacman/package.c:339
-#: src/pacman/util.c:490 src/pacman/util.c:676 src/pacman/util.c:716
-#: src/pacman/util.c:744
+#: src/pacman/util.c:486 src/pacman/util.c:672 src/pacman/util.c:712
+#: src/pacman/util.c:740
#, c-format
msgid "None"
msgstr "无"
@@ -757,13 +787,14 @@ msgstr "操作:\n"
msgid ""
"\n"
"use '%s {-h --help}' with an operation for available options\n"
-msgstr "\n使用 '%s {-h --help}' 及某个操作以查看可用选项\n"
+msgstr ""
+"\n"
+"使用 '%s {-h --help}' 及某个操作以查看可用选项\n"
#: src/pacman/pacman.c:125
#, c-format
msgid ""
-" -c, --cascade remove packages and all packages that depend on "
-"them\n"
+" -c, --cascade remove packages and all packages that depend on them\n"
msgstr " -c, --cascade 删除软件包及所有依赖于此的软件包\n"
#: src/pacman/pacman.c:126
@@ -776,7 +807,9 @@ msgstr " -n, --nosave 删除配置文件\n"
msgid ""
" -s, --recursive remove unnecessary dependencies\n"
" (-ss includes explicitly installed dependencies)\n"
-msgstr " -s, --recursive 删除不需要的依赖关系\n (-ss 包括单独指定安装的依赖关系)\n"
+msgstr ""
+" -s, --recursive 删除不需要的依赖关系\n"
+" (-ss 包括单独指定安装的依赖关系)\n"
#: src/pacman/pacman.c:129
#, c-format
@@ -811,7 +844,8 @@ msgstr " -g, --groups 查看某软件包组所属的所有软件包\n"
#: src/pacman/pacman.c:141
#, c-format
-msgid " -i, --info view package information (-ii for backup files)\n"
+msgid ""
+" -i, --info view package information (-ii for backup files)\n"
msgstr " -i, --info 查看软件包信息 (-ii 查看备份文件) \n"
#: src/pacman/pacman.c:142
@@ -821,7 +855,7 @@ msgid ""
"properties)\n"
msgstr " -k, --check 检查软件包的文件存在(-kk检查文件属性)\n"
-#: src/pacman/pacman.c:143 src/pacman/pacman.c:178
+#: src/pacman/pacman.c:143 src/pacman/pacman.c:179
#, c-format
msgid " -l, --list list the files owned by the queried package\n"
msgstr " -l, --list 列出被查询软件包的内容\n"
@@ -831,7 +865,8 @@ msgstr " -l, --list 列出被查询软件包的内容\n"
msgid ""
" -m, --foreign list installed packages not found in sync db(s) "
"[filter]\n"
-msgstr " -m, --foreign 列出没有在同步数据库时找到的已安装软件包 [过滤器]\n"
+msgstr ""
+" -m, --foreign 列出没有在同步数据库时找到的已安装软件包 [过滤器]\n"
#: src/pacman/pacman.c:145
#, c-format
@@ -840,7 +875,7 @@ msgid ""
"[filter]\n"
msgstr " -n, --native 列出只在(同步)数据库中的已安装软件包 [过滤]\n"
-#: src/pacman/pacman.c:146 src/pacman/pacman.c:179
+#: src/pacman/pacman.c:146 src/pacman/pacman.c:180
#, c-format
msgid " -o, --owns <file> query the package that owns <file>\n"
msgstr " -o, --owns <文件> 查询哪个软件包拥有<文件>\n"
@@ -850,7 +885,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:180
+#: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:181
#, c-format
msgid " -q, --quiet show less information for query and search\n"
msgstr " -q, --quiet 在查询或搜索时显示较少的信息\n"
@@ -867,7 +902,9 @@ msgstr " -s, --search <regex> 搜寻符合指定字符串的已安装本地的
msgid ""
" -t, --unrequired list packages not (optionally) required by any\n"
" package (-tt to ignore optdepends) [filter]\n"
-msgstr " -t, --unrequired 列出不被任何软件包(可选)要求的软件包(-tt 忽略可选依赖) [过滤器]\n"
+msgstr ""
+" -t, --unrequired 列出不被任何软件包(可选)要求的软件包(-tt 忽略可选依"
+"赖) [过滤器]\n"
#: src/pacman/pacman.c:152
#, c-format
@@ -886,7 +923,9 @@ msgstr " -c, --clean 从缓存目录中删除旧软件包 (-cc 清除
msgid ""
" -g, --groups view all members of a package group\n"
" (-gg to view all groups and members)\n"
-msgstr " -g, --groups 查看某软件包组所属的所有软件包\n (-gg 查看所有软件包组和所属于它们的软件包)\n"
+msgstr ""
+" -g, --groups 查看某软件包组所属的所有软件包\n"
+" (-gg 查看所有软件包组和所属于它们的软件包)\n"
#: src/pacman/pacman.c:159
#, c-format
@@ -902,7 +941,8 @@ msgstr " -l, --list <repo> 查看在该软件库中的软件包清单\n"
#: src/pacman/pacman.c:162
#, c-format
-msgid " -s, --search <regex> search remote repositories for matching strings\n"
+msgid ""
+" -s, --search <regex> search remote repositories for matching strings\n"
msgstr " -s, --search <正则表达式> 按照指定字符串查询远端软件库\n"
#: src/pacman/pacman.c:163
@@ -918,12 +958,14 @@ msgid ""
"anything\n"
msgstr " -w, --downloadonly 下载但不安装/升级软件包\n"
-#: src/pacman/pacman.c:165 src/pacman/pacman.c:183
+#: src/pacman/pacman.c:165 src/pacman/pacman.c:184
#, c-format
msgid ""
" -y, --refresh download fresh package databases from the server\n"
" (-yy to force a refresh even if up to date)\n"
-msgstr " -y, --refresh 从服务器下载新的软件包数据库\n (-yy 强制更新软件包数据库)\n"
+msgstr ""
+" -y, --refresh 从服务器下载新的软件包数据库\n"
+" (-yy 强制更新软件包数据库)\n"
#: src/pacman/pacman.c:171
#, c-format
@@ -942,290 +984,323 @@ msgid ""
"databases)\n"
msgstr " -k, --check 检查本地数据库有效性 (-kk 以同步数据库)\n"
-#: src/pacman/pacman.c:181
+#: src/pacman/pacman.c:174
+#, fuzzy, c-format
+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:182
+#: src/pacman/pacman.c:183
#, c-format
msgid " -x, --regex enable searching using regular expressions\n"
msgstr " -x, --regex 启用正则表达式进行搜索\n"
-#: src/pacman/pacman.c:185
+#: src/pacman/pacman.c:186
#, c-format
msgid ""
" --machinereadable\n"
" produce machine-readable output\n"
-msgstr " --machinereadable\n 产生机器可读输出\n"
-
-#: src/pacman/pacman.c:191
-#, c-format
-msgid " --force force install, overwrite conflicting files\n"
-msgstr " --force 强制安装,覆盖存在冲突的文件\n"
+msgstr ""
+" --machinereadable\n"
+" 产生机器可读输出\n"
#: src/pacman/pacman.c:192
+#, fuzzy, c-format
+msgid ""
+" --overwrite <path>\n"
+" overwrite conflicting files (can be used more than "
+"once)\n"
+msgstr ""
+" --ignoregroup <软件包组>\n"
+" 升级时忽略某个软件包组 (可多次使用) \n"
+
+#: src/pacman/pacman.c:194
#, c-format
msgid " --asdeps install packages as non-explicitly installed\n"
msgstr " --asdeps 作为非单独指定安装的软件包安装\n"
-#: src/pacman/pacman.c:193
+#: src/pacman/pacman.c:195
#, c-format
msgid " --asexplicit install packages as explicitly installed\n"
msgstr " --asexplicit 作为单独指定安装的软件包安装\n"
-#: src/pacman/pacman.c:194
+#: src/pacman/pacman.c:196
#, c-format
msgid ""
" --ignore <pkg> ignore a package upgrade (can be used more than "
"once)\n"
msgstr " --ignore <软件包> 升级时忽略某个软件包 (可多次使用) \n"
-#: src/pacman/pacman.c:195
+#: src/pacman/pacman.c:197
#, c-format
msgid ""
" --ignoregroup <grp>\n"
" ignore a group upgrade (can be used more than once)\n"
-msgstr " --ignoregroup <软件包组>\n 升级时忽略某个软件包组 (可多次使用) \n"
+msgstr ""
+" --ignoregroup <软件包组>\n"
+" 升级时忽略某个软件包组 (可多次使用) \n"
-#: src/pacman/pacman.c:199
+#: src/pacman/pacman.c:201
#, c-format
msgid ""
" -d, --nodeps skip dependency version checks (-dd to skip all "
"checks)\n"
msgstr " -d, --nodeps 跳过依赖关系的版本检查 (-dd 跳过所有检查)\n"
-#: src/pacman/pacman.c:200
+#: src/pacman/pacman.c:202
#, c-format
msgid ""
" --assume-installed <package=version>\n"
" add a virtual package to satisfy dependencies\n"
-msgstr " --assume-installed <package=version>\n 添加一个虚拟包用以满足依赖要求\n"
+msgstr ""
+" --assume-installed <package=version>\n"
+" 添加一个虚拟包用以满足依赖要求\n"
-#: src/pacman/pacman.c:202
+#: src/pacman/pacman.c:204
#, c-format
-msgid " --dbonly only modify database entries, not package files\n"
+msgid ""
+" --dbonly only modify database entries, not package files\n"
msgstr " --dbonly 仅修改数据库条目,而非软件包文件\n"
-#: src/pacman/pacman.c:203
+#: src/pacman/pacman.c:205
#, c-format
msgid ""
" --noprogressbar do not show a progress bar when downloading files\n"
msgstr " --noprogressbar 下载文件时不显示进度条\n"
-#: src/pacman/pacman.c:204
+#: src/pacman/pacman.c:206
#, c-format
msgid ""
" --noscriptlet do not execute the install scriptlet if one exists\n"
msgstr " --noscriptlet 不执行安装小脚本\n"
-#: src/pacman/pacman.c:205
+#: src/pacman/pacman.c:207
#, c-format
msgid ""
" -p, --print print the targets instead of performing the "
"operation\n"
msgstr " -p, --print 打印目标而不是执行操作\n"
-#: src/pacman/pacman.c:206
+#: src/pacman/pacman.c:208
#, c-format
msgid ""
" --print-format <string>\n"
" specify how the targets should be printed\n"
-msgstr " --print-format <字符串>\n 指定如何打印目标\n"
+msgstr ""
+" --print-format <字符串>\n"
+" 指定如何打印目标\n"
-#: src/pacman/pacman.c:211
+#: src/pacman/pacman.c:213
#, c-format
msgid " -b, --dbpath <path> set an alternate database location\n"
msgstr " -b, --dbpath <路径> 指定另外的数据库位置\n"
-#: 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:213
+#: src/pacman/pacman.c:214
#, c-format
msgid " -v, --verbose be verbose\n"
msgstr " -v, --verbose 显示详细信息\n"
-#: src/pacman/pacman.c:214
+#: src/pacman/pacman.c:215
#, c-format
msgid " --arch <arch> set an alternate architecture\n"
msgstr " --arch <架构> 设定另外的架构\n"
-#: src/pacman/pacman.c:215
+#: src/pacman/pacman.c:216
+#, c-format
+msgid " --sysroot operate on a mounted guest system (root-only)\n"
+msgstr ""
+
+#: src/pacman/pacman.c:217
#, c-format
msgid " --cachedir <dir> set an alternate package cache location\n"
msgstr " --cachedir <dir> 指定另外的软件包缓存位置\n"
-#: src/pacman/pacman.c:216
+#: src/pacman/pacman.c:218
#, c-format
msgid " --hookdir <dir> set an alternate hook location\n"
msgstr " --hookdir <目录> 指定另外的钩子位置\n"
-#: src/pacman/pacman.c:217
+#: src/pacman/pacman.c:219
#, c-format
msgid " --color <when> colorize the output\n"
msgstr " --color <when> 彩色化输出\n"
-#: src/pacman/pacman.c:218
+#: src/pacman/pacman.c:220
#, c-format
msgid " --config <path> set an alternate configuration file\n"
msgstr " --config <路径> 指定另外的配置文件\n"
-#: src/pacman/pacman.c:219
+#: src/pacman/pacman.c:221
#, c-format
msgid " --debug display debug messages\n"
msgstr " --debug 显示调试信息\n"
-#: src/pacman/pacman.c:220
+#: src/pacman/pacman.c:222
#, c-format
msgid " --gpgdir <path> set an alternate home directory for GnuPG\n"
msgstr " --gpgdir <路径> 设定 GnuPG 的其他主目录\n"
-#: src/pacman/pacman.c:221
+#: src/pacman/pacman.c:223
#, c-format
msgid " --logfile <path> set an alternate log file\n"
msgstr " --logfile <路径> 指定另外的日志文件\n"
-#: src/pacman/pacman.c:222
+#: src/pacman/pacman.c:224
#, c-format
msgid " --noconfirm do not ask for any confirmation\n"
msgstr " --noconfirm 不询问确认\n"
-#: src/pacman/pacman.c:223
+#: src/pacman/pacman.c:225
#, c-format
msgid " --confirm always ask for confirmation\n"
msgstr " --confirm 总是询问确认\n"
-#: src/pacman/pacman.c:242
+#: src/pacman/pacman.c:226
+#, c-format
+msgid ""
+" --disable-download-timeout\n"
+" use relaxed timeouts for download\n"
+msgstr ""
+
+#: src/pacman/pacman.c:246
#, c-format
msgid ""
" This program may be freely redistributed under\n"
" the terms of the GNU General Public License.\n"
-msgstr " 本程序可以在GNU一般公众许可条款下\n 自由分发\n"
+msgstr ""
+" 本程序可以在GNU一般公众许可条款下\n"
+" 自由分发\n"
+
+#: src/pacman/pacman.c:279
+#, c-format
+msgid "HTTP_USER_AGENT truncated\n"
+msgstr ""
-#: src/pacman/pacman.c:302
+#: src/pacman/pacman.c:311
#, c-format
msgid "invalid option: '%s' and '%s' may not be used together\n"
msgstr "无效选项: 选项 '%s' 和 '%s' 不可以同时使用\n"
-#: src/pacman/pacman.c:386
+#: src/pacman/pacman.c:395
#, c-format
msgid "invalid argument '%s' for %s\n"
msgstr " '%s' 不是 %s 的合法参数\n"
-#: src/pacman/pacman.c:409
+#: src/pacman/pacman.c:418
#, c-format
msgid "'%s' is not a valid debug level\n"
msgstr "'%s' 不是有效的调试级别\n"
-#: src/pacman/pacman.c:952
+#: src/pacman/pacman.c:453
+#, c-format
+msgid "option --root is deprecated; use --sysroot instead\n"
+msgstr ""
+
+#: src/pacman/pacman.c:722
+#, c-format
+msgid "option --force is deprecated; use --overwrite instead\n"
+msgstr ""
+
+#: src/pacman/pacman.c:982
#, c-format
msgid "only one operation may be used at a time\n"
msgstr "一次只能运行一个操作\n"
-#: src/pacman/pacman.c:1010
+#: src/pacman/pacman.c:1040
#, c-format
msgid "invalid option '-%c'\n"
msgstr "无效选项 '-%c'\n"
-#: src/pacman/pacman.c:1012
+#: src/pacman/pacman.c:1042
#, c-format
msgid "invalid option '--%s'\n"
msgstr "无效选项 '--%s'\n"
-#: src/pacman/pacman.c:1170
+#: src/pacman/pacman.c:1167
#, c-format
-msgid "memory exhausted in argument parsing\n"
-msgstr "参数解析时内存耗尽\n"
+msgid "you cannot perform this operation unless you are root.\n"
+msgstr "非 root (根用户) 无法执行指定操作。\n"
+
+#: src/pacman/pacman.c:1173
+#, fuzzy, c-format
+msgid "chroot to '%s' failed: (%s)\n"
+msgstr "无法注册 '%s' 数据库 (%s)\n"
+
+#: src/pacman/pacman.c:1207
+#, fuzzy, c-format
+msgid "failed to read arguments from stdin: (%s)\n"
+msgstr "无法准备事务处理 (%s)\n"
-#: src/pacman/pacman.c:1179
+#: src/pacman/pacman.c:1212
#, c-format
msgid "failed to reopen stdin for reading: (%s)\n"
msgstr "无法打开 stdin 以读取:(%s)\n"
-#: src/pacman/pacman.c:1184
+#: src/pacman/pacman.c:1217
#, c-format
msgid "argument '-' specified with empty stdin\n"
msgstr "有参数 '-' 但标准输入中没有数据\n"
-#: src/pacman/pacman.c:1189
+#: src/pacman/pacman.c:1222
#, c-format
msgid "argument '-' specified without input on stdin\n"
msgstr "有参数'-'但标准输入中没有数据\n"
-#: src/pacman/pacman.c:1218
-#, c-format
-msgid "you cannot perform this operation unless you are root.\n"
-msgstr "非 root (根用户) 无法执行指定操作。\n"
-
-#: src/pacman/pacman.c:1272
+#: src/pacman/pacman.c:1299
#, c-format
msgid "no operation specified (use -h for help)\n"
msgstr "没有指定的操作 (使用 -h 获取帮助) \n"
-#: src/pacman/query.c:86
-#, c-format
-msgid "%s is owned by %s %s\n"
+#: src/pacman/query.c:87
+#, fuzzy, c-format
+msgid "%s is owned by %s%s %s%s%s\n"
msgstr "%s 属于 %s %s\n"
-#: src/pacman/query.c:147
+#: src/pacman/query.c:149
#, c-format
msgid "no file was specified for --owns\n"
msgstr "没有为 --owns 指定文件\n"
-#: src/pacman/query.c:176
+#: src/pacman/query.c:170
#, c-format
-msgid "failed to find '%s' in PATH: %s\n"
-msgstr "无法找到 '%s' (在路径:%s 中)\n"
-
-#: src/pacman/query.c:181
-#, c-format
-msgid "failed to read file '%s': %s\n"
-msgstr "无法读取文件 '%s':%s\n"
-
-#: src/pacman/query.c:188
-#, c-format
-msgid "cannot determine real path for '%s': %s\n"
-msgstr "无法确定 '%s' 的真实路径:%s\n"
+msgid "empty string passed to file owner query\n"
+msgstr ""
-#: src/pacman/query.c:195 src/pacman/query.c:216
+#: src/pacman/query.c:197 src/pacman/query.c:219
#, c-format
msgid "No package owns %s\n"
msgstr "没有软件包拥有 %s\n"
-#: src/pacman/query.c:204
+#: src/pacman/query.c:206
#, c-format
msgid "path too long: %s/\n"
msgstr "路径过长:%s\n"
-#: src/pacman/query.c:329
+#: src/pacman/query.c:332
#, c-format
msgid "[ignored]"
msgstr "[被忽略的]"
-#: src/pacman/query.c:380
+#: src/pacman/query.c:383
#, c-format
msgid "group '%s' was not found\n"
msgstr "软件组 '%s' 未找到\n"
-#: src/pacman/query.c:471 src/pacman/sync.c:429
+#: src/pacman/query.c:469
#, c-format
-msgid "package '%s' was not found\n"
-msgstr "软件包 '%s' 未找到\n"
+msgid "could not load package '%s': %s\n"
+msgstr "无法加载软件包 '%s': %s\n"
-#: src/pacman/query.c:474
+#: src/pacman/query.c:483
#, c-format
msgid "'%s' is a file, you might want to use %s.\n"
msgstr "'%s' 是一个文件,您可能打算使用 %s。\n"
-#: src/pacman/query.c:480
-#, c-format
-msgid "could not load package '%s': %s\n"
-msgstr "无法加载软件包 '%s': %s\n"
-
-#: src/pacman/remove.c:49 src/pacman/sync.c:526 src/pacman/sync.c:610
+#: 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"
@@ -1235,12 +1310,12 @@ msgstr "正在跳过软件包:%s\n"
msgid "target not found: %s\n"
msgstr "未找到目标:%s\n"
-#: src/pacman/remove.c:118 src/pacman/sync.c:738
+#: src/pacman/remove.c:118 src/pacman/sync.c:742
#, c-format
msgid "failed to prepare transaction (%s)\n"
msgstr "无法准备事务处理 (%s)\n"
-#: src/pacman/remove.c:125 src/pacman/sync.c:724
+#: src/pacman/remove.c:125
#, c-format
msgid "%s: removing %s breaks dependency '%s'\n"
msgstr "%s:移除 %s 将破坏依赖关系 '%s'\n"
@@ -1255,7 +1330,7 @@ msgstr "%s 被指定为 HoldPkg (保留软件包) 。\n"
msgid "HoldPkg was found in target list. Do you want to continue?"
msgstr "在目标清单中发现 HoldPkg 指定的软件包。你确定要继续吗?"
-#: src/pacman/remove.c:157 src/pacman/sync.c:781
+#: src/pacman/remove.c:157 src/pacman/sync.c:785
#, c-format
msgid " there is nothing to do\n"
msgstr "今日无事可做\n"
@@ -1265,7 +1340,7 @@ msgstr "今日无事可做\n"
msgid "Do you want to remove these packages?"
msgstr "打算删除这些软件包吗?"
-#: src/pacman/remove.c:175 src/pacman/sync.c:808
+#: src/pacman/remove.c:175 src/pacman/sync.c:812
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr "无法提交处理 (%s)\n"
@@ -1350,92 +1425,97 @@ msgstr "软件库 '%s' 不存在\n"
msgid "repository \"%s\" was not found.\n"
msgstr "软件库 \"%s\" 未找到\n"
-#: src/pacman/sync.c:560
-#, c-format
-msgid "There is %d member in group %s:\n"
-msgid_plural "There are %d members in group %s:\n"
+#: src/pacman/sync.c:561
+#, fuzzy, 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] "共有 %d 组员在组 %s 中:\n"
-#: src/pacman/sync.c:639
+#: src/pacman/sync.c:640
#, c-format
msgid "database not found: %s\n"
msgstr "未找到数据库:%s\n"
-#: src/pacman/sync.c:667
+#: src/pacman/sync.c:668
#, c-format
msgid "'%s' is a file, did you mean %s instead of %s?\n"
msgstr "'%s' 是一个文件,您是否想要 %s 而不是 %s?\n"
-#: src/pacman/sync.c:697
+#: src/pacman/sync.c:699
#, c-format
msgid "Starting full system upgrade...\n"
msgstr "正在进行全面系统更新...\n"
-#: src/pacman/sync.c:717
-#, c-format
-msgid "%s: requires %s\n"
-msgstr "%s: 要求 %s\n"
-
#: src/pacman/sync.c:720
#, c-format
-msgid "%s: installing %s (%s) breaks dependency '%s'\n"
+msgid "unable to satisfy dependency '%s' required by %s\n"
+msgstr ""
+
+#: src/pacman/sync.c:724
+#, fuzzy, c-format
+msgid "installing %s (%s) breaks dependency '%s' required by %s\n"
msgstr "%s:安装 %s (%s) 将破坏依赖关系 '%s'\n"
-#: src/pacman/sync.c:744
+#: src/pacman/sync.c:728
+#, fuzzy, c-format
+msgid "removing %s breaks dependency '%s' required by %s\n"
+msgstr "%s:移除 %s 将破坏依赖关系 '%s'\n"
+
+#: src/pacman/sync.c:748
#, c-format
msgid "package %s does not have a valid architecture\n"
msgstr "软件包 '%s' 未包含一个有效的架构\n"
-#: src/pacman/sync.c:759
+#: src/pacman/sync.c:763
#, c-format
msgid "%s and %s are in conflict\n"
msgstr "%s 与 %s 有冲突\n"
-#: src/pacman/sync.c:763
+#: src/pacman/sync.c:767
#, c-format
msgid "%s and %s are in conflict (%s)\n"
msgstr "%s: 与 %s 冲突 (%s)\n"
-#: src/pacman/sync.c:797
+#: src/pacman/sync.c:801
#, c-format
msgid "Proceed with download?"
msgstr "进行下载吗?"
-#: src/pacman/sync.c:799
+#: src/pacman/sync.c:803
#, c-format
msgid "Proceed with installation?"
msgstr "进行安装吗?"
-#: src/pacman/sync.c:813
+#: src/pacman/sync.c:817
#, c-format
msgid "unable to %s directory-file conflicts\n"
msgstr "无法%s目录-文件冲突\n"
-#: src/pacman/sync.c:819
+#: src/pacman/sync.c:823
#, c-format
msgid "%s exists in both '%s' and '%s'\n"
msgstr "%s 同时存在于 '%s' 和 '%s'\n"
-#: src/pacman/sync.c:823
+#: src/pacman/sync.c:828
+#, fuzzy, c-format
+msgid "%s: %s exists in filesystem (owned by %s)\n"
+msgstr "%s: 文件系统中已存在 %s \n"
+
+#: src/pacman/sync.c:831
#, c-format
msgid "%s: %s exists in filesystem\n"
msgstr "%s: 文件系统中已存在 %s \n"
-#: src/pacman/sync.c:836
+#: src/pacman/sync.c:845
#, c-format
msgid "%s is invalid or corrupted\n"
msgstr "%s 无效或已损坏\n"
-#: src/pacman/sync.c:844
+#: src/pacman/sync.c:853
#, c-format
msgid "Errors occurred, no packages were upgraded.\n"
msgstr "发生错误,没有软件包被更新。\n"
-#: src/pacman/sync.c:889
-#, c-format
-msgid "Synchronizing package databases...\n"
-msgstr "正在同步软件包数据库...\n"
-
#: src/pacman/upgrade.c:56
#, c-format
msgid "memory exhausted\n"
@@ -1461,234 +1541,260 @@ msgstr "无法锁定数据库:%s\n"
msgid ""
" if you're sure a package manager is not already\n"
" running, you can remove %s\n"
-msgstr " 如果你确认软件包管理器没有在运行,\n 你可以删除 %s。\n"
+msgstr ""
+" 如果你确认软件包管理器没有在运行,\n"
+" 你可以删除 %s。\n"
#: src/pacman/util.c:97
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr "无法释放事务处理 (%s)\n"
-#: src/pacman/util.c:130
+#: src/pacman/util.c:133
#, c-format
msgid "no usable package repositories configured.\n"
msgstr "没有设置可用的软件包库。\n"
-#: src/pacman/util.c:139
+#: src/pacman/util.c:142
#, c-format
msgid "database '%s' is not valid (%s)\n"
msgstr "数据库 '%s' 无效 (%s)\n"
-#: src/pacman/util.c:158
+#: src/pacman/util.c:161
#, c-format
msgid "failed to update %s (%s)\n"
msgstr "无法升级 %s (%s)\n"
-#: src/pacman/util.c:161
+#: src/pacman/util.c:165
#, c-format
msgid " %s is up to date\n"
msgstr " %s 已经是最新版本\n"
-#: src/pacman/util.c:173
-#, c-format
-msgid "failed to synchronize any databases\n"
+#: src/pacman/util.c:170
+#, fuzzy, c-format
+msgid "failed to synchronize all databases\n"
msgstr "无法同步任何数据库\n"
-#: src/pacman/util.c:640
+#: src/pacman/util.c:636
#, c-format
msgid "insufficient columns available for table display\n"
msgstr "栏数不足以使用表格显示视图\n"
-#: src/pacman/util.c:761
+#: src/pacman/util.c:757
#, c-format
msgid "Valid"
msgstr "有效"
-#: src/pacman/util.c:764
+#: src/pacman/util.c:760
#, c-format
msgid "Key expired"
msgstr "密匙已过期"
-#: src/pacman/util.c:767
+#: src/pacman/util.c:763
#, c-format
msgid "Expired"
msgstr "已过期"
-#: src/pacman/util.c:770
+#: src/pacman/util.c:766
#, c-format
msgid "Invalid"
msgstr "无效"
-#: src/pacman/util.c:773
+#: src/pacman/util.c:769
#, c-format
msgid "Key unknown"
msgstr "未知密匙"
-#: src/pacman/util.c:776
+#: src/pacman/util.c:772
#, c-format
msgid "Key disabled"
msgstr "已禁用密匙"
-#: src/pacman/util.c:779
+#: src/pacman/util.c:775
#, c-format
msgid "Signature error"
msgstr "签名错误"
-#: src/pacman/util.c:784
+#: src/pacman/util.c:780
#, c-format
msgid "full trust"
msgstr "完全信任"
-#: src/pacman/util.c:787
+#: src/pacman/util.c:783
#, c-format
msgid "marginal trust"
msgstr "有限信任"
-#: src/pacman/util.c:790
+#: src/pacman/util.c:786
#, c-format
msgid "never trust"
msgstr "永不信任"
-#: src/pacman/util.c:794
+#: src/pacman/util.c:790
#, c-format
msgid "unknown trust"
msgstr "未知信任"
-#: src/pacman/util.c:798
+#: src/pacman/util.c:794
#, c-format
msgid "%s, %s from \"%s\""
msgstr "%s,%s 来自 \"%s\""
-#: src/pacman/util.c:816
+#: src/pacman/util.c:812
#, c-format
msgid "Package"
msgstr "软件包"
-#: src/pacman/util.c:819
+#: src/pacman/util.c:815
#, c-format
msgid "Old Version"
msgstr "旧版本"
-#: src/pacman/util.c:820
+#: src/pacman/util.c:816
#, c-format
msgid "New Version"
msgstr "新版本"
-#: src/pacman/util.c:821
+#: src/pacman/util.c:817
#, c-format
msgid "Net Change"
msgstr "净变化"
-#: src/pacman/util.c:919
+#: src/pacman/util.c:915
#, c-format
msgid "removal"
msgstr "删除"
-#: src/pacman/util.c:925
+#: src/pacman/util.c:921
#, c-format
msgid "Packages"
msgstr "软件包"
-#: src/pacman/util.c:946
+#: src/pacman/util.c:942
#, c-format
msgid "Total Download Size:"
msgstr "下载大小:"
-#: src/pacman/util.c:950
+#: src/pacman/util.c:946
#, c-format
msgid "Total Installed Size:"
msgstr "全部安装大小:"
-#: src/pacman/util.c:953
+#: src/pacman/util.c:949
#, c-format
msgid "Total Removed Size:"
msgstr "全部移去体积:"
-#: src/pacman/util.c:957
+#: src/pacman/util.c:953
#, c-format
msgid "Net Upgrade Size:"
msgstr "净更新大小:"
-#: src/pacman/util.c:1208
+#: src/pacman/util.c:1225
#, c-format
msgid " [pending]"
msgstr "[等待中]"
-#: src/pacman/util.c:1232
+#: src/pacman/util.c:1249
#, c-format
msgid "New optional dependencies for %s\n"
msgstr "%s 的新可选依赖\n"
-#: src/pacman/util.c:1254
+#: src/pacman/util.c:1271
#, c-format
msgid "Optional dependencies for %s\n"
msgstr "%s 的可选依赖\n"
-#: src/pacman/util.c:1267
-#, c-format
-msgid "Repository %s\n"
+#: src/pacman/util.c:1285
+#, fuzzy, c-format
+msgid "Repository %s%s\n"
msgstr "软件库 %s\n"
-#: src/pacman/util.c:1307
+#: src/pacman/util.c:1326
#, c-format
msgid "invalid value: %d is not between %d and %d\n"
msgstr "无效值:%d 不在 %d 和 %d 之间\n"
-#: src/pacman/util.c:1314
+#: src/pacman/util.c:1333
#, c-format
msgid "invalid number: %s\n"
msgstr "无效数字:%s\n"
-#: src/pacman/util.c:1398
+#: src/pacman/util.c:1419
#, c-format
msgid "Enter a selection (default=all)"
msgstr "输入某个选择 ( 默认=全部选定 )"
-#: src/pacman/util.c:1465
+#: src/pacman/util.c:1486
#, c-format
msgid "Enter a number (default=%d)"
msgstr "输入某个数字 ( 默认=%d )"
-#: src/pacman/util.c:1548
+#: src/pacman/util.c:1570
#, c-format
msgid "[Y/n]"
msgstr "[Y/n]"
-#: src/pacman/util.c:1550
+#: src/pacman/util.c:1572
#, c-format
msgid "[y/N]"
msgstr "[y/N]"
-#: src/pacman/util.c:1575
+#: src/pacman/util.c:1597
#, c-format
msgid "Y"
msgstr "Y"
-#: src/pacman/util.c:1575
+#: src/pacman/util.c:1597
#, c-format
msgid "YES"
msgstr "是"
-#: src/pacman/util.c:1577
+#: src/pacman/util.c:1599
#, c-format
msgid "N"
msgstr "N"
-#: src/pacman/util.c:1577
+#: src/pacman/util.c:1599
#, c-format
msgid "NO"
msgstr "否"
-#: src/pacman/util.c:1644
+#: src/pacman/util.c:1666
#, c-format
msgid "failed to allocate string\n"
msgstr "无法分配字符串\n"
-#: src/pacman/util.c:1681 src/pacman/util.c:1731
+#: src/pacman/util.c:1703 src/pacman/util.c:1753
#, c-format
msgid "error: "
msgstr "错误:"
-#: src/pacman/util.c:1685 src/pacman/util.c:1735
+#: src/pacman/util.c:1707 src/pacman/util.c:1757
#, c-format
msgid "warning: "
msgstr "警告:"
+
+#~ msgid "could not add mirror '%s' to database '%s' (%s)\n"
+#~ msgstr "无法添加 '%s' 镜像到数据库 '%s' (%s)\n"
+
+#~ msgid " --force force install, overwrite conflicting files\n"
+#~ msgstr " --force 强制安装,覆盖存在冲突的文件\n"
+
+#~ msgid " -r, --root <path> set an alternate installation root\n"
+#~ msgstr " -r, --root <路径> 指定另外的安装根目录\n"
+
+#~ msgid "memory exhausted in argument parsing\n"
+#~ msgstr "参数解析时内存耗尽\n"
+
+#~ msgid "failed to find '%s' in PATH: %s\n"
+#~ msgstr "无法找到 '%s' (在路径:%s 中)\n"
+
+#~ msgid "failed to read file '%s': %s\n"
+#~ msgstr "无法读取文件 '%s':%s\n"
+
+#~ msgid "cannot determine real path for '%s': %s\n"
+#~ msgstr "无法确定 '%s' 的真实路径:%s\n"
+
+#~ msgid "%s: requires %s\n"
+#~ msgstr "%s: 要求 %s\n"