X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/0312a4ab115195b3b34ddf5a7a50ee1a07a59d1a..af81a46102237236f25d12c370beb7e461be9086:/po/zh_CN.po?ds=sidebyside

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 55c4c221a..56100d404 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,14 +4,14 @@
 # Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
-# Zhou Mo <cdluminate@gmail.com>, 2014.
+# Zhou Mo <cdluminate@gmail.com>, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.8.0~pre1\n"
+"Project-Id-Version: apt 1.2.x\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-12-23 13:28+0100\n"
-"PO-Revision-Date: 2014-12-04 04:42+0000\n"
+"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"PO-Revision-Date: 2016-03-27 07:00+0000\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -20,1768 +20,1844 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: cmdline/apt-cache.cc:149
+#. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
+#: apt-private/acqprogress.cc
 #, c-format
-msgid "Package %s version %s has an unmet dep:\n"
-msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
+msgid "Hit:%lu %s"
+msgstr "命中:%lu %s"
 
-#: cmdline/apt-cache.cc:277
-msgid "Total package names: "
-msgstr "软件包名称总数："
+#. TRANSLATOR: Very short word to be displayed for files processed in 'apt-get update'
+#. Potentially replaced later by "Hit:", "Ign:" or "Err:" if something (bad) happens
+#: apt-private/acqprogress.cc
+#, c-format
+msgid "Get:%lu %s"
+msgstr "获取:%lu %s"
 
-#: cmdline/apt-cache.cc:279
-msgid "Total package structures: "
-msgstr "全部软件包结构："
+#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+#. which failed to download, but the error is ignored (compare "Err:")
+#: apt-private/acqprogress.cc
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "忽略:%lu %s"
 
-#: cmdline/apt-cache.cc:319
-msgid "  Normal packages: "
-msgstr "  普通软件包："
+#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+#. which failed to download and the error is critical (compare "Ign:")
+#: apt-private/acqprogress.cc
+#, c-format
+msgid "Err:%lu %s"
+msgstr "错误:%lu %s"
 
-#: cmdline/apt-cache.cc:320
-msgid "  Pure virtual packages: "
-msgstr "  完全虚拟软件包："
+#: apt-private/acqprogress.cc
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "已下载 %sB，耗时 %s (%sB/s)\n"
 
-#: cmdline/apt-cache.cc:321
-msgid "  Single virtual packages: "
-msgstr "  单虚拟软件包："
+#: apt-private/acqprogress.cc
+msgid " [Working]"
+msgstr " [执行中]"
 
-#: cmdline/apt-cache.cc:322
-msgid "  Mixed virtual packages: "
-msgstr "  混合虚拟软件包："
+#: apt-private/acqprogress.cc
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press [Enter]\n"
+msgstr ""
+"更换介质：请把标有\n"
+" “%s”\n"
+"的盘片插入驱动器“%s”再按「回车」键\n"
 
-#: cmdline/apt-cache.cc:323
-msgid "  Missing: "
-msgstr "  缺失："
+#: apt-private/private-cachefile.cc
+msgid "Correcting dependencies..."
+msgstr "正在修复依赖关系..."
 
-#: cmdline/apt-cache.cc:325
-msgid "Total distinct versions: "
-msgstr "按版本共计："
+#: apt-private/private-cachefile.cc
+msgid " failed."
+msgstr " 失败。"
 
-#: cmdline/apt-cache.cc:327
-msgid "Total distinct descriptions: "
-msgstr "按不同的说明共计："
+#: apt-private/private-cachefile.cc
+msgid "Unable to correct dependencies"
+msgstr "无法修复依赖关系"
 
-#: cmdline/apt-cache.cc:329
-msgid "Total dependencies: "
-msgstr "按依赖关系共计："
+#: apt-private/private-cachefile.cc
+msgid "Unable to minimize the upgrade set"
+msgstr "无法最小化待升级软件包集合"
 
-#: cmdline/apt-cache.cc:332
-msgid "Total ver/file relations: "
-msgstr "按版本/文件关系共计："
+#: apt-private/private-cachefile.cc
+msgid " Done"
+msgstr " 完成"
 
-#: cmdline/apt-cache.cc:334
-msgid "Total Desc/File relations: "
-msgstr "按说明/文件关系共计："
+#: apt-private/private-cachefile.cc
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
 
-#: cmdline/apt-cache.cc:336
-msgid "Total Provides mappings: "
-msgstr "提供映射共计："
+#: apt-private/private-cachefile.cc
+msgid "Unmet dependencies. Try using -f."
+msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
 
-#: cmdline/apt-cache.cc:348
-msgid "Total globbed strings: "
-msgstr "Glob 字串共计："
+#: apt-private/private-cacheset.cc apt-private/private-search.cc
+msgid "Sorting"
+msgstr "正在排序"
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "依赖关系版本名所占空间共计："
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "注意，根据任务 '%2$s' 选中了 '%1$s'\n"
 
-#: cmdline/apt-cache.cc:367
-msgid "Total slack space: "
-msgstr "Slack 空间共计："
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Note, selecting '%s' for glob '%s'\n"
+msgstr "注意，根据Glob '%2$s' 选中了 '%1$s'\n"
 
-#: cmdline/apt-cache.cc:375
-msgid "Total space accounted for: "
-msgstr "总占用空间："
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "注意，根据正则表达式 '%2$s' 选中了 '%1$s'\n"
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
-#: apt-private/private-show.cc:58
+#: apt-private/private-cacheset.cc
 #, c-format
-msgid "Package file %s is out of sync."
-msgstr "软件包文件 %s 尚未同步。"
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "虚拟软件包 %s 由下面的软件包提供：\n"
 
-#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
-#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
-msgid "No packages found"
-msgstr "没有发现匹配的软件包"
+#: apt-private/private-cacheset.cc
+msgid " [Installed]"
+msgstr "[已安装]"
 
-#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
-msgid "You must give at least one search pattern"
-msgstr "您必须明确地给出至少一个表达式"
+#: apt-private/private-cacheset.cc
+msgid " [Not candidate version]"
+msgstr " [无候选]"
 
-#: cmdline/apt-cache.cc:1421
-msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr "该命令已废弃。请使用‘apt-mark showauto’代替。"
+#: apt-private/private-cacheset.cc
+msgid "You should explicitly select one to install."
+msgstr "请您明确地选择安装其中一个。"
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: apt-private/private-cacheset.cc
 #, c-format
-msgid "Unable to locate package %s"
-msgstr "未发现软件包 %s"
-
-#: cmdline/apt-cache.cc:1546
-msgid "Package files:"
-msgstr "软件包文件："
-
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"没有可用的软件包 %s，但是它被其它的软件包引用了。\n"
+"这可能意味着这个缺失的软件包可能已被废弃，\n"
+"或者只能在其他发布源中找到\n"
 
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1567
-msgid "Pinned packages:"
-msgstr "被锁定的软件包："
+#: apt-private/private-cacheset.cc
+msgid "However the following packages replace it:"
+msgstr "然而下列软件包会取代它："
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
-msgid "(not found)"
-msgstr "(没有找到)"
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "软件包 %s 没有可安装候选"
 
-#: cmdline/apt-cache.cc:1587
-msgid "  Installed: "
-msgstr "  已安装："
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr "类似 '%s' 的虚拟软件包「不」可以卸载\n"
 
-#: cmdline/apt-cache.cc:1588
-msgid "  Candidate: "
-msgstr "  候选软件包："
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-cacheset.cc apt-private/private-install.cc
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "软件包 %s 未安装，所以不会被卸载。您的意思是 ‘%s’ 吗？\n"
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
-msgid "(none)"
-msgstr "(无)"
+#: apt-private/private-cacheset.cc apt-private/private-install.cc
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "软件包 %s 未安装，所以不会被卸载\n"
 
-#: cmdline/apt-cache.cc:1621
-msgid "  Package pin: "
-msgstr "  软件包锁："
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "注意，选中 '%s' 而非 '%s'\n"
 
-#. Show the priority tables
-#: cmdline/apt-cache.cc:1630
-msgid "  Version table:"
-msgstr "  版本列表："
+#: apt-private/private-cmndline.cc
+msgid "Most used commands:"
+msgstr "常用命令："
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: apt-private/private-cmndline.cc
 #, c-format
-msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
+msgid "See %s for more information about the available commands."
+msgstr "参见 %s 以获取更多关于可用命令的信息。"
 
-#: cmdline/apt-cache.cc:1750
+#: apt-private/private-cmndline.cc
 msgid ""
-"Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-"\n"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -p=? The package cache.\n"
-"  -s=? The source cache.\n"
-"  -q   Disable progress indicator.\n"
-"  -i   Show only important deps for the unmet command.\n"
-"  -c=? Read this configuration file\n"
-"  -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"
+"Configuration options and syntax is detailed in apt.conf(5).\n"
+"Information about how to configure sources can be found in sources.list(5).\n"
+"Package and version choices can be expressed via apt_preferences(5).\n"
+"Security details are available in apt-secure(8).\n"
 msgstr ""
-"用法： apt-cache [选项] 命令\n"
-"　　　 apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
-"　　　 apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"
-"\n"
-"apt-cache 是一个底层的工具，可以用来\n"
-"在 APT 的二进制缓存文件中查询信息\n"
-"\n"
-"命令：\n"
-"   gencaches - 同时生成软件包和源代码包的缓存\n"
-"   showpkg - 显示某个软件包的全面信息\n"
-"   showsrc - 显示源文件的各项记录\n"
-"   stats - 显示基本的统计信息\n"
-"   dump - 简要显示整个缓存文件的内容\n"
-"   dumpavail - 把所有有效的包文件列表打印到标准输出\n"
-"   unmet - 显示所有未满足的依赖关系\n"
-"   search - 根据正则表达式搜索软件包列表\n"
-"   show - 以便于阅读的格式介绍该软件包\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:76
-msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”"
+"程序配置选项及语法都已经在 apt.conf(5) 中阐明。\n"
+"欲知如何配置软件源，请参阅 sources.list(5)。\n"
+"软件包及其版本偏好可以通过 apt_preferences(5) 来设置。\n"
+"关于安全方面的细节可以参考 apt-secure(8).\n"
 
-#: cmdline/apt-cdrom.cc:91
-msgid "Please insert a Disc in the drive and press enter"
-msgstr "请把盘片插入驱动器再按回车键"
+#: apt-private/private-cmndline.cc
+msgid "This APT has Super Cow Powers."
+msgstr "本 APT 具有超级牛力。"
 
-#: cmdline/apt-cdrom.cc:139
-#, c-format
-msgid "Failed to mount '%s' to '%s'"
-msgstr "无法将 %s 挂载到 %s"
-
-#: cmdline/apt-cdrom.cc:178
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point.\n"
-"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
-"mount point."
-msgstr ""
-"从默认挂载点自动检测 CD-ROM 失败。\n"
-"您可以尝试用 --cdrom 选项来设置 CD-ROM 的挂载点。\n"
-"更多关于 CD-ROM 自动检测以及挂载点的信息，请参见‘man apt-cdrom’。"
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "本 APT 助手具有超级喵力。"
 
-#: cmdline/apt-cdrom.cc:182
-msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "没有发现匹配的软件包"
 
-#: cmdline/apt-config.cc:48
-msgid "Arguments not in pairs"
-msgstr "参数没有成对"
+#: apt-private/private-download.cc
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "【警告】：下列软件包不能通过认证！"
 
-#: cmdline/apt-config.cc:89
-msgid ""
-"Usage: apt-config [options] command\n"
-"\n"
-"apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法：apt-config [选项] 命令\n"
-"\n"
-"apt-config 是一个用于读取APT 配置文件的简单工具\n"
-"\n"
-"命令：\n"
-"   shell - Shell 模式\n"
-"   dump - 显示配置文件\n"
-"\n"
-"选项：\n"
-"  -h   显示本帮助文本。\n"
-"  -c=? 读取指定的配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n"
+#: apt-private/private-download.cc
+msgid "Authentication warning overridden.\n"
+msgstr "已忽略认证警告。\n"
 
-#: cmdline/apt-get.cc:245
-#, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "找不到‘%s’体系结构下的软件包"
+#: apt-private/private-download.cc
+msgid "Some packages could not be authenticated"
+msgstr "有些软件包不能通过验证"
 
-#: cmdline/apt-get.cc:327
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "找不到软件包‘%s’的‘%s’版本"
+#: apt-private/private-download.cc
+msgid "Install these packages without verification?"
+msgstr "没有验证的情况下就安装这些软件包吗？"
 
-#: cmdline/apt-get.cc:330
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "找不到软件包‘%s’的‘%s’发行"
+#: apt-private/private-download.cc apt-private/private-install.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr "--force-yes 已经被废弃，请使用以 --allow 开头的选项来代替。"
 
-#: cmdline/apt-get.cc:367
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "选择 %s 作为源代码包而非 %s\n"
+#: apt-private/private-download.cc
+msgid ""
+"There were unauthenticated packages and -y was used without --allow-"
+"unauthenticated"
+msgstr ""
+"存在未认证的软件包同时使用了 -y 选项，然而未搭配  --allow-unauthenticated"
 
-#: cmdline/apt-get.cc:423
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "找不到 %2$s 软件包的 %1$s 版本"
+msgid "Failed to fetch %s  %s"
+msgstr "无法下载 %s  %s"
 
-#: cmdline/apt-get.cc:454
+#: apt-private/private-download.cc
 #, c-format
-msgid "Couldn't find package %s"
-msgstr "无法找到软件包 %s"
+msgid "Couldn't determine free space in %s"
+msgstr "无法获知您在 %s 上的可用空间"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: apt-private/private-download.cc
 #, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+msgid "You don't have enough free space in %s."
+msgstr "您在 %s 上没有足够的可用空间。"
 
-#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
-#, c-format
-msgid "%s set to automatically installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "无法锁定下载目录"
 
-#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
+#: apt-private/private-install.cc
 msgid ""
-"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
-"instead."
-msgstr "该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’替代。"
+"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"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n"
+"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
+"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
-msgid "Internal error, problem resolver broke stuff"
-msgstr "内部错误，问题解决工具坏事了"
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("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.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc
+msgid "The following information may help to resolve the situation:"
+msgstr "下列信息可能会对解决问题有所帮助："
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
-msgid "Unable to lock the download directory"
-msgstr "无法锁定下载目录"
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "破损的软件包"
 
-#: cmdline/apt-get.cc:726
-msgid "Must specify at least one package to fetch source for"
-msgstr "要下载源代码，必须指定至少一个对应的软件包"
+#: apt-private/private-install.cc
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "内部错误，InstallPackages 被用在了损坏的软件包上！"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "无法找到与 %s 对应的源代码包"
+#: apt-private/private-install.cc
+msgid "Packages need to be removed but remove is disabled."
+msgstr "有软件包需要被卸载，但是卸载被设置为禁止。"
 
-#: cmdline/apt-get.cc:786
-#, c-format
+#: apt-private/private-install.cc
 msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
+"Essential packages were removed and -y was used without --allow-remove-"
+"essential."
 msgstr ""
-"提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
-"%s\n"
+"关键软件包被移除同时使用了 -y 选项，但是没有搭配 --allow-remove-essential。"
 
-#: cmdline/apt-get.cc:791
-#, c-format
+#: apt-private/private-install.cc
+msgid "Packages were downgraded and -y was used without --allow-downgrades."
+msgstr "降级软件包同时使用了 -y 选项，但是没有用 --allow-downgrades."
+
+#: apt-private/private-install.cc
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
+"Held packages were changed and -y was used without --allow-change-held-"
+"packages."
 msgstr ""
-"请使用：\n"
-"bzr branch %s\n"
-"获得该软件包的最近更新(可能尚未正式发布)。\n"
+"在更改保留软件包的同时使用了 -y 选项，但没有搭配 --allow-change-held-"
+"packages."
 
-#: cmdline/apt-get.cc:839
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "忽略已下载的文件“%s”\n"
+#: apt-private/private-install.cc
+msgid "Internal error, Ordering didn't finish"
+msgstr "内部错误，排序未完成"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "无法获知您在 %s 上的可用空间"
+#: apt-private/private-install.cc
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "怪了……文件大小不符，请发邮件给 apt@packages.debian.org 吧"
 
-#: cmdline/apt-get.cc:886
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc
 #, c-format
-msgid "You don't have enough free space in %s"
-msgstr "您在 %s 上没有足够的可用空间"
+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 strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:895
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc
 #, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "需要下载 %sB/%sB 的源代码包。\n"
+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:900
+#: apt-private/private-install.cc
 #, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr "需要下载 %sB 的源代码包。\n"
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "解压缩后会消耗 %sB 的额外空间。\n"
 
-#: cmdline/apt-get.cc:906
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc
 #, c-format
-msgid "Fetch source %s\n"
-msgstr "下载源代码 %s\n"
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "解压缩后将会空出 %sB 的空间。\n"
 
-#: cmdline/apt-get.cc:924
-msgid "Failed to fetch some archives."
-msgstr "有一些包文件无法下载。"
+#: apt-private/private-install.cc
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "虽然您指定了仅执行常规操作，但这并不是常规操作。"
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
-msgid "Download complete and in download only mode"
-msgstr "下载完毕，目前是“仅下载”模式"
+#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
+#. careful with hard to type or special characters (like non-breaking spaces)
+#: apt-private/private-install.cc
+msgid "Yes, do as I say!"
+msgstr "是，按我说的做！"
 
-#: cmdline/apt-get.cc:954
+#: apt-private/private-install.cc
 #, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "忽略已经被解包到 %s 目录的源代码包\n"
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"您的操作有潜在的危害性。\n"
+"若要继续，请输入下面的短句“%s”\n"
+" ?] "
 
-#: cmdline/apt-get.cc:967
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "运行解包的命令“%s”出错。\n"
-
-#: cmdline/apt-get.cc:968
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
+#: apt-private/private-install.cc
+msgid "Abort."
+msgstr "中止。"
 
-#: cmdline/apt-get.cc:996
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "执行构造软件包命令“%s”失败。\n"
+#: apt-private/private-install.cc
+msgid "Do you want to continue?"
+msgstr "您希望继续执行吗？"
 
-#: cmdline/apt-get.cc:1015
-msgid "Child process failed"
-msgstr "子进程出错"
+#: apt-private/private-install.cc
+msgid "Some files failed to download"
+msgstr "有一些文件下载失败"
 
-#: cmdline/apt-get.cc:1034
-msgid "Must specify at least one package to check builddeps for"
-msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
+#: apt-private/private-install.cc apt-private/private-source.cc
+msgid "Download complete and in download only mode"
+msgstr "于“仅下载”模式中下载完毕"
 
-#: cmdline/apt-get.cc:1059
-#, c-format
+#: apt-private/private-install.cc
 msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
 msgstr ""
-"找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::Architectures for "
-"setup"
+"有几个软件包无法下载，要不运行 apt-get update 或者加上 --fix-missing 的选项再"
+"试试？"
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "无法获得 %s 的构建依赖关系信息"
+#: apt-private/private-install.cc
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "目前不支持 --fix-missing 和介质交换"
 
-#: cmdline/apt-get.cc:1106
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr " %s 没有构建依赖关系信息。\n"
+#: apt-private/private-install.cc
+msgid "Unable to correct missing packages."
+msgstr "无法修复缺失的软件包。"
 
-#: cmdline/apt-get.cc:1276
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"由于 %3$s 不被软件包 %4$s 所允许，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+#: apt-private/private-install.cc
+msgid "Aborting install."
+msgstr "中止安装。"
 
-#: cmdline/apt-get.cc:1294
-#, c-format
+#: apt-private/private-install.cc
 msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
 
-#: cmdline/apt-get.cc:1317
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
+#: apt-private/private-install.cc
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "注意：这是自动被 dpkg 有意完成的。"
 
-#: cmdline/apt-get.cc:1356
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"软件包 %3$s 的候选版本不能满足版本要求，因此 %2$s 软件包的 %1$s 依赖无法满足"
+#: apt-private/private-install.cc
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "我们不应该进行删除，无法启动自动删除器"
 
-#: cmdline/apt-get.cc:1362
-#, c-format
+#: apt-private/private-install.cc
 msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "软件包 %3$s 没有可用的候选版本，因此 %2$s 的 %1$s 依赖无法满足"
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
 
-#: cmdline/apt-get.cc:1385
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
+#: apt-private/private-install.cc
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "内部错误，自动卸载工具坏事了"
 
-#: cmdline/apt-get.cc:1400
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
+#: apt-private/private-install.cc
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "下列软件包是自动安装的并且现在不需要了："
 
-#: cmdline/apt-get.cc:1405
-msgid "Failed to process build dependencies"
-msgstr "无法处理构建依赖关系"
+#: apt-private/private-install.cc
+#, c-format
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: apt-private/private-install.cc
 #, c-format
-msgid "Changelog for %s (%s)"
-msgstr "%s (%s) 的 Changelog"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "使用'%s'来卸载它(它们)。"
 
-#: cmdline/apt-get.cc:1596
-msgid "Supported modules:"
-msgstr "支持的模块："
+#: apt-private/private-install.cc
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 
-#: cmdline/apt-get.cc:1637
+#: apt-private/private-install.cc
 msgid ""
-"Usage: apt-get [options] command\n"
-"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get is a simple command line interface for downloading and\n"
-"installing packages. The most frequently used commands are update\n"
-"and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -d  Download only - do NOT install or unpack archives\n"
-"  -s  No-act. Perform ordering simulation\n"
-"  -y  Assume Yes to all queries and do not prompt\n"
-"  -f  Attempt to correct a system with broken dependencies in place\n"
-"  -m  Attempt to continue if archives are unlocatable\n"
-"  -u  Show a list of upgraded packages as well\n"
-"  -b  Build the source package after fetching it\n"
-"  -V  Show verbose version numbers\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-"pages for more information and options.\n"
-"                       This APT has Super Cow Powers.\n"
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
 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"
-"   changelog - 下载指定软件包，并显示其changelog\n"
-"   download - 下载指定的二进制包到当前目录\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-helper.cc:36
-msgid "Need one URL as argument"
-msgstr "需要一个 URL 作为参数"
-
-#: cmdline/apt-helper.cc:49
-msgid "Must specify at least one pair url/filename"
-msgstr "必须指定至少一对URL或者文件名"
+"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
+"以指定一个解决办法)。"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
-msgid "Download Failed"
-msgstr "下载失败"
+#: apt-private/private-install.cc
+msgid "The following additional packages will be installed:"
+msgstr "将会同时安装下列软件："
 
-#: cmdline/apt-helper.cc:91
-msgid ""
-"Usage: apt-helper [options] command\n"
-"       apt-helper [options] download-file uri target-path\n"
-"\n"
-"apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
-msgstr ""
-"用法： apt-helper [选项] 命令\n"
-"       apt-helper [选项] download-file uri target-path\n"
-"\n"
-"apt-helper 是一个 apt 的内部帮助程序\n"
-"\n"
-"命令：\n"
-"   download-file - 将uri指定的文件下载到指定目标目录\n"
-"   auto-detect-proxy - 用 apt.conf 检测代理设置\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+#: apt-private/private-install.cc
+msgid "Suggested packages:"
+msgstr "建议安装："
 
-#: cmdline/apt-mark.cc:68
-#, c-format
-msgid "%s can not be marked as it is not installed.\n"
-msgstr "%s 还没有安装，因此无法标记。\n"
+#: apt-private/private-install.cc
+msgid "Recommended packages:"
+msgstr "推荐安装："
 
-#: cmdline/apt-mark.cc:74
+#: apt-private/private-install.cc
 #, c-format
-msgid "%s was already set to manually installed.\n"
-msgstr "%s 已经被设置为手动安装。\n"
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 
-#: cmdline/apt-mark.cc:76
+#: apt-private/private-install.cc
 #, c-format
-msgid "%s was already set to automatically installed.\n"
-msgstr "%s 已经被设置为自动安装。\n"
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
 
-#: cmdline/apt-mark.cc:241
+#: apt-private/private-install.cc
 #, c-format
-msgid "%s was already set on hold.\n"
-msgstr "%s 已经设置为保留。\n"
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "不能重新安装 %s，因为无法下载它。\n"
 
-#: cmdline/apt-mark.cc:243
+#. TRANSLATORS: First string is package name, second is version
+#: apt-private/private-install.cc
 #, c-format
-msgid "%s was already not hold.\n"
-msgstr "%s 已经设置为不保留。\n"
+msgid "%s is already the newest version (%s).\n"
+msgstr "%s 已经是最新版 (%s)。\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
-#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: apt-private/private-install.cc cmdline/apt-get.cc cmdline/apt-mark.cc
 #, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "等待子进程 %s 的退出，但是它并不存在"
+msgid "%s set to manually installed.\n"
+msgstr "%s 已设置为手动安装。\n"
 
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: apt-private/private-install.cc
 #, c-format
-msgid "%s set on hold.\n"
-msgstr "%s 设置为保留。\n"
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: apt-private/private-install.cc
 #, c-format
-msgid "Canceled hold on %s.\n"
-msgstr "取消保留 %s 的设置。\n"
-
-#: cmdline/apt-mark.cc:345
-msgid "Executing dpkg failed. Are you root?"
-msgstr "执行 dpkg 失败。您是 root 吗？"
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "由于 %4$s，为 %3$s 选定了版本 %1$s (%2$s)\n"
 
-#: cmdline/apt-mark.cc:392
-msgid ""
-"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-"\n"
-"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"用法：apt-mark [选项] {auto|manual} 软件包1 [软件包2 ...]\n"
-"\n"
-"apt-mark 是一个可以对软件包进行 手动/自动 安装标记的简单命令行界面。\n"
-"它也能列出标记。\n"
-"\n"
-"命令：\n"
-"   auto - 标记指定软件包为自动安装\n"
-"   manual - 标记指定软件包为手动安装\n"
-"   hold - 标记指定软件包为保留(held back)\n"
-"   unhold - 取消指定软件包的保留(held back)标记\n"
-"   showauto - 列出所有自动安装的软件包\n"
-"   showmanual - 列出所有手动安装的软件包\n"
-"   showhold - 列出设为保留的软件包\n"
-"\n"
-"选项：\n"
-"  -h  显示本帮助信息\n"
-"  -q  日志型输出 - 不显示进度\n"
-"  -qq 安静模式，只输出错误信息\n"
-"  -s  无动作。只说明将要做什么。\n"
-"  -f  读取/写入 指定文件的  自动/手动 标记\n"
-"  -c=? 读取指定的配置文件\n"
-"  -o=? 任意设置一个配置项，比如 -o dir::cache=/tmp\n"
-"更多细节请参见 the apt-mark(8) 和 apt.conf(5) 的 man 手册。"
-
-#: cmdline/apt.cc:47
-msgid ""
-"Usage: apt [options] command\n"
-"\n"
-"CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
-msgstr ""
-"用法： apt [选项] 命令\n"
-"\n"
-"apt 的命令行界面。\n"
-"基本命令：\n"
-" list - 根据名称列出软件包\n"
-" search - 搜索软件包描述\n"
-" show - 显示软件包细节\n"
-"\n"
-" update - 更新可用软件包列表\n"
-"\n"
-" install - 安装软件包\n"
-" remove  - 移除软件包\n"
-"\n"
-" upgrade - 通过 安装/升级 软件来更新系统\n"
-" full-upgrade - 通过 卸载/安装/升级 来更新系统\n"
-"\n"
-" edit-sources - 编辑软件源信息文件\n"
+#: apt-private/private-list.cc
+msgid "Listing"
+msgstr "正在列表"
 
-#: methods/cdrom.cc:203
+#: apt-private/private-list.cc
 #, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "无法读取盘片数据库 %s"
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "还有 %i 个版本。请使用 -a 选项来查看它(他们)。"
 
-#: methods/cdrom.cc:212
+#: apt-private/private-main.cc
 msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
 msgstr ""
-"请使用 apt-cdrom，通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来"
-"加入新的盘片。"
+"注意：这只是模拟！\n"
+"　　　apt-get 需要 root 特权进行实际的执行。\n"
+"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
 
-#: methods/cdrom.cc:222
-msgid "Wrong CD-ROM"
-msgstr "错误的 CD-ROM"
+#: apt-private/private-output.cc apt-private/private-show.cc
+msgid "unknown"
+msgstr "未知"
 
-#: methods/cdrom.cc:249
+#: apt-private/private-output.cc
 #, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"
-
-#: methods/cdrom.cc:254
-msgid "Disk not found."
-msgstr "找不到盘片。"
-
-#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281
-msgid "File not found"
-msgstr "无法找到该文件"
+msgid "[installed,upgradable to: %s]"
+msgstr "[已安装，可升级至：%s]"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
-#: methods/rred.cc:608
-msgid "Failed to stat"
-msgstr "无法读取状态"
+#: apt-private/private-output.cc
+msgid "[installed,local]"
+msgstr "[已安装，本地]"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
-msgid "Failed to set modification time"
-msgstr "无法设置文件的修改日期"
+#: apt-private/private-output.cc
+msgid "[installed,auto-removable]"
+msgstr "[已安装，可自动卸载]"
 
-#: methods/file.cc:48
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "无效的 URI，本地的 URI 不能以 // 开头"
+#: apt-private/private-output.cc
+msgid "[installed,automatic]"
+msgstr "[已安装，自动]"
 
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
-msgid "Logging in"
-msgstr "正在登录"
+#: apt-private/private-output.cc
+msgid "[installed]"
+msgstr "[已安装]"
 
-#: methods/ftp.cc:183
-msgid "Unable to determine the peer name"
-msgstr "无法获知对方主机名"
+#: apt-private/private-output.cc
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[可从该版本升级：%s]"
 
-#: methods/ftp.cc:188
-msgid "Unable to determine the local name"
-msgstr "无法获知本地主机名"
+#: apt-private/private-output.cc
+msgid "[residual-config]"
+msgstr "[配置文件残留]"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: apt-private/private-output.cc
 #, c-format
-msgid "The server refused the connection and said: %s"
-msgstr "服务器拒绝了我们的连接，响应信息为：%s"
+msgid "but %s is installed"
+msgstr "但是 %s 已经安装"
 
-#: methods/ftp.cc:225
+#: apt-private/private-output.cc
 #, c-format
-msgid "USER failed, server said: %s"
-msgstr "USER 指令出错，服务器响应信息为：%s"
+msgid "but %s is to be installed"
+msgstr "但是 %s 正要被安装"
 
-#: methods/ftp.cc:232
-#, c-format
-msgid "PASS failed, server said: %s"
-msgstr "PASS 指令出错，服务器响应信息为：%s"
+#: apt-private/private-output.cc
+msgid "but it is not installable"
+msgstr "但无法安装它"
 
-#: methods/ftp.cc:252
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-"您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
+#: apt-private/private-output.cc
+msgid "but it is a virtual package"
+msgstr "但是它是虚拟软件包"
 
-#: methods/ftp.cc:280
-#, c-format
-msgid "Login script command '%s' failed, server said: %s"
-msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
+#: apt-private/private-output.cc
+msgid "but it is not installed"
+msgstr "但是它还没有被安装"
 
-#: methods/ftp.cc:306
-#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr "TYPE 指令出错，服务器响应信息为：%s"
+#: apt-private/private-output.cc
+msgid "but it is not going to be installed"
+msgstr "但是它将不会被安装"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
-msgid "Connection timeout"
-msgstr "连接超时"
-
-#: methods/ftp.cc:350
-msgid "Server closed the connection"
-msgstr "服务器关闭了连接"
-
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
-msgid "Read error"
-msgstr "读错误"
-
-#: methods/ftp.cc:360 methods/rsh.cc:209
-msgid "A response overflowed the buffer."
-msgstr "回应超出了缓存区大小。"
+#: apt-private/private-output.cc
+msgid " or"
+msgstr " 或"
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
-msgid "Protocol corruption"
-msgstr "协议有误"
+#: apt-private/private-output.cc
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的依赖关系："
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
-msgid "Write error"
-msgstr "写出错"
+#: apt-private/private-output.cc
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】软件包将被安装："
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
-msgid "Could not create a socket"
-msgstr "无法创建套接字"
+#: apt-private/private-output.cc
+msgid "The following packages will be REMOVED:"
+msgstr "下列软件包将被【卸载】："
 
-#: methods/ftp.cc:712
-msgid "Could not connect data socket, connection timed out"
-msgstr "无法连接上数据套接字，连接超时"
+#: apt-private/private-output.cc
+msgid "The following packages have been kept back:"
+msgstr "下列软件包的版本将保持不变："
 
-#: methods/ftp.cc:716 methods/connect.cc:116
-msgid "Failed"
-msgstr "失败"
+#: apt-private/private-output.cc
+msgid "The following packages will be upgraded:"
+msgstr "下列软件包将被升级："
 
-#: methods/ftp.cc:718
-msgid "Could not connect passive socket."
-msgstr "无法连接被动模式的套接字。"
+#: apt-private/private-output.cc
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列软件包将被【降级】："
 
-#: methods/ftp.cc:735
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo 无法得到监听套接字"
+#: apt-private/private-output.cc
+msgid "The following held packages will be changed:"
+msgstr "下列被要求保持版本不变的软件包将被改变："
 
-#: methods/ftp.cc:749
-msgid "Could not bind a socket"
-msgstr "无法绑定套接字"
+#: apt-private/private-output.cc
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (是由于 %s)"
 
-#: methods/ftp.cc:753
-msgid "Could not listen on the socket"
-msgstr "无法在套接字上监听"
+#: apt-private/private-output.cc
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"【警告】：下列基础软件包将被卸载。\n"
+"请勿尝试，除非您确实知道您在做什么！"
 
-#: methods/ftp.cc:760
-msgid "Could not determine the socket's name"
-msgstr "无法确定套接字的名字"
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
-#: methods/ftp.cc:792
-msgid "Unable to send PORT command"
-msgstr "无法发出 PORT 指令"
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "重新安装了 %lu 个软件包，"
 
-#: methods/ftp.cc:802
+#: apt-private/private-output.cc
 #, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr "无法识别的地址族 %u (AF_*)"
+msgid "%lu downgraded, "
+msgstr "降级了 %lu 个软件包，"
 
-#: methods/ftp.cc:811
+#: apt-private/private-output.cc
 #, c-format
-msgid "EPRT failed, server said: %s"
-msgstr "EPRT 指令出错，服务器响应信息为：%s"
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
 
-#: methods/ftp.cc:831
-msgid "Data socket connect timed out"
-msgstr "数据套接字连接超时"
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 
-#: methods/ftp.cc:838
-msgid "Unable to accept connection"
-msgstr "无法接受连接"
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc
+msgid "[Y/n]"
+msgstr "[Y/n]"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
-msgid "Problem hashing file"
-msgstr "把文件加入哈希表时出错"
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc
+msgid "[y/N]"
+msgstr "[y/N]"
 
-#: methods/ftp.cc:890
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "无法获取文件，服务器响应信息为“%s”"
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc
+msgid "Y"
+msgstr "Y"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
-msgid "Data socket timed out"
-msgstr "数据套接字超时"
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc
+msgid "N"
+msgstr "N"
 
-#: methods/ftp.cc:935
+#: apt-private/private-output.cc apt-pkg/cachefilter.cc
 #, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "数据传送出错，服务器响应信息为“%s”"
+msgid "Regex compilation error - %s"
+msgstr "编译正则表达式时出错 - %s"
 
-#. Get the files information
-#: methods/ftp.cc:1014
-msgid "Query"
-msgstr "查询"
+#: apt-private/private-search.cc
+msgid "You must give at least one search pattern"
+msgstr "您必须明确地给出至少一个表达式"
 
-#: methods/ftp.cc:1128
-msgid "Unable to invoke "
-msgstr "无法调用 "
+#: apt-private/private-search.cc
+msgid "Full Text Search"
+msgstr "全文搜索"
 
-#: methods/connect.cc:76
+#: apt-private/private-show.cc cmdline/apt-cache.cc
 #, c-format
-msgid "Connecting to %s (%s)"
-msgstr "正在连接 %s (%s)"
+msgid "Package file %s is out of sync."
+msgstr "软件包文件 %s 尚未同步。"
 
-#: methods/connect.cc:87
+#: apt-private/private-show.cc
 #, c-format
-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "有 %i 条附加记录。请加上 ‘-a’ 参数来查看它们"
 
-#: methods/connect.cc:94
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
+#: apt-private/private-show.cc
+msgid "not a real package (virtual)"
+msgstr "不是一个实包(虚包)"
 
-#: methods/connect.cc:100
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
 #, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "无法发起与 %s:%s (%s) 的连接"
+msgid "Unable to locate package %s"
+msgstr "无法定位软件包 %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "软件包文件："
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "被锁定的软件包："
 
-#: methods/connect.cc:108
+#. Print the package name and the version we are forcing to
+#: apt-private/private-show.cc
 #, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "无法连接上 %s:%s (%s)，连接超时"
+msgid "%s -> %s with priority %d\n"
+msgstr "%s -> %s ，其优先级为 %d\n"
+
+#: apt-private/private-show.cc
+msgid "  Installed: "
+msgstr "  已安装："
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  候选："
 
-#: methods/connect.cc:126
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(无)"
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  版本列表："
+
+#: apt-private/private-source.cc
 #, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "无法连接上 %s:%s (%s)。"
+msgid "Can not find a package for architecture '%s'"
+msgstr "找不到‘%s’体系结构下的软件包"
 
-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:442
+#: apt-private/private-source.cc
 #, c-format
-msgid "Connecting to %s"
-msgstr "正在连接 %s"
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "找不到软件包‘%s’的‘%s’版本"
 
-#: methods/connect.cc:180 methods/connect.cc:199
+#: apt-private/private-source.cc
 #, c-format
-msgid "Could not resolve '%s'"
-msgstr "无法解析域名“%s”"
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "找不到软件包‘%s’的‘%s’发行"
 
-#: methods/connect.cc:205
+#: apt-private/private-source.cc
 #, c-format
-msgid "Temporary failure resolving '%s'"
-msgstr "暂时不能解析域名“%s”"
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "选择 %s 作为源代码包而非 %s\n"
 
-#: methods/connect.cc:209
+#: apt-private/private-source.cc
 #, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "解析“%s:%s”时出现系统故障"
+msgid "Can not find version '%s' of package '%s'"
+msgstr "找不到 %2$s 软件包的 %1$s 版本"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
-#: methods/connect.cc:211
+#: apt-private/private-source.cc
 #, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
+msgid "Unable to find a source package for %s"
+msgstr "无法找到与 %s 对应的源代码包"
 
-#: methods/connect.cc:258
+#: apt-private/private-source.cc
 #, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr "不能连接到 %s：%s："
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
+"%s\n"
 
-#: methods/gpgv.cc:168
+#: apt-private/private-source.cc
+#, c-format
 msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
+"Please use:\n"
+"%s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+"请使用：\n"
+"%s\n"
+"获得该软件包的最近更新(可能尚未正式发布)。\n"
 
-#: methods/gpgv.cc:172
-msgid "At least one invalid signature was encountered."
-msgstr "至少发现一个无效的签名。"
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "忽略已下载的文件“%s”\n"
 
-#: methods/gpgv.cc:174
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-source.cc
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
-#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-source.cc
 #, c-format
-msgid ""
-"Clearsigned file isn't valid, got '%s' (does the network require "
-"authentication?)"
-msgstr "明文签署文件不可用，结果为‘%s’（您的网络需要认证吗？）"
+msgid "Need to get %sB of source archives.\n"
+msgstr "需要下载 %sB 的源代码包。\n"
 
-#: methods/gpgv.cc:184
-msgid "Unknown error executing gpgv"
-msgstr "运行 gpgv 时发生未知错误"
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "下载源代码 %s\n"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
-msgid "The following signatures were invalid:\n"
-msgstr "下列签名无效：\n"
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "有一些包文件无法下载。"
 
-#: methods/gpgv.cc:231
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr "由于没有公钥，无法验证下列签名：\n"
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "忽略已经被解包到 %s 目录的源代码包\n"
 
-#: methods/gzip.cc:69
-msgid "Empty files can't be valid archives"
-msgstr "空文件不能当作有效归档"
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "运行解包的命令“%s”出错。\n"
 
-#: methods/http.cc:513
-msgid "Error writing to the file"
-msgstr "写入文件出错"
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
-#: methods/http.cc:527
-msgid "Error reading from server. Remote end closed connection"
-msgstr "从服务器读取数据时出错，对方关闭了连接"
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "执行构造软件包命令“%s”失败。\n"
 
-#: methods/http.cc:529
-msgid "Error reading from server"
-msgstr "从服务器读取数据出错"
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "无法获得 %s 的构建依赖关系信息"
 
-#: methods/http.cc:565
-msgid "Error writing to file"
-msgstr "写入文件出错"
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr " %s 没有构建依赖关系信息。\n"
 
-#: methods/http.cc:625
-msgid "Select failed"
-msgstr "select 调用出错"
-
-#: methods/http.cc:630
-msgid "Connection timed out"
-msgstr "连接超时"
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
 
-#: methods/http.cc:653
-msgid "Error writing to output file"
-msgstr "写输出文件时出错"
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::Architectures for "
+"setup"
 
-#: methods/server.cc:52
-msgid "Waiting for headers"
-msgstr "正在等待报头"
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr "注意，正使用 '%s' 目录下载编译依赖\n"
 
-#: methods/server.cc:111
-msgid "Bad header line"
-msgstr "错误的报头行"
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "注意，正使用 '%s' 文件来获取编译依赖\n"
 
-#: methods/server.cc:136 methods/server.cc:143
-msgid "The HTTP server sent an invalid reply header"
-msgstr "该 HTTP 服务器发送了一个无效的应答报头"
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "无法处理构建依赖关系"
 
-#: methods/server.cc:173
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "解析 %s 失败。请重新编辑之后再试。"
 
-#: methods/server.cc:193
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr "您的 %s 文件有过改动，请执行 ‘apt-get update’。"
 
-#: methods/server.cc:195
-msgid "This HTTP server has broken range support"
-msgstr "该 HTTP 服务器的 range 支持不正常"
+#: apt-private/private-unmet.cc
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
-#: methods/server.cc:219
-msgid "Unknown date format"
-msgstr "无法识别的日期格式"
+#: apt-private/private-update.cc
+msgid "The update command takes no arguments"
+msgstr " update 命令不需要参数"
 
-#: methods/server.cc:494
-msgid "Bad header data"
-msgstr "错误的报头数据"
+#: apt-private/private-update.cc
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"有 %i 个软件包可以升级。请执行 ‘apt list --upgradable’ 来查看它们。\n"
 
-#: methods/server.cc:511 methods/server.cc:567
-msgid "Connection failed"
-msgstr "连接失败"
+#: apt-private/private-update.cc
+msgid "All packages are up to date."
+msgstr "所有软件包均为最新。"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "内部错误"
+#: cmdline/apt-cache.cc
+msgid "apt-cache stats does not take any arguments"
+msgstr "apt-cache stats 命令不需要参数"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "正在列表"
+#: cmdline/apt-cache.cc
+msgid "Total package names: "
+msgstr "软件包名称总数："
 
-#: apt-private/private-list.cc:159
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "还有 %i 个版本。请使用 -a 选项来查看它(他们)。"
+#: cmdline/apt-cache.cc
+msgid "Total package structures: "
+msgstr "全部软件包结构："
 
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "正在更正依赖关系..."
+#: cmdline/apt-cache.cc
+msgid "  Normal packages: "
+msgstr "  普通软件包："
 
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 失败。"
+#: cmdline/apt-cache.cc
+msgid "  Pure virtual packages: "
+msgstr "  纯虚拟软件包："
 
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "无法更正依赖关系"
+#: cmdline/apt-cache.cc
+msgid "  Single virtual packages: "
+msgstr "  单虚拟软件包："
 
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "无法最小化要升级的软件包集合"
+#: cmdline/apt-cache.cc
+msgid "  Mixed virtual packages: "
+msgstr "  混合虚拟软件包："
 
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 完成"
+#: cmdline/apt-cache.cc
+msgid "  Missing: "
+msgstr "  缺失："
 
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
+#: cmdline/apt-cache.cc
+msgid "Total distinct versions: "
+msgstr "按不同的版本共计："
 
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
+#: cmdline/apt-cache.cc
+msgid "Total distinct descriptions: "
+msgstr "按不同的说明共计："
 
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "未知"
+#: cmdline/apt-cache.cc
+msgid "Total dependencies: "
+msgstr "按依赖关系共计："
 
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[已安装，可升级至：%s]"
+#: cmdline/apt-cache.cc
+msgid "Total ver/file relations: "
+msgstr "按版本/文件关系共计："
 
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr "[已安装，本地]"
+#: cmdline/apt-cache.cc
+msgid "Total Desc/File relations: "
+msgstr "按说明/文件关系共计："
 
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr "[已安装，可自动卸载]"
+#: cmdline/apt-cache.cc
+msgid "Total Provides mappings: "
+msgstr "提供映射共计："
 
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr "[已安装，自动]"
+#: cmdline/apt-cache.cc
+msgid "Total globbed strings: "
+msgstr "Glob 字串共计："
 
-#: apt-private/private-output.cc:274
-msgid "[installed]"
-msgstr "[已安装]"
+#: cmdline/apt-cache.cc
+msgid "Total slack space: "
+msgstr "Slack 空间共计："
 
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[可从该版本升级：%s]"
+#: cmdline/apt-cache.cc
+msgid "Total space accounted for: "
+msgstr "总占用空间："
 
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr "[配置文件残留]"
+#: cmdline/apt-cache.cc
+msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
+msgstr "该命令已废弃。请使用‘apt-mark showauto’。"
 
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "但是 %s 已经安装"
+#: cmdline/apt-cache.cc
+msgid ""
+"Usage: apt-cache [options] command\n"
+"       apt-cache [options] show pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache queries and displays available information about installed\n"
+"and installable packages. It works exclusively on the data acquired\n"
+"into the local cache via the 'update' command of e.g. apt-get. The\n"
+"displayed information may therefore be outdated if the last update was\n"
+"too long ago, but in exchange apt-cache works independently of the\n"
+"availability of the configured sources (e.g. offline).\n"
+msgstr ""
+"用法： apt-cache [选项] 命令\n"
+"       apt-cache [选项] show 软件包1 [软件包2 ...]\n"
+"\n"
+"apt-cache 可以查询和显示已安装和可安装软件包的可用信息。\n"
+"它专门工作在本地的数据缓存上，而这些缓存可以通过比如\n"
+"apt-get 的 'update' 命令来更新。如果距离上一次更新的时间太久，\n"
+"那么它显示的信息可能就会过时。不过作为交换，apt-cache 不依赖\n"
+"当前软件源的可用性（比如：离线状态）。\n"
 
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但是 %s 正要被安装"
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "显示源文件的各项记录"
 
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "但无法安装它"
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "根据正则表达式搜索软件包列表"
 
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "但是它是虚拟软件包"
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "显示该软件包的依赖关系信息"
 
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "但是它还没有被安装"
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "显示所有依赖于该软件包的软件包名字"
 
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "但是它将不会被安装"
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "以便于阅读的格式介绍该软件包"
 
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " 或"
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "列出所有软件包的名字"
 
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "下列软件包有未满足的依赖关系："
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "显示软件包的安装设置状态"
 
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】软件包将被安装："
+#: cmdline/apt-cdrom.cc
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
+msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”"
 
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "下列软件包将被【卸载】："
+#: cmdline/apt-cdrom.cc
+msgid "Please insert a Disc in the drive and press [Enter]"
+msgstr "请把盘片插入驱动器再按「回车键」"
 
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "下列软件包的版本将保持不变："
+#: cmdline/apt-cdrom.cc
+#, c-format
+msgid "Failed to mount '%s' to '%s'"
+msgstr "无法将 ‘%s’ 挂载到 ‘%s’"
 
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "下列软件包将被升级："
+#: cmdline/apt-cdrom.cc
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+"从默认挂载点自动检测 CD-ROM 失败。\n"
+"您可以尝试用 --cdrom 选项来设置 CD-ROM 的挂载点。\n"
+"更多关于 CD-ROM 自动检测以及挂载点的信息，请参见‘man apt-cdrom’。"
 
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列软件包将被【降级】："
+#: cmdline/apt-cdrom.cc
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
 
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "下列被要求保持版本不变的软件包将被改变："
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is used to add CDROM's, USB flashdrives and other removable\n"
+"media types as package sources to APT. The mount point and device\n"
+"information is taken from apt.conf(5), udev(7) and fstab(5).\n"
+msgstr ""
+"用法： apt-cdrom [选项] 命令\n"
+"\n"
+"apt-cdrom 用于添加CDROM, USB存储器和其他可移动媒介作为 APT 软件源。\n"
+"关于挂载点和设备的详细信息参见 apt.conf(5), udev(7) 和 fstab(5)。\n"
 
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (是由于 %s) "
+#: cmdline/apt-config.cc
+msgid "Arguments not in pairs"
+msgstr "参数不成对"
 
-#: apt-private/private-output.cc:696
+#: cmdline/apt-config.cc
 msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is an interface to the configuration settings used by\n"
+"all APT tools, mainly intended for debugging and shell scripting.\n"
 msgstr ""
-"【警告】：下列基础软件包将被卸载。\n"
-"请勿尝试，除非您确实知道您在做什么！"
+"用法：apt-config [选项] 命令\n"
+"\n"
+"apt-config 是所有 APT 工具的配置接口，主要用于Debug和编写Shell脚本。\n"
 
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr "通过shell求值来获取设置值"
 
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "重新安装了 %lu 个软件包，"
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr "显示活动的设置选项"
 
-#: apt-private/private-output.cc:733
+#: cmdline/apt-get.cc
 #, c-format
-msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包，"
+msgid "Couldn't find package %s"
+msgstr "找不到软件包 %s"
 
-#: apt-private/private-output.cc:735
+#: cmdline/apt-get.cc cmdline/apt-mark.cc
 #, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
+msgid "%s set to automatically installed.\n"
+msgstr "%s 已设置为自动安装。\n"
 
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
+#: cmdline/apt-get.cc cmdline/apt-mark.cc
+msgid ""
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."
+msgstr "该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’。"
 
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[Y/n]"
+#: cmdline/apt-get.cc
+msgid "Internal error, problem resolver broke stuff"
+msgstr "内部错误，问题解决工具坏事了"
 
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[y/N]"
+#: cmdline/apt-get.cc
+msgid "Supported modules:"
+msgstr "支持的模块："
 
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "Y"
+#: cmdline/apt-get.cc
+msgid ""
+"Usage: apt-get [options] command\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a command line interface for retrieval of packages\n"
+"and information about them from authenticated sources and\n"
+"for installation, upgrade and removal of packages together\n"
+"with their dependencies.\n"
+msgstr ""
+"用法： apt-get [选项] 命令\n"
+"　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
+"　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"
+"\n"
+"apt-get 可以从认证软件源下载软件包及相关信息，以便安装和升级软件包，\n"
+"或者用于移除软件包。在这些过程中，软件包依赖会被妥善处理。\n"
 
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "取回更新的软件包列表信息"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "编译正则表达式时出错 - %s"
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "进行一次升级"
 
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr " update 命令不需要参数"
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)"
 
-#: apt-private/private-update.cc:97
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"有 %i 个软件包可以升级。请执行 ‘apt list --upgradable’ 来查看它们。\n"
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "卸载软件包"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr "所有软件包均为最新。"
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "卸载并清除软件包的配置"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "正在排序"
+#: cmdline/apt-get.cc cmdline/apt.cc
+msgid "Remove automatically all unused packages"
+msgstr "卸载所有自动安装且不再使用的软件包"
 
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "有 %i 条附加记录。请加上 ‘-a’ 参数来查看它们"
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "发布版升级，见 apt-get(8)"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "不是一个实包(虚包)"
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "根据 dselect 的选择来进行升级"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "为源码包配置所需的编译依赖关系"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "删除所有已下载的包文件"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "删除已下载的旧包文件"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "核对以确认系统的依赖关系的完整性"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "下载源码包文件"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "下载指定的二进制包到当前目录"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "下载指定软件包，并显示其changelog"
+
+#: cmdline/apt-helper.cc
+msgid "Need one URL as argument"
+msgstr "需要一个 URL 作为参数"
 
-#: apt-private/private-main.cc:32
+#: cmdline/apt-helper.cc
+msgid "Must specify at least one pair url/filename"
+msgstr "必须指定至少一对URL或文件名"
+
+#: cmdline/apt-helper.cc
+msgid "Download Failed"
+msgstr "下载失败"
+
+#: cmdline/apt-helper.cc
+#, c-format
+msgid "GetSrvRec failed for %s"
+msgstr "GetSrvRec 失败，因为 %s"
+
+#: cmdline/apt-helper.cc
 msgid ""
-"NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
-"      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] cat-file file ...\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper bundles a variety of commands for shell scripts to use\n"
+"e.g. the same proxy configuration or acquire system as APT would.\n"
 msgstr ""
-"注意：这只是模拟！\n"
-"　　　apt-get 需要 root 特权进行实际的执行。\n"
-"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
+"用法： apt-helper [选项] 命令\n"
+"       apt-helper [选项] download-file URI 目标路径\n"
+"\n"
+"apt-helper 汇集了各种各样的功能来供shell脚本调用，比如\n"
+"使用与APT相同的代理设置，或者相同的捕获系统。\n"
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr "将 URI 指定的文件下载到目标路径"
 
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr "查阅一个 SRV 记录 (如： _http._tcp.ftp.debian.org)"
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "内部错误，Ordering 未能完成"
+#: cmdline/apt-helper.cc
+msgid "concatenate files, with automatic decompression"
+msgstr "自动解压并连接文件"
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "用 apt.conf 检测代理设置"
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:155
+#: cmdline/apt-mark.cc
 #, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "需要下载 %sB/%sB 的软件包。\n"
+msgid "%s can not be marked as it is not installed.\n"
+msgstr "%s 还没有安装，因此无法标记。\n"
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:160
+#: cmdline/apt-mark.cc
 #, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "需要下载 %sB 的软件包。\n"
+msgid "%s was already set to manually installed.\n"
+msgstr "%s 已经被设置为手动安装。\n"
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:167
+#: cmdline/apt-mark.cc
 #, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
+msgid "%s was already set to automatically installed.\n"
+msgstr "%s 已经被设置为自动安装。\n"
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:172
+#: cmdline/apt-mark.cc
 #, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "解压缩后将会空出 %sB 的空间。\n"
+msgid "%s was already set on hold.\n"
+msgstr "%s 已经设置为保留。\n"
 
-#: apt-private/private-install.cc:200
+#: cmdline/apt-mark.cc
 #, c-format
-msgid "You don't have enough free space in %s."
-msgstr "您在 %s 上没有足够的可用空间。"
+msgid "%s was already not hold.\n"
+msgstr "%s 已经设置为不保留。\n"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "执行 dpkg 失败。您是 root 吗？"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "%s set on hold.\n"
+msgstr "%s 设置为保留。\n"
 
-#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
-#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "是，按我说的做！"
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Canceled hold on %s.\n"
+msgstr "取消保留 %s 的设置。\n"
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr "选中 %s 以待彻底卸载。\n"
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr "选中 %s 以待卸载。\n"
 
-#: apt-private/private-install.cc:222
+#: cmdline/apt-mark.cc
 #, c-format
+msgid "Selected %s for installation.\n"
+msgstr "选中 %s 以待安装。\n"
+
+#: cmdline/apt-mark.cc
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+"\n"
+"apt-mark is a simple command line interface for marking packages\n"
+"as manually or automatically installed. It can also be used to\n"
+"manipulate the dpkg(1) selection states of packages, and to list\n"
+"all packages with or without a certain marking.\n"
 msgstr ""
-"您的操作会导致潜在的危害。\n"
-"若还想继续的话，就输入下面的短句“%s”\n"
-" ?] "
+"用法：apt-mark [选项] {auto|manual} 软件包1 [软件包2 ...]\n"
+"\n"
+"apt-mark 可以对软件包进行 手动/自动 安装标记，也可以用来处理软件\n"
+"包的 dpkg(1) 选中状态，以及列出或过滤拥有某个标记的软件包。\n"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "中止执行。"
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as automatically installed"
+msgstr "标记指定软件包为自动安装"
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "您希望继续执行吗？"
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "标记指定软件包为手动安装"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "有一些文件无法下载"
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "标记指定软件包为保留(held back)"
 
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
-"再试试？"
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "取消指定软件包的保留(held back)标记"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "目前还不支持 --fix-missing 和介质交换"
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "列出所有自动安装的软件包"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "无法更正缺少的软件包。"
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "列出所有手动安装的软件包"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "中止安装。"
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "列出设为保留的软件包"
 
-#: apt-private/private-install.cc:366
+#: cmdline/apt.cc
 msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
+"Usage: apt [options] command\n"
+"\n"
+"apt is a commandline package manager and provides commands for\n"
+"searching and managing as well as querying information about packages.\n"
+"It provides the same functionality as the specialized APT tools,\n"
+"like apt-get and apt-cache, but enables options more suitable for\n"
+"interactive use by default.\n"
+msgstr ""
+"用法： apt [选项] 命令\n"
+"\n"
+"命令行软件包管理器 apt 提供软件包搜索，管理和信息查询等功能。\n"
+"它提供的功能与其他 APT 工具相同（像 apt-get 和 apt-cache），\n"
+"但是默认情况下被设置得更适合交互。\n"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "注意：这是自动被 dpkg 有意完成的。"
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "根据名称列出软件包"
 
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "我们不应该进行删除，无法启动自动删除器"
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "搜索软件包描述"
 
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "显示软件包细节"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("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.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "下列信息可能会对解决问题有所帮助："
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "安装软件包"
 
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部错误，自动卸载工具坏事了"
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "移除软件包"
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "下列软件包是自动安装的并且现在不需要了："
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "更新可用软件包列表"
 
-#: apt-private/private-install.cc:517
-#, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "通过 安装/升级 软件来更新系统"
 
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用'apt-get autoremove'来卸载它(它们)。"
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr "通过 卸载/安装/升级 来更新系统"
 
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
+#. misc
+#: cmdline/apt.cc
+msgid "edit the source information file"
+msgstr "编辑软件源信息文件"
 
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
-"以指定一个解决办法)。"
+#: methods/cdrom.cc
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "无法读取盘片数据库 %s"
 
-#: apt-private/private-install.cc:638
+#: methods/cdrom.cc
 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"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
 msgstr ""
-"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n"
-"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
-"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
+"请使用 apt-cdrom，通过它可以让 APT 识别该盘片。apt-get upgdate 不能被用来加入"
+"新的盘片。"
 
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "破损的软件包"
+#: methods/cdrom.cc
+msgid "Wrong CD-ROM"
+msgstr "错误的 CD-ROM"
 
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "将会安装下列额外的软件包："
+#: methods/cdrom.cc
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "无法卸载挂载于 %s 的 CD-ROM，它可能正被使用。"
 
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "建议安装的软件包："
+#: methods/cdrom.cc
+msgid "Disk not found."
+msgstr "找不到盘片。"
 
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "推荐安装的软件包："
+#: methods/cdrom.cc methods/file.cc methods/rsh.cc
+msgid "File not found"
+msgstr "无法找到文件"
 
-#: apt-private/private-install.cc:825
+#: methods/connect.cc
 #, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
+msgid "Connecting to %s (%s)"
+msgstr "正在连接 %s (%s)"
 
-#: apt-private/private-install.cc:829
+#: methods/connect.cc
 #, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
 
-#: apt-private/private-install.cc:841
+#: methods/connect.cc
 #, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "不能重新安装 %s，因为无法下载它。\n"
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
 
-#: apt-private/private-install.cc:846
+#: methods/connect.cc
 #, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 已经是最新的版本。\n"
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "无法发起与 %s:%s (%s) 的连接"
 
-#: apt-private/private-install.cc:894
+#: methods/connect.cc
 #, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "无法连接上 %s:%s (%s)，连接超时"
 
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "由于 %4$s，为 %3$s 选定了版本 %1$s (%2$s)\n"
+#: methods/connect.cc methods/ftp.cc methods/rsh.cc
+msgid "Failed"
+msgstr "失败"
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
+#: methods/connect.cc
 #, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘%s’ 吗？\n"
+msgid "Could not connect to %s:%s (%s)."
+msgstr "无法连接上 %s:%s (%s)。"
 
-#: apt-private/private-install.cc:947
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc methods/rsh.cc
 #, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载\n"
-
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】：下列软件包不能通过验证！"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "忽略了认证警告。\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "有些软件包不能通过验证"
+msgid "Connecting to %s"
+msgstr "正在连接 %s"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "不经验证就安装这些软件包吗？"
+#: methods/connect.cc
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "无法解析域名“%s”"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: methods/connect.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "无法下载 %s  %s\n"
+msgid "Temporary failure resolving '%s'"
+msgstr "暂时不能解析域名“%s”"
 
-#: apt-private/private-sources.cc:58
+#: methods/connect.cc
 #, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "解析 %s 失败。请重新编辑之后再试。"
+msgid "System error resolving '%s:%s'"
+msgstr "解析“%s:%s”时出现系统故障"
 
-#: apt-private/private-sources.cc:70
+#: methods/connect.cc
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr "您的 %s 文件有过改动，请执行 ‘apt-get update’。"
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
-msgstr "全文搜索"
+#: methods/connect.cc
+#, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr "不能连接到 %s：%s："
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "正在对升级进行计算... "
+#: methods/copy.cc methods/store.cc
+msgid "Failed to stat"
+msgstr "无法读取状态"
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "完成"
+#: methods/copy.cc methods/rred.cc methods/store.cc
+msgid "Failed to set modification time"
+msgstr "无法设置文件的修改日期"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "命中 "
+#: methods/file.cc
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "无效的 URI，本地 URI 不能以 // 开头"
 
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "获取："
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc
+msgid "Logging in"
+msgstr "正在登录"
 
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "忽略 "
+#: methods/ftp.cc
+msgid "Unable to determine the peer name"
+msgstr "无法获知对方主机名"
 
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "错误 "
+#: methods/ftp.cc
+msgid "Unable to determine the local name"
+msgstr "无法获知本地主机名"
 
-#: apt-private/acqprogress.cc:146
+#: methods/ftp.cc
 #, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "下载 %sB，耗时 %s (%sB/s)\n"
+msgid "The server refused the connection and said: %s"
+msgstr "服务器拒绝了我们的连接，响应信息为：%s"
 
-#: apt-private/acqprogress.cc:236
+#: methods/ftp.cc
 #, c-format
-msgid " [Working]"
-msgstr " [执行中]"
+msgid "USER failed, server said: %s"
+msgstr "USER 指令出错，服务器响应信息为：%s"
 
-#: apt-private/acqprogress.cc:297
+#: methods/ftp.cc
 #, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
+msgid "PASS failed, server said: %s"
+msgstr "PASS 指令出错，服务器响应信息为：%s"
+
+#: methods/ftp.cc
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
 msgstr ""
-"更换介质：请把标有\n"
-"“%s”\n"
-"的盘片插入驱动器“%s”再按回车键\n"
+"您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
+
+#: methods/ftp.cc
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
+
+#: methods/ftp.cc
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "TYPE 指令出错，服务器响应信息为：%s"
+
+#: methods/ftp.cc methods/rsh.cc
+msgid "Connection timeout"
+msgstr "连接超时"
+
+#: methods/ftp.cc
+msgid "Server closed the connection"
+msgstr "服务器关闭了连接"
+
+#: methods/ftp.cc methods/rsh.cc apt-pkg/contrib/fileutl.cc
+msgid "Read error"
+msgstr "读错误"
+
+#: methods/ftp.cc methods/rsh.cc
+msgid "A response overflowed the buffer."
+msgstr "回应超出了缓存区大小。"
+
+#: methods/ftp.cc
+msgid "Protocol corruption"
+msgstr "协议有误"
+
+#: methods/ftp.cc methods/rsh.cc apt-pkg/contrib/fileutl.cc
+msgid "Write error"
+msgstr "写出错"
+
+#: methods/ftp.cc
+msgid "Could not create a socket"
+msgstr "无法创建套接字"
+
+#: methods/ftp.cc
+msgid "Could not connect data socket, connection timed out"
+msgstr "无法连接数据套接字，连接超时"
+
+#: methods/ftp.cc
+msgid "Could not connect passive socket."
+msgstr "无法连接被动模式的套接字。"
+
+#: methods/ftp.cc
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo 无法得到监听套接字"
+
+#: methods/ftp.cc
+msgid "Could not bind a socket"
+msgstr "无法绑定套接字"
+
+#: methods/ftp.cc
+msgid "Could not listen on the socket"
+msgstr "无法在套接字上监听"
+
+#: methods/ftp.cc
+msgid "Could not determine the socket's name"
+msgstr "无法确定套接字的名字"
+
+#: methods/ftp.cc
+msgid "Unable to send PORT command"
+msgstr "无法发出 PORT 指令"
+
+#: methods/ftp.cc
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "无法识别的地址族 %u (AF_*)"
+
+#: methods/ftp.cc
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "EPRT 指令失败，服务器响应为：%s"
+
+#: methods/ftp.cc
+msgid "Data socket connect timed out"
+msgstr "数据套接字连接超时"
+
+#: methods/ftp.cc
+msgid "Unable to accept connection"
+msgstr "无法接受连接"
+
+#: methods/ftp.cc methods/rsh.cc methods/server.cc
+msgid "Problem hashing file"
+msgstr "把文件加入哈希表时出错"
+
+#: methods/ftp.cc
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "无法获取文件，服务器响应为“%s”"
+
+#: methods/ftp.cc methods/rsh.cc
+msgid "Data socket timed out"
+msgstr "数据套接字超时"
+
+#: methods/ftp.cc
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "数据传送出错，服务器响应为“%s”"
+
+#. Get the files information
+#: methods/ftp.cc
+msgid "Query"
+msgstr "查询"
+
+#: methods/ftp.cc
+msgid "Unable to invoke "
+msgstr "无法调用 "
+
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr "明文签署文件不可用，结果为‘%s’（您的网络需要认证吗？）"
+
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc
+#, c-format
+msgid ""
+"Signed file isn't valid, got '%s' (does the network require authentication?)"
+msgstr "明文签署文件不可用，结果为‘%s’（您的网络接入需要认证吗？）"
+
+#: methods/gpgv.cc
+msgid "At least one invalid signature was encountered."
+msgstr "至少发现一个无效的签名。"
+
+#: methods/gpgv.cc
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
+
+#: methods/gpgv.cc
+msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
+msgstr "无法运行 apt-key 以验证签名(您安装了 gnupg 吗？)"
+
+#: methods/gpgv.cc
+msgid "Unknown error executing apt-key"
+msgstr "运行 apt-key 时发生未知错误"
+
+#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.
+#: methods/gpgv.cc
+#, c-format
+msgid "Signature by key %s uses weak digest algorithm (%s)"
+msgstr "密钥 %s 生成的数字签名使用了弱安全性摘要算法(%s)"
+
+#: methods/gpgv.cc
+msgid "The following signatures were invalid:\n"
+msgstr "下列签名无效：\n"
+
+#: methods/gpgv.cc
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr "由于没有公钥，无法验证下列签名：\n"
+
+#: methods/http.cc
+msgid "Error writing to the file"
+msgstr "写入文件出错"
+
+#: methods/http.cc
+msgid "Error reading from server. Remote end closed connection"
+msgstr "从服务器读取数据时出错，对方关闭了连接"
+
+#: methods/http.cc
+msgid "Error reading from server"
+msgstr "从服务器读取数据出错"
+
+#: methods/http.cc
+msgid "Error writing to file"
+msgstr "写入文件出错"
+
+#: methods/http.cc
+msgid "Select failed"
+msgstr "select 调用出错"
+
+#: methods/http.cc
+msgid "Connection timed out"
+msgstr "连接超时"
+
+#: methods/http.cc
+msgid "Error writing to output file"
+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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
+#: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/init.cc
+#: apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
-#: apt-pkg/contrib/cdromutl.cc:235
+#: methods/mirror.cc apt-pkg/acquire.cc apt-pkg/clean.cc
+#: apt-pkg/contrib/cdromutl.cc
 #, 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
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "没有找到镜像文件 %s"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:287
+#: methods/mirror.cc
 #, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "无法读取镜像文件 %s"
 
-#: methods/mirror.cc:315
+#: methods/mirror.cc
 #, c-format
 msgid "No entry found in mirror file '%s'"
 msgstr "在镜像文件 %s 中未找到所需条目"
 
-#: methods/mirror.cc:445
+#: methods/mirror.cc
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[镜像：%s]"
 
-#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
+#: methods/rred.cc ftparchive/cachedb.cc apt-inst/extract.cc
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "Failed to stat %s"
+msgstr "无法获得 %s 的状态"
+
+#: methods/rsh.cc ftparchive/multicompress.cc
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "无法为子进程创建 IPC 管道"
 
-#: methods/rsh.cc:346
+#: methods/rsh.cc
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
 
+#: methods/server.cc
+msgid "Waiting for headers"
+msgstr "正在等待报头"
+
+#: methods/server.cc
+msgid "Bad header line"
+msgstr "错误的报头行"
+
+#: methods/server.cc
+msgid "The HTTP server sent an invalid reply header"
+msgstr "该 HTTP 服务器发送了一个无效的应答报头"
+
+#: methods/server.cc
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
+
+#: methods/server.cc
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
+
+#: methods/server.cc
+msgid "This HTTP server has broken range support"
+msgstr "该 HTTP 服务器的 range 支持不正常"
+
+#: methods/server.cc
+msgid "Unknown date format"
+msgstr "无法识别的日期格式"
+
+#: methods/server.cc
+msgid "Bad header data"
+msgstr "错误的报头数据"
+
+#: methods/server.cc
+msgid "Connection failed"
+msgstr "连接失败"
+
+#: methods/server.cc
+#, c-format
+msgid ""
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
+msgstr "由于服务器或代理的响应错误，因此自动禁止 %s。（参见 man 5 apt.conf）"
+
+#: methods/server.cc
+msgid "Internal error"
+msgstr "内部错误"
+
+#: methods/store.cc
+msgid "Empty files can't be valid archives"
+msgstr "空文件不是有效归档"
+
 #: dselect/install:33
 msgid "Bad default setting!"
 msgstr "错误的默认设置！"
 
 #: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
 #: dselect/install:106 dselect/update:45
-msgid "Press enter to continue."
-msgstr "按回车键继续。"
+msgid "Press [Enter] to continue."
+msgstr "按「回车键」继续。"
 
 #: dselect/install:92
 msgid "Do you want to erase any previously downloaded .deb files?"
@@ -1789,7 +1865,7 @@ msgstr "您想要删除之前下载的所有 .deb 文件吗？"
 
 #: dselect/install:102
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "在解包时发生了一些错误。已经安装的软件包"
+msgstr "在解压时发生了一些错误。已经安装的软件包"
 
 #: dselect/install:103
 msgid "will be configured. This may result in duplicate errors"
@@ -1808,528 +1884,573 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们，
 msgid "Merging available information"
 msgstr "正在合并可用信息"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "把 DropNode 用在了仍在链表中的节点上"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "无法定位哈希表元素！"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "无法分配转移项"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "内部错误，出现在 AddDiversion"
+#: cmdline/apt-extracttemplates.cc
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is used to extract config and template files\n"
+"from debian packages. It is used mainly by debconf(1) to prompt for\n"
+"configuration questions before installation of packages.\n"
+msgstr ""
+"用法： apt-extracttemplates 文件1 [文件2 ...]\n"
+"\n"
+"apt-extracttemplates 可以从 debian 软件包中解压出配置文件和模板\n"
+"信息。它主要被 debconf(1) 用于在安装软件包前询问用户配置问题。\n"
 
-#: apt-inst/filelist.cc:477
+#: cmdline/apt-extracttemplates.cc apt-pkg/contrib/fileutl.cc
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
+msgid "Unable to mkstemp %s"
+msgstr "无法建立临时文件(mkstemp) %s "
 
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc apt-pkg/contrib/fileutl.cc
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "添加了两个转移项 %s-> %s"
+msgid "Unable to write to %s"
+msgstr "无法写入 %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "重复的配置文件 %s/%s"
+#: cmdline/apt-extracttemplates.cc
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
-#, c-format
-msgid "The path %s is too long"
-msgstr "路径名 %s 太长"
+#: cmdline/apt-internal-solver.cc
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"resolver for the APT family like an external one, for debugging or\n"
+"the like.\n"
+msgstr ""
+"用法： apt-internal-solver\n"
+"\n"
+"apt-internal-solver 可以像外部解析器那样使用当前的APT家族内部解析器，\n"
+"以便调试等用途。\n"
 
-#: apt-inst/extract.cc:132
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s 被解包了不只一次"
+#: cmdline/apt-sortpkgs.cc
+msgid "Unknown package record!"
+msgstr "未知的软件包记录！"
 
-#: apt-inst/extract.cc:142
-#, c-format
-msgid "The directory %s is diverted"
-msgstr "目录 %s 已被转移"
+#: cmdline/apt-sortpkgs.cc
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package information files.\n"
+"By default it sorts by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
+msgstr ""
+"用法： apt-sortpkgs [选项] 文件1 [文件2 ...]\n"
+"\n"
+"简易工具 apt-sortpkgs 用于排序软件包信息。\n"
+"它默认对二进制包信息排序，但是 -s 选项可以将其切换为\n"
+"对源码包排序。\n"
+
+#: ftparchive/apt-ftparchive.cc
+msgid "Package extension list is too long"
+msgstr "软件包的扩展列表太长"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/apt-ftparchive.cc
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "该软件包正尝试写入转移对象 %s/%s"
+msgid "Error processing directory %s"
+msgstr "处理目录 %s 时出错"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "该转移路径太长"
+#: ftparchive/apt-ftparchive.cc
+msgid "Source extension list is too long"
+msgstr "源扩展列表太长"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, c-format
-msgid "Failed to stat %s"
-msgstr "无法获得 %s 的状态"
+#: ftparchive/apt-ftparchive.cc
+msgid "Error writing header to contents file"
+msgstr "将头写入到目录文件时出错"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/apt-ftparchive.cc
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "无法将 %s 重命名为 %s"
+msgid "Error processing contents %s"
+msgstr "处理目录 %s 时出错"
 
-#: apt-inst/extract.cc:249
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "目录 %s 要被一个非目录的文件替换"
-
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "无法在其散列桶中分配节点"
-
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "路径名太长"
+#: ftparchive/apt-ftparchive.cc
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"用法： apt-ftparchive [选项] 命令\n"
+"命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
+"       sources 源代码包搜索路径 [overridefile [路径前缀]]\n"
+"       contents 搜索路径\n"
+"       release 搜索路径\n"
+"       generate 配置文件 [groups]\n"
+"       clean 配置文件\n"
+"\n"
+"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
+"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n"
+"和 dpkg-scansources，都能游刃有余\n"
+"\n"
+"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
+"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
+"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n"
+"通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
+"\n"
+"与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
+"可以通过使用 --source-override 选项来指定一个 override 文件\n"
+"\n"
+"使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
+"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"
+"应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
+"下面有个来自 Debian 文档的例子：\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"选项:\n"
+"  -h    本帮助文档\n"
+"  --md5 使之生成 MD5 校验和\n"
+"  -s=?  源代码包 override 文件\n"
+"  -q    输出精简信息\n"
+"  -d=?  指定可选的缓存数据库\n"
+"  -d=?  使用另一个可选的缓存数据库\n"
+"  --no-delink 开启delink的调试模式\n"
+"  --contents  使之生成控制内容文件\n"
+"  -c=?  读取指定配置文件\n"
+"  -o=?  设置任意指定的配置选项"
 
-#: apt-inst/extract.cc:421
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "用来覆盖的软件包不属于 %s 的任何版本"
+#: ftparchive/apt-ftparchive.cc
+msgid "No selections matched"
+msgstr "没有任何选定项是匹配的"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/apt-ftparchive.cc
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "软件包文件组“%s”中缺少一些文件"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/cachedb.cc
 #, c-format
-msgid "Unable to stat %s"
-msgstr "无法读取 %s 的状态"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/cachedb.cc
 #, c-format
-msgid "Failed to write file %s"
-msgstr "无法写入文件 %s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "数据库已过期，现尝试进行升级 %s"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "无法关闭文件 %s"
+#: ftparchive/cachedb.cc
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/cachedb.cc
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
+msgid "Unable to open DB file %s: %s"
+msgstr "无法打开数据库文件 %s：%s"
 
-#: apt-inst/deb/debfile.cc:132
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "内部错误，无法定位包内文件 %s"
+#: ftparchive/cachedb.cc
+msgid "Failed to read .dsc"
+msgstr "读取 .dsc 文件失败"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "不能解析的主控文件"
+#: ftparchive/cachedb.cc
+msgid "Archive has no control record"
+msgstr "归档文件没有包含控制字段"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "无效的归档签名"
+#: ftparchive/cachedb.cc
+msgid "Unable to get a cursor"
+msgstr "无法获得游标"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "读取归档成员文件头出错"
+#: ftparchive/contents.cc
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - 分配内存失败"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "归档文件中成员文件头 %s 无效"
-
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "归档文件中成员文件头无效"
-
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "归档文件太短"
-
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "无法读取归档文件的数据头"
-
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "无法创建管道"
-
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "无法执行 gzip"
-
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "包文件已被损坏"
-
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar 的校验和不符，文件已损坏"
+msgid "Unknown compression algorithm '%s'"
+msgstr "未知的压缩算法“%s”"
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知的 TAR 数据头类型 %u，成员 %s"
+msgid "Compressed output %s needs a compression set"
+msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr "进度：[%3i%%]"
+#: ftparchive/multicompress.cc
+msgid "Failed to fork"
+msgstr "无法 fork"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "正在运行 dpkg"
+#: ftparchive/multicompress.cc
+msgid "Compress child"
+msgstr "压缩子进程"
 
-#: apt-pkg/init.cc:146
+#: ftparchive/multicompress.cc
 #, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "不支持“%s”打包系统"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "无法确定适合的打包系统类型"
+msgid "Internal error, failed to create %s"
+msgstr "内部错误，无法创建 %s"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "已写入 %i 条记录。\n"
+#: ftparchive/multicompress.cc
+msgid "IO to subprocess/file failed"
+msgstr "无法对子进程或文件进行读写"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
+#: ftparchive/multicompress.cc
+msgid "Failed to read while computing MD5"
+msgstr "在计算 MD5 校验和时无法读取数据"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: ftparchive/multicompress.cc apt-inst/extract.cc
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
+msgid "Failed to rename %s to %s"
+msgstr "无法将 %s 重命名为 %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: ftparchive/override.cc
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
+msgid "Unable to open %s"
+msgstr "无法打开 %s"
 
-#: apt-pkg/indexcopy.cc:515
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "无法找到认证记录：%s"
+msgid "Malformed override %s line %llu (%s)"
+msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"
 
-#: apt-pkg/indexcopy.cc:521
+#: ftparchive/override.cc
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash 校验和不符：%s"
+msgid "Failed to read the override file %s"
+msgstr "无法读取 override 文件 %s"
 
-#: apt-pkg/acquire-worker.cc:116
+#: ftparchive/override.cc
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
+msgid "Malformed override %s line %llu #1"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #1"
 
-#: apt-pkg/acquire-worker.cc:118
+#: ftparchive/override.cc
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "请检查是否安装了 %s 软件包"
+msgid "Malformed override %s line %llu #2"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #2"
 
-#: apt-pkg/acquire-worker.cc:169
+#: ftparchive/override.cc
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
+msgid "Malformed override %s line %llu #3"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #3"
 
-#: apt-pkg/acquire-worker.cc:455
+#: ftparchive/writer.cc
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "无法解析或打开软件包的列表或是状态文件。"
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "您可能需要运行 apt-get update 来解决这些问题"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "无法读取源列表。"
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "软件包缓存区是空的"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "软件包缓存文件损坏了"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "软件包缓存区文件的版本不兼容"
-
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "软件包缓存文件损坏，它太小了"
+msgid "W: Unable to read directory %s\n"
+msgstr "警告：无法读取目录 %s\n"
 
-#: apt-pkg/pkgcache.cc:174
+#: ftparchive/writer.cc
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "本程序目前不支持“%s”版本系统"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "软件包缓存区是为其它架构的硬件构建的"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "依赖"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "预依赖"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "建议"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "推荐"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "冲突"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "替换"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "废弃"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "破坏"
+msgid "W: Unable to stat %s\n"
+msgstr "警告：无法获得 %s 的状态\n"
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "增强"
+#: ftparchive/writer.cc
+msgid "E: "
+msgstr "错误："
 
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "重要"
+#: ftparchive/writer.cc
+msgid "W: "
+msgstr "警告："
 
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "必需"
+#: ftparchive/writer.cc
+msgid "E: Errors apply to file "
+msgstr "错误：处理文件时出错 "
 
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "标准"
+#: ftparchive/writer.cc
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "无法解析 %s"
 
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "可选"
+#: ftparchive/writer.cc
+msgid "Tree walking failed"
+msgstr "无法遍历目录树"
 
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "额外"
+#: ftparchive/writer.cc
+#, c-format
+msgid "Failed to open %s"
+msgstr "无法打开 %s"
 
-#: apt-pkg/pkgrecords.cc:38
+#: ftparchive/writer.cc
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "不支持索引文件类型“%s”"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-pkg/sourcelist.cc:127
+#: ftparchive/writer.cc apt-pkg/acquire-item.cc
 #, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "安装源配置文件“%2$s”第 %1$u 节有错误(URI 解析)"
+msgid "Failed to readlink %s"
+msgstr "无法读取符号链接 %s"
 
-#: apt-pkg/sourcelist.cc:170
+#: ftparchive/writer.cc
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
+msgid "*** Failed to link %s to %s"
+msgstr "*** 无法将 %s 链接到 %s"
 
-#: apt-pkg/sourcelist.cc:173
+#: ftparchive/writer.cc
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " 达到了 DeLink 的上限 %sB。\n"
 
-#: apt-pkg/sourcelist.cc:184
+#: ftparchive/writer.cc
+msgid "Archive had no package field"
+msgstr "归档文件没有包含 package 字段"
+
+#: ftparchive/writer.cc
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
+msgid "  %s has no override entry\n"
+msgstr "  %s 中没有 override 项\n"
 
-#: apt-pkg/sourcelist.cc:190
+#: ftparchive/writer.cc
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s 的维护者 %s 并非 %s\n"
 
-#: apt-pkg/sourcelist.cc:193
+#: ftparchive/writer.cc
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
+msgid "  %s has no source override entry\n"
+msgstr "  %s 没有源代码的 override 项\n"
 
-#: apt-pkg/sourcelist.cc:206
+#: ftparchive/writer.cc
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s 中没有二进制文件的 override 项\n"
+
+#: apt-inst/contrib/arfile.cc
+msgid "Invalid archive signature"
+msgstr "无效的归档签名"
+
+#: apt-inst/contrib/arfile.cc
+msgid "Error reading archive member header"
+msgstr "读取归档成员文件头出错"
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-inst/contrib/arfile.cc
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
+msgid "Invalid archive member header %s"
+msgstr "归档文件中成员文件头 %s 无效"
+
+#: apt-inst/contrib/arfile.cc
+msgid "Invalid archive member header"
+msgstr "归档文件中成员文件头无效"
+
+#: apt-inst/contrib/arfile.cc
+msgid "Archive is too short"
+msgstr "归档文件太短"
+
+#: apt-inst/contrib/arfile.cc
+msgid "Failed to read the archive headers"
+msgstr "无法读取归档文件的数据头"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-inst/contrib/extracttar.cc
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
+msgid "Cannot find a configured compressor for '%s'"
+msgstr "找不到对应于 '%s' 的已配置压缩工具"
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-inst/contrib/extracttar.cc
+msgid "Corrupted archive"
+msgstr "包文件已被损坏"
+
+#: apt-inst/contrib/extracttar.cc
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar 的校验和不符，文件已损坏"
+
+#: apt-inst/contrib/extracttar.cc
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "未知的 TAR 数据头类型 %u，成员 %s"
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-inst/deb/debfile.cc
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-inst/deb/debfile.cc
 #, c-format
-msgid "Opening %s"
-msgstr "正在打开 %s"
+msgid "Internal error, could not locate member %s"
+msgstr "内部错误，无法定位包内文件 %s"
+
+#: apt-inst/deb/debfile.cc
+msgid "Unparsable control file"
+msgstr "不能解析的主控文件"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-inst/dirstream.cc
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "源列表 %2$s 的第 %1$u 行太长了。"
+msgid "Failed to write file %s"
+msgstr "无法写入文件 %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-inst/dirstream.cc
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
+msgid "Failed to close file %s"
+msgstr "无法关闭文件 %s"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-inst/extract.cc
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
+msgid "The path %s is too long"
+msgstr "路径名 %s 太长"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-inst/extract.cc
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里，第 %2$u 节中的软件包类别“%1$s”"
+msgid "Unpacking %s more than once"
+msgstr "%s 被解压了不只一次"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#: apt-inst/extract.cc
 #, c-format
-msgid "Clean of %s is not supported"
-msgstr "%s 的 Clean (清理)不被支持"
+msgid "The directory %s is diverted"
+msgstr "目录 %s 已被转移"
 
-#: apt-pkg/clean.cc:64
+#: apt-inst/extract.cc
 #, c-format
-msgid "Unable to stat %s."
-msgstr "无法读取 %s 的状态。"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "该软件包正尝试写入转移对象 %s/%s"
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "软件包暂存区使用的是不兼容的版本控制系统"
+#: apt-inst/extract.cc
+msgid "The diversion path is too long"
+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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-inst/extract.cc
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "处理 %s (%s%d) 时出错"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇，软件包数量超出了本 APT 的处理能力。"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "目录 %s 要被一个非目录的文件替换"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
+#: apt-inst/extract.cc
+msgid "Failed to locate node in its hash bucket"
+msgstr "无法在其散列桶中分配节点"
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
+#: apt-inst/extract.cc
+msgid "The path is too long"
+msgstr "路径名太长"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
+#: apt-inst/extract.cc
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-inst/extract.cc
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-inst/extract.cc
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "无法获取源软件包列表 %s 的状态"
+msgid "Unable to stat %s"
+msgstr "无法读取 %s 的状态"
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "正在读取软件包列表"
+#: apt-inst/filelist.cc
+msgid "DropNode called on still linked node"
+msgstr "把 DropNode 用在了仍在链表中的节点上"
+
+#: apt-inst/filelist.cc
+msgid "Failed to locate the hash element!"
+msgstr "无法定位哈希表元素！"
+
+#: apt-inst/filelist.cc
+msgid "Failed to allocate diversion"
+msgstr "无法分配转移项"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "正在收集文件所提供的软件包"
+#: apt-inst/filelist.cc
+msgid "Internal error in AddDiversion"
+msgstr "内部错误，出现在 AddDiversion"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-inst/filelist.cc
 #, c-format
-msgid "Unable to write to %s"
-msgstr "无法写入 %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "无法读取或写入软件源缓存"
+#: apt-inst/filelist.cc
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "添加了两个转移项 %s-> %s"
 
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "向solver发送情景"
+#: apt-inst/filelist.cc
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "重复的配置文件 %s/%s"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "向solver发送请求"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Updating from such a repository can't be done securely, and is therefore "
+"disabled by default."
+msgstr "无法安全地用该源进行更新，所以默认禁用该源。"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "准备接收解决方案"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can't be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr "无法认证来自该源的数据，所以使用它会带来潜在风险。"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "外部solver出错，错误信息不恰当"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
+msgstr "参见 apt-secure(8) 手册以了解仓库创建和用户配置方面的细节。"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "执行外部solver"
+#: apt-pkg/acquire-item.cc
+msgid "Hash Sum mismatch"
+msgstr "Hash 校验和不符"
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Hash 校验和不符"
-
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc
 msgid "Size mismatch"
 msgstr "大小不符"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc
 msgid "Invalid file format"
 msgstr "无效的文件格式 %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc
+msgid "Signature error"
+msgstr "数字签名错误"
+
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s"
+msgstr ""
+"校验数字签名时出错。此仓库未被更新，所以仍然使用此前的索引文件。GPG 错误："
+"%s: %s"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG 错误：%s: %s"
+
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' doesn't support "
+"architecture '%s'"
+msgstr "鉴于仓库 '%2$s' 不支持 '%3$s' 体系结构，跳过配置文件 '%1$s' 的捕获。"
+
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2337,16 +2458,17 @@ msgid ""
 msgstr ""
 "在 Release 文件中找不到期望的条目 %s（sources.list条目有误，或者文件有误）"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/acquire-item.cc
 #, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "在 Release 文件中找不到 %s 的哈希值"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "以下 ID 的密钥没有可用的公钥：\n"
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' provides only "
+"weak security information for it"
+msgstr "鉴于仓库 '%2$s' 提供的安全信息强度太低，跳过配置文件 '%1$s' 的acquire."
 
-#: apt-pkg/acquire-item.cc:1736
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formatted in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2354,26 +2476,41 @@ msgid ""
 msgstr ""
 "%s 的 Release 文件已经过期(invalid since %s)。该仓库的更新将不会被应用。"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 
-#: apt-pkg/acquire-item.cc:1788
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the user explicitly wants it
+#: apt-pkg/acquire-item.cc
 #, c-format
-msgid ""
-"An error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
-msgstr ""
-"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
+msgid "The repository '%s' is not signed."
+msgstr "仓库 “%s” 没有数字签名。"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the user explicitly wants it
+#: apt-pkg/acquire-item.cc
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG 错误：%s: %s"
+msgid "The repository '%s' does not have a Release file."
+msgstr "仓库 “%s” 没有 Release 文件。"
+
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "仓库 “%s” 的签名不再生效。"
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+"一般不可以这样做，但选项 Acquire:: AllowDowngradeToInsecureRepositories 可以"
+"用于覆盖默认设置。"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2382,137 +2519,208 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "没有源可以用来下载 %s 版本的 %s"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
-#: apt-pkg/vendorlist.cc:85
+#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "Changelog unavailable for %s=%s"
+msgstr "%s=%s 的 Changelog 不可用"
+
+#: apt-pkg/acquire-worker.cc
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
+
+#: apt-pkg/acquire-worker.cc
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "请检查是否安装了 %s 软件包"
+
+#: apt-pkg/acquire-worker.cc
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
+
+#: apt-pkg/acquire-worker.cc
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "软件提供者数据块内 %s 没有包含指纹信息"
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "请把标有 “%s” 的盘片插入驱动器 “%s” 再按「回车键」。"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc apt-pkg/cdrom.cc
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 缺失。"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "仓库目录 %spartial 确实。"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "无法对目录 %s 加锁"
 
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "No sandbox user '%s' on the system, can not drop privileges"
+msgstr "系统中不存在沙箱用户'%s'，无法降低权限"
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr "文件'%s'无法被用户'%s'访问，无法降低权限以进行下载。"
+
+#: apt-pkg/acquire.cc apt-pkg/clean.cc
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "%s 的 Clean (清理)不被支持"
+
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:902
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 
-#: apt-pkg/acquire.cc:904
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "正在下载第 %li 个文件，共 %li 个"
+
+#: apt-pkg/algorithms.cc
+#, 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
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
+"缘故。"
+
+#: apt-pkg/algorithms.cc
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
+"系。"
+
+#: apt-pkg/cachefile.cc
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "无法解析或打开软件包的列表或是状态文件。"
+
+#: apt-pkg/cachefile.cc
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "您可能需要运行 apt-get update 来解决这些问题"
+
+#: apt-pkg/cachefile.cc
+msgid "The list of sources could not be read."
+msgstr "无法读取源列表。"
+
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "未找到“%2$s”的“%1$s”发布版本"
+
+#: apt-pkg/cacheset.cc
 #, c-format
-msgid "Retrieving file %li of %li"
-msgstr "正在下载第 %li 个文件，共 %li 个"
+msgid "Version '%s' for '%s' was not found"
+msgstr "未找到“%2$s”的“%1$s”版本"
 
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "无法找到任务 %s"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc
 #, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"'%s' 这个值对 APT::Default-Release 是无效的，因为在源里找不到这样的发行"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
 
-#: apt-pkg/policy.cc:422
+#: apt-pkg/cacheset.cc
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "无法按照 glob ‘%s’ 找到任何软件包"
 
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc
 #, c-format
-msgid "Did not understand pin type %s"
-msgstr "无法识别锁定的类型 %s"
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "无法从完全虚拟的软件包 %s 中选择版本"
 
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
-msgstr "没有为版本锁定指定优先级(或为零)"
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: apt-pkg/cacheset.cc
 #, 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)"
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "因为软件包 %s 没有候选版本，无法进行选择"
 
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/cacheset.cc
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "无法配置 %s。"
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/cacheset.cc
 #, 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 选项。"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
 
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr "部分索引文件下载失败。如果忽略它们，那将转而使用旧的索引文件。"
+#: apt-pkg/cdrom.cc
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "源列表 %2$s 的第 %1$u 行太长了。"
 
-#: apt-pkg/cdrom.cc:571
+#: apt-pkg/cdrom.cc
 msgid "Unmounting CD-ROM...\n"
 msgstr "正在卸载 CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:586
+#: apt-pkg/cdrom.cc
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
 
-#: apt-pkg/cdrom.cc:599
+#: apt-pkg/cdrom.cc
 msgid "Waiting for disc...\n"
 msgstr "等待插入盘片……\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc
 msgid "Mounting CD-ROM...\n"
 msgstr "正在挂载 CD-ROM 文件系统……\n"
 
-#: apt-pkg/cdrom.cc:620
+#: apt-pkg/cdrom.cc
 msgid "Identifying... "
 msgstr "正在鉴别... "
 
-#: apt-pkg/cdrom.cc:662
+#: apt-pkg/cdrom.cc
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "已归档文件的标签：%s\n"
 
-#: apt-pkg/cdrom.cc:680
+#: apt-pkg/cdrom.cc
 msgid "Scanning disc for index files...\n"
 msgstr "正在盘片中查找索引文件...\n"
 
-#: apt-pkg/cdrom.cc:734
+#: apt-pkg/cdrom.cc
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -2521,7 +2729,7 @@ msgstr ""
 "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
 "名\n"
 
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -2529,16 +2737,16 @@ msgstr ""
 "无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
 "架。"
 
-#: apt-pkg/cdrom.cc:771
+#: apt-pkg/cdrom.cc
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "找到标签 '%s'\n"
 
-#: apt-pkg/cdrom.cc:800
+#: apt-pkg/cdrom.cc
 msgid "That is not a valid name, try again.\n"
 msgstr "这不是一个有效的名字，请重试。\n"
 
-#: apt-pkg/cdrom.cc:817
+#: apt-pkg/cdrom.cc
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -2547,345 +2755,290 @@ msgstr ""
 "这张盘片现在的名字是：\n"
 "“%s”\n"
 
-#: apt-pkg/cdrom.cc:819
+#: apt-pkg/cdrom.cc
 msgid "Copying package lists..."
 msgstr "正在复制软件包列表……"
 
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc
 msgid "Writing new source list\n"
 msgstr "正在写入新的源列表\n"
 
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc
 msgid "Source list entries for this disc are:\n"
 msgstr "对应于该盘片的软件源设置项是：\n"
 
-#: apt-pkg/algorithms.cc:265
-#, 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:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
-"缘故。"
-
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
-"系。"
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在分析软件包的依赖关系树"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候选版本"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "生成依赖关系"
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在读取状态信息"
-
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/clean.cc
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "无法打开状态文件 %s"
+msgid "Unable to stat %s."
+msgstr "无法读取 %s 的状态。"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/contrib/cdromutl.cc
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入临时状态文件 %s"
+msgid "Unable to stat the mount point %s"
+msgstr "无法读取文件系统挂载点 %s 的状态"
 
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "无法解析软件包文件 %s (1)"
+#: apt-pkg/contrib/cdromutl.cc
+msgid "Failed to stat the cdrom"
+msgstr "无法读取盘片的状态"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "无法解析软件包文件 %s (2)"
+msgid ""
+"Command line option '%c' [from %s] is not understood in combination with the "
+"other options."
+msgstr "不能理解命令行选项 “%c” [来自 %s] 与其他选项的搭配。"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”发布版本"
+msgid ""
+"Command line option %s is not understood in combination with the other "
+"options"
+msgstr "不能理解命令行选项 “%s” 与其他选项的搭配。"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”版本"
+msgid "Command line option %s is not boolean"
+msgstr "命令行选项 %s 不是布尔值"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
-msgid "Couldn't find task '%s'"
-msgstr "无法找到任务 %s"
+msgid "Option %s requires an argument."
+msgstr "选项 %s 要求有一个参数"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "无法按照 glob ‘%s’ 找到任何软件包"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "无法从完全虚拟的软件包 %s 中选择版本"
+msgid "Option '%s' is too long"
+msgstr "选项“%s”太长"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
+msgid "Sense %s is not understood, try true or false."
+msgstr "不能识别参数 %s，请用 true 或 false"
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
+msgid "Invalid operation %s"
+msgstr "无效的操作 %s"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "因为软件包 %s 没有候选版本，无法进行选择"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "无法识别的类型缩写：“%c”"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
+msgid "Opening configuration file %s"
+msgstr "正在打开配置文件 %s"
 
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "无法解析软件包仓库 Release 文件 %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "语法错误 %s:%u：配置小节没有以名字开头"
 
-#: apt-pkg/indexrecords.cc:86
+#: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "语法错误 %s:%u：标签格式有误"
 
-#: apt-pkg/indexrecords.cc:117
+#: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"
 
-#: apt-pkg/indexrecords.cc:130
+#: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"
 
-#: apt-pkg/indexrecords.cc:149
+#: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li天 %li小时 %li分 %li秒"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "语法错误 %s:%u：Included from here"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
+#: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "%lih %limin %lis"
-msgstr "%li小时 %li分 %li秒"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "语法错误 %s:%u：不支持的指令“%s”"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "%limin %lis"
-msgstr "%li分 %li秒"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "%lis"
-msgstr "%li秒"
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
-msgid "Selection %s not found"
-msgstr "找不到您选则的 %s"
+msgid "Problem unlinking the file %s"
+msgstr "用 unlink 删除文件 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "由于文件系统为只读，因而无法使用文件锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "无法打开锁文件 %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "无法在 nfs 文件系统上使用文件锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Could not get lock %s"
 msgstr "无法获得锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "无法创建文件列表，因为‘%s’不是一个目录"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "忽略‘%s’(于目录‘%s’)，鉴于它不是一个常规文件"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "忽略‘%s’(于目录‘%s’)，鉴于它没有文件扩展名"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "忽略‘%s’(于目录‘%s’)，鉴于它的文件扩展名无效"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "等待子进程 %s 的退出，但是它并不存在"
+
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子进程 %s 发生了段错误"
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子进程 %s 收到信号 %u。"
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子进程 %s 返回了一个错误号 (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "关闭 gzip %s 文件出错"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc
+msgid "Unexpected end of file"
+msgstr "未预期的文件结束符"
+
+#: apt-pkg/contrib/fileutl.cc
+msgid "Failed to create subprocess IPC"
+msgstr "无法创建子进程的 IPC 管道"
+
+#: apt-pkg/contrib/fileutl.cc
+msgid "Failed to exec compressor "
+msgstr "无法执行压缩程序"
+
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Could not open file %s"
 msgstr "无法打开文件 %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "无法打开文件描述符 %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
-msgid "Failed to create subprocess IPC"
-msgstr "无法创建子进程的 IPC 管道"
-
-#: apt-pkg/contrib/fileutl.cc:1373
-msgid "Failed to exec compressor "
-msgstr "无法执行压缩程序"
-
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "还剩 %llu 字节没有读出，但已没有可读信息"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "还剩 %llu 字节没有写入，但无法写入操作"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "关闭文件 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "重命名文件 %s 为 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:1938
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "用 unlink 删除文件 %s 出错"
-
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc
 msgid "Problem syncing the file"
 msgstr "同步文件出错"
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... 有错误！"
-
-#: apt-pkg/contrib/progress.cc:150
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... 完成"
-
-#: apt-pkg/contrib/progress.cc:181
-msgid "..."
-msgstr "..."
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... %u%%"
-
-#: apt-pkg/contrib/mmap.cc:79
+#: apt-pkg/contrib/mmap.cc
 msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "无法为复制文件描述符 %i"
-
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-pkg/contrib/mmap.cc
 #, c-format
 msgid "Couldn't make mmap of %llu bytes"
 msgstr "无法 mmap %llu 字节的数据"
 
-#: apt-pkg/contrib/mmap.cc:146
+#: apt-pkg/contrib/mmap.cc
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "无法为复制文件描述符 %i"
+
+#: apt-pkg/contrib/mmap.cc
 msgid "Unable to close mmap"
 msgstr "无法关闭 mmap"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc
 msgid "Unable to synchronize mmap"
 msgstr "无法同步 mmap "
 
-#: apt-pkg/contrib/mmap.cc:290
+#: apt-pkg/contrib/mmap.cc
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
-#: apt-pkg/contrib/mmap.cc:322
+#: apt-pkg/contrib/mmap.cc
 msgid "Failed to truncate file"
 msgstr "无法截断文件"
 
-#: apt-pkg/contrib/mmap.cc:341
+#: apt-pkg/contrib/mmap.cc
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
@@ -2894,682 +3047,860 @@ msgstr ""
 "动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 "
 "apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:446
+#: apt-pkg/contrib/mmap.cc
 #, 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:449
+#: apt-pkg/contrib/mmap.cc
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
 
-#: apt-pkg/contrib/cdromutl.cc:65
+#: apt-pkg/contrib/progress.cc
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "无法读取文件系统挂载点 %s 的状态"
-
-#: apt-pkg/contrib/cdromutl.cc:246
-msgid "Failed to stat the cdrom"
-msgstr "无法读取盘片的状态"
+msgid "%c%s... Error!"
+msgstr "%c%s... 有错误！"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/progress.cc
 #, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "无法识别的类型缩写：“%c”"
+msgid "%c%s... Done"
+msgstr "%c%s... 完成"
+
+#: apt-pkg/contrib/progress.cc
+msgid "..."
+msgstr "..."
 
-#: apt-pkg/contrib/configuration.cc:633
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "正在打开配置文件 %s"
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
 
-#: apt-pkg/contrib/configuration.cc:801
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "语法错误 %s:%u：配置小节没有以名字开头"
+msgid "%lid %lih %limin %lis"
+msgstr "%li天 %li小时 %li分 %li秒"
 
-#: apt-pkg/contrib/configuration.cc:820
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
 #, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "语法错误 %s:%u：标签格式有误"
+msgid "%lih %limin %lis"
+msgstr "%li小时 %li分 %li秒"
 
-#: apt-pkg/contrib/configuration.cc:837
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
 #, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
 
-#: apt-pkg/contrib/configuration.cc:877
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc
 #, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"
+msgid "%lis"
+msgstr "%li秒"
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/contrib/strutl.cc
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
+msgid "Selection %s not found"
+msgstr "找不到您选则的 %s"
 
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "语法错误 %s:%u：Included from here"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr "目标 %1$s 想要捕获与 %3$s (来自软件源 %4$s) 相同的文件 (%2$s)"
 
-#: apt-pkg/contrib/configuration.cc:897
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "语法错误 %s:%u：不支持的指令“%s”"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr "目标 %s (%s) 在 %s 和 %s 中被配置了多次"
 
-#: apt-pkg/contrib/configuration.cc:900
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
+msgid "Unable to parse Release file %s"
+msgstr "无法解析软件包仓库 Release 文件 %s"
 
-#: apt-pkg/contrib/configuration.cc:950
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
+msgid "No sections in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "No keyring installed in %s."
-msgstr "%s 中没有安装密钥环。"
+msgid "No Hash entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "未知的命令行选项“%c” [来自 %s]"
+msgid ""
+"No Hash entry in Release file %s which is considered strong enough for "
+"security purposes"
+msgstr "Release 文件 %s 中不含散列项，该文件用于保证足够的安全性。"
 
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Command line option %s is not understood"
-msgstr "无法识别命令行选项 %s"
+msgid "Invalid '%s' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %2$s 内 %1$s 条目无效"
 
-#: apt-pkg/contrib/cmndline.cc:171
+#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "命令行选项 %s 不是布尔值"
+msgid "Conflicting values set for option %s regarding source %s %s"
+msgstr "软件源 %2$s %3$s 的选项 %1$s 中含有互相冲突的值"
 
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "选项 %s 要求有一个参数"
+msgid "Invalid value set for option %s regarding source %s %s (%s)"
+msgstr "软件源 %2$s %3$s (%4$s) 的选项 %1$s 中含有无效值"
 
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
+msgid "Unable to parse package file %s (%d)"
+msgstr "无法解析软件包文件 %s (%d)"
 
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/deb/debsystem.cc
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
 
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/deb/debsystem.cc
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "选项“%s”太长"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
 
-#: apt-pkg/contrib/cmndline.cc:344
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "不能识别参数 %s，请用 true 或 false"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg 被中断，您必须手工运行 ‘%s’ 解决此问题。"
 
-#: apt-pkg/contrib/cmndline.cc:394
-#, c-format
-msgid "Invalid operation %s"
-msgstr "无效的操作 %s"
+#: apt-pkg/deb/debsystem.cc
+msgid "Not locked"
+msgstr "未锁定"
 
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Completely removing %s"
 msgstr "完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:116
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "注意到 %s 已经消失"
 
-#: apt-pkg/deb/dpkgpm.cc:117
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "无法打开文件 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "无法写入日志 (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc
 msgid "Is /dev/pts mounted?"
 msgstr "/dev/pts 挂载了吗？"
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc
 msgid "Operation was interrupted before it could finish"
 msgstr "操作在完成之前被打断"
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc
 msgid "No apport report written because MaxReports is reached already"
 msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1737
+#: apt-pkg/deb/dpkgpm.cc
 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:1745
+#: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr "错误信息显示本地系统有一些问题，因此没有写入 apport 报告"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/depcache.cc
+msgid "Building dependency tree"
+msgstr "正在分析软件包的依赖关系树"
+
+#: apt-pkg/depcache.cc
+msgid "Candidate versions"
+msgstr "候选版本"
+
+#: apt-pkg/depcache.cc
+msgid "Dependency generation"
+msgstr "生成依赖关系"
+
+#: apt-pkg/depcache.cc
+msgid "Reading state information"
+msgstr "正在读取状态信息"
+
+#: apt-pkg/depcache.cc
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
+msgid "Failed to open StateFile %s"
+msgstr "无法打开状态文件 %s"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/depcache.cc
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入临时状态文件 %s"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/edsp.cc
+msgid "Send scenario to solver"
+msgstr "向solver发送情景"
+
+#: apt-pkg/edsp.cc
+msgid "Send request to solver"
+msgstr "向solver发送请求"
+
+#: apt-pkg/edsp.cc
+msgid "Prepare for receiving solution"
+msgstr "准备接收解决方案"
+
+#: apt-pkg/edsp.cc
+msgid "External solver failed without a proper error message"
+msgstr "外部solver出错，错误信息不恰当"
+
+#: apt-pkg/edsp.cc
+msgid "Execute external solver"
+msgstr "执行外部solver"
+
+#: apt-pkg/indexcopy.cc
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg 被中断，您必须手工运行 ‘%s’ 解决此问题。"
+msgid "Wrote %i records.\n"
+msgstr "已写入 %i 条记录。\n"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "未锁定"
+#: apt-pkg/indexcopy.cc
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
-"信息的工具\n"
-"\n"
-"选项：\n"
-"  -h   本帮助文本\n"
-"  -t   设置 temp 目录\n"
-"  -c=? 读指定的配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+#: apt-pkg/indexcopy.cc
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
 
-#: cmdline/apt-extracttemplates.cc:254
+#: apt-pkg/indexcopy.cc
 #, c-format
-msgid "Unable to mkstemp %s"
-msgstr "无法建立临时文件(mkstemp) %s "
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
 
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
+#: apt-pkg/indexcopy.cc
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "无法找到认证记录：%s"
 
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "软件包的扩展列表太长"
+#: apt-pkg/indexcopy.cc
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash 校验和不符：%s"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/init.cc
 #, c-format
-msgid "Error processing directory %s"
-msgstr "处理目录 %s 时出错"
+msgid "Packaging system '%s' is not supported"
+msgstr "不支持“%s”打包系统"
 
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "源扩展列表太长"
+#: apt-pkg/init.cc
+msgid "Unable to determine a suitable packaging system type"
+msgstr "无法确定适合的打包系统类型"
 
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "将头写入到目录文件时出错"
+#: apt-pkg/install-progress.cc
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr "进度：[%3i%%]"
+
+#: apt-pkg/install-progress.cc
+msgid "Running dpkg"
+msgstr "正在运行 dpkg"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/packagemanager.cc
 #, c-format
-msgid "Error processing contents %s"
-msgstr "处理目录 %s 时出错"
+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)"
+
+#: apt-pkg/packagemanager.cc
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "无法配置 %s。"
 
-#: ftparchive/apt-ftparchive.cc:626
+#: apt-pkg/packagemanager.cc
+#, c-format
 msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
+"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 ""
-"用法： apt-ftparchive [选项] 命令\n"
-"命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
-"       sources 源代码包搜索路径 [overridefile [路径前缀]]\n"
-"       contents 搜索路径\n"
-"       release 搜索路径\n"
-"       generate 配置文件 [groups]\n"
-"       clean 配置文件\n"
-"\n"
-"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
-"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n"
-"和 dpkg-scansources，都能游刃有余\n"
-"\n"
-"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
-"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
-"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n"
-"通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
-"\n"
-"与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
-"可以通过使用 --source-override 选项来指定一个 override 文件\n"
-"\n"
-"使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
-"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"
-"应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
-"下面有个来自 Debian 文档的例子：\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"选项:\n"
-"  -h    本帮助文档\n"
-"  --md5 使之生成 MD5 校验和\n"
-"  -s=?  源代码包 override 文件\n"
-"  -q    输出精简信息\n"
-"  -d=?  指定可选的缓存数据库\n"
-"  -d=?  使用另一个可选的缓存数据库\n"
-"  --no-delink 开启delink的调试模式\n"
-"  --contents  使之生成控制内容文件\n"
-"  -c=?  读取指定配置文件\n"
-"  -o=?  设置任意指定的配置选项"
+"由于这次安装存在着一个 Conflicts/Pre-Depends 循环，因而需要暂时删除一个必不可"
+"少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
+"Force-LoopBreak 选项。"
+
+#: apt-pkg/pkgcache.cc
+msgid "Empty package cache"
+msgstr "软件包缓存区是空的"
+
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is corrupted"
+msgstr "软件包缓存文件损坏了"
+
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is an incompatible version"
+msgstr "软件包缓存区文件的版本不兼容"
+
+#: apt-pkg/pkgcache.cc
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "本程序目前不支持“%s”版本系统"
+
+#: apt-pkg/pkgcache.cc
+#, c-format
+msgid "The package cache was built for different architectures: %s vs %s"
+msgstr "软件包缓存是为其它架构的硬件构建的: %s vs %s"
+
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is corrupted, it has the wrong hash"
+msgstr "软件包缓存文件损坏，散列值错误"
+
+#: apt-pkg/pkgcache.cc
+msgid "Depends"
+msgstr "依赖"
+
+#: apt-pkg/pkgcache.cc
+msgid "PreDepends"
+msgstr "预依赖"
+
+#: apt-pkg/pkgcache.cc
+msgid "Suggests"
+msgstr "建议"
 
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "没有任何选定项是匹配的"
+#: apt-pkg/pkgcache.cc
+msgid "Recommends"
+msgstr "推荐"
 
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "软件包文件组“%s”中缺少一些文件"
+#: apt-pkg/pkgcache.cc
+msgid "Conflicts"
+msgstr "冲突"
 
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
+#: apt-pkg/pkgcache.cc
+msgid "Replaces"
+msgstr "替换"
 
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "数据库已过期，现尝试进行升级 %s"
+#: apt-pkg/pkgcache.cc
+msgid "Obsoletes"
+msgstr "废弃"
 
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
+#: apt-pkg/pkgcache.cc
+msgid "Breaks"
+msgstr "破坏"
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "无法打开数据库文件 %s：%s"
+#: apt-pkg/pkgcache.cc
+msgid "Enhances"
+msgstr "增强"
 
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr "读取 .dsc 文件失败"
+#: apt-pkg/pkgcache.cc
+msgid "required"
+msgstr "必需"
 
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "归档文件没有包含控制字段"
+#: apt-pkg/pkgcache.cc
+msgid "important"
+msgstr "重要"
 
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "无法获得游标"
+#: apt-pkg/pkgcache.cc
+msgid "standard"
+msgstr "标准"
 
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "警告：无法读取目录 %s\n"
+#: apt-pkg/pkgcache.cc
+msgid "optional"
+msgstr "可选"
+
+#: apt-pkg/pkgcache.cc
+msgid "extra"
+msgstr "额外"
+
+#: apt-pkg/pkgcachegen.cc
+msgid "Cache has an incompatible versioning system"
+msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "警告：无法获得 %s 的状态\n"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "处理 %s (%s%d) 时出错"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "错误："
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇，软件包数量超出了本 APT 的处理能力。"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "警告："
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "错误：处理文件时出错 "
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "无法解析 %s"
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "无法遍历目录树"
+#: apt-pkg/pkgcachegen.cc
+msgid "Reading package lists"
+msgstr "正在读取软件包列表"
 
-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
-msgstr "无法打开 %s"
+#: apt-pkg/pkgcachegen.cc
+msgid "IO Error saving source cache"
+msgstr "无法读取或写入软件源缓存"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/pkgrecords.cc
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Index file type '%s' is not supported"
+msgstr "不支持索引文件类型“%s”"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/policy.cc
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "无法读取符号链接 %s"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"'%s' 这个值对 APT::Default-Release 是无效的，因为在源里找不到这样的发行"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/policy.cc
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "无法使用 unlink 删除 %s"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/policy.cc
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** 无法将 %s 链接到 %s"
+msgid "Did not understand pin type %s"
+msgstr "无法识别锁定的类型 %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/policy.cc
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " 达到了 DeLink 的上限 %sB。\n"
+msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)"
+msgstr "%s: 值 %s 超出锁定优先级有效范围 (%d 到 %d)"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "归档文件没有包含 package 字段"
+#: apt-pkg/policy.cc
+msgid "No priority (or zero) specified for pin"
+msgstr "没有为版本锁定指定优先级(或为零)"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s 中没有 override 项\n"
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "文件 %2$s 第 %1$u 行的记录格式有误 %3$s (%4$s)"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/sourcelist.cc
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 的维护者 %s 并非 %s\n"
+msgid "Opening %s"
+msgstr "正在打开 %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/sourcelist.cc
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s 没有源代码的 override 项\n"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "在源列表 %2$s 中第 %1$u 行有误 (类型)"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/sourcelist.cc
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s 中没有二进制文件的 override 项\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 分配内存失败"
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "软件源列表 %3$s 第 %2$u 行中的类别 “%1$s” 无法识别"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Unable to open %s"
-msgstr "无法打开 %s"
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "软件源列表 %2$s 中第 %1$u 行的小节格式有误 (类型)"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "软件源列表 %3$s 第 %2$u 小节的类别 “%1$s” 无法识别"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "无法读取 override 文件 %s"
+msgid "Unsupported file %s given on commandline"
+msgstr "命令行中有不支持的文件 %s"
 
-#: ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "override 文件 %s 第 %llu 行的格式有误 #1"
+#: apt-pkg/srcrecords.cc
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "您必须在 sources.list 中指定代码源(deb-src) URI"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/tagfile.cc
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "override 文件 %s 第 %llu 行的格式有误 #2"
+msgid "Cannot convert %s to integer: out of range"
+msgstr "无法将 %s 转换为整数：超出范围"
 
-#: ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "override 文件 %s 第 %llu 行的格式有误 #3"
+#: apt-pkg/update.cc
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "部分索引文件下载失败。如果忽略它们，那将转而使用旧的索引文件。"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "未知的压缩算法“%s”"
+#: apt-pkg/upgrade.cc
+msgid "Calculating upgrade"
+msgstr "正在计算更新"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
+#~ msgid "(not found)"
+#~ msgstr "(没有找到)"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "无法创建 FILE*"
+#~ msgid "  Package pin: "
+#~ msgstr "  软件包锁："
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "无法 fork"
+#~ msgid "There is no public key available for the following key IDs:\n"
+#~ msgstr "以下 ID 的密钥没有可用的公钥：\n"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "压缩子进程"
+#~ msgid "The repository is insufficiently signed by key %s (%s)"
+#~ msgstr "仓库 “%s” 数字签名不完整。"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "内部错误，无法创建 %s"
+#~ msgid ""
+#~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+#~ "packages"
+#~ msgstr ""
+#~ "由于 %3$s 不被软件包 %4$s 所允许，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "无法对子进程或文件进行读写"
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because the package %s cannot be "
+#~ "found"
+#~ msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "在计算 MD5 校验和时无法读取数据"
+#~ msgid ""
+#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#~ msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "在使用 unlink 删除 %s 时出错"
+#~ 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-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法： apt-internal-solver\n"
-"\n"
-"apt-internal-solver 是个用于调试及类似用途的接口，它可以\n"
-"像 APT 家族外部解决器(resolver)那样使用当前的内部解决器。\n"
-"\n"
-"选项：\n"
-"  -h  显示本帮助。\n"
-"  -q  日志型输出 - 无进度指示\n"
-"  -c=? 读取指定配置文件\n"
-"  -o=? 设置任意配置项，比如 -o dir::cache=/tmp\n"
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because package %s has no "
+#~ "candidate version"
+#~ msgstr "软件包 %3$s 没有可用的候选版本，因此 %2$s 的 %1$s 依赖无法满足"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "未知的软件包记录！"
+#~ msgid "Failed to satisfy %s dependency for %s: %s"
+#~ msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n"
-"是用来指出后面参数所示文件是哪种文件。\n"
-"\n"
-"选项：\n"
-"  -h   本帮助文档\n"
-"  -s   根据源文件排序\n"
-"  -c=? 读取指定配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+#~ msgid "Build-dependencies for %s could not be satisfied."
+#~ msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
+
+#~ msgid "Problem unlinking %s"
+#~ msgstr "在使用 unlink 删除 %s 时出错"
+
+#~ msgid "Failed to unlink %s"
+#~ msgstr "无法使用 unlink 删除 %s"
+
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "用法： apt-cache [选项] 命令\n"
+#~ "　　　 apt-cache [选项] show 软件包1 [软件包2 ...]\n"
+#~ "\n"
+#~ "apt-cache 是一个底层的工具，它可以在 APT 的\n"
+#~ "二进制缓存文件中查询信息\n"
+
+#~ msgid "Commands:"
+#~ msgstr "命令："
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text.\n"
+#~ "  -p=? The package cache.\n"
+#~ "  -s=? The source cache.\n"
+#~ "  -q   Disable progress indicator.\n"
+#~ "  -i   Show only important deps for the unmet command.\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -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 ""
+#~ "选项：\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"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "用法： apt [选项] 命令\n"
+#~ "\n"
+#~ "apt 的命令行界面。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "选项：\n"
+#~ "  -h  显示本帮助信息\n"
+#~ "  -q  日志型输出 - 不显示进度\n"
+#~ "  -qq 安静模式，只输出错误信息\n"
+#~ "  -s  无动作。只说明将要做什么。\n"
+#~ "  -f  读取/写入 指定文件的  自动/手动 标记\n"
+#~ "  -c=? 读取指定的配置文件\n"
+#~ "  -o=? 任意设置一个配置项，比如 -o dir::cache=/tmp\n"
+#~ "更多细节请参见 the apt-mark(8) 和 apt.conf(5) 的 man 手册。"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text.\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "选项：\n"
+#~ "  -h   显示本帮助文本。\n"
+#~ "  -c=? 读取指定的配置文件\n"
+#~ "  -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "选项：\n"
+#~ "  -h  显示本帮助信息\n"
+#~ "  -q  日志型输出 - 不显示进度\n"
+#~ "  -qq 安静模式，只输出错误信息\n"
+#~ "  -s  无动作。只说明将要做什么。\n"
+#~ "  -f  读取/写入 指定文件的  自动/手动 标记\n"
+#~ "  -c=? 读取指定的配置文件\n"
+#~ "  -o=? 任意设置一个配置项，比如 -o dir::cache=/tmp\n"
+#~ "更多细节请参见 the apt-mark(8) 和 apt.conf(5) 的 man 手册。"
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n"
+#~ "是用来指出后面参数所示文件是哪种文件。\n"
+#~ "\n"
+#~ "选项：\n"
+#~ "  -h   本帮助文档\n"
+#~ "  -s   根据源文件排序\n"
+#~ "  -c=? 读取指定配置文件\n"
+#~ "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+
+#~ msgid "Child process failed"
+#~ msgstr "子进程出错"
+
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "必须指定至少一对URL或者文件名"
+
+#~ msgid "Failed to create pipes"
+#~ msgstr "无法创建管道"
+
+#~ msgid "Failed to exec gzip "
+#~ msgstr "无法执行 gzip"
+
+#~ msgid "%s %s for %s compiled on %s %s\n"
+#~ msgstr "%s %s，用于 %s 体系结构，编译于 %s %s\n"
+
+#~ msgid "Failed to create FILE*"
+#~ msgstr "无法创建 FILE*"
+
+#~ msgid "Malformed stanza %u in source list %s (URI parse)"
+#~ msgstr "安装源配置文件“%2$s”第 %1$u 节有错误(URI 解析)"
+
+#~ msgid "Malformed line %lu in source list %s ([option] unparseable)"
+#~ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
+
+#~ msgid "Malformed line %lu in source list %s ([option] too short)"
+#~ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
+
+#~ msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+#~ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
+
+#~ msgid "Malformed line %lu in source list %s ([%s] has no key)"
+#~ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
+
+#~ msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+#~ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
+
+#~ msgid "Malformed line %lu in source list %s (URI)"
+#~ msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
+
+#~ msgid "Malformed line %lu in source list %s (dist)"
+#~ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
+
+#~ msgid "Malformed line %lu in source list %s (URI parse)"
+#~ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
+
+#~ msgid "Malformed line %lu in source list %s (absolute dist)"
+#~ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
+
+#~ msgid "Malformed line %lu in source list %s (dist parse)"
+#~ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+
+#~ msgid "Package %s %s was not found while processing file dependencies"
+#~ msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
+
+#~ msgid "Couldn't stat source package list %s"
+#~ msgstr "无法获取源软件包列表 %s 的状态"
+
+#~ msgid "Collecting File Provides"
+#~ msgstr "正在收集文件所提供的软件包"
+
+#~ msgid "Unable to find hash sum for '%s' in Release file"
+#~ msgstr "在 Release 文件中找不到 %s 的哈希值"
+
+#~ msgid "Vendor block %s contains no fingerprint"
+#~ msgstr "软件提供者数据块内 %s 没有包含指纹信息"
+
+#~ msgid "Total dependency version space: "
+#~ msgstr "依赖关系版本名所占空间共计："
+
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "您在 %s 上没有足够的可用空间"
+
+#~ msgid "Done"
+#~ msgstr "完成"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "%s 中没有安装密钥环。"
 
 #~ msgid "Is stdout a terminal?"
 #~ msgstr "stdout 是终端吗？"
@@ -3598,42 +3929,6 @@ msgstr ""
 #~ "seems to be corrupt."
 #~ msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
 
-#~ msgid "Note, selecting '%s' for task '%s'\n"
-#~ msgstr "注意，为任务 %2$s 选中了 %1$s\n"
-
-#~ msgid "Note, selecting '%s' for regex '%s'\n"
-#~ msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n"
-
-#~ msgid "Package %s is a virtual package provided by:\n"
-#~ msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
-
-#~ msgid " [Not candidate version]"
-#~ msgstr " [无候选版本]"
-
-#~ msgid "You should explicitly select one to install."
-#~ msgstr "请您明确地选择一个来进行安装。"
-
-#~ msgid ""
-#~ "Package %s is not available, but is referred to by another package.\n"
-#~ "This may mean that the package is missing, has been obsoleted, or\n"
-#~ "is only available from another source\n"
-#~ msgstr ""
-#~ "现在没有可用的软件包 %s，但是它被其它的软件包引用了。\n"
-#~ "这可能意味着这个缺失的软件包可能已被废弃，\n"
-#~ "或者只能在其他发布源中找到\n"
-
-#~ msgid "However the following packages replace it:"
-#~ msgstr "可是下列软件包取代了它："
-
-#~ msgid "Package '%s' has no installation candidate"
-#~ msgstr "软件包 %s 没有可供安装的候选者"
-
-#~ msgid "Virtual packages like '%s' can't be removed\n"
-#~ msgstr "类似 %s 的虚拟软件包可以卸载\n"
-
-#~ msgid "Note, selecting '%s' instead of '%s'\n"
-#~ msgstr "注意，选取 %s 而非 %s\n"
-
 #~ msgid "Ignore unavailable target release '%s' of package '%s'"
 #~ msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"
 
@@ -3754,7 +4049,7 @@ msgstr ""
 #~ "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::"
+#~ "无法立即对已经解压的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::"
 #~ "Immediate-Configure。"
 
 #~ msgid "Error occurred while processing %s (NewPackage)"