summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-03-09 01:34:10 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-03-16 17:59:31 +0100
commitd61960d9244340956a27f4ca46aecd15cc75e18b (patch)
treec8f7cb33e08c84bcf06fbff39647dc03bc103afb /po/zh_CN.po
parentb0be0e09cfbbcb033eb0b92eaf17ac31a6b9f423 (diff)
parent1a0619ac765cc0b2f4906c96c1a4d7f510569a3f (diff)
merge debian/sid into debian/experimental
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po2476
1 files changed, 1229 insertions, 1247 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index db316aebe..661d8f92c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,14 +4,15 @@
# Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
+# Zhou Mo <cdluminate@gmail.com>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
-"PO-Revision-Date: 2010-08-26 14:42+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\n"
+"PO-Revision-Date: 2014-12-04 04:42+0000\n"
+"Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -24,145 +25,148 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:277
msgid "Total package names: "
msgstr "软件包名称总数:"
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:279
msgid "Total package structures: "
msgstr "全部软件包结构:"
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:319
msgid " Normal packages: "
msgstr " 普通软件包:"
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:320
msgid " Pure virtual packages: "
msgstr " 完全虚拟软件包:"
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:321
msgid " Single virtual packages: "
msgstr " 单虚拟软件包:"
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:322
msgid " Mixed virtual packages: "
msgstr " 混合虚拟软件包:"
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:323
msgid " Missing: "
msgstr " 缺失:"
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:325
msgid "Total distinct versions: "
msgstr "按版本共计:"
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:327
msgid "Total distinct descriptions: "
msgstr "按不同的说明共计:"
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:329
msgid "Total dependencies: "
msgstr "按依赖关系共计:"
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:332
msgid "Total ver/file relations: "
msgstr "按版本/文件关系共计:"
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:334
msgid "Total Desc/File relations: "
msgstr "按说明/文件关系共计:"
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:336
msgid "Total Provides mappings: "
msgstr "提供映射共计:"
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:348
msgid "Total globbed strings: "
msgstr "Glob 字串共计:"
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:362
+msgid "Total dependency version space: "
+msgstr "依赖关系版本名所占空间共计:"
+
+#: cmdline/apt-cache.cc:367
msgid "Total slack space: "
msgstr "Slack 空间共计:"
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:375
msgid "Total space accounted for: "
msgstr "总占用空间:"
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步。"
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 cmdline/apt-mark.cc:59
#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "没有发现匹配的软件包"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "您必须明确地给出至少一个表达式"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1421
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+msgstr "该命令已废弃。请使用‘apt-mark showauto’代替。"
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
#, c-format
msgid "Unable to locate package %s"
msgstr "未发现软件包 %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1546
msgid "Package files:"
msgstr "软件包文件:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "缓存尚未同步,无法交差引证(x-ref)一个软件包文件"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1567
msgid "Pinned packages:"
msgstr "被锁定的软件包:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
msgid "(not found)"
msgstr "(没有找到)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1587
msgid " Installed: "
msgstr " 已安装:"
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1588
msgid " Candidate: "
msgstr " 候选软件包:"
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
msgid "(none)"
msgstr "(无)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1621
msgid " Package pin: "
msgstr " 软件包锁:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1630
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s,用于 %s 构架,编译于 %s %s\n"
-#: cmdline/apt-cache.cc:1829
-#, fuzzy
+#: cmdline/apt-cache.cc:1750
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -199,15 +203,13 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
"用法: apt-cache [选项] 命令\n"
-"    apt-cache [选项] add 文件1 [文件2 ...]\n"
"    apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
"    apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"
"\n"
-"apt-cache 是一个底层的工具,我们用它来操纵 APT 的二进制\n"
-"缓存文件,也用来在那些文件中查询相关信息\n"
+"apt-cache 是一个底层的工具,可以用来\n"
+"在 APT 的二进制缓存文件中查询信息\n"
"\n"
"命令:\n"
-" add - 向源缓存加入一个软件包文件\n"
" gencaches - 同时生成软件包和源代码包的缓存\n"
" showpkg - 显示某个软件包的全面信息\n"
" showsrc - 显示源文件的各项记录\n"
@@ -217,7 +219,6 @@ msgstr ""
" unmet - 显示所有未满足的依赖关系\n"
" search - 根据正则表达式搜索软件包列表\n"
" show - 以便于阅读的格式介绍该软件包\n"
-" showauto - 显示自动安装的软件包的列表\n"
" depends - 显示该软件包的依赖关系信息\n"
" rdepends - 显示所有依赖于该软件包的软件包名字\n"
" pkgnames - 列出所有软件包的名字\n"
@@ -255,6 +256,9 @@ msgid ""
"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
"mount point."
msgstr ""
+"从默认挂载点自动检测 CD-ROM 失败。\n"
+"您可以尝试用 --cdrom 选项来设置 CD-ROM 的挂载点。\n"
+"更多关于 CD-ROM 自动检测以及挂载点的信息,请参见‘man apt-cdrom’。"
#: cmdline/apt-cdrom.cc:182
msgid "Repeat this process for the rest of the CDs in your set."
@@ -288,80 +292,75 @@ msgstr ""
" dump - 显示配置文件\n"
"\n"
"选项:\n"
-" -h 本帮助文本。\n"
+" -h 显示本帮助文本。\n"
" -c=? 读取指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:245
+#, c-format
msgid "Can not find a package for architecture '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "找不到‘%s’体系结构下的软件包"
-#: cmdline/apt-get.cc:322
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:327
+#, c-format
msgid "Can not find a package '%s' with version '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "找不到软件包‘%s’的‘%s’版本"
-#: cmdline/apt-get.cc:325
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:330
+#, c-format
msgid "Can not find a package '%s' with release '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "找不到软件包‘%s’的‘%s’发行"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "选择 %s 作为源代码包而非 %s\n"
-#: cmdline/apt-get.cc:418
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:423
+#, c-format
msgid "Can not find version '%s' of package '%s'"
-msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
+msgstr "找不到 %2$s 软件包的 %1$s 版本"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:863
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
-msgstr ""
+msgstr "该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’替代。"
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,问题解决工具坏事了"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "无法对目录 %s 加锁"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:786
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -370,164 +369,166 @@ msgstr ""
"提示:%s 的打包工作被维护于以下位置的 %s 版本控制系统中:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:791
+#, c-format
msgid ""
"Please use:\n"
"bzr branch %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
"请使用:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
"获得该软件包的最近更新(可能尚未正式发布)。\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr "忽略已下载过的文件“%s”\n"
+msgstr "忽略已下载的文件“%s”\n"
+
+#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "无法获知您在 %s 上的可用空间"
+
+#: cmdline/apt-get.cc:886
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "您在 %s 上没有足够的可用空间"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:895
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:900
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:906
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:924
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:967
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:968
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:996
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:1015
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1034
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1059
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
+"找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::Architectures for "
+"setup"
-#: cmdline/apt-get.cc:1060
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1070
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "无法处理构建依赖关系"
-
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1106
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:1288
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1276
+#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
-msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+msgstr ""
+"由于 %3$s 不被软件包 %4$s 所允许,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1294
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1317
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:已安装的软件包 %3$s 太新"
-#: cmdline/apt-get.cc:1368
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1356
+#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 "
-"%1$s 依赖关系"
+"软件包 %3$s 的候选版本不能满足版本要求,因此 %2$s 软件包的 %1$s 依赖无法满足"
-#: cmdline/apt-get.cc:1374
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1362
+#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
-msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+msgstr "软件包 %3$s 没有可用的候选版本,因此 %2$s 的 %1$s 依赖无法满足"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1385
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1400
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1405
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#, c-format
msgid "Changelog for %s (%s)"
-msgstr "正在连接 %s (%s)"
+msgstr "%s (%s) 的 Changelog"
-#: cmdline/apt-get.cc:1615
+#: cmdline/apt-get.cc:1596
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:1656
-#, fuzzy
+#: cmdline/apt-get.cc:1637
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -576,7 +577,7 @@ msgstr ""
"    apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
"    apt-get [选项] source 软件包1 [软件包2 ...]\n"
"\n"
-"apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n"
+"apt-get 是一个用于下载和安装软件包的简易命令行界面。\n"
"最常用命令是 update 和 install。\n"
"\n"
"命令:\n"
@@ -591,10 +592,10 @@ msgstr ""
" dist-upgrade - 发布版升级,见 apt-get(8)\n"
" dselect-upgrade - 根据 dselect 的选择来进行升级\n"
" clean - 删除所有已下载的包文件\n"
-" autoclean - 删除老版本的已下载的包文件\n"
+" autoclean - 删除已下载的旧包文件\n"
" check - 核对以确认系统的依赖关系的完整性\n"
-" markauto - 标记指定的软件包为自动安装\n"
-" unmarkauto - 标记指定的软件包为手动安装\n"
+" changelog - 下载指定软件包,并显示其changelog\n"
+" download - 下载指定的二进制包到当前目录\n"
"\n"
"选项:\n"
" -h 本帮助文档。\n"
@@ -616,18 +617,17 @@ msgstr ""
#: cmdline/apt-helper.cc:36
msgid "Need one URL as argument"
-msgstr ""
+msgstr "需要一个 URL 作为参数"
#: cmdline/apt-helper.cc:49
-#, fuzzy
msgid "Must specify at least one pair url/filename"
-msgstr "要下载源代码,必须指定至少一个对应的软件包"
+msgstr "必须指定至少一对URL或者文件名"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
-msgstr ""
+msgstr "下载失败"
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:91
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -640,51 +640,62 @@ msgid ""
"\n"
" This APT helper has Super Meep Powers.\n"
msgstr ""
+"用法: apt-helper [选项] 命令\n"
+" apt-helper [选项] download-file uri target-path\n"
+"\n"
+"apt-helper 是一个 apt 的内部帮助程序\n"
+"\n"
+"命令:\n"
+" download-file - 将uri指定的文件下载到指定目标目录\n"
+" auto-detect-proxy - 用 apt.conf 检测代理设置\n"
+"\n"
+" This APT helper has Super Meep Powers.\n"
#: cmdline/apt-mark.cc:68
-#, fuzzy, c-format
+#, c-format
msgid "%s can not be marked as it is not installed.\n"
-msgstr "但是它还没有被安装"
+msgstr "%s 还没有安装,因此无法标记。\n"
#: cmdline/apt-mark.cc:74
-#, fuzzy, c-format
+#, c-format
msgid "%s was already set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+msgstr "%s 已经被设置为手动安装。\n"
#: cmdline/apt-mark.cc:76
-#, fuzzy, c-format
+#, c-format
msgid "%s was already set to automatically installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+msgstr "%s 已经被设置为自动安装。\n"
#: cmdline/apt-mark.cc:241
-#, fuzzy, c-format
+#, c-format
msgid "%s was already set on hold.\n"
-msgstr "%s 已经是最新的版本了。\n"
+msgstr "%s 已经设置为保留。\n"
#: cmdline/apt-mark.cc:243
-#, fuzzy, c-format
+#, c-format
msgid "%s was already not hold.\n"
-msgstr "%s 已经是最新的版本了。\n"
+msgstr "%s 已经设置为不保留。\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
-#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1317
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
-#, fuzzy, c-format
+#, c-format
msgid "%s set on hold.\n"
-msgstr "%s 已设置为手动安装。\n"
+msgstr "%s 设置为保留。\n"
#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
-#, fuzzy, c-format
+#, c-format
msgid "Canceled hold on %s.\n"
-msgstr "无法打开 %s"
+msgstr "取消保留 %s 的设置。\n"
#: cmdline/apt-mark.cc:345
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "执行 dpkg 失败。您是 root 吗?"
#: cmdline/apt-mark.cc:392
msgid ""
@@ -712,6 +723,29 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
+"用法:apt-mark [选项] {auto|manual} 软件包1 [软件包2 ...]\n"
+"\n"
+"apt-mark 是一个可以对软件包进行 手动/自动 安装标记的简单命令行界面。\n"
+"它也能列出标记。\n"
+"\n"
+"命令:\n"
+" auto - 标记指定软件包为自动安装\n"
+" manual - 标记指定软件包为手动安装\n"
+" hold - 标记指定软件包为保留(held back)\n"
+" unhold - 取消指定软件包的保留(held back)标记\n"
+" showauto - 列出所有自动安装的软件包\n"
+" showmanual - 列出所有手动安装的软件包\n"
+" showhold - 列出设为保留的软件包\n"
+"\n"
+"选项:\n"
+" -h 显示本帮助信息\n"
+" -q 日志型输出 - 不显示进度\n"
+" -qq 安静模式,只输出错误信息\n"
+" -s 无动作。只说明将要做什么。\n"
+" -f 读取/写入 指定文件的 自动/手动 标记\n"
+" -c=? 读取指定的配置文件\n"
+" -o=? 任意设置一个配置项,比如 -o dir::cache=/tmp\n"
+"更多细节请参见 the apt-mark(8) 和 apt.conf(5) 的 man 手册。"
#: cmdline/apt.cc:47
msgid ""
@@ -734,6 +768,23 @@ msgid ""
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
+"用法: apt [选项] 命令\n"
+"\n"
+"apt 的命令行界面。\n"
+"基本命令:\n"
+" list - 根据名称列出软件包\n"
+" search - 搜索软件包描述\n"
+" show - 显示软件包细节\n"
+"\n"
+" update - 更新可用软件包列表\n"
+"\n"
+" install - 安装软件包\n"
+" remove - 移除软件包\n"
+"\n"
+" upgrade - 通过 安装/升级 软件来更新系统\n"
+" full-upgrade - 通过 卸载/安装/升级 来更新系统\n"
+"\n"
+" edit-sources - 编辑软件源信息文件\n"
#: methods/cdrom.cc:203
#, c-format
@@ -765,12 +816,12 @@ msgstr "找不到盘片。"
msgid "File not found"
msgstr "无法找到该文件"
-#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
#: methods/rred.cc:608
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
+#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -779,157 +830,157 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "无效的 URI,本地的 URI 不能以 // 开头"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:178
+#: methods/ftp.cc:177
msgid "Logging in"
msgstr "正在登录"
-#: methods/ftp.cc:184
+#: methods/ftp.cc:183
msgid "Unable to determine the peer name"
msgstr "无法获知对方主机名"
-#: methods/ftp.cc:189
+#: methods/ftp.cc:188
msgid "Unable to determine the local name"
msgstr "无法获知本地主机名"
-#: methods/ftp.cc:220 methods/ftp.cc:248
+#: methods/ftp.cc:219 methods/ftp.cc:247
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "服务器拒绝了我们的连接,响应信息为:%s"
-#: methods/ftp.cc:226
+#: methods/ftp.cc:225
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:233
+#: methods/ftp.cc:232
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:253
+#: methods/ftp.cc:252
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
"您指定了代理服务器,但是没有登陆脚本,Acquire::ftp::ProxyLogin 设置为空。"
-#: methods/ftp.cc:281
+#: methods/ftp.cc:280
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "登录脚本命令“%s”出错,服务器响应信息为:%s"
-#: methods/ftp.cc:307
+#: methods/ftp.cc:306
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
msgid "Connection timeout"
msgstr "连接超时"
-#: methods/ftp.cc:351
+#: methods/ftp.cc:350
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
-#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529
-#: apt-pkg/contrib/fileutl.cc:1531
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
+#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
+#: apt-pkg/contrib/fileutl.cc:1492
msgid "Read error"
msgstr "读错误"
-#: methods/ftp.cc:361 methods/rsh.cc:209
+#: methods/ftp.cc:360 methods/rsh.cc:209
msgid "A response overflowed the buffer."
msgstr "回应超出了缓存区大小。"
-#: methods/ftp.cc:378 methods/ftp.cc:390
+#: methods/ftp.cc:377 methods/ftp.cc:389
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:463 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911
-#: apt-pkg/contrib/fileutl.cc:1637 apt-pkg/contrib/fileutl.cc:1646
-#: apt-pkg/contrib/fileutl.cc:1651 apt-pkg/contrib/fileutl.cc:1653
-#: apt-pkg/contrib/fileutl.cc:1678
+#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
+#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
+#: apt-pkg/contrib/fileutl.cc:1639
msgid "Write error"
msgstr "写出错"
-#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
msgid "Could not create a socket"
msgstr "无法创建套接字"
-#: methods/ftp.cc:713
+#: methods/ftp.cc:712
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数据套接字,连接超时"
-#: methods/ftp.cc:717 methods/connect.cc:116
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "失败"
-#: methods/ftp.cc:719
+#: methods/ftp.cc:718
msgid "Could not connect passive socket."
msgstr "无法连接被动模式的套接字。"
-#: methods/ftp.cc:736
+#: methods/ftp.cc:735
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo 无法得到监听套接字"
-#: methods/ftp.cc:750
+#: methods/ftp.cc:749
msgid "Could not bind a socket"
msgstr "无法绑定套接字"
-#: methods/ftp.cc:754
+#: methods/ftp.cc:753
msgid "Could not listen on the socket"
msgstr "无法在套接字上监听"
-#: methods/ftp.cc:761
+#: methods/ftp.cc:760
msgid "Could not determine the socket's name"
msgstr "无法确定套接字的名字"
-#: methods/ftp.cc:793
+#: methods/ftp.cc:792
msgid "Unable to send PORT command"
msgstr "无法发出 PORT 指令"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:802
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "无法识别的地址族 %u (AF_*)"
-#: methods/ftp.cc:812
+#: methods/ftp.cc:811
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:832
+#: methods/ftp.cc:831
msgid "Data socket connect timed out"
msgstr "数据套接字连接超时"
-#: methods/ftp.cc:839
+#: methods/ftp.cc:838
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "把文件加入哈希表时出错"
-#: methods/ftp.cc:892
+#: methods/ftp.cc:890
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "无法获取文件,服务器响应信息为“%s”"
-#: methods/ftp.cc:907 methods/rsh.cc:338
+#: methods/ftp.cc:905 methods/rsh.cc:338
msgid "Data socket timed out"
msgstr "数据套接字超时"
-#: methods/ftp.cc:944
+#: methods/ftp.cc:935
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "数据传送出错,服务器响应信息为“%s”"
#. Get the files information
-#: methods/ftp.cc:1027
+#: methods/ftp.cc:1014
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1141
+#: methods/ftp.cc:1128
msgid "Unable to invoke "
msgstr "无法调用 "
@@ -981,9 +1032,9 @@ msgid "Temporary failure resolving '%s'"
msgstr "暂时不能解析域名“%s”"
#: methods/connect.cc:209
-#, fuzzy, c-format
+#, c-format
msgid "System error resolving '%s:%s'"
-msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
+msgstr "解析“%s:%s”时出现系统故障"
#: methods/connect.cc:211
#, c-format
@@ -995,70 +1046,70 @@ msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:168
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:172
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr "无法运行 apt-key 以验证签名(您安装了 gnupg 吗?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:180
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
-msgstr ""
+msgstr "明文签署文件不可用,结果为‘%s’(您的网络需要认证吗?)"
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:184
msgid "Unknown error executing apt-key"
msgstr "运行 apt-key 时发生未知错误"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr "由于没有公钥,无法验证下列签名:\n"
-#: methods/gzip.cc:79
+#: methods/gzip.cc:69
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "空文件不能当作有效归档"
-#: methods/http.cc:515
+#: methods/http.cc:513
msgid "Error writing to the file"
msgstr "写入文件出错"
-#: methods/http.cc:529
+#: methods/http.cc:527
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:531
+#: methods/http.cc:529
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:567
+#: methods/http.cc:565
msgid "Error writing to file"
msgstr "写入文件出错"
-#: methods/http.cc:627
+#: methods/http.cc:625
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:632
+#: methods/http.cc:630
msgid "Connection timed out"
msgstr "连接超时"
-#: methods/http.cc:655
+#: methods/http.cc:653
msgid "Error writing to output file"
msgstr "写输出文件时出错"
@@ -1066,112 +1117,110 @@ msgstr "写输出文件时出错"
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "错误的报头行"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "该 HTTP 服务器发送了一个无效的应答报头"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "该 HTTP 服务器的 range 支持不正常"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/server.cc:497
+#: methods/server.cc:494
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:511 methods/server.cc:567
msgid "Connection failed"
msgstr "连接失败"
-#: methods/server.cc:580
-#, c-format
-msgid ""
-"Automatically disabled %s due to incorrect response from server/proxy. (man "
-"5 apt.conf)"
-msgstr ""
-
-#: methods/server.cc:703
+#: methods/server.cc:659
msgid "Internal error"
msgstr "内部错误"
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
-msgstr ""
+msgstr "正在排序"
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 未能完成"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "怪了……文件大小不符,请发信给 apt@packages.debian.org 吧"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+#: apt-private/private-install.cc:200
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "您在 %s 上没有足够的可用空间。"
+
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了仅执行常规操作,但这不是个常规操作。"
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:195
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "是,按我说的做!"
-#: apt-private/private-install.cc:197
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1182,19 +1231,19 @@ msgstr ""
"若还想继续的话,就输入下面的短句“%s”\n"
" ?] "
-#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "中止执行。"
-#: apt-private/private-install.cc:218
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "您希望继续执行吗?"
-#: apt-private/private-install.cc:288
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "有一些文件无法下载"
-#: apt-private/private-install.cc:295
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1202,19 +1251,19 @@ msgstr ""
"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试?"
-#: apt-private/private-install.cc:299
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换"
-#: apt-private/private-install.cc:304
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: apt-private/private-install.cc:305
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "中止安装。"
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1223,15 +1272,15 @@ msgid_plural ""
"all files have been overwritten by other packages:"
msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失:"
-#: apt-private/private-install.cc:345
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "注意:这是自动被 dpkg 有意完成的。"
-#: apt-private/private-install.cc:366
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们不应该进行删除,无法启动自动删除器"
-#: apt-private/private-install.cc:474
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1247,15 +1296,15 @@ msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "下列信息可能会对解决问题有所帮助:"
-#: apt-private/private-install.cc:481
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部错误,自动卸载工具坏事了"
-#: apt-private/private-install.cc:488
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1263,24 +1312,23 @@ msgid_plural ""
"required:"
msgstr[0] "下列软件包是自动安装的并且现在不需要了:"
-#: apt-private/private-install.cc:492
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
"%lu packages were automatically installed and are no longer required.\n"
msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
-#: apt-private/private-install.cc:494
-#, fuzzy
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用'apt-get autoremove'来卸载它们"
+msgstr[0] "使用'apt-get autoremove'来卸载它(它们)。"
-#: apt-private/private-install.cc:587
+#: apt-private/private-install.cc:612
msgid "You might want to run 'apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-#: apt-private/private-install.cc:589
+#: apt-private/private-install.cc:614
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1288,7 +1336,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1299,139 +1347,136 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: apt-private/private-install.cc:633
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "破损的软件包"
-#: apt-private/private-install.cc:710
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: apt-private/private-install.cc:800
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: apt-private/private-install.cc:801
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: apt-private/private-install.cc:823
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n"
-#: apt-private/private-install.cc:827
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "忽略了 %s,它已经被安装而且仅请求了升级。\n"
-#: apt-private/private-install.cc:839
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安装 %s,因为无法下载它。\n"
-#: apt-private/private-install.cc:844
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
-msgstr "%s 已经是最新的版本了。\n"
+msgstr "%s 已经是最新的版本。\n"
-#: apt-private/private-install.cc:892
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
-#: apt-private/private-install.cc:897
-#, fuzzy, c-format
+#: apt-private/private-install.cc:899
+#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+msgstr "由于 %4$s,为 %3$s 选定了版本 %1$s (%2$s)\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:939
-#, fuzzy, c-format
+#: apt-private/private-install.cc:941
+#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "软件包 %s 还未安装,因而不会被卸载\n"
+msgstr "软件包 %s 还未安装,因而不会被卸载。您的意思是 ‘%s’ 吗?\n"
-#: apt-private/private-install.cc:945
-#, fuzzy, c-format
+#: apt-private/private-install.cc:947
+#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "软件包 %s 还未安装,因而不会被卸载\n"
-#: apt-private/private-list.cc:121
+#: apt-private/private-list.cc:129
msgid "Listing"
-msgstr ""
+msgstr "正在列表"
-#: apt-private/private-list.cc:151
+#: apt-private/private-list.cc:159
#, c-format
msgid "There is %i additional version. Please use the '-a' switch to see it"
msgid_plural ""
"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
+msgstr[0] "还有 %i 个版本。请使用 -a 选项来查看它(他们)。"
-#: apt-private/private-cachefile.cc:95
+#: apt-private/private-cachefile.cc:93
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: apt-private/private-cachefile.cc:98
+#: apt-private/private-cachefile.cc:96
msgid " failed."
msgstr " 失败。"
-#: apt-private/private-cachefile.cc:101
+#: apt-private/private-cachefile.cc:99
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:102
msgid "Unable to minimize the upgrade set"
msgstr "无法最小化要升级的软件包集合"
-#: apt-private/private-cachefile.cc:106
+#: apt-private/private-cachefile.cc:104
msgid " Done"
msgstr " 完成"
-#: apt-private/private-cachefile.cc:110
+#: apt-private/private-cachefile.cc:108
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-#: apt-private/private-cachefile.cc:113
+#: apt-private/private-cachefile.cc:111
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
#: apt-private/private-show.cc:89
msgid "unknown"
-msgstr ""
+msgstr "未知"
#: apt-private/private-output.cc:265
-#, fuzzy, c-format
+#, c-format
msgid "[installed,upgradable to: %s]"
-msgstr " [已安装]"
+msgstr "[已安装,可升级至:%s]"
#: apt-private/private-output.cc:268
-#, fuzzy
msgid "[installed,local]"
-msgstr " [已安装]"
+msgstr "[已安装,本地]"
#: apt-private/private-output.cc:270
msgid "[installed,auto-removable]"
-msgstr ""
+msgstr "[已安装,可自动卸载]"
#: apt-private/private-output.cc:272
-#, fuzzy
msgid "[installed,automatic]"
-msgstr " [已安装]"
+msgstr "[已安装,自动]"
#: apt-private/private-output.cc:274
-#, fuzzy
msgid "[installed]"
-msgstr " [已安装]"
+msgstr "[已安装]"
#: apt-private/private-output.cc:277
#, c-format
msgid "[upgradable from: %s]"
-msgstr ""
+msgstr "[可从该版本升级:%s]"
#: apt-private/private-output.cc:281
msgid "[residual-config]"
-msgstr ""
+msgstr "[配置文件残留]"
#: apt-private/private-output.cc:455
#, c-format
@@ -1535,7 +1580,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
#. YESEXPR/NOEXPR defined in your l10n.
#: apt-private/private-output.cc:761
msgid "[Y/n]"
-msgstr ""
+msgstr "[Y/n]"
#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
#. e.g. "Should this file be removed? [y/N] "
@@ -1543,19 +1588,19 @@ msgstr ""
#. YESEXPR/NOEXPR defined in your l10n.
#: apt-private/private-output.cc:767
msgid "[y/N]"
-msgstr ""
+msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
#: apt-private/private-output.cc:778
msgid "Y"
-msgstr ""
+msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
#: apt-private/private-output.cc:784
msgid "N"
-msgstr ""
+msgstr "N"
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -1564,27 +1609,28 @@ msgstr "编译正则表达式时出错 - %s"
msgid "The update command takes no arguments"
msgstr " update 命令不需要参数"
-#: apt-private/private-update.cc:95
+#: apt-private/private-update.cc:97
#, c-format
msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
msgid_plural ""
"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
msgstr[0] ""
+"有 %i 个软件包可以升级。请执行 ‘apt list --upgradable’ 来查看它们。\n"
-#: apt-private/private-update.cc:99
+#: apt-private/private-update.cc:101
msgid "All packages are up to date."
-msgstr ""
+msgstr "所有软件包均为最新。"
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
msgid_plural ""
"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
+msgstr[0] "有 %i 条附加记录。请加上 ‘-a’ 参数来查看它们"
#: apt-private/private-show.cc:163
msgid "not a real package (virtual)"
-msgstr ""
+msgstr "不是一个实包(虚包)"
#: apt-private/private-main.cc:32
msgid ""
@@ -1597,85 +1643,76 @@ msgstr ""
"   apt-get 需要 root 特权进行实际的执行。\n"
"   同时请记住此时并未锁定,所以请勿完全相信当前的情况!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:36
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:下列软件包不能通过验证!"
-#: apt-private/private-download.cc:98
+#: apt-private/private-download.cc:40
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: apt-private/private-download.cc:108
+#: apt-private/private-download.cc:50
msgid "Install these packages without verification?"
msgstr "不经验证就安装这些软件包吗?"
-#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "无法获知您在 %s 上的可用空间"
-
-#: apt-private/private-download.cc:188
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "您在 %s 上没有足够的可用空间。"
-
#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse %s. Edit again? "
-msgstr "无法将 %s 重命名为 %s"
+msgstr "解析 %s 失败。请重新编辑之后再试。"
#: apt-private/private-sources.cc:70
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgstr "您的 %s 文件有过改动,请执行 ‘apt-get update’。"
#: apt-private/private-search.cc:69
msgid "Full Text Search"
-msgstr ""
+msgstr "全文搜索"
+
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade"
+msgstr "正在对升级进行计算"
+
+#: apt-private/private-upgrade.cc:28
+msgid "Done"
+msgstr "完成"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "命中 "
-#: apt-private/acqprogress.cc:88
+#: apt-private/acqprogress.cc:90
msgid "Get:"
msgstr "获取:"
-#: apt-private/acqprogress.cc:119
+#: apt-private/acqprogress.cc:121
msgid "Ign "
msgstr "忽略 "
-#: apt-private/acqprogress.cc:126
+#: apt-private/acqprogress.cc:125
msgid "Err "
msgstr "错误 "
-#: apt-private/acqprogress.cc:150
+#: apt-private/acqprogress.cc:146
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr "下载 %sB,耗时 %s (%sB/s)\n"
-#: apt-private/acqprogress.cc:240
+#: apt-private/acqprogress.cc:236
#, c-format
msgid " [Working]"
msgstr " [执行中]"
-#: apt-private/acqprogress.cc:301
+#: apt-private/acqprogress.cc:297
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -1688,18 +1725,18 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1715,14 +1752,14 @@ msgstr "没有找到镜像文件 %s"
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
#: methods/mirror.cc:287
-#, fuzzy, c-format
+#, c-format
msgid "Can not read mirror file '%s'"
-msgstr "没有找到镜像文件 %s"
+msgstr "无法读取镜像文件 %s"
#: methods/mirror.cc:315
-#, fuzzy, c-format
+#, c-format
msgid "No entry found in mirror file '%s'"
-msgstr "没有找到镜像文件 %s"
+msgstr "在镜像文件 %s 中未找到所需条目"
#: methods/mirror.cc:445
#, c-format
@@ -1771,452 +1808,205 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们,
msgid "Merging available information"
msgstr "正在合并可用信息"
-#: cmdline/apt-extracttemplates.cc:227
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" -t Set the temp dir\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法: apt-extracttemplates 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
-"信息的工具\n"
-"\n"
-"选项:\n"
-" -h 本帮助文本\n"
-" -t 设置 temp 目录\n"
-" -c=? 读指定的配置文件\n"
-" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "无法读取 %s 的状态"
-
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
-#: apt-pkg/contrib/fileutl.cc:2097
-#, c-format
-msgid "Unable to write to %s"
-msgstr "无法写入 %s"
-
-#: cmdline/apt-extracttemplates.cc:303
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "软件包的扩展列表太长"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "处理目录 %s 时出错"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "源扩展列表太长"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "将头写入到目录文件时出错"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "处理目录 %s 时出错"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "把 DropNode 用在了仍在链表中的节点上"
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-" sources srcpath [overridefile [pathprefix]]\n"
-" contents path\n"
-" release path\n"
-" generate config [groups]\n"
-" clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-" dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" --md5 Control MD5 generation\n"
-" -s=? Source override file\n"
-" -q Quiet\n"
-" -d=? Select the optional caching database\n"
-" --no-delink Enable delinking debug mode\n"
-" --contents Control contents file generation\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option"
-msgstr ""
-"用法: apt-ftparchive [选项] 命令\n"
-"命令: packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
-" sources 源代码包搜索路径 [overridefile [路径前缀]]\n"
-" contents 搜索路径\n"
-" release 搜索路径\n"
-" generate 配置文件 [groups]\n"
-" clean 配置文件\n"
-"\n"
-"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
-"多种生成索引的方式,从全自动的索引生成到在功能上取代 dpkg-scanpackages \n"
-"和 dpkg-scansources,都能游刃有余\n"
-"\n"
-"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
-"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小,\n"
-"还有软件包的所有控制字段的内容。该软件同时支持 override 文件,\n"
-"通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
-"\n"
-"与上面类似,apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
-"可以通过使用 --source-override 选项来指定一个 override 文件\n"
-"\n"
-"使用“packages”和“source”命令时,必须在文件树的根部执行本程序。\n"
-"二进制包的搜索路径一定要是递归搜索的底层,而且 override 文件里\n"
-"应该注明 override 的标志。若指定了路径前缀,那么它会被加到文件名前面。\n"
-"下面有个来自 Debian 文档的例子:\n"
-" apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
-" dists/potato/main/binary-i386/Packages\n"
-"\n"
-"选项:\n"
-" -h 本帮助文档\n"
-" --md5 使之生成 MD5 校验和\n"
-" -s=? 源代码包 override 文件\n"
-" -q 输出精简信息\n"
-" -d=? 指定可选的缓存数据库\n"
-" -d=? 使用另一个可选的缓存数据库\n"
-" --no-delink 开启delink的调试模式\n"
-" --contents 使之生成控制内容文件\n"
-" -c=? 读取指定配置文件\n"
-" -o=? 设置任意指定的配置选项"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "无法定位哈希表元素!"
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "没有任何选定项是匹配的"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "无法分配转移项"
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "软件包文件组“%s”中缺少一些文件"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "内部错误,出现在 AddDiversion"
-#: ftparchive/cachedb.cc:67
+#: apt-inst/filelist.cc:477
#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "数据库被损坏,该数据库文件的文件名已改成 %s.old"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "尝试覆盖一个转移项,%s -> %s 和 %s/%s"
-#: ftparchive/cachedb.cc:85
+#: apt-inst/filelist.cc:506
#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "数据库已过期,现尝试进行升级 %s"
-
-#: ftparchive/cachedb.cc:96
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"数据库格式无效。如果您是从一个老版本的 apt 升级而来,请删除数据库并重建它。"
+msgid "Double add of diversion %s -> %s"
+msgstr "添加了两个转移项 %s-> %s"
-#: ftparchive/cachedb.cc:101
+#: apt-inst/filelist.cc:549
#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "无法打开数据库文件 %s:%s"
+msgid "Duplicate conf file %s/%s"
+msgstr "重复的配置文件 %s/%s"
-#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
-#: apt-inst/extract.cc:216
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
#, c-format
-msgid "Failed to stat %s"
-msgstr "无法获得 %s 的状态"
-
-#: ftparchive/cachedb.cc:326
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "无法读取符号链接 %s"
-
-#: ftparchive/cachedb.cc:359
-msgid "Archive has no control record"
-msgstr "归档文件没有包含控制字段"
-
-#: ftparchive/cachedb.cc:526
-msgid "Unable to get a cursor"
-msgstr "无法获得游标"
+msgid "The path %s is too long"
+msgstr "路径名 %s 太长"
-#: ftparchive/writer.cc:104
+#: apt-inst/extract.cc:132
#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "警告:无法读取目录 %s\n"
+msgid "Unpacking %s more than once"
+msgstr "%s 被解包了不只一次"
-#: ftparchive/writer.cc:109
+#: apt-inst/extract.cc:142
#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "警告:无法获得 %s 的状态\n"
-
-#: ftparchive/writer.cc:165
-msgid "E: "
-msgstr "错误:"
-
-#: ftparchive/writer.cc:167
-msgid "W: "
-msgstr "警告:"
-
-#: ftparchive/writer.cc:174
-msgid "E: Errors apply to file "
-msgstr "错误:处理文件时出错 "
+msgid "The directory %s is diverted"
+msgstr "目录 %s 已被转移"
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: apt-inst/extract.cc:152
#, c-format
-msgid "Failed to resolve %s"
-msgstr "无法解析 %s"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "该软件包正尝试写入转移对象 %s/%s"
-#: ftparchive/writer.cc:205
-msgid "Tree walking failed"
-msgstr "无法遍历目录树"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "该转移路径太长"
-#: ftparchive/writer.cc:232
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:182
#, c-format
-msgid "Failed to open %s"
-msgstr "无法打开 %s"
+msgid "Failed to stat %s"
+msgstr "无法获得 %s 的状态"
-#: ftparchive/writer.cc:291
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Failed to rename %s to %s"
+msgstr "无法将 %s 重命名为 %s"
-#: ftparchive/writer.cc:299
+#: apt-inst/extract.cc:249
#, c-format
-msgid "Failed to readlink %s"
-msgstr "无法读取符号链接 %s"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "目录 %s 要被一个非目录的文件替换"
-#: ftparchive/writer.cc:303
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "无法使用 unlink 删除 %s"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "无法在其散列桶中分配节点"
-#: ftparchive/writer.cc:311
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** 无法将 %s 链接到 %s"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "路径名太长"
-#: ftparchive/writer.cc:321
+#: apt-inst/extract.cc:421
#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " 达到了 DeLink 的上限 %sB。\n"
-
-#: ftparchive/writer.cc:427
-msgid "Archive had no package field"
-msgstr "归档文件没有包含 package 字段"
+msgid "Overwrite package match with no version for %s"
+msgstr "用来覆盖的软件包不属于 %s 的任何版本"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: apt-inst/extract.cc:438
#, c-format
-msgid " %s has no override entry\n"
-msgstr " %s 中没有 override 项\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: apt-inst/extract.cc:498
#, c-format
-msgid " %s maintainer is %s not %s\n"
-msgstr " %s 的维护者 %s 并非 %s\n"
+msgid "Unable to stat %s"
+msgstr "无法读取 %s 的状态"
-#: ftparchive/writer.cc:720
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
#, c-format
-msgid " %s has no source override entry\n"
-msgstr " %s 没有源代码的 override 项\n"
+msgid "Failed to write file %s"
+msgstr "无法写入文件 %s"
-#: ftparchive/writer.cc:724
+#: apt-inst/dirstream.cc:105
#, c-format
-msgid " %s has no binary override entry either\n"
-msgstr " %s 中没有二进制文件的 override 项\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 分配内存失败"
+msgid "Failed to close file %s"
+msgstr "无法关闭文件 %s"
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
#, c-format
-msgid "Unable to open %s"
-msgstr "无法打开 %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”"
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
#, c-format
-msgid "Failed to read the override file %s"
-msgstr "无法读取 override 文件 %s"
-
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+msgid "Internal error, could not locate member %s"
+msgstr "内部错误,无法定位包内文件 %s"
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "不能解析的主控文件"
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "无效的归档签名"
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "未知的压缩算法“%s”"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "读取归档成员文件头出错"
-#: ftparchive/multicompress.cc:103
+#: apt-inst/contrib/arfile.cc:96
#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
+msgid "Invalid archive member header %s"
+msgstr "归档文件中成员文件头 %s 无效"
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "无法创建 FILE*"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "归档文件中成员文件头无效"
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "无法 fork"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "归档文件太短"
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "压缩子进程"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "无法读取归档文件的数据头"
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "内部错误,无法创建 %s"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "无法创建管道"
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "无法对子进程或文件进行读写"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "无法执行 gzip"
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "在计算 MD5 校验和时无法读取数据"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "包文件已被损坏"
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "在使用 unlink 删除 %s 时出错"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar 的校验和不符,文件已损坏"
-#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#: apt-inst/contrib/extracttar.cc:308
#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "无法将 %s 重命名为 %s"
-
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-" -h This help text.\n"
-" -q Loggable output - no progress indicator\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法: apt-extracttemplates 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
-"信息的工具\n"
-"\n"
-"选项:\n"
-" -h 本帮助文本\n"
-" -t 设置 temp 目录\n"
-" -c=? 读指定的配置文件\n"
-" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "未知的软件包记录!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" -s Use source file sorting\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法: apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n"
-"是用来指出后面参数所示文件是哪种文件。\n"
-"\n"
-"选项:\n"
-" -h 本帮助文档\n"
-" -s 根据源文件排序\n"
-" -c=? 读取指定配置文件\n"
-" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "未知的 TAR 数据头类型 %u,成员 %s"
-#: apt-pkg/install-progress.cc:59
+#: apt-pkg/install-progress.cc:57
#, c-format
msgid "Progress: [%3i%%]"
-msgstr ""
+msgstr "进度:[%3i%%]"
-#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
msgid "Running dpkg"
msgstr "正在运行 dpkg"
-#: apt-pkg/init.cc:156
+#: apt-pkg/init.cc:146
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:172
+#: apt-pkg/init.cc:162
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n"
@@ -2243,109 +2033,103 @@ msgstr "您可能需要运行 apt-get update 来解决这些问题"
msgid "The list of sources could not be read."
msgstr "无法读取源列表。"
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:155
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:161
msgid "The package cache file is corrupted"
msgstr "软件包缓存文件损坏了"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:166
msgid "The package cache file is an incompatible version"
msgstr "软件包缓存区文件的版本不兼容"
-#: apt-pkg/pkgcache.cc:163
-#, fuzzy
+#: apt-pkg/pkgcache.cc:169
msgid "The package cache file is corrupted, it is too small"
-msgstr "软件包缓存文件损坏了"
+msgstr "软件包缓存文件损坏,它太小了"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:174
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "本程序目前不支持“%s”版本系统"
-#: apt-pkg/pkgcache.cc:180
-#, fuzzy, c-format
-msgid "The package cache was built for different architectures: %s vs %s"
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
msgstr "软件包缓存区是为其它架构的硬件构建的"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:321
msgid "Depends"
msgstr "依赖"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:321
msgid "PreDepends"
msgstr "预依赖"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:321
msgid "Suggests"
msgstr "建议"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:322
msgid "Recommends"
msgstr "推荐"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:322
msgid "Conflicts"
msgstr "冲突"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:322
msgid "Replaces"
msgstr "替换"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:323
msgid "Obsoletes"
msgstr "废弃"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:323
msgid "Breaks"
msgstr "破坏"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:323
msgid "Enhances"
msgstr "增强"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:334
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:334
msgid "required"
msgstr "必需"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:334
msgid "standard"
msgstr "标准"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:335
msgid "optional"
msgstr "可选"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:335
msgid "extra"
msgstr "额外"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
-msgid "Calculating upgrade"
-msgstr "正在对升级进行计算"
-
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/acquire-worker.cc:116
#, c-format
msgid "The method driver %s could not be found."
msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
-#: apt-pkg/acquire-worker.cc:135
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
msgid "Is the package %s installed?"
-msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
+msgstr "请检查是否安装了 %s 软件包"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/acquire-worker.cc:169
#, c-format
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/acquire-worker.cc:455
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
@@ -2381,105 +2165,68 @@ msgstr "无法打开状态文件 %s"
msgid "Failed to write temporary StateFile %s"
msgstr "无法写入临时状态文件 %s"
-#: apt-pkg/acquire-item.cc:98
-msgid "Use --allow-insecure-repositories to force the update"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:163
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:168
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/acquire-item.cc:255
-#, fuzzy
+#: apt-pkg/acquire-item.cc:173
msgid "Invalid file format"
-msgstr "无效的操作 %s"
+msgstr "无效的文件格式 %s"
-#: apt-pkg/acquire-item.cc:260
-#, fuzzy
-msgid "Signature error"
-msgstr "写出错"
-
-#: apt-pkg/acquire-item.cc:264
-msgid "Does not start with a cleartext signature"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1588
-#, c-format
-msgid ""
-"An error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
-msgstr ""
-"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG 错误:%s: %s"
-
-#: apt-pkg/acquire-item.cc:1707
-#, fuzzy, c-format
-msgid "The repository '%s' is no longer signed."
-msgstr "目录 %s 已被转移"
-
-#: apt-pkg/acquire-item.cc:1714
-msgid ""
-"This is normally not allowed, but the option Acquire::"
-"AllowDowngradeToInsecureRepositories was given to override it."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1640
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
+"在 Release 文件中找不到期望的条目 %s(sources.list条目有误,或者文件有误)"
-#: apt-pkg/acquire-item.cc:1971
-#, fuzzy, c-format
+#: apt-pkg/acquire-item.cc:1656
+#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "无法解析软件包仓库 Release 文件 %s"
+msgstr "在 Release 文件中找不到 %s 的哈希值"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1698
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:1736
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
+"%s 的 Release 文件已经过期(invalid since %s)。该仓库的更新将不会被应用。"
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:1758
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:1788
#, c-format
msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
+"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
-#: apt-pkg/acquire-item.cc:2241
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG 错误:%s: %s"
+
+#: apt-pkg/acquire-item.cc:1926
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2488,71 +2235,87 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:1992
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgstr "没有源可以用来下载 %s 版本的 %s"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2050
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/pkgcachegen.cc:113
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "%s 的 Clean (清理)不被支持"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "无法读取 %s 的状态。"
+
+#: apt-pkg/pkgcachegen.cc:93
msgid "Cache has an incompatible versioning system"
msgstr "软件包暂存区使用的是不兼容的版本控制系统"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
msgid "Error occurred while processing %s (%s%d)"
-msgstr "处理 %s (FindPkg)时出错"
+msgstr "处理 %s (%s%d) 时出错"
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:257
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "哇,软件包数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "哇,软件包版本数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:263
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr "哇,软件包说明数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:266
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "哇,依赖关系数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:591
+#: apt-pkg/pkgcachegen.cc:576
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:1203
+#: apt-pkg/pkgcachegen.cc:1211
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
msgid "Reading package lists"
msgstr "正在读取软件包列表"
-#: apt-pkg/pkgcachegen.cc:1308
+#: apt-pkg/pkgcachegen.cc:1316
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "无法写入 %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
@@ -2561,56 +2324,50 @@ msgstr "无法读取或写入软件源缓存"
msgid "Vendor block %s contains no fingerprint"
msgstr "软件提供者数据块内 %s 没有包含指纹信息"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
#, c-format
msgid "List directory %spartial is missing."
msgstr "软件包列表的目录 %spartial 缺失。"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:91
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "仓库目录 %spartial 确实。"
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "不支持索引文件类型“%s”"
+#: apt-pkg/acquire.cc:99
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "无法对目录 %s 加锁"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:902
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在下载第 %li 个文件,共 %li 个(还剩 %s 个)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:904
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在下载第 %li 个文件,共 %li 个"
#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
-msgstr ""
-"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
+msgstr "部分索引文件下载失败。如果忽略它们,那将转而使用旧的索引文件。"
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "无法读取 %s 的状态。"
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
msgstr ""
+"'%s' 这个值对 APT::Default-Release 是无效的,因为在源里找不到这样的发行"
#: apt-pkg/policy.cc:422
#, c-format
@@ -2626,7 +2383,7 @@ msgstr "无法识别锁定的类型 %s"
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2635,12 +2392,12 @@ msgstr ""
"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
"(%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
-#, fuzzy, c-format
+#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#, c-format
msgid "Could not configure '%s'. "
-msgstr "无法打开文件 %s"
+msgstr "无法配置 %s。"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:630
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2739,7 +2496,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1086
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2747,7 +2504,7 @@ msgstr ""
"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1088
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
@@ -2755,63 +2512,58 @@ msgstr ""
#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
-msgstr ""
+msgstr "向solver发送情景"
-#: apt-pkg/edsp.cc:237
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
-msgstr ""
+msgstr "向solver发送请求"
-#: apt-pkg/edsp.cc:316
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "准备接收解决方案"
-#: apt-pkg/edsp.cc:323
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
-msgstr ""
+msgstr "外部solver出错,错误信息不恰当"
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
-msgstr ""
+msgstr "执行外部solver"
-#: apt-pkg/tagfile.cc:169
+#: apt-pkg/tagfile.cc:140
#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "无法解析软件包文件 %s (1)"
+msgid "Unable to parse package file %s (%d)"
+msgstr "无法解析软件包文件 %s (%d)"
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "无法解析软件包文件 %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:91
+#: apt-pkg/indexrecords.cc:86
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/indexrecords.cc:139
+#: apt-pkg/indexrecords.cc:117
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/indexrecords.cc:152
+#: apt-pkg/indexrecords.cc:130
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-#: apt-pkg/indexrecords.cc:171
+#: apt-pkg/indexrecords.cc:149
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
+#, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
+msgstr "安装源配置文件“%2$s”第 %1$u 节有错误(URI 解析)"
#: apt-pkg/sourcelist.cc:170
#, c-format
@@ -2879,334 +2631,201 @@ msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
+#, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
+msgstr "无法识别在源列表 %3$s 里,第 %2$u 节中的软件包类别“%1$s”"
-#: apt-pkg/cacheset.cc:501
+#: apt-pkg/cacheset.cc:489
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: apt-pkg/cacheset.cc:504
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:603
#, c-format
msgid "Couldn't find task '%s'"
msgstr "无法找到任务 %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:609
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: apt-pkg/cacheset.cc:646
-#, fuzzy, c-format
+#: apt-pkg/cacheset.cc:615
+#, c-format
msgid "Couldn't find any package by glob '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "无法按照 glob ‘%s’ 找到任何软件包"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:626
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "无法从完全虚拟的软件包 %s 中选择版本"
-#: apt-pkg/cacheset.cc:734
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "因为软件包 %s 是完全的虚拟软件包,无法选择它的最新版"
-
-#: apt-pkg/cacheset.cc:742
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "因为软件包 %s 没有候选版本,无法进行选择"
-
-#: apt-pkg/cacheset.cc:750
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本"
-
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr "因为软件包 %s 没有已安装或候选的版本,无法进行选择"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "正在安装 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "正在配置 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "正在删除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/cacheset.cc:647
#, c-format
-msgid "Completely removing %s"
-msgstr "完全删除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "注意到 %s 已经消失"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "执行安装后执行的触发器 %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "目录 %s 缺失"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "无法打开文件 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "正在准备 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "正在解压缩 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "正在准备配置 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "已安装 %s"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "因为软件包 %s 是完全的虚拟软件包,无法选择它的最新版"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/cacheset.cc:655
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "正在准备 %s 的删除操作"
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "因为软件包 %s 没有候选版本,无法进行选择"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/cacheset.cc:663
#, c-format
-msgid "Removed %s"
-msgstr "已删除 %s"
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "正在准备完全删除 %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%li天 %li小时 %li分 %li秒"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "完全删除了 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "无法写入 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "由于已经达到 MaxReports 限制,没有写入 apport 报告。"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "依赖问题 - 保持未配置"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr "因为错误消息指示这是由于上一个问题导致的错误,没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
+msgid "%lih %limin %lis"
+msgstr "%li小时 %li分 %li秒"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "无法锁定管理目录(%s),是否有其他进程正占用它?"
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "无法对状态列表目录加锁(%s),请查看您是否正以 root 用户运行?"
+msgid "%lis"
+msgstr "%li秒"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1258
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。"
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "未锁定"
+msgid "Selection %s not found"
+msgstr "找不到您选则的 %s"
-#: apt-pkg/contrib/fileutl.cc:196
+#: apt-pkg/contrib/fileutl.cc:190
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读,因而无法使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:201
+#: apt-pkg/contrib/fileutl.cc:195
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:224
+#: apt-pkg/contrib/fileutl.cc:218
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:229
+#: apt-pkg/contrib/fileutl.cc:223
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "无法创建文件列表,因为‘%s’不是一个目录"
-#: apt-pkg/contrib/fileutl.cc:400
+#: apt-pkg/contrib/fileutl.cc:394
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "忽略‘%s’(于目录‘%s’),鉴于它不是一个常规文件"
-#: apt-pkg/contrib/fileutl.cc:418
+#: apt-pkg/contrib/fileutl.cc:412
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+msgstr "忽略‘%s’(于目录‘%s’),鉴于它没有文件扩展名"
-#: apt-pkg/contrib/fileutl.cc:427
+#: apt-pkg/contrib/fileutl.cc:421
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgstr "忽略‘%s’(于目录‘%s’),鉴于它的文件扩展名无效"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:824
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:826
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:952
+#: apt-pkg/contrib/fileutl.cc:913
#, c-format
msgid "Problem closing the gzip file %s"
msgstr "关闭 gzip %s 文件出错"
-#: apt-pkg/contrib/fileutl.cc:1140
+#: apt-pkg/contrib/fileutl.cc:1101
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
#, c-format
msgid "Could not open file descriptor %d"
msgstr "无法打开文件描述符 %d"
-#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
+#: apt-pkg/contrib/fileutl.cc:1315
msgid "Failed to create subprocess IPC"
msgstr "无法创建子进程的 IPC 管道"
-#: apt-pkg/contrib/fileutl.cc:1412
+#: apt-pkg/contrib/fileutl.cc:1373
msgid "Failed to exec compressor "
msgstr "无法执行压缩程序"
-#: apt-pkg/contrib/fileutl.cc:1553
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:1514
+#, c-format
msgid "read, still have %llu to read but none left"
-msgstr "读取文件出错,还剩 %lu 字节没有读出"
+msgstr "还剩 %llu 字节没有读出,但已没有可读信息"
-#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#, c-format
msgid "write, still have %llu to write but couldn't"
-msgstr "写入文件出错,还剩 %lu 字节没有保存"
+msgstr "还剩 %llu 字节没有写入,但无法写入操作"
-#: apt-pkg/contrib/fileutl.cc:1954
+#: apt-pkg/contrib/fileutl.cc:1915
#, c-format
msgid "Problem closing the file %s"
msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1965
+#: apt-pkg/contrib/fileutl.cc:1927
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "重命名文件 %s 为 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1976
+#: apt-pkg/contrib/fileutl.cc:1938
#, c-format
msgid "Problem unlinking the file %s"
msgstr "用 unlink 删除文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1989
+#: apt-pkg/contrib/fileutl.cc:1951
msgid "Problem syncing the file"
msgstr "同步文件出错"
@@ -3222,42 +2841,13 @@ msgstr "%c%s... 完成"
#: apt-pkg/contrib/progress.cc:181
msgid "..."
-msgstr ""
+msgstr "..."
#. Print the spinner
#: apt-pkg/contrib/progress.cc:197
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... 完成"
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li天 %li小时 %li分 %li秒"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li小时 %li分 %li秒"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%li分 %li秒"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%li秒"
-
-#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid "Selection %s not found"
-msgstr "找不到您选则的 %s"
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
@@ -3269,9 +2859,9 @@ msgid "Couldn't duplicate file descriptor %i"
msgstr "无法为复制文件描述符 %i"
#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't make mmap of %llu bytes"
-msgstr "无法 mmap %lu 字节的数据"
+msgstr "无法 mmap %llu 字节的数据"
#: apt-pkg/contrib/mmap.cc:146
msgid "Unable to close mmap"
@@ -3320,61 +2910,67 @@ msgstr "无法读取文件系统挂载点 %s 的状态"
msgid "Failed to stat the cdrom"
msgstr "无法读取盘片的状态"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:519
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写:“%c”"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:633
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:801
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u:配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:820
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u:标签格式有误"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:837
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "语法错误 %s:%u:配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:877
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "语法错误 %s:%u:只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:884
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u:太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "语法错误 %s:%u:Included from here"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:897
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "语法错误 %s:%u:不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "语法错误 %s:%u:clean 指令需要一个选项树作为参数"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:950
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "语法错误 %s:%u:文件尾部有多余的无意义的数据"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s 中没有安装密钥环。"
+
#: apt-pkg/contrib/cmndline.cc:124
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -3421,171 +3017,557 @@ msgstr "不能识别参数 %s,请用 true 或 false"
msgid "Invalid operation %s"
msgstr "无效的操作 %s"
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "把 DropNode 用在了仍在链表中的节点上"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "正在安装 %s"
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "无法定位哈希表元素!"
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Configuring %s"
+msgstr "正在配置 %s"
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "无法分配转移项"
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
+#, c-format
+msgid "Removing %s"
+msgstr "正在删除 %s"
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "内部错误,出现在 AddDiversion"
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "完全删除 %s"
-#: apt-inst/filelist.cc:477
+#: apt-pkg/deb/dpkgpm.cc:116
#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "尝试覆盖一个转移项,%s -> %s 和 %s/%s"
+msgid "Noting disappearance of %s"
+msgstr "注意到 %s 已经消失"
-#: apt-inst/filelist.cc:506
+#: apt-pkg/deb/dpkgpm.cc:117
#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "添加了两个转移项 %s-> %s"
+msgid "Running post-installation trigger %s"
+msgstr "执行安装后执行的触发器 %s"
-#: apt-inst/filelist.cc:549
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:847
#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "重复的配置文件 %s/%s"
+msgid "Directory '%s' missing"
+msgstr "目录 %s 缺失"
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
#, c-format
-msgid "The path %s is too long"
-msgstr "路径名 %s 太长"
+msgid "Could not open file '%s'"
+msgstr "无法打开文件 %s"
-#: apt-inst/extract.cc:132
+#: apt-pkg/deb/dpkgpm.cc:1009
#, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s 被解包了不只一次"
+msgid "Preparing %s"
+msgstr "正在准备 %s"
-#: apt-inst/extract.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1010
#, c-format
-msgid "The directory %s is diverted"
-msgstr "目录 %s 已被转移"
+msgid "Unpacking %s"
+msgstr "正在解压缩 %s"
-#: apt-inst/extract.cc:152
+#: apt-pkg/deb/dpkgpm.cc:1015
#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "该软件包正尝试写入转移对象 %s/%s"
+msgid "Preparing to configure %s"
+msgstr "正在准备配置 %s"
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "该转移路径太长"
+#: apt-pkg/deb/dpkgpm.cc:1017
+#, c-format
+msgid "Installed %s"
+msgstr "已安装 %s"
-#: apt-inst/extract.cc:249
+#: apt-pkg/deb/dpkgpm.cc:1022
#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "目录 %s 要被一个非目录的文件替换"
+msgid "Preparing for removal of %s"
+msgstr "正在准备 %s 的删除操作"
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "无法在其散列桶中分配节点"
+#: apt-pkg/deb/dpkgpm.cc:1024
+#, c-format
+msgid "Removed %s"
+msgstr "已删除 %s"
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "路径名太长"
+#: apt-pkg/deb/dpkgpm.cc:1029
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "正在准备完全删除 %s"
-#: apt-inst/extract.cc:421
+#: apt-pkg/deb/dpkgpm.cc:1030
#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "用来覆盖的软件包不属于 %s 的任何版本"
+msgid "Completely removed %s"
+msgstr "完全删除了 %s"
-#: apt-inst/extract.cc:438
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
+msgid "Can not write log (%s)"
+msgstr "无法写入日志 (%s)"
-#: apt-inst/extract.cc:498
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+msgid "Is /dev/pts mounted?"
+msgstr "/dev/pts 挂载了吗?"
+
+#: apt-pkg/deb/dpkgpm.cc:1670
+msgid "Operation was interrupted before it could finish"
+msgstr "操作在完成之前被打断"
+
+#: apt-pkg/deb/dpkgpm.cc:1732
+msgid "No apport report written because MaxReports is reached already"
+msgstr "由于已经达到 MaxReports 限制,没有写入 apport 报告。"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1737
+msgid "dependency problems - leaving unconfigured"
+msgstr "依赖问题 - 保持未配置"
+
+#: apt-pkg/deb/dpkgpm.cc:1739
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr "因为错误消息指示这是由于上一个问题导致的错误,没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1745
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1752
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr "错误信息显示本地系统有一些问题,因此没有写入 apport 报告"
+
+#: apt-pkg/deb/dpkgpm.cc:1787
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
+
+#: apt-pkg/deb/debsystem.cc:91
#, c-format
-msgid "Unable to stat %s"
-msgstr "无法读取 %s 的状态"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "无法锁定管理目录(%s),是否有其他进程正占用它?"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-pkg/deb/debsystem.cc:94
#, c-format
-msgid "Failed to write file %s"
-msgstr "无法写入文件 %s"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "无法对状态列表目录加锁(%s),请查看您是否正以 root 用户运行?"
-#: apt-inst/dirstream.cc:104
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
#, c-format
-msgid "Failed to close file %s"
-msgstr "无法关闭文件 %s"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg 被中断,您必须手工运行 ‘%s’ 解决此问题。"
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "未锁定"
+
+#: cmdline/apt-extracttemplates.cc:224
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法: apt-extracttemplates 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
+"信息的工具\n"
+"\n"
+"选项:\n"
+" -h 本帮助文本\n"
+" -t 设置 temp 目录\n"
+" -c=? 读指定的配置文件\n"
+" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”"
+msgid "Unable to mkstemp %s"
+msgstr "无法建立临时文件(mkstemp) %s "
-#: apt-inst/deb/debfile.cc:132
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
+
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "软件包的扩展列表太长"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "内部错误,无法定位包内文件 %s"
+msgid "Error processing directory %s"
+msgstr "处理目录 %s 时出错"
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "不能解析的主控文件"
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "源扩展列表太长"
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "无效的归档签名"
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "将头写入到目录文件时出错"
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "读取归档成员文件头出错"
+#: ftparchive/apt-ftparchive.cc:431
+#, c-format
+msgid "Error processing contents %s"
+msgstr "处理目录 %s 时出错"
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/apt-ftparchive.cc:626
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option"
+msgstr ""
+"用法: apt-ftparchive [选项] 命令\n"
+"命令: packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
+" sources 源代码包搜索路径 [overridefile [路径前缀]]\n"
+" contents 搜索路径\n"
+" release 搜索路径\n"
+" generate 配置文件 [groups]\n"
+" clean 配置文件\n"
+"\n"
+"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
+"多种生成索引的方式,从全自动的索引生成到在功能上取代 dpkg-scanpackages \n"
+"和 dpkg-scansources,都能游刃有余\n"
+"\n"
+"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
+"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小,\n"
+"还有软件包的所有控制字段的内容。该软件同时支持 override 文件,\n"
+"通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
+"\n"
+"与上面类似,apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
+"可以通过使用 --source-override 选项来指定一个 override 文件\n"
+"\n"
+"使用“packages”和“source”命令时,必须在文件树的根部执行本程序。\n"
+"二进制包的搜索路径一定要是递归搜索的底层,而且 override 文件里\n"
+"应该注明 override 的标志。若指定了路径前缀,那么它会被加到文件名前面。\n"
+"下面有个来自 Debian 文档的例子:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"选项:\n"
+" -h 本帮助文档\n"
+" --md5 使之生成 MD5 校验和\n"
+" -s=? 源代码包 override 文件\n"
+" -q 输出精简信息\n"
+" -d=? 指定可选的缓存数据库\n"
+" -d=? 使用另一个可选的缓存数据库\n"
+" --no-delink 开启delink的调试模式\n"
+" --contents 使之生成控制内容文件\n"
+" -c=? 读取指定配置文件\n"
+" -o=? 设置任意指定的配置选项"
+
+#: ftparchive/apt-ftparchive.cc:822
+msgid "No selections matched"
+msgstr "没有任何选定项是匹配的"
+
+#: ftparchive/apt-ftparchive.cc:907
#, c-format
-msgid "Invalid archive member header %s"
-msgstr "归档文件中成员文件头 %s 无效"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "软件包文件组“%s”中缺少一些文件"
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "归档文件中成员文件头无效"
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "数据库被损坏,该数据库文件的文件名已改成 %s.old"
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "归档文件太短"
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "数据库已过期,现尝试进行升级 %s"
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "无法读取归档文件的数据头"
+#: ftparchive/cachedb.cc:94
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"数据库格式无效。如果您是从一个老版本的 apt 升级而来,请删除数据库并重建它。"
-#: apt-inst/contrib/extracttar.cc:123
-msgid "Failed to create pipes"
-msgstr "无法创建管道"
+#: ftparchive/cachedb.cc:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "无法打开数据库文件 %s:%s"
-#: apt-inst/contrib/extracttar.cc:150
-msgid "Failed to exec gzip "
-msgstr "无法执行 gzip"
+#: ftparchive/cachedb.cc:332
+msgid "Failed to read .dsc"
+msgstr "读取 .dsc 文件失败"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
-msgid "Corrupted archive"
-msgstr "包文件已被损坏"
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "归档文件没有包含控制字段"
-#: apt-inst/contrib/extracttar.cc:202
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar 的校验和不符,文件已损坏"
+#: ftparchive/cachedb.cc:594
+msgid "Unable to get a cursor"
+msgstr "无法获得游标"
-#: apt-inst/contrib/extracttar.cc:307
+#: ftparchive/writer.cc:91
#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知的 TAR 数据头类型 %u,成员 %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "警告:无法读取目录 %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "警告:无法获得 %s 的状态\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "错误:"
-#~ msgid "Total dependency version space: "
-#~ msgstr "依赖关系版本名所占空间共计:"
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "警告:"
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "错误:处理文件时出错 "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "无法解析 %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "无法遍历目录树"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "无法打开 %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "无法读取符号链接 %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "无法使用 unlink 删除 %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** 无法将 %s 链接到 %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " 达到了 DeLink 的上限 %sB。\n"
+
+#: ftparchive/writer.cc:417
+msgid "Archive had no package field"
+msgstr "归档文件没有包含 package 字段"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " %s 中没有 override 项\n"
-#~ msgid "You don't have enough free space in %s"
-#~ msgstr "您在 %s 上没有足够的可用空间"
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#, c-format
+msgid " %s maintainer is %s not %s\n"
+msgstr " %s 的维护者 %s 并非 %s\n"
+
+#: ftparchive/writer.cc:698
+#, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s 没有源代码的 override 项\n"
+
+#: ftparchive/writer.cc:702
+#, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s 中没有二进制文件的 override 项\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - 分配内存失败"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "无法打开 %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "无法读取 override 文件 %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #3"
-#~ msgid "Done"
-#~ msgstr "完成"
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "未知的压缩算法“%s”"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "无法创建 FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "无法 fork"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "压缩子进程"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "内部错误,无法创建 %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "无法对子进程或文件进行读写"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "在计算 MD5 校验和时无法读取数据"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "在使用 unlink 删除 %s 时出错"
+
+#: cmdline/apt-internal-solver.cc:49
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法: apt-internal-solver\n"
+"\n"
+"apt-internal-solver 是个用于调试及类似用途的接口,它可以\n"
+"像 APT 家族外部解决器(resolver)那样使用当前的内部解决器。\n"
+"\n"
+"选项:\n"
+" -h 显示本帮助。\n"
+" -q 日志型输出 - 无进度指示\n"
+" -c=? 读取指定配置文件\n"
+" -o=? 设置任意配置项,比如 -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "未知的软件包记录!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法: apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n"
+"是用来指出后面参数所示文件是哪种文件。\n"
+"\n"
+"选项:\n"
+" -h 本帮助文档\n"
+" -s 根据源文件排序\n"
+" -c=? 读取指定配置文件\n"
+" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#~ msgid "No keyring installed in %s."
-#~ msgstr "%s 中没有安装密钥环。"
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "stdout 是终端吗?"
#, fuzzy
#~ msgid "Internal error, Upgrade broke stuff"