summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@canonical.com>2012-10-12 13:01:28 +0200
committerMartin Pitt <martin.pitt@canonical.com>2012-10-12 13:01:28 +0200
commit66b40c04d002c5085d8985936046b05b55b70797 (patch)
tree95e17f26a83abff55ad34483cbc0b82f676948f0 /po/zh_CN.po
parent3df2cc3c0e9fb4dff107b69a99443ae9a03a3f80 (diff)
Refresh translations from Launchpad. Amongst other fixes, this drops the
erroneous "个" from "Retrieving file ..." translation in zn_CN. (LP: #985634)
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1533
1 files changed, 640 insertions, 893 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d8ad2369e..82c2860f0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,14 +10,23 @@ 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: 2012-09-04 15:34+0200\n"
-"PO-Revision-Date: 2010-08-26 14:42+0800\n"
+"PO-Revision-Date: 2012-10-12 06:28+0000\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
+"Language: \n"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:864
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在下载第 %li 个文件,共 %li 个(还剩 %s )"
#: cmdline/apt-cache.cc:158
#, c-format
@@ -26,71 +35,71 @@ msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系:\n"
#: cmdline/apt-cache.cc:286
msgid "Total package names: "
-msgstr "软件包名称总数:"
+msgstr "软件包名称总数: "
#: cmdline/apt-cache.cc:288
msgid "Total package structures: "
-msgstr "全部软件包结构:"
+msgstr "全部软件包结构: "
#: cmdline/apt-cache.cc:328
msgid " Normal packages: "
-msgstr " 普通软件包:"
+msgstr " 普通软件包: "
#: cmdline/apt-cache.cc:329
msgid " Pure virtual packages: "
-msgstr " 完全虚拟软件包:"
+msgstr " 完全虚拟软件包: "
#: cmdline/apt-cache.cc:330
msgid " Single virtual packages: "
-msgstr " 单虚拟软件包:"
+msgstr " 单虚拟软件包: "
#: cmdline/apt-cache.cc:331
msgid " Mixed virtual packages: "
-msgstr " 混合虚拟软件包:"
+msgstr " 混合虚拟软件包: "
#: cmdline/apt-cache.cc:332
msgid " Missing: "
-msgstr " 缺失:"
+msgstr " 缺失: "
#: cmdline/apt-cache.cc:334
msgid "Total distinct versions: "
-msgstr "按版本共计:"
+msgstr "按版本共计: "
#: cmdline/apt-cache.cc:336
msgid "Total distinct descriptions: "
-msgstr "按不同的说明共计:"
+msgstr "按不同的说明共计: "
#: cmdline/apt-cache.cc:338
msgid "Total dependencies: "
-msgstr "按依赖关系共计:"
+msgstr "按依赖关系共计: "
#: cmdline/apt-cache.cc:341
msgid "Total ver/file relations: "
-msgstr "按版本/文件关系共计:"
+msgstr "按版本/文件关系共计: "
#: cmdline/apt-cache.cc:343
msgid "Total Desc/File relations: "
-msgstr "按说明/文件关系共计:"
+msgstr "按说明/文件关系共计: "
#: cmdline/apt-cache.cc:345
msgid "Total Provides mappings: "
-msgstr "提供映射共计:"
+msgstr "提供映射共计: "
#: cmdline/apt-cache.cc:357
msgid "Total globbed strings: "
-msgstr "Glob 字串共计:"
+msgstr "Glob 字串共计: "
#: cmdline/apt-cache.cc:371
msgid "Total dependency version space: "
-msgstr "依赖关系版本名所占空间共计:"
+msgstr "依赖关系版本名所占空间共计: "
#: cmdline/apt-cache.cc:376
msgid "Total slack space: "
-msgstr "Slack 空间共计:"
+msgstr "Slack 空间共计: "
#: cmdline/apt-cache.cc:384
msgid "Total space accounted for: "
-msgstr "总占用空间:"
+msgstr "总占用空间: "
#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
#, c-format
@@ -98,8 +107,8 @@ msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步。"
#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
-#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:46
-#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:39
+#: cmdline/apt-mark.cc:86 cmdline/apt-mark.cc:162
msgid "No packages found"
msgstr "没有发现匹配的软件包"
@@ -111,10 +120,10 @@ msgstr "您必须明确地给出至少一个表达式"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:445
#, c-format
msgid "Unable to locate package %s"
-msgstr "未发现软件包 %s"
+msgstr "无法定位软件包 %s"
#: cmdline/apt-cache.cc:1482
msgid "Package files:"
@@ -135,11 +144,11 @@ msgstr "(没有找到)"
#: cmdline/apt-cache.cc:1523
msgid " Installed: "
-msgstr " 已安装:"
+msgstr " 已安装: "
#: cmdline/apt-cache.cc:1524
msgid " Candidate: "
-msgstr " 候选软件包:"
+msgstr " 候选软件包: "
#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
msgid "(none)"
@@ -147,23 +156,22 @@ msgstr "(无)"
#: cmdline/apt-cache.cc:1557
msgid " Package pin: "
-msgstr " 软件包锁:"
+msgstr " 软件包锁: "
#. Show the priority tables
#: cmdline/apt-cache.cc:1566
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
-#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3247 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:266 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:1686
-#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -199,42 +207,6 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"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"
-"\n"
-"命令:\n"
-" add - 向源缓存加入一个软件包文件\n"
-" gencaches - 同时生成软件包和源代码包的缓存\n"
-" showpkg - 显示某个软件包的全面信息\n"
-" showsrc - 显示源文件的各项记录\n"
-" stats - 显示基本的统计信息\n"
-" dump - 简要显示整个缓存文件的内容\n"
-" dumpavail - 把所有有效的包文件列表打印到标准输出\n"
-" unmet - 显示所有未满足的依赖关系\n"
-" search - 根据正则表达式搜索软件包列表\n"
-" show - 以便于阅读的格式介绍该软件包\n"
-" showauto - 显示自动安装的软件包的列表\n"
-" depends - 显示该软件包的依赖关系信息\n"
-" rdepends - 显示所有依赖于该软件包的软件包名字\n"
-" pkgnames - 列出所有软件包的名字\n"
-" dotty - 生成可用 GraphViz 处理的软件包关系图\n"
-" xvcg - 生成可用 xvcg 处理的软件包的关系图\n"
-" policy - 显示软件包的安装设置状态\n"
-"\n"
-"选项:\n"
-" -h 本帮助文档。\n"
-" -p=? 软件包的缓存。\n"
-" -s=? 源代码包的缓存。\n"
-" -q 关闭进度显示。\n"
-" -i 仅为 unmet 命令显示重要的依赖关系。\n"
-" -c=? 读取指定配置文件\n"
-" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-"若要了解更多信息,您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
#: cmdline/apt-cdrom.cc:79
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -249,7 +221,7 @@ msgstr "请把盘片插入驱动器再按回车键"
msgid "Failed to mount '%s' to '%s'"
msgstr "无法将 %s 挂载到 %s"
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:164
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
@@ -257,7 +229,7 @@ msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
msgid "Arguments not in pairs"
msgstr "参数没有成对"
-#: cmdline/apt-config.cc:87
+#: cmdline/apt-config.cc:81
msgid ""
"Usage: apt-config [options] command\n"
"\n"
@@ -293,75 +265,75 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
-#: cmdline/apt-get.cc:260
+#: cmdline/apt-get.cc:257
msgid "The following packages have unmet dependencies:"
msgstr "下列软件包有未满足的依赖关系:"
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:347
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装"
-#: cmdline/apt-get.cc:352
+#: cmdline/apt-get.cc:349
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: cmdline/apt-get.cc:359
+#: cmdline/apt-get.cc:356
msgid "but it is not installable"
msgstr "但无法安装它"
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:358
msgid "but it is a virtual package"
msgstr "但是它是虚拟软件包"
-#: cmdline/apt-get.cc:364
+#: cmdline/apt-get.cc:361
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: cmdline/apt-get.cc:364
+#: cmdline/apt-get.cc:361
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: cmdline/apt-get.cc:369
+#: cmdline/apt-get.cc:366
msgid " or"
msgstr " 或"
-#: cmdline/apt-get.cc:398
+#: cmdline/apt-get.cc:395
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装:"
-#: cmdline/apt-get.cc:424
+#: cmdline/apt-get.cc:421
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】:"
-#: cmdline/apt-get.cc:446
+#: cmdline/apt-get.cc:443
msgid "The following packages have been kept back:"
msgstr "下列软件包的版本将保持不变:"
-#: cmdline/apt-get.cc:467
+#: cmdline/apt-get.cc:464
msgid "The following packages will be upgraded:"
msgstr "下列软件包将被升级:"
-#: cmdline/apt-get.cc:488
+#: cmdline/apt-get.cc:485
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】:"
-#: cmdline/apt-get.cc:508
+#: cmdline/apt-get.cc:505
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变:"
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:560
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: cmdline/apt-get.cc:571
+#: cmdline/apt-get.cc:568
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -369,59 +341,59 @@ msgstr ""
"【警告】:下列基础软件包将被卸载。\n"
"请勿尝试,除非您确实知道您在做什么!"
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:599
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包,"
+msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包, "
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:603
#, c-format
msgid "%lu reinstalled, "
-msgstr "重新安装了 %lu 个软件包,"
+msgstr "重新安装了 %lu 个软件包, "
-#: cmdline/apt-get.cc:608
+#: cmdline/apt-get.cc:605
#, c-format
msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包,"
+msgstr "降级了 %lu 个软件包, "
-#: cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:607
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
-#: cmdline/apt-get.cc:614
+#: cmdline/apt-get.cc:611
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-#: cmdline/apt-get.cc:635
+#: cmdline/apt-get.cc:633
#, c-format
msgid "Note, selecting '%s' for task '%s'\n"
msgstr "注意,为任务 %2$s 选中了 %1$s\n"
-#: cmdline/apt-get.cc:640
+#: cmdline/apt-get.cc:639
#, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
msgstr "注意,根据正则表达式 %2$s 选中了 %1$s\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:656
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包:\n"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:667
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:677
+#: cmdline/apt-get.cc:676
msgid " [Not candidate version]"
msgstr " [无候选版本]"
-#: cmdline/apt-get.cc:679
+#: cmdline/apt-get.cc:678
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:681
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -432,183 +404,183 @@ msgstr ""
"这可能意味着这个缺失的软件包可能已被废弃,\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:699
msgid "However the following packages replace it:"
msgstr "可是下列软件包取代了它:"
-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:711
#, c-format
msgid "Package '%s' has no installation candidate"
msgstr "软件包 %s 没有可供安装的候选者"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:722
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
msgstr "类似 %s 的虚拟软件包可以卸载\n"
#. TRANSLATORS: Note, this is not an interactive question
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, fuzzy, c-format
+#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "软件包 %s 还未安装,因而不会被卸载\n"
+msgstr ""
#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, fuzzy, c-format
+#, c-format
msgid "Package '%s' is not installed, so not removed\n"
-msgstr "软件包 %s 还未安装,因而不会被卸载\n"
+msgstr ""
-#: cmdline/apt-get.cc:788
+#: cmdline/apt-get.cc:753
#, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "注意,选取 %s 而非 %s\n"
-#: cmdline/apt-get.cc:818
+#: cmdline/apt-get.cc:783
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:787
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "忽略了 %s,它已经被安装而且仅请求了升级。\n"
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:799
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安装 %s,因为无法下载它。\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:804
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:61
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:849
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
-#: cmdline/apt-get.cc:889
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:854
+#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+msgstr ""
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:974
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:977
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:1031
+#: cmdline/apt-get.cc:980
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:983
msgid "Unable to minimize the upgrade set"
msgstr "无法最小化要升级的软件包集合"
-#: cmdline/apt-get.cc:1036
+#: cmdline/apt-get.cc:985
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:989
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:992
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:1068
+#: cmdline/apt-get.cc:1017
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:下列软件包不能通过验证!"
-#: cmdline/apt-get.cc:1072
+#: cmdline/apt-get.cc:1021
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1028
msgid "Install these packages without verification [y/N]? "
msgstr "不经验证就安装这些软件包吗?[y/N] "
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1030
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
+#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1080
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: cmdline/apt-get.cc:1140
+#: cmdline/apt-get.cc:1089
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:1151
+#: cmdline/apt-get.cc:1100
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 未能完成"
-#: cmdline/apt-get.cc:1189
+#: cmdline/apt-get.cc:1138
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
-#: cmdline/apt-get.cc:1196
+#: cmdline/apt-get.cc:1145
#, 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
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1150
#, 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
-#: cmdline/apt-get.cc:1208
+#: cmdline/apt-get.cc:1157
#, 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
-#: cmdline/apt-get.cc:1213
+#: cmdline/apt-get.cc:1162
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2523
+#: cmdline/apt-get.cc:2526
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
-#: cmdline/apt-get.cc:1241
+#: cmdline/apt-get.cc:1190
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 上没有足够的可用空间。"
-#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277
+#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了仅执行常规操作,但这不是个常规操作。"
-#: cmdline/apt-get.cc:1259
+#: cmdline/apt-get.cc:1208
msgid "Yes, do as I say!"
msgstr "是,按我说的做!"
-#: cmdline/apt-get.cc:1261
+#: cmdline/apt-get.cc:1210
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -619,48 +591,46 @@ msgstr ""
"若还想继续的话,就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286
+#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:1282
+#: cmdline/apt-get.cc:1231
msgid "Do you want to continue [Y/n]? "
-msgstr "您希望继续执行吗?[Y/n]"
+msgstr "您希望继续执行吗?[Y/n] "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2588 apt-pkg/algorithms.cc:1492
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:1372
+#: cmdline/apt-get.cc:1321
msgid "Some files failed to download"
msgstr "有一些文件无法下载"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2600
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1328
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
-msgstr ""
-"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
-"再试试?"
+msgstr "有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项再试试?"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1332
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换"
-#: cmdline/apt-get.cc:1388
+#: cmdline/apt-get.cc:1337
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1338
msgid "Aborting install."
msgstr "中止安装。"
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -673,37 +643,37 @@ msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失:"
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "注意:这是自动被 dpkg 有意完成的。"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1508
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1540
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "选择 %s 作为源代码包而非 %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1629
+#: cmdline/apt-get.cc:1578
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
-#: cmdline/apt-get.cc:1645
+#: cmdline/apt-get.cc:1594
msgid "The update command takes no arguments"
-msgstr " update 命令不需要参数"
+msgstr "update 命令不需要参数"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1657
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们不应该进行删除,无法启动自动删除器"
-#: cmdline/apt-get.cc:1815
+#: cmdline/apt-get.cc:1761
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请向 apt 提交错误报告。"
-#.
+#.
#. if (Packages == 1)
#. {
#. c1out << endl;
@@ -712,16 +682,16 @@ msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请
#. "the package is simply not installable and a bug report against\n"
#. "that package should be filed.") << endl;
#. }
-#.
-#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987
+#.
+#: cmdline/apt-get.cc:1764 cmdline/apt-get.cc:1933
msgid "The following information may help to resolve the situation:"
msgstr "下列信息可能会对解决问题有所帮助:"
-#: cmdline/apt-get.cc:1822
+#: cmdline/apt-get.cc:1768
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部错误,自动卸载工具坏事了"
-#: cmdline/apt-get.cc:1829
+#: cmdline/apt-get.cc:1775
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -729,7 +699,7 @@ msgid_plural ""
"required:"
msgstr[0] "下列软件包是自动安装的并且现在不需要了:"
-#: cmdline/apt-get.cc:1833
+#: cmdline/apt-get.cc:1779
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -737,28 +707,26 @@ msgid_plural ""
msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
#: cmdline/apt-get.cc:1835
-#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用'apt-get autoremove'来卸载它们"
+msgstr[0] ""
+msgstr[1] ""
-#: cmdline/apt-get.cc:1854
+#: cmdline/apt-get.cc:1800
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误,全部升级工具坏事了"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1899
msgid "You might want to run 'apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1903
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
-msgstr ""
-"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
-"以指定一个解决办法)。"
+msgstr "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1972
+#: cmdline/apt-get.cc:1918
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"
@@ -769,55 +737,55 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1939
msgid "Broken packages"
msgstr "破损的软件包"
-#: cmdline/apt-get.cc:2019
+#: cmdline/apt-get.cc:1965
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: cmdline/apt-get.cc:2109
+#: cmdline/apt-get.cc:2055
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:2110
+#: cmdline/apt-get.cc:2056
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: cmdline/apt-get.cc:2152
+#: cmdline/apt-get.cc:2098
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2105 cmdline/apt-mark.cc:63
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2113 cmdline/apt-mark.cc:107
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:2183
+#: cmdline/apt-get.cc:2129
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2132 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:2191
+#: cmdline/apt-get.cc:2137
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
+#: cmdline/apt-get.cc:2204 cmdline/apt-get.cc:2212
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,问题解决工具坏事了"
-#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2240 cmdline/apt-get.cc:2276
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
@@ -826,21 +794,21 @@ msgstr "无法锁定下载目录"
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2327
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2385
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2425 cmdline/apt-get.cc:2737
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2442
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -849,155 +817,150 @@ msgstr ""
"提示:%s 的打包工作被维护于以下位置的 %s 版本控制系统中:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:2447
+#, 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"
-"获得该软件包的最近更新(可能尚未正式发布)。\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2500
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2537
#, 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:2612
+#: cmdline/apt-get.cc:2546
#, 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:2617
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2557
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2595
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2626
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2638
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2639
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2661
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2681
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2700
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2725
#, c-format
msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
+"No architecture information available for %s. See apt.conf(5) "
+"APT::Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2742
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2762
#, c-format
msgid "%s has no build depends.\n"
-msgstr " %s 没有构建依赖关系信息。\n"
+msgstr "%s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:3008
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:2892
+#, 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 ""
-#: cmdline/apt-get.cc:3026
+#: cmdline/apt-get.cc:2913
#, 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:3049
+#: cmdline/apt-get.cc:2936
#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+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:3088
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:2975
+#, 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 依赖关系"
-#: cmdline/apt-get.cc:3094
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:2981
+#, 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 ""
-#: cmdline/apt-get.cc:3117
+#: cmdline/apt-get.cc:3004
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:3133
+#: cmdline/apt-get.cc:3020
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:3138
+#: cmdline/apt-get.cc:3025
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:3118 cmdline/apt-get.cc:3130
+#, c-format
msgid "Changelog for %s (%s)"
-msgstr "正在连接 %s (%s)"
+msgstr ""
-#: cmdline/apt-get.cc:3369
+#: cmdline/apt-get.cc:3252
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:3410
-#, fuzzy
+#: cmdline/apt-get.cc:3293
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1042,49 +1005,8 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
-"用法: apt-get [选项] 命令\n"
-"    apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
-"    apt-get [选项] source 软件包1 [软件包2 ...]\n"
-"\n"
-"apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n"
-"最常用命令是 update 和 install。\n"
-"\n"
-"命令:\n"
-" update - 取回更新的软件包列表信息\n"
-" upgrade - 进行一次升级\n"
-" install - 安装新的软件包(注:软件包名称是 libc6 而非 libc6.deb)\n"
-" remove - 卸载软件包\n"
-" autoremove - 卸载所有自动安装且不再使用的软件包\n"
-" purge - 卸载并清除软件包的配置\n"
-" source - 下载源码包文件\n"
-" build-dep - 为源码包配置所需的编译依赖关系\n"
-" dist-upgrade - 发布版升级,见 apt-get(8)\n"
-" dselect-upgrade - 根据 dselect 的选择来进行升级\n"
-" clean - 删除所有已下载的包文件\n"
-" autoclean - 删除老版本的已下载的包文件\n"
-" check - 核对以确认系统的依赖关系的完整性\n"
-" markauto - 标记指定的软件包为自动安装\n"
-" unmarkauto - 标记指定的软件包为手动安装\n"
-"\n"
-"选项:\n"
-" -h 本帮助文档。\n"
-" -q 让输出可作为日志 - 不显示进度\n"
-" -qq 除了错误外,什么都不输出\n"
-" -d 仅仅下载 - 【不】安装或解开包文件\n"
-" -s 不作实际操作。只是依次模拟执行命令\n"
-" -y 对所有询问都回答是(Yes),同时不作任何提示\n"
-" -f 当出现破损的依赖关系时,程序将尝试修正系统\n"
-" -m 当有包文件无法找到时,程序仍尝试继续执行\n"
-" -u 显示已升级的软件包列表\n"
-" -b 在下载完源码包后,编译生成相应的软件包\n"
-" -V 显示详尽的版本号\n"
-" -c=? 读取指定配置文件\n"
-" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-"请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"
-"以获取更多信息和选项。\n"
-" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:3575
+#: cmdline/apt-get.cc:3458
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1095,33 +1017,33 @@ msgstr ""
"   apt-get 需要 root 特权进行实际的执行。\n"
"   同时请记住此时并未锁定,所以请勿完全相信当前的情况!"
-#: cmdline/acqprogress.cc:60
+#: cmdline/acqprogress.cc:59
msgid "Hit "
msgstr "命中 "
-#: cmdline/acqprogress.cc:84
+#: cmdline/acqprogress.cc:83
msgid "Get:"
msgstr "获取:"
-#: cmdline/acqprogress.cc:115
+#: cmdline/acqprogress.cc:114
msgid "Ign "
msgstr "忽略 "
-#: cmdline/acqprogress.cc:119
+#: cmdline/acqprogress.cc:118
msgid "Err "
msgstr "错误 "
-#: cmdline/acqprogress.cc:140
+#: cmdline/acqprogress.cc:139
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr "下载 %sB,耗时 %s (%sB/s)\n"
-#: cmdline/acqprogress.cc:230
+#: cmdline/acqprogress.cc:229
#, c-format
msgid " [Working]"
msgstr " [执行中]"
-#: cmdline/acqprogress.cc:286
+#: cmdline/acqprogress.cc:285
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -1132,48 +1054,47 @@ msgstr ""
"“%s”\n"
"的盘片插入驱动器“%s”再按回车键\n"
-#: cmdline/apt-mark.cc:55
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:48
+#, c-format
msgid "%s can not be marked as it is not installed.\n"
-msgstr "但是它还没有被安装"
+msgstr ""
-#: cmdline/apt-mark.cc:61
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:54
+#, c-format
msgid "%s was already set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+msgstr ""
-#: cmdline/apt-mark.cc:63
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:56
+#, c-format
msgid "%s was already set to automatically installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+msgstr ""
-#: cmdline/apt-mark.cc:228
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:171
+#, c-format
msgid "%s was already set on hold.\n"
-msgstr "%s 已经是最新的版本了。\n"
+msgstr ""
-#: cmdline/apt-mark.cc:230
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:173
+#, c-format
msgid "%s was already not hold.\n"
-msgstr "%s 已经是最新的版本了。\n"
+msgstr ""
-#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:691
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
-#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:209
+#, c-format
msgid "%s set on hold.\n"
-msgstr "%s 已设置为手动安装。\n"
+msgstr ""
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:189 cmdline/apt-mark.cc:214
+#, c-format
msgid "Canceled hold on %s.\n"
-msgstr "无法打开 %s"
+msgstr ""
-#: cmdline/apt-mark.cc:332
+#: cmdline/apt-mark.cc:222
msgid "Executing dpkg failed. Are you root?"
msgstr ""
@@ -1208,9 +1129,7 @@ msgstr "无法读取盘片数据库 %s"
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
-msgstr ""
-"请使用 apt-cdrom,通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来"
-"加入新的盘片。"
+msgstr "请使用 apt-cdrom,通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来加入新的盘片。"
#: methods/cdrom.cc:222
msgid "Wrong CD-ROM"
@@ -1225,16 +1144,18 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM,它可能正在使用中。"
msgid "Disk not found."
msgstr "找不到盘片。"
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
msgid "File not found"
msgstr "无法找到该文件"
-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:530
+#: methods/rred.cc:539
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:536
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -1243,78 +1164,74 @@ 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:173
+#: methods/ftp.cc:172
msgid "Logging in"
msgstr "正在登录"
-#: methods/ftp.cc:179
+#: methods/ftp.cc:178
msgid "Unable to determine the peer name"
msgstr "无法获知对方主机名"
-#: methods/ftp.cc:184
+#: methods/ftp.cc:183
msgid "Unable to determine the local name"
msgstr "无法获知本地主机名"
-#: methods/ftp.cc:215 methods/ftp.cc:243
+#: methods/ftp.cc:214 methods/ftp.cc:242
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "服务器拒绝了我们的连接,响应信息为:%s"
-#: methods/ftp.cc:221
+#: methods/ftp.cc:220
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:228
+#: methods/ftp.cc:227
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:248
+#: methods/ftp.cc:247
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
-msgstr ""
-"您指定了代理服务器,但是没有登陆脚本,Acquire::ftp::ProxyLogin 设置为空。"
+msgstr "您指定了代理服务器,但是没有登陆脚本,Acquire::ftp::ProxyLogin 设置为空。"
-#: methods/ftp.cc:276
+#: methods/ftp.cc:275
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "登录脚本命令“%s”出错,服务器响应信息为:%s"
-#: methods/ftp.cc:302
+#: methods/ftp.cc:301
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
msgid "Connection timeout"
msgstr "连接超时"
-#: methods/ftp.cc:346
+#: methods/ftp.cc:345
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:832 methods/rsh.cc:197
msgid "Read error"
msgstr "读错误"
-#: methods/ftp.cc:356 methods/rsh.cc:206
+#: methods/ftp.cc:355 methods/rsh.cc:204
msgid "A response overflowed the buffer."
msgstr "回应超出了缓存区大小。"
-#: methods/ftp.cc:373 methods/ftp.cc:385
+#: methods/ftp.cc:372 methods/ftp.cc:384
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:874 methods/rsh.cc:239
msgid "Write error"
msgstr "写出错"
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
msgid "Could not create a socket"
msgstr "无法创建套接字"
@@ -1326,68 +1243,68 @@ msgstr "无法连接上数据套接字,连接超时"
msgid "Could not connect passive socket."
msgstr "无法连接被动模式的套接字。"
-#: methods/ftp.cc:730
+#: methods/ftp.cc:731
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo 无法得到监听套接字"
-#: methods/ftp.cc:744
+#: methods/ftp.cc:745
msgid "Could not bind a socket"
msgstr "无法绑定套接字"
-#: methods/ftp.cc:748
+#: methods/ftp.cc:749
msgid "Could not listen on the socket"
msgstr "无法在套接字上监听"
-#: methods/ftp.cc:755
+#: methods/ftp.cc:756
msgid "Could not determine the socket's name"
msgstr "无法确定套接字的名字"
-#: methods/ftp.cc:787
+#: methods/ftp.cc:788
msgid "Unable to send PORT command"
msgstr "无法发出 PORT 指令"
-#: methods/ftp.cc:797
+#: methods/ftp.cc:798
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "无法识别的地址族 %u (AF_*)"
-#: methods/ftp.cc:806
+#: methods/ftp.cc:807
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:826
+#: methods/ftp.cc:827
msgid "Data socket connect timed out"
msgstr "数据套接字连接超时"
-#: methods/ftp.cc:833
+#: methods/ftp.cc:834
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:873 methods/http.cc:1031 methods/rsh.cc:309
msgid "Problem hashing file"
msgstr "把文件加入哈希表时出错"
-#: methods/ftp.cc:885
+#: methods/ftp.cc:886
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "无法获取文件,服务器响应信息为“%s”"
-#: methods/ftp.cc:900 methods/rsh.cc:330
+#: methods/ftp.cc:901 methods/rsh.cc:328
msgid "Data socket timed out"
msgstr "数据套接字超时"
-#: methods/ftp.cc:930
+#: methods/ftp.cc:931
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "数据传送出错,服务器响应信息为“%s”"
#. Get the files information
-#: methods/ftp.cc:1007
+#: methods/ftp.cc:1008
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1119
+#: methods/ftp.cc:1120
msgid "Unable to invoke "
msgstr "无法调用 "
@@ -1423,7 +1340,7 @@ msgstr "无法连接上 %s:%s (%s)。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:431
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
@@ -1448,164 +1365,163 @@ msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:172
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:177
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:181
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:186
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:234
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr "由于没有公钥,无法验证下列签名:\n"
-#: methods/gzip.cc:65
+#: methods/bzip2.cc:63 methods/gzip.cc:54
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:394
+#: methods/http.cc:393
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:544
+#: methods/http.cc:547
msgid "Bad header line"
msgstr "错误的报头行"
-#: methods/http.cc:569 methods/http.cc:576
+#: methods/http.cc:572 methods/http.cc:579
msgid "The HTTP server sent an invalid reply header"
msgstr "该 HTTP 服务器发送了一个无效的应答报头"
-#: methods/http.cc:606
+#: methods/http.cc:608
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:621
+#: methods/http.cc:623
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:623
+#: methods/http.cc:625
msgid "This HTTP server has broken range support"
msgstr "该 HTTP 服务器的 range 支持不正常"
-#: methods/http.cc:647
+#: methods/http.cc:649
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:818
+#: methods/http.cc:808
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:823
+#: methods/http.cc:813
msgid "Connection timed out"
msgstr "连接超时"
-#: methods/http.cc:846
+#: methods/http.cc:836
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:877
+#: methods/http.cc:867
msgid "Error writing to file"
msgstr "写入文件出错"
-#: methods/http.cc:905
+#: methods/http.cc:895
msgid "Error writing to the file"
msgstr "写入文件出错"
-#: methods/http.cc:919
+#: methods/http.cc:909
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:921
+#: methods/http.cc:911
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1194
+#: methods/http.cc:1191
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1208 methods/http.cc:1263
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1358
+#: methods/http.cc:1355
msgid "Internal error"
msgstr "内部错误"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:344 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
#, c-format
msgid "Unable to change to %s"
msgstr "无法切换工作目录到 %s"
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
-#: methods/mirror.cc:280
+#: methods/mirror.cc:279
#, c-format
msgid "No mirror file '%s' found "
-msgstr "没有找到镜像文件 %s"
+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
+#: methods/mirror.cc:286
+#, c-format
msgid "Can not read mirror file '%s'"
-msgstr "没有找到镜像文件 %s"
+msgstr ""
-#: methods/mirror.cc:442
+#: methods/mirror.cc:441
#, c-format
msgid "[Mirror: %s]"
msgstr "[镜像:%s]"
-#: methods/rred.cc:491
+#: methods/rred.cc:509
#, c-format
msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
-#: methods/rred.cc:496
+#: methods/rred.cc:514
#, c-format
msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
-#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+#: ftparchive/multicompress.cc:167 methods/rsh.cc:97
msgid "Failed to create IPC pipe to subprocess"
msgstr "无法为子进程创建 IPC 管道"
-#: methods/rsh.cc:338
+#: methods/rsh.cc:336
msgid "Connection closed prematurely"
-msgstr "连接被永久关闭"
+msgstr "连接被过早地关闭了"
#: dselect/install:32
msgid "Bad default setting!"
@@ -1641,12 +1557,12 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们,
msgid "Merging available information"
msgstr "正在合并可用信息"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s 不是一个有效的 DEB 软件包。"
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1670,12 +1586,12 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1277
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1269
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:311
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
@@ -1792,39 +1708,38 @@ msgstr "没有任何选定项是匹配的"
msgid "Some files are missing in the package file group `%s'"
msgstr "软件包文件组“%s”中缺少一些文件"
-#: ftparchive/cachedb.cc:47
+#: ftparchive/cachedb.cc:46
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "数据库被损坏,该数据库文件的文件名已改成 %s.old"
-#: ftparchive/cachedb.cc:65
+#: ftparchive/cachedb.cc:64
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "数据库已过期,现尝试进行升级 %s"
-#: ftparchive/cachedb.cc:76
+#: ftparchive/cachedb.cc:75
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
-msgstr ""
-"数据库格式无效。如果您是从一个老版本的 apt 升级而来,请删除数据库并重建它。"
+msgstr "数据库格式无效。如果您是从一个老版本的 apt 升级而来,请删除数据库并重建它。"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "无法打开数据库文件 %s:%s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
#, c-format
msgid "Failed to stat %s"
msgstr "无法获得 %s 的状态"
-#: ftparchive/cachedb.cc:249
+#: ftparchive/cachedb.cc:248
msgid "Archive has no control record"
msgstr "归档文件没有包含控制字段"
-#: ftparchive/cachedb.cc:490
+#: ftparchive/cachedb.cc:489
msgid "Unable to get a cursor"
msgstr "无法获得游标"
@@ -1840,11 +1755,11 @@ msgstr "警告:无法获得 %s 的状态\n"
#: ftparchive/writer.cc:141
msgid "E: "
-msgstr "错误:"
+msgstr "错误: "
#: ftparchive/writer.cc:143
msgid "W: "
-msgstr "警告:"
+msgstr "警告: "
#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
@@ -1913,82 +1828,81 @@ msgstr " %s 没有源代码的 override 项\n"
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
msgid "realloc - Failed to allocate memory"
msgstr "realloc - 分配内存失败"
-#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#: ftparchive/override.cc:34 ftparchive/override.cc:142
#, c-format
msgid "Unable to open %s"
msgstr "无法打开 %s"
-#: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, fuzzy, c-format
+#: ftparchive/override.cc:60 ftparchive/override.cc:166
+#, c-format
msgid "Malformed override %s line %llu #1"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+msgstr ""
-#: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, fuzzy, c-format
+#: ftparchive/override.cc:74 ftparchive/override.cc:178
+#, c-format
msgid "Malformed override %s line %llu #2"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
+msgstr ""
-#: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, fuzzy, c-format
+#: ftparchive/override.cc:88 ftparchive/override.cc:191
+#, c-format
msgid "Malformed override %s line %llu #3"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
+msgstr ""
-#: ftparchive/override.cc:128 ftparchive/override.cc:202
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
#, c-format
msgid "Failed to read the override file %s"
msgstr "无法读取 override 文件 %s"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:69
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "未知的压缩算法“%s”"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:99
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:193
msgid "Failed to create FILE*"
msgstr "无法创建 FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:196
msgid "Failed to fork"
msgstr "无法 fork"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:210
msgid "Compress child"
msgstr "压缩子进程"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:233
#, c-format
msgid "Internal error, failed to create %s"
msgstr "内部错误,无法创建 %s"
-#: ftparchive/multicompress.cc:304
+#: ftparchive/multicompress.cc:403
msgid "IO to subprocess/file failed"
msgstr "无法对子进程或文件进行读写"
-#: ftparchive/multicompress.cc:342
+#: ftparchive/multicompress.cc:455
msgid "Failed to read while computing MD5"
msgstr "在计算 MD5 校验和时无法读取数据"
-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:472
#, c-format
msgid "Problem unlinking %s"
msgstr "在使用 unlink 删除 %s 时出错"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2001,16 +1915,6 @@ msgid ""
" -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!"
@@ -2046,7 +1950,7 @@ msgstr "无法创建管道"
#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
-msgstr "无法执行 gzip"
+msgstr "无法执行 gzip "
#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
msgid "Corrupted archive"
@@ -2117,12 +2021,12 @@ msgstr "添加了两个转移项 %s-> %s"
msgid "Duplicate conf file %s/%s"
msgstr "重复的配置文件 %s/%s"
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "无法写入文件 %s"
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
#, c-format
msgid "Failed to close file %s"
msgstr "无法关闭文件 %s"
@@ -2179,23 +2083,23 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
msgid "Unable to stat %s"
msgstr "无法读取 %s 的状态"
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”"
#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:55
+#: apt-inst/deb/debfile.cc:56
#, c-format
msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”,“%s”或者“%s”"
-#: apt-inst/deb/debfile.cc:120
+#: apt-inst/deb/debfile.cc:157
#, c-format
msgid "Internal error, could not locate member %s"
msgstr "内部错误,无法定位包内文件 %s"
-#: apt-inst/deb/debfile.cc:214
+#: apt-inst/deb/debfile.cc:277
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
@@ -2203,30 +2107,30 @@ msgstr "不能解析的主控文件"
msgid "Can't mmap an empty file"
msgstr "无法 mmap 一个空文件"
-#: apt-pkg/contrib/mmap.cc:111
+#: apt-pkg/contrib/mmap.cc:91
#, c-format
msgid "Couldn't duplicate file descriptor %i"
msgstr "无法为复制文件描述符 %i"
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
+#: apt-pkg/contrib/mmap.cc:99
+#, c-format
msgid "Couldn't make mmap of %llu bytes"
-msgstr "无法 mmap %lu 字节的数据"
+msgstr ""
-#: apt-pkg/contrib/mmap.cc:146
+#: apt-pkg/contrib/mmap.cc:126
msgid "Unable to close mmap"
msgstr "无法关闭 mmap"
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:154 apt-pkg/contrib/mmap.cc:182
msgid "Unable to synchronize mmap"
-msgstr "无法同步 mmap "
+msgstr "无法同步 mmap"
-#: apt-pkg/contrib/mmap.cc:290
+#: apt-pkg/contrib/mmap.cc:260
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数据"
-#: apt-pkg/contrib/mmap.cc:322
+#: methods/http.cc:1016 apt-pkg/contrib/mmap.cc:293
msgid "Failed to truncate file"
msgstr "无法截断文件"
@@ -2235,102 +2139,101 @@ msgstr "无法截断文件"
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值:%lu。(man 5 "
-"apt.conf)"
+msgstr "动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值:%lu。(man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:440
+#: apt-pkg/contrib/mmap.cc:411
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr "无法增加 MMap 的大小,因为已经达到 %lu 字节的限制。"
-#: apt-pkg/contrib/mmap.cc:443
+#: apt-pkg/contrib/mmap.cc:414
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr "无法增加 MMap 大小,因为用户已禁用自动增加。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:371
#, 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:379
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lih %limin %lis"
msgstr "%li小时 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:390
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1165
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:468
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写:“%c”"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:526
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:773
+#: apt-pkg/contrib/configuration.cc:694
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u:配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:792
+#: apt-pkg/contrib/configuration.cc:713
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u:标签格式有误"
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:730
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "语法错误 %s:%u:配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:849
+#: apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "语法错误 %s:%u:只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:856
+#: apt-pkg/contrib/configuration.cc:777
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u:太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "语法错误 %s:%u:Included from here"
-#: apt-pkg/contrib/configuration.cc:869
+#: apt-pkg/contrib/configuration.cc:790
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "语法错误 %s:%u:不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:872
+#: apt-pkg/contrib/configuration.cc:793
#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid ""
+"Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "语法错误 %s:%u:clean 指令需要一个选项树作为参数"
-#: apt-pkg/contrib/configuration.cc:922
+#: apt-pkg/contrib/configuration.cc:843
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "语法错误 %s:%u:文件尾部有多余的无意义的数据"
@@ -2350,43 +2253,43 @@ msgstr "%c%s... 完成"
msgid "Command line option '%c' [from %s] is not known."
msgstr "未知的命令行选项“%c” [来自 %s]"
-#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
#, c-format
msgid "Command line option %s is not understood"
msgstr "无法识别命令行选项 %s"
-#: apt-pkg/contrib/cmndline.cc:127
+#: apt-pkg/contrib/cmndline.cc:125
#, c-format
msgid "Command line option %s is not boolean"
msgstr "命令行选项 %s 不是布尔值"
-#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
#, c-format
msgid "Option %s requires an argument."
msgstr "选项 %s 要求有一个参数"
-#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "选项 %s:配置项后必须包含有形如“=<变量>”的具体指定"
-#: apt-pkg/contrib/cmndline.cc:237
+#: apt-pkg/contrib/cmndline.cc:235
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "选项 %s 要求有一个整数作为参数,而不是“%s”"
-#: apt-pkg/contrib/cmndline.cc:268
+#: apt-pkg/contrib/cmndline.cc:266
#, c-format
msgid "Option '%s' is too long"
msgstr "选项“%s”太长"
-#: apt-pkg/contrib/cmndline.cc:300
+#: apt-pkg/contrib/cmndline.cc:298
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "不能识别参数 %s,请用 true 或 false"
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
#, c-format
msgid "Invalid operation %s"
msgstr "无效的操作 %s"
@@ -2400,116 +2303,116 @@ msgstr "无法读取文件系统挂载点 %s 的状态"
msgid "Failed to stat the cdrom"
msgstr "无法读取盘片的状态"
-#: apt-pkg/contrib/fileutl.cc:93
+#: apt-pkg/contrib/fileutl.cc:1023
#, c-format
msgid "Problem closing the gzip file %s"
msgstr "关闭 gzip %s 文件出错"
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:169
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读,因而无法使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:192
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:196
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:336
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:363
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:381
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:703
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:705
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:709
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:711
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:776 apt-pkg/indexcopy.cc:676
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:793
#, c-format
msgid "Could not open file descriptor %d"
msgstr "无法打开文件描述符 %d"
-#: apt-pkg/contrib/fileutl.cc:1156
+#: ftparchive/multicompress.cc:284
msgid "Failed to create subprocess IPC"
msgstr "无法创建子进程的 IPC 管道"
-#: apt-pkg/contrib/fileutl.cc:1212
+#: ftparchive/multicompress.cc:321
msgid "Failed to exec compressor "
-msgstr "无法执行压缩程序"
+msgstr "无法执行压缩程序 "
-#: apt-pkg/contrib/fileutl.cc:1309
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:853
+#, c-format
msgid "read, still have %llu to read but none left"
-msgstr "读取文件出错,还剩 %lu 字节没有读出"
+msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:886
+#, c-format
msgid "write, still have %llu to write but couldn't"
-msgstr "写入文件出错,还剩 %lu 字节没有保存"
+msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1026
#, c-format
msgid "Problem closing the file %s"
msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1031
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "重命名文件 %s 为 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1042
#, c-format
msgid "Problem unlinking the file %s"
msgstr "用 unlink 删除文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1055
msgid "Problem syncing the file"
msgstr "同步文件出错"
@@ -2526,9 +2429,8 @@ msgid "The package cache file is an incompatible version"
msgstr "软件包缓存区文件的版本不兼容"
#: apt-pkg/pkgcache.cc:162
-#, fuzzy
msgid "The package cache file is corrupted, it is too small"
-msgstr "软件包缓存文件损坏了"
+msgstr ""
#: apt-pkg/pkgcache.cc:167
#, c-format
@@ -2595,38 +2497,38 @@ msgstr "可选"
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+#: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:133
+#: apt-pkg/depcache.cc:131
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:162
+#: apt-pkg/depcache.cc:160
msgid "Dependency generation"
msgstr "生成依赖关系"
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:180 apt-pkg/depcache.cc:213 apt-pkg/depcache.cc:217
msgid "Reading state information"
msgstr "正在读取状态信息"
-#: apt-pkg/depcache.cc:244
+#: apt-pkg/depcache.cc:242
#, c-format
msgid "Failed to open StateFile %s"
msgstr "无法打开状态文件 %s"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/depcache.cc:248
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "无法写入临时状态文件 %s"
-#: apt-pkg/tagfile.cc:129
+#: apt-pkg/tagfile.cc:126
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "无法解析软件包文件 %s (1)"
-#: apt-pkg/tagfile.cc:216
+#: apt-pkg/tagfile.cc:213
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
@@ -2686,7 +2588,7 @@ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:447
#, c-format
msgid "Line %u too long in source list %s."
msgstr "源列表 %2$s 的第 %1$u 行太长了。"
@@ -2701,63 +2603,54 @@ msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
-"(%d)"
+msgstr "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure (%d)"
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, fuzzy, c-format
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, c-format
msgid "Could not configure '%s'. "
-msgstr "无法打开文件 %s"
+msgstr ""
-#: apt-pkg/packagemanager.cc:545
+#: apt-pkg/packagemanager.cc:507
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-"由于这次安装存在着一个 Conflicts/Pre-Depends 循环,因而需要暂时删除一个必不可"
-"少的软件包 %s。通常并不建议这样做,但是如果您确实希望如此,可以打开 APT::"
-"Force-LoopBreak 选项。"
+"由于这次安装存在着一个 Conflicts/Pre-Depends 循环,因而需要暂时删除一个必不可少的软件包 "
+"%s。通常并不建议这样做,但是如果您确实希望如此,可以打开 APT::Force-LoopBreak 选项。"
#: apt-pkg/pkgrecords.cc:34
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/algorithms.cc:261
+#: apt-pkg/algorithms.cc:255
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1223
+#: apt-pkg/algorithms.cc:1191
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
-msgstr ""
-"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
-"缘故。"
+msgstr "错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的缘故。"
-#: apt-pkg/algorithms.cc:1225
+#: apt-pkg/algorithms.cc:1193
msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
-"系。"
+msgstr "无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关系。"
-#: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
-#, fuzzy
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
msgstr ""
-"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
#: apt-pkg/acquire.cc:81
#, c-format
@@ -2774,14 +2667,7 @@ msgstr "仓库目录 %spartial 确实。"
msgid "Unable to lock directory %s"
msgstr "无法对目录 %s 加锁"
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在下载第 %li 个文件,共 %li 个(还剩 %s 个)"
-
-#: apt-pkg/acquire.cc:895
+#: apt-pkg/acquire.cc:866
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在下载第 %li 个文件,共 %li 个"
@@ -2796,21 +2682,22 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:425
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:59
#, c-format
msgid "Unable to stat %s."
msgstr "无法读取 %s 的状态。"
@@ -2852,60 +2739,60 @@ msgstr "无法识别锁定的类型 %s"
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/pkgcachegen.cc:85
+#: apt-pkg/pkgcachegen.cc:83
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:211 apt-pkg/pkgcachegen.cc:277
-#: apt-pkg/pkgcachegen.cc:308 apt-pkg/pkgcachegen.cc:316
-#: apt-pkg/pkgcachegen.cc:358 apt-pkg/pkgcachegen.cc:362
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:389
-#: apt-pkg/pkgcachegen.cc:393 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
-#: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
-#: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275
+#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353
+#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374
+#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388
+#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:413
+#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:463
+#: apt-pkg/pkgcachegen.cc:494 apt-pkg/pkgcachegen.cc:508
+#, c-format
msgid "Error occurred while processing %s (%s%d)"
-msgstr "处理 %s (FindPkg)时出错"
+msgstr ""
-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:232
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "哇,软件包数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:237
+#: apt-pkg/pkgcachegen.cc:235
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "哇,软件包版本数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:240
+#: apt-pkg/pkgcachegen.cc:238
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr "哇,软件包说明数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:243
+#: apt-pkg/pkgcachegen.cc:241
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "哇,依赖关系数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:523
+#: apt-pkg/pkgcachegen.cc:515
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:1088
+#: apt-pkg/pkgcachegen.cc:1080
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1168
+#: apt-pkg/pkgcachegen.cc:1272 apt-pkg/pkgcachegen.cc:1278
+#: apt-pkg/pkgcachegen.cc:1434
msgid "Reading package lists"
msgstr "正在读取软件包列表"
-#: apt-pkg/pkgcachegen.cc:1193
+#: apt-pkg/pkgcachegen.cc:1185
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1376 apt-pkg/pkgcachegen.cc:1383
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
@@ -2914,105 +2801,101 @@ msgstr "无法读取或写入软件源缓存"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:599
+#: apt-pkg/acquire-item.cc:640
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1399
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1397
-#, fuzzy, c-format
+#: apt-pkg/acquire-item.cc:1415
+#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "无法解析软件包仓库 Release 文件 %s"
+msgstr ""
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1450
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1488
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1510
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
#, c-format
msgid ""
"A 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"
+msgstr "校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1650
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
-msgstr ""
-"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
-"包。(缘于架构缺失)"
+msgstr "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package."
-msgstr ""
-"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
+msgstr "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1768
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1855
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:61
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:71
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:105
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:118
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:137
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
@@ -3022,7 +2905,7 @@ msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
msgid "Vendor block %s contains no fingerprint"
msgstr "软件提供者数据块内 %s 没有包含指纹信息"
-#: apt-pkg/cdrom.cc:576
+#: apt-pkg/cdrom.cc:528
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
@@ -3031,67 +2914,63 @@ msgstr ""
"现把 %s 作为了 CD-ROM 的挂载点\n"
"正在挂载 CD-ROM\n"
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
+#: apt-pkg/cdrom.cc:537 apt-pkg/cdrom.cc:634
msgid "Identifying.. "
msgstr "正在鉴别.. "
-#: apt-pkg/cdrom.cc:613
+#: apt-pkg/cdrom.cc:565
#, c-format
msgid "Stored label: %s\n"
msgstr "已归档文件的标签:%s\n"
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:574 apt-pkg/cdrom.cc:850
msgid "Unmounting CD-ROM...\n"
msgstr "正在卸载 CD-ROM...\n"
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:594
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:612
msgid "Unmounting CD-ROM\n"
msgstr "正在卸载 CD-ROM 文件系统\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:617
msgid "Waiting for disc...\n"
msgstr "等待插入盘片……\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:626
msgid "Mounting CD-ROM...\n"
msgstr "正在挂载 CD-ROM 文件系统……\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:645
msgid "Scanning disc for index files..\n"
msgstr "正在盘片中查找索引文件..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:687
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
-msgstr ""
-"找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
-"名\n"
+msgstr "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签名\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:698
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
-msgstr ""
-"无法确定任何包文件的位置,可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
-"架。"
+msgstr "无法确定任何包文件的位置,可能这不是一张 Debian 盘片或者是选择了错误的硬件构架。"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:725
#, c-format
msgid "Found label '%s'\n"
msgstr "找到标签 '%s'\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:754
msgid "That is not a valid name, try again.\n"
msgstr "这不是一个有效的名字,请重试。\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:771
#, c-format
msgid ""
"This disc is called: \n"
@@ -3100,102 +2979,102 @@ msgstr ""
"这张盘片现在的名字是:\n"
"“%s”\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:773
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:800
msgid "Writing new source list\n"
msgstr "正在写入新的源列表\n"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:808
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件源设置项是:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:930
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:281 apt-pkg/indexcopy.cc:938
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/indexcopy.cc:546
#, c-format
msgid "Can't find authentication record for: %s"
msgstr "无法找到认证记录:%s"
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/indexcopy.cc:552
#, c-format
msgid "Hash mismatch for: %s"
msgstr "Hash 校验和不符:%s"
-#: apt-pkg/indexcopy.cc:662
+#: apt-pkg/indexcopy.cc:680
#, c-format
msgid "File %s doesn't start with a clearsigned message"
msgstr ""
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
+#: apt-pkg/indexcopy.cc:711
#, c-format
msgid "No keyring installed in %s."
msgstr "%s 中没有安装密钥环。"
-#: apt-pkg/cacheset.cc:403
+#: apt-pkg/cacheset.cc:342
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: apt-pkg/cacheset.cc:406
+#: apt-pkg/cacheset.cc:345
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: apt-pkg/cacheset.cc:517
+#: apt-pkg/cacheset.cc:452
#, c-format
msgid "Couldn't find task '%s'"
msgstr "无法找到任务 %s"
-#: apt-pkg/cacheset.cc:523
+#: apt-pkg/cacheset.cc:459
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: apt-pkg/cacheset.cc:534
+#: apt-pkg/cacheset.cc:472
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "无法从完全虚拟的软件包 %s 中选择版本"
-#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
+#: apt-pkg/cacheset.cc:480 apt-pkg/cacheset.cc:488
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr "因为软件包 %s 没有已安装或候选的版本,无法进行选择"
-#: apt-pkg/cacheset.cc:555
+#: apt-pkg/cacheset.cc:496
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "因为软件包 %s 是完全的虚拟软件包,无法选择它的最新版"
-#: apt-pkg/cacheset.cc:563
+#: apt-pkg/cacheset.cc:504
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "因为软件包 %s 没有候选版本,无法进行选择"
-#: apt-pkg/cacheset.cc:571
+#: apt-pkg/cacheset.cc:512
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本"
@@ -3204,150 +3083,149 @@ msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本"
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:209
+#: apt-pkg/edsp.cc:213
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:277
+#: apt-pkg/edsp.cc:281
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:284
+#: apt-pkg/edsp.cc:288
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:70
#, c-format
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:865
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:872
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:73
#, c-format
msgid "Completely removing %s"
msgstr "完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:74
#, c-format
msgid "Noting disappearance of %s"
msgstr "注意到 %s 已经消失"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Running post-installation trigger %s"
msgstr "执行安装后执行的触发器 %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:671
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s 缺失"
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:686 apt-pkg/deb/dpkgpm.cc:706
#, c-format
msgid "Could not open file '%s'"
msgstr "无法打开文件 %s"
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:858
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:859
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:864
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:866
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:871
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:873
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:878
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:879
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1208
+#: apt-pkg/deb/dpkgpm.cc:1110
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1238
+#: apt-pkg/deb/dpkgpm.cc:1140
msgid "Running dpkg"
msgstr "正在运行 dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1410
+#: apt-pkg/deb/dpkgpm.cc:1319
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1472
+#: apt-pkg/deb/dpkgpm.cc:1376
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:1477
+#: apt-pkg/deb/dpkgpm.cc:1381
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1479
+#: apt-pkg/deb/dpkgpm.cc:1383
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:1485
+#: apt-pkg/deb/dpkgpm.cc:1389
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1492
+#: apt-pkg/deb/dpkgpm.cc:1396
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1403 apt-pkg/deb/dpkgpm.cc:1409
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
-msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1526
+#: apt-pkg/deb/dpkgpm.cc:1430
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
@@ -3370,246 +3248,115 @@ msgstr "无法对状态列表目录加锁(%s),请查看您是否正以 root
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。"
+msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。 "
#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
msgstr "未锁定"
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "跳过不存在的文件 %s"
+#, c-format
+#~ msgid "Read error from %s process"
+#~ msgstr "从 %s 进程读取数据出错"
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值:%lu。(man 5 "
-#~ "apt.conf)"
+#, c-format
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "无法为 %s 开启管道"
-#~ msgid "Failed to remove %s"
-#~ msgstr "无法卸载 %s"
+#, c-format
+#~ msgid "Couldn't change to %s"
+#~ msgstr "无法切换工作目录到 %s"
-#~ msgid "Unable to create %s"
-#~ msgstr "无法创建 %s "
+#, c-format
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "无法读取 %sinfo 的状态"
+#, c-format
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "无法找到某个软件包:包头,于偏移位置 %lu"
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "info 和 temp 目录要求处于同一文件系统之下"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "必须首先初始化软件包缓存"
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "无法切换工作目录到 admin 目录 %sinfo"
+#, c-format
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "转移配置文件中有一行是无效的:%s"
-#~ msgid "Internal error getting a package name"
-#~ msgstr "在获取软件包名字时出现内部错误"
+#~ msgid "Internal error getting a node"
+#~ msgstr "获得一个节点时出现内部错误"
+
+#, c-format
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "无法读取列表文件 %sinfo/%s"
#~ msgid "Reading file listing"
#~ msgstr "正在读取文件列表"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "在获取软件包名字时出现内部错误"
+
+#, c-format
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "无法切换工作目录到 admin 目录 %sinfo"
+
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "info 和 temp 目录要求处于同一文件系统之下"
+
+#, c-format
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "无法读取 %sinfo 的状态"
+
+#, c-format
+#~ msgid "Unable to create %s"
+#~ msgstr "无法创建 %s"
+
+#, c-format
+#~ msgid "Package %s is not installed, so not removed\n"
+#~ msgstr "软件包 %s 还未安装,因而不会被卸载\n"
+
+#, c-format
#~ msgid ""
#~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
#~ "then make it empty and immediately re-install the same version of the "
#~ "package!"
-#~ msgstr ""
-#~ "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件,那么就清空该文件并马"
-#~ "上重新安装相同版本的这个软件包!"
-
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "无法读取列表文件 %sinfo/%s"
-
-#~ msgid "Internal error getting a node"
-#~ msgstr "获得一个节点时出现内部错误"
+#~ msgstr "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件,那么就清空该文件并马上重新安装相同版本的这个软件包!"
+#, c-format
#~ msgid "Failed to open the diversions file %sdiversions"
#~ msgstr "无法打开转移配置文件 %sdiversions"
#~ msgid "The diversion file is corrupted"
#~ msgstr "该转移配置文件被损坏了"
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "转移配置文件中有一行是无效的:%s"
-
#~ msgid "Internal error adding a diversion"
#~ msgstr "添加转移配置时出现内部错误"
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "必须首先初始化软件包缓存"
-
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "无法找到某个软件包:包头,于偏移位置 %lu"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
-
+#, c-format
#~ msgid "Error parsing MD5. Offset %lu"
#~ msgstr "解析 MD5 出错。文件内偏移量为 %lu"
-#~ msgid "Couldn't change to %s"
-#~ msgstr "无法切换工作目录到 %s"
-
#~ msgid "Failed to locate a valid control file"
#~ msgstr "无法在归档文件中找到有效的主控文件"
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "无法为 %s 开启管道"
-
-#~ msgid "Read error from %s process"
-#~ msgstr "从 %s 进程读取数据出错"
-
+#, c-format
#~ msgid "Got a single header line over %u chars"
#~ msgstr "接收到一行报头行,它的长度超过了 %u 个字符"
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "注意:这是自动被 dpkg 有意完成的。"
-
-#~ msgid "Malformed override %s line %lu #1"
-#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
-
-#~ msgid "Malformed override %s line %lu #2"
-#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
-
-#~ msgid "Malformed override %s line %lu #3"
-#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
-
-#~ msgid "decompressor"
-#~ msgstr "解压程序"
-
-#~ msgid "read, still have %lu to read but none left"
-#~ msgstr "读取文件出错,还剩 %lu 字节没有读出"
-
-#~ msgid "write, still have %lu to write but couldn't"
-#~ msgstr "写入文件出错,还剩 %lu 字节没有保存"
-
-#~ msgid ""
-#~ "Could not perform immediate configuration on already unpacked '%s'. "
-#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
-#~ msgstr ""
-#~ "无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::"
-#~ "Immediate-Configure。"
-
-#~ msgid "Error occurred while processing %s (NewPackage)"
-#~ msgstr "处理 %s (NewPackage)时出错"
-
-#~ msgid "Error occurred while processing %s (UsePackage1)"
-#~ msgstr "处理 %s (UsePackage1)时出错"
-
-#~ msgid "Error occurred while processing %s (NewFileDesc1)"
-#~ msgstr "处理 %s (NewFileDesc1)时出错"
-
-#~ msgid "Error occurred while processing %s (UsePackage2)"
-#~ msgstr "处理 %s (UsePackage2)时出错"
-
-#~ msgid "Error occurred while processing %s (NewFileVer1)"
-#~ msgstr "处理 %s (NewFileVer1)时出错"
-
-#~ msgid "Error occurred while processing %s (NewVersion%d)"
-#~ msgstr "处理 %s (NewVersion%d)时出错"
-
-#~ msgid "Error occurred while processing %s (UsePackage3)"
-#~ msgstr "处理 %s (UsePackage3)时出错"
-
-#~ msgid "Error occurred while processing %s (NewFileDesc2)"
-#~ msgstr "处理 %s (NewFileDesc2)时出错"
-
-#~ msgid "Error occurred while processing %s (FindPkg)"
-#~ msgstr "处理 %s (FindPkg)时出错"
-
-#~ msgid "Error occurred while processing %s (CollectFileProvides)"
-#~ msgstr "处理 %s (CollectFileProvides)时出错"
-
-#~ msgid "Internal error, could not locate member"
-#~ msgstr "内部错误,无法定位包内文件"
-
-#~ msgid "Internal error, group '%s' has no installable pseudo package"
-#~ msgstr "内部错误,组 %s 没有可安装的 pseudo 软件包"
-
-#~ msgid "Release file expired, ignoring %s (invalid since %s)"
-#~ msgstr "Release 文件已过期,忽略 %s (从 %s 起无效)"
-
-#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-#~ msgstr "错误:Acquire::gpgv::Options 的参数列表太长。结束运行。"
-
-#~ msgid "Error occurred while processing %s (NewVersion2)"
-#~ msgstr "处理 %s (NewVersion2)时出错"
-
-#~ msgid "Malformed line %u in source list %s (vendor id)"
-#~ msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)"
-
-#~ msgid "Couldn't access keyring: '%s'"
-#~ msgstr "无法访问密钥环:“%s”"
-
-#~ msgid "Could not patch file"
-#~ msgstr "无法打开补丁文件"
-
-#~ msgid " %4i %s\n"
-#~ msgstr " %4i %s\n"
-
-#~ msgid "No source package '%s' picking '%s' instead\n"
-#~ msgstr "没有源代码包“%s”,使用“%s”代替\n"
-
-#~ msgid "%4i %s\n"
-#~ msgstr "%4i %s\n"
-
-#~ msgid "Processing triggers for %s"
-#~ msgstr "启动对 %s 的处理"
-
-#~ msgid "Dynamic MMap ran out of room"
-#~ msgstr "动态内存映射(Dynamic MMap)空间不足"
-
-#~ msgid ""
-#~ "Since you only requested a single operation it is extremely likely that\n"
-#~ "the package is simply not installable and a bug report against\n"
-#~ "that package should be filed."
-#~ msgstr ""
-#~ "您仅要求对单一软件包进行操作,这极有可能是因为该软件包安装不上,同时,\n"
-#~ "您最好提交一个针对这个软件包的故障报告。"
-
-#~ msgid "Line %d too long (max %lu)"
-#~ msgstr "第 %d 行太长了(长度限制为 %lu)。"
-
-#~ msgid "After unpacking %sB of additional disk space will be used.\n"
-#~ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
-
-#~ msgid "After unpacking %sB disk space will be freed.\n"
-#~ msgstr "解压缩后将会空出 %sB 的空间。\n"
-
-#~ msgid "Line %d too long (max %d)"
-#~ msgstr "第 %d 行太长了(长度限制为 %d)"
-
-#~ msgid "Error occured while processing %s (NewFileDesc1)"
-#~ msgstr "处理 %s (NewFileDesc1)时出错"
-
-#~ msgid "Error occured while processing %s (NewFileDesc2)"
-#~ msgstr "处理 %s (NewFileDesc2)时出错"
-
-#~ msgid "Stored label: %s \n"
-#~ msgstr "归档文件标签:%s \n"
-
+#, c-format
#~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
-#~ "%i signatures\n"
-#~ msgstr ""
-#~ "找到了 %i 个软件包索引、%i 个源代码包索引,%i 个翻译索引和 %i 个数字签名\n"
-
-#~ msgid "openpty failed\n"
-#~ msgstr "openpty 失败\n"
-
-#~ msgid "File date has changed %s"
-#~ msgstr "文件 %s 的时间已被改动"
-
-#~ msgid "Reading file list"
-#~ msgstr "正在读取文件列表"
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+#~ "Current value: %lu. (man 5 apt.conf)"
+#~ msgstr "动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值:%lu。(man 5 apt.conf)"
-#~ msgid "Could not execute "
-#~ msgstr "未能执行 "
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "注意:这是自动被 dpkg 有意完成的。"
-#~ msgid "Preparing for remove with config %s"
-#~ msgstr "正在准备连同配置文件的删除 %s"
+#~ msgid "Use 'apt-get autoremove' to remove them."
+#~ msgstr "使用'apt-get autoremove'来卸载它们"
-#~ msgid "Removed with config %s"
-#~ msgstr "连同配置文件一同删除 %s "
+#, c-format
+#~ msgid "Failed to remove %s"
+#~ msgstr "无法卸载 %s"
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr ""
-#~ "在源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%1$s”"
+#, c-format
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "跳过不存在的文件 %s"