* added the apt-secure manpage

[apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 24ccc3ec4e4a9b792753e39947b5ab4cf8706a49..0ecf15e2461d9d8cd1c50f68c25b8b59ed2e0b6a 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,16 +1,16 @@
 # Chinese/Simplified translation of apt.
 # This file is put in the public domain.
 # Chinese/Simplified translation of apt.
 # This file is put in the public domain.

-# Tchaikov <chaisave@263.net>, 2004.
+# Tchaikov <tchaikov@sjtu.edu.cn>, 2005.

 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.23\n"
 "Report-Msgid-Bugs-To: \n"
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.23\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
-"PO-Revision-Date: 2005-02-09 17:34+0800\n"
-"Last-Translator: Tchaikov <chaisave@263.net>\n"
-"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"PO-Revision-Date: 2005-11-15 00:05+0800\n"
+"Last-Translator: Tchaikov <tchaikov@sjtu.edu.cn>\n"
+"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"


@@ -148,7 +148,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
 
 #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550

-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s for %s %s ，编译于 %s %s\n"
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s for %s %s ，编译于 %s %s\n"


@@ -206,11 +206,11 @@ msgstr ""
 "   showsrc - 显示源文件的各项记录\n"
 "   stats - 显示一些基本的统计信息\n"
 "   dump - 简要显示整个缓存文件的内容\n"
 "   showsrc - 显示源文件的各项记录\n"
 "   stats - 显示一些基本的统计信息\n"
 "   dump - 简要显示整个缓存文件的内容\n"

-"   dumpavail - 把所有有效的包文件列表打印到 stdout\n"
+"   dumpavail - 把所有有效的包文件列表打印到标准输出\n"

 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"

-"   show - 显示关于该软件包的便于阅读的一个报告\n"
-"   depends - 原原本本的显示该软件包的依赖关系的信息\n"
+"   show - 以便于阅读的格式介绍该软件包\n"
+"   depends - 原原本本地显示该软件包的依赖信息\n"

 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"
 "   dotty - 生成可用 GraphVis 处理的软件包关系图\n"
 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"
 "   dotty - 生成可用 GraphVis 处理的软件包关系图\n"


@@ -229,19 +229,15 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"

-msgstr ""
+msgstr "请给这张光盘起个名字，比如说“Debian 2.1r1 Disk 1”"

 
 #: cmdline/apt-cdrom.cc:93
 
 #: cmdline/apt-cdrom.cc:93

-#, fuzzy

 msgid "Please insert a Disc in the drive and press enter"
 msgid "Please insert a Disc in the drive and press enter"

-msgstr ""
-"更换介质：请把标有\n"
-"“%s”\n"
-"的碟片插入驱动器“%s”再按回车键\n"
+msgstr "请把光盘碟片插入驱动器再按回车键"

 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."

-msgstr ""
+msgstr "请对您的光盘套件中的其它光盘重复相同的操作。"

 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"


@@ -300,7 +296,7 @@ msgstr ""
 "\n"
 "选项：\n"
 "  -h   本帮助文本\n"
 "\n"
 "选项：\n"
 "  -h   本帮助文本\n"

-"  -t   设置temp目录\n"
+"  -t   设置 temp 目录\n"

 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 


@@ -338,7 +334,6 @@ msgid "Error processing contents %s"
 msgstr "处理 Contents %s 时出错"
 
 #: ftparchive/apt-ftparchive.cc:556
 msgstr "处理 Contents %s 时出错"
 
 #: ftparchive/apt-ftparchive.cc:556

-#, fuzzy

 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"


@@ -388,8 +383,8 @@ msgstr ""
 "       clean 配置文件\n"
 "\n"
 "apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
 "       clean 配置文件\n"
 "\n"
 "apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"

-"å¤\9aç§\8dç\94\9fæ\88\90ç´¢å¼\95ç\9a\84æ\96¹å¼\8fï¼\8cä»\8eå\85¨è\87ªå\8a¨ç\9a\84ç\94\9fæ\88\90å\88°å\9c¨å\8a\9fè\83½ä¸\8a对 dpkg-scanpackages \n"
-"和 dpkg-scansources 的替代，都能游刃有余\n"
+"å¤\9aç§\8dç\94\9fæ\88\90ç´¢å¼\95ç\9a\84æ\96¹å¼\8fï¼\8cä»\8eå\85¨è\87ªå\8a¨ç\9a\84ç´¢å¼\95ç\94\9fæ\88\90å\88°å\9c¨å\8a\9fè\83½ä¸\8aå\8f\96代 dpkg-scanpackages \n"
+"和 dpkg-scansources，都能游刃有余\n"

 "\n"
 "apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
 "Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
 "\n"
 "apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
 "Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"


@@ -410,7 +405,8 @@ msgstr ""
 "  -h    本帮助文档\n"
 "  --md5 使之生成 MD5 校验和\n"
 "  -s=?  源代码包 override 文件\n"
 "  -h    本帮助文档\n"
 "  --md5 使之生成 MD5 校验和\n"
 "  -s=?  源代码包 override 文件\n"

-"  -q    输出精简信息  -d=?  指定可选的缓存数据库\n"
+"  -q    输出精简信息\n"
+"  -d=?  指定可选的缓存数据库\n"

 "  -d=?  使用另一个可选的缓存数据库\n"
 "  --no-delink 开启delink的调试模式\n"
 "  --contents  使之生成控制内容文件\n"
 "  -d=?  使用另一个可选的缓存数据库\n"
 "  --no-delink 开启delink的调试模式\n"
 "  --contents  使之生成控制内容文件\n"


@@ -634,7 +630,7 @@ msgstr "无法将 %s 重命名为 %s"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"


@@ -703,13 +699,12 @@ msgid "%s (due to %s) "
 msgstr "%s (是由于 %s) "
 
 #: cmdline/apt-get.cc:544
 msgstr "%s (是由于 %s) "
 
 #: cmdline/apt-get.cc:544

-#, fuzzy

 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"
 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"

-"请勿尝试，除非您确实清楚您正在执行的操作！"
+"请勿尝试，除非您确实知道您在做什么！"

 
 #: cmdline/apt-get.cc:575
 #, c-format
 
 #: cmdline/apt-get.cc:575
 #, c-format


@@ -750,7 +745,7 @@ msgstr "无法更正依赖关系"
 
 #: cmdline/apt-get.cc:656
 msgid "Unable to minimize the upgrade set"
 
 #: cmdline/apt-get.cc:656
 msgid "Unable to minimize the upgrade set"

-msgstr "无法使升级的软件包集最小化"
+msgstr "无法最小化要升级的软件包集合"

 
 #: cmdline/apt-get.cc:658
 msgid " Done"
 
 #: cmdline/apt-get.cc:658
 msgid " Done"


@@ -766,11 +761,11 @@ msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
 
 #: cmdline/apt-get.cc:687
 msgid "WARNING: The following packages cannot be authenticated!"
 
 #: cmdline/apt-get.cc:687
 msgid "WARNING: The following packages cannot be authenticated!"

-msgstr "【警告】：下列的软件包不能通过认证！"
+msgstr "【警告】：下列的软件包不能通过验证！"

 
 #: cmdline/apt-get.cc:691
 msgid "Authentication warning overridden.\n"
 
 #: cmdline/apt-get.cc:691
 msgid "Authentication warning overridden.\n"

-msgstr ""
+msgstr "忽略了认证警告。\n"

 
 #: cmdline/apt-get.cc:698
 msgid "Install these packages without verification [y/N]? "
 
 #: cmdline/apt-get.cc:698
 msgid "Install these packages without verification [y/N]? "


@@ -782,33 +777,32 @@ msgstr "有些软件包不能通过验证"
 
 #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
 msgid "There are problems and -y was used without --force-yes"
 
 #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
 msgid "There are problems and -y was used without --force-yes"

-msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes。"
+msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"

 
 #: cmdline/apt-get.cc:753
 msgid "Internal error, InstallPackages was called with broken packages!"
 
 #: cmdline/apt-get.cc:753
 msgid "Internal error, InstallPackages was called with broken packages!"

-msgstr ""
+msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"

 
 #: cmdline/apt-get.cc:762
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
 #: cmdline/apt-get.cc:773
 
 #: cmdline/apt-get.cc:762
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
 #: cmdline/apt-get.cc:773

-#, fuzzy

 msgid "Internal error, Ordering didn't finish"
 msgid "Internal error, Ordering didn't finish"

-msgstr "添加 diversion 时出现内部错误"
+msgstr "内部错误，Ordering 没有完成"

 
 

-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840

 msgid "Unable to lock the download directory"
 msgstr "无法对下载目录加锁"
 
 msgid "Unable to lock the download directory"
 msgstr "无法对下载目录加锁"
 

-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100

 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "无法读取安装源列表。"
 
 #: cmdline/apt-get.cc:814
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "无法读取安装源列表。"
 
 #: cmdline/apt-get.cc:814
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"

-msgstr ""
+msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧"

 
 #: cmdline/apt-get.cc:819
 #, c-format
 
 #: cmdline/apt-get.cc:819
 #, c-format


@@ -830,10 +824,10 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 

-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
+#, c-format

 msgid "Couldn't determine free space in %s"
 msgid "Couldn't determine free space in %s"

-msgstr "æ\82¨å\9c¨ %s ä¸\8a没æ\9c\89足å¤\9f的空余空间"
+msgstr "æ\97 æ³\95è\8e·ç\9f¥æ\82¨å\9c¨ %s ä¸\8a的空余空间"

 
 #: cmdline/apt-get.cc:847
 #, c-format
 
 #: cmdline/apt-get.cc:847
 #, c-format


@@ -849,13 +843,13 @@ msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
 #: cmdline/apt-get.cc:866
 msgstr "Yes, do as I say!"
 
 #: cmdline/apt-get.cc:866

-#, fuzzy, c-format
+#, c-format

 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""

-"您的操作会导致潜在的危害\n"
+"您的操作会导致潜在的危害。\n"

 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 
 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 


@@ -867,7 +861,7 @@ msgstr "中止执行。"
 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 

-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"


@@ -876,7 +870,7 @@ msgstr "无法下载 %s  %s\n"
 msgid "Some files failed to download"
 msgstr "有一些文件下载失败"
 
 msgid "Some files failed to download"
 msgstr "有一些文件下载失败"
 

-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006

 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 
 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 


@@ -973,40 +967,40 @@ msgstr "未找到“%2$s”的“%1$s”版本"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "选定了版本为 %s (%s) 的 %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "选定了版本为 %s (%s) 的 %s\n"
 

-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311

 msgid "The update command takes no arguments"
 msgstr " update 命令是不需任何参数的"
 
 msgid "The update command takes no arguments"
 msgstr " update 命令是不需任何参数的"
 

-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418

 msgid "Unable to lock the list directory"
 msgstr "无法对状态列表目录加锁"
 
 msgid "Unable to lock the list directory"
 msgstr "无法对状态列表目录加锁"
 

-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382

 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 

-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401

 msgid "Internal error, AllUpgrade broke stuff"
 msgid "Internal error, AllUpgrade broke stuff"

-msgstr "内部错误，AllUpgrade 造成某些故障"
+msgstr "内部错误，AllUpgrade 坏事了"

 
 

-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 

-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
 

-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 

-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1014,7 +1008,7 @@ msgstr ""
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 

-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568

 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"
 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"


@@ -1025,7 +1019,7 @@ msgstr ""
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们还在新到(incoming)目录中。"
 
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们还在新到(incoming)目录中。"
 

-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576

 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"


@@ -1034,122 +1028,121 @@ msgstr ""
 "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
 "您最好提交一个针对这个软件包的故障报告。"
 
 "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
 "您最好提交一个针对这个软件包的故障报告。"
 

-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581

 msgid "The following information may help to resolve the situation:"
 msgid "The following information may help to resolve the situation:"

-msgstr "下列的信息可能会对问题的解决有所帮助："
+msgstr "下列的信息可能会对解决问题有所帮助："

 
 

-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584

 msgid "Broken packages"
 msgid "Broken packages"

-msgstr "受损安装包"
+msgstr "无法安装的软件包"

 
 

-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610

 msgid "The following extra packages will be installed:"
 msgid "The following extra packages will be installed:"

-msgstr "将会安装下列的额外的软件包："
+msgstr "将会安装下列额外的软件包："

 
 

-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681

 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 
 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 

-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682

 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 
 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 

-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702

 msgid "Calculating upgrade... "
 msgstr "正在筹划升级... "
 
 msgid "Calculating upgrade... "
 msgstr "正在筹划升级... "
 

-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101

 msgid "Failed"
 msgstr "失败"
 
 msgid "Failed"
 msgstr "失败"
 

-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710

 msgid "Done"
 msgstr "完成"
 
 msgid "Done"
 msgstr "完成"
 

-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
-#, fuzzy
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783

 msgid "Internal error, problem resolver broke stuff"
 msgid "Internal error, problem resolver broke stuff"

-msgstr "内部错误，AllUpgrade 造成某些故障"
+msgstr "内部错误，problem resolver 坏事了"

 
 

-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883

 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 

-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 

-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的空余空间"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的空余空间"
 

-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 

-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 

-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 

-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002

 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 

-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
 

-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 

-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"

-msgstr ""
+msgstr "请检查是否安装了“dpkg-dev”软件包。\n"

 
 

-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 

-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079

 msgid "Child process failed"
 msgstr "子进程出错"
 
 msgid "Child process failed"
 msgstr "子进程出错"
 

-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095

 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
 

-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 

-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 

-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1158,30 +1151,30 @@ msgstr ""
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
 "$s 依赖关系"
 
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
 "$s 依赖关系"
 

-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了"
 

-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 

-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 

-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325

 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 

-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357

 msgid "Supported modules:"
 msgstr "被支持模块："
 
 msgid "Supported modules:"
 msgstr "被支持模块："
 

-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1427,11 +1420,11 @@ msgid "Duplicate conf file %s/%s"
 msgstr "重复的配置文件 %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 msgstr "重复的配置文件 %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53

-#, fuzzy, c-format
+#, c-format

 msgid "Failed to write file %s"
 msgstr "无法写入文件 %s"
 
 msgid "Failed to write file %s"
 msgstr "无法写入文件 %s"
 

-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104

 #, c-format
 msgid "Failed to close file %s"
 msgstr "无法关闭文件 %s"
 #, c-format
 msgid "Failed to close file %s"
 msgstr "无法关闭文件 %s"


@@ -1484,7 +1477,8 @@ msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
 #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
 #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750

-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38

 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"


@@ -1642,12 +1636,11 @@ msgstr "错误的光盘"
 #: methods/cdrom.cc:164
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 #: methods/cdrom.cc:164
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."

-msgstr "æ\97 æ³\95å\8d¸è½½ç\8e°å\9c¨æ\8c\82è½½äº\8e %s ç\9a\84 CD-ROMï¼\8cå\8f¯è\83½å®\83正在使用中。"
+msgstr "æ\97 æ³\95å\8d¸è½½ç\8e°å\9c¨æ\8c\82è½½äº\8e %s ç\9a\84 CD-ROMï¼\8cå®\83å\8f¯è\83½正在使用中。"

 
 #: methods/cdrom.cc:169
 
 #: methods/cdrom.cc:169

-#, fuzzy

 msgid "Disk not found."
 msgid "Disk not found."

-msgstr "æ\97 æ³\95æ\89¾å\88°è¯¥æ\96\87件"
+msgstr "æ\89¾ä¸\8då\88°å\85\89ç\9b\98ã\80\82"

 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"


@@ -1785,7 +1778,7 @@ msgstr "数据套接字连接超时"
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 

-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 
 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 


@@ -1871,41 +1864,39 @@ msgstr "不能连接上 %s %s："
 
 #: methods/gpgv.cc:92
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 
 #: methods/gpgv.cc:92
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."

-msgstr ""
+msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"

 
 #: methods/gpgv.cc:191
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 
 #: methods/gpgv.cc:191
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"

-msgstr ""
+msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"

 
 #: methods/gpgv.cc:196
 msgid "At least one invalid signature was encountered."
 
 #: methods/gpgv.cc:196
 msgid "At least one invalid signature was encountered."

-msgstr ""
+msgstr "至少发现一个无效的签名。"

 
 #. FIXME String concatenation considered harmful.
 #: methods/gpgv.cc:201
 
 #. FIXME String concatenation considered harmful.
 #: methods/gpgv.cc:201

-#, fuzzy

 msgid "Could not execute "
 msgid "Could not execute "

-msgstr "æ\97 æ³\95è\8e·å¾\97é\94\81 %s"
+msgstr "æ\9cªè\83½æ\89§è¡\8c "

 
 #: methods/gpgv.cc:202
 msgid " to verify signature (is gnupg installed?)"
 
 #: methods/gpgv.cc:202
 msgid " to verify signature (is gnupg installed?)"

-msgstr ""
+msgstr "用于验证签名(您安装了 gnupg 么？)"

 
 #: methods/gpgv.cc:206
 msgid "Unknown error executing gpgv"
 
 #: methods/gpgv.cc:206
 msgid "Unknown error executing gpgv"

-msgstr ""
+msgstr "运行 gpgv 时发生未知错误"

 
 #: methods/gpgv.cc:237
 
 #: methods/gpgv.cc:237

-#, fuzzy

 msgid "The following signatures were invalid:\n"
 msgid "The following signatures were invalid:\n"

-msgstr "将会安装下列的额外的软件包："
+msgstr "下列签名无效：\n"

 
 #: methods/gpgv.cc:244
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 
 #: methods/gpgv.cc:244
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"

-msgstr ""
+msgstr "由于没有公钥，下列签名无法进行验证：\n"

 
 #: methods/gzip.cc:57
 #, c-format
 
 #: methods/gzip.cc:57
 #, c-format


@@ -1917,76 +1908,76 @@ msgstr "无法为 %s 开启管道"
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
 
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
 

-#: methods/http.cc:344
+#: methods/http.cc:381

 msgid "Waiting for headers"
 msgstr "正在等待报头"
 
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 

-#: methods/http.cc:490
+#: methods/http.cc:527

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
 

-#: methods/http.cc:498
+#: methods/http.cc:535

 msgid "Bad header line"
 msgstr "错误的报头条目"
 
 msgid "Bad header line"
 msgstr "错误的报头条目"
 

-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561

 msgid "The HTTP server sent an invalid reply header"
 msgstr "该 http 服务器发送了一个无效的应答报头"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "该 http 服务器发送了一个无效的应答报头"
 

-#: methods/http.cc:553
+#: methods/http.cc:590

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
 

-#: methods/http.cc:568
+#: methods/http.cc:605

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
 

-#: methods/http.cc:570
+#: methods/http.cc:607

 msgid "This HTTP server has broken range support"
 msgstr "该 http 服务器的 range 支持不正常"
 
 msgid "This HTTP server has broken range support"
 msgstr "该 http 服务器的 range 支持不正常"
 

-#: methods/http.cc:594
+#: methods/http.cc:631

 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 

-#: methods/http.cc:741
+#: methods/http.cc:778

 msgid "Select failed"
 msgstr "select 调用出错"
 
 msgid "Select failed"
 msgstr "select 调用出错"
 

-#: methods/http.cc:746
+#: methods/http.cc:783

 msgid "Connection timed out"
 msgstr "连接服务器超时"
 
 msgid "Connection timed out"
 msgstr "连接服务器超时"
 

-#: methods/http.cc:769
+#: methods/http.cc:806

 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 

-#: methods/http.cc:797
+#: methods/http.cc:834

 msgid "Error writing to file"
 msgstr "写文件时出错"
 
 msgid "Error writing to file"
 msgstr "写文件时出错"
 

-#: methods/http.cc:822
+#: methods/http.cc:859

 msgid "Error writing to the file"
 msgstr "写文件时出错"
 
 msgid "Error writing to the file"
 msgstr "写文件时出错"
 

-#: methods/http.cc:836
+#: methods/http.cc:873

 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 

-#: methods/http.cc:838
+#: methods/http.cc:875

 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 

-#: methods/http.cc:1069
+#: methods/http.cc:1106

 msgid "Bad header data"
 msgstr "错误的报头数据"
 
 msgid "Bad header data"
 msgstr "错误的报头数据"
 

-#: methods/http.cc:1086
+#: methods/http.cc:1123

 msgid "Connection failed"
 msgstr "连接失败"
 
 msgid "Connection failed"
 msgstr "连接失败"
 

-#: methods/http.cc:1177
+#: methods/http.cc:1214

 msgid "Internal error"
 msgstr "内部错误"
 
 msgid "Internal error"
 msgstr "内部错误"
 


@@ -1999,7 +1990,7 @@ msgstr "无法 mmap 一个空文件"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 

-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938

 #, c-format
 msgid "Selection %s not found"
 msgstr "没有发现您的所选 %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "没有发现您的所选 %s"


@@ -2120,7 +2111,7 @@ msgstr "无效的操作 %s"
 msgid "Unable to stat the mount point %s"
 msgstr "无法读取文件系统挂载点 %s 的状态"
 
 msgid "Unable to stat the mount point %s"
 msgstr "无法读取文件系统挂载点 %s 的状态"
 

-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44

 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法切换工作目录到 %s"
 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法切换工作目录到 %s"


@@ -2287,52 +2278,52 @@ msgstr "无法解析软件包文件 %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 

-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94

 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)"
 

-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96

 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)"
 

-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99

 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
 

-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105

 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)"
 

-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
 

-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203

 #, c-format
 msgid "Opening %s"
 msgstr "正在打开 %s"
 
 #, c-format
 msgid "Opening %s"
 msgstr "正在打开 %s"
 

-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426

 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
 
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
 

-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240

 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
 
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
 

-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"

 msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
 
 msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
 

-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255

 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"


@@ -2383,10 +2374,10 @@ msgstr "软件包列表的目录 %spartial 不见了。"
 msgid "Archive directory %spartial is missing."
 msgstr "找不到“%spartial”这个目录。"
 
 msgid "Archive directory %spartial is missing."
 msgstr "找不到“%spartial”这个目录。"
 

-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821

 #, c-format
 msgid "Downloading file %li of %li (%s remaining)"
 #, c-format
 msgid "Downloading file %li of %li (%s remaining)"

-msgstr ""
+msgstr "正在下载第 %li 个文件(共 %li 个，尚需 %s)"

 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format


@@ -2399,19 +2390,16 @@ msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
 #: apt-pkg/acquire-worker.cc:377
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
 #: apt-pkg/acquire-worker.cc:377

-#, fuzzy, c-format
+#, c-format

 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."

-msgstr ""
-"更换介质：请把标有\n"
-"“%s”\n"
-"的碟片插入驱动器“%s”再按回车键\n"
+msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"

 
 

-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120

 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支持“%s”打包系统"
 
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支持“%s”打包系统"
 

-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136

 msgid "Unable to determine a suitable packaging system type"
 msgstr "无法确定适合的打包系统类型"
 
 msgid "Unable to determine a suitable packaging system type"
 msgstr "无法确定适合的打包系统类型"
 


@@ -2422,7 +2410,7 @@ msgstr "无法读取 %s 的状态。"
 
 #: apt-pkg/srcrecords.cc:48
 msgid "You must put some 'source' URIs in your sources.list"
 
 #: apt-pkg/srcrecords.cc:48
 msgid "You must put some 'source' URIs in your sources.list"

-msgstr "您必须在您的 sources.list 输入一些“软件包源”的 URL"
+msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI"

 
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."
 
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."


@@ -2529,11 +2517,11 @@ msgstr "无法写入来源缓存文件"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 

-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911

 msgid "MD5Sum mismatch"
 msgstr "MD5 校验和不符"
 
 msgid "MD5Sum mismatch"
 msgstr "MD5 校验和不符"
 

-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719

 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "


@@ -2542,7 +2530,7 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 

-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778

 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "


@@ -2550,13 +2538,13 @@ msgid ""
 msgstr ""
 "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
 
 msgstr ""
 "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
 

-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."

-msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段"
+msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"

 
 

-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901

 msgid "Size mismatch"
 msgstr "大小不符"
 
 msgid "Size mismatch"
 msgstr "大小不符"
 


@@ -2660,54 +2648,54 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358

-#, fuzzy, c-format
+#, c-format

 msgid "Preparing %s"
 msgid "Preparing %s"

-msgstr "正在打开 %s"
+msgstr "正在准备 %s"

 
 #: apt-pkg/deb/dpkgpm.cc:359
 
 #: apt-pkg/deb/dpkgpm.cc:359

-#, fuzzy, c-format
+#, c-format

 msgid "Unpacking %s"
 msgid "Unpacking %s"

-msgstr "正在打开 %s"
+msgstr "正在解压缩 %s"

 
 #: apt-pkg/deb/dpkgpm.cc:364
 
 #: apt-pkg/deb/dpkgpm.cc:364

-#, fuzzy, c-format
+#, c-format

 msgid "Preparing to configure %s"
 msgid "Preparing to configure %s"

-msgstr "正在打开配置文件 %s"
+msgstr "正在准备配置 %s"

 
 #: apt-pkg/deb/dpkgpm.cc:365
 
 #: apt-pkg/deb/dpkgpm.cc:365

-#, fuzzy, c-format
+#, c-format

 msgid "Configuring %s"
 msgid "Configuring %s"

-msgstr "正在连接 %s"
+msgstr "正在配置 %s"

 
 #: apt-pkg/deb/dpkgpm.cc:366
 
 #: apt-pkg/deb/dpkgpm.cc:366

-#, fuzzy, c-format
+#, c-format

 msgid "Installed %s"
 msgid "Installed %s"

-msgstr "  已安装："
+msgstr "已安装 %s"

 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"

-msgstr ""
+msgstr "正在准备 %s 的删除操作"

 
 #: apt-pkg/deb/dpkgpm.cc:372
 
 #: apt-pkg/deb/dpkgpm.cc:372

-#, fuzzy, c-format
+#, c-format

 msgid "Removing %s"
 msgid "Removing %s"

-msgstr "正在打开 %s"
+msgstr "正在删除 %s"

 
 #: apt-pkg/deb/dpkgpm.cc:373
 
 #: apt-pkg/deb/dpkgpm.cc:373

-#, fuzzy, c-format
+#, c-format

 msgid "Removed %s"
 msgid "Removed %s"

-msgstr "推荐"
+msgstr "已删除 %s"

 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
 msgid "Preparing for remove with config %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
 msgid "Preparing for remove with config %s"

-msgstr ""
+msgstr "正在准备连同配置文件的删除 %s"

 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 msgid "Removed with config %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 msgid "Removed with config %s"

-msgstr ""
+msgstr "连同配置文件一同删除 %s "

 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"