Updated French manpage. Closes: #291020

[apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index af67d226f159c3e39f415bd30c360c2ae611054a..20e6f8a54552ebe98bb97d8377bd75780874e96b 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,17 +1,14 @@
 # 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.

-#
-# Initially converted from zh_TW.po
-#
-# Tchaikov <chaisave@263.net>, 2004
-# Carlos Z.F. Liu <carlos_liu@yahoo.com>, 2004
+# Tchaikov <chaisave@263.net>, 2004.
+# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.

 # 
 msgid ""
 msgstr ""
 # 
 msgid ""
 msgstr ""

-"Project-Id-Version: apt 0.5.22\n"
+"Project-Id-Version: apt 0.5.23\n"

 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2004-03-14 13:46-0800\n"
-"PO-Revision-Date: 2004-02-26 17:05-0800\n"
+"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"PO-Revision-Date: 2005-01-15 00:39+0800\n"

 "Last-Translator: Tchaikov <chaisave@263.net>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Tchaikov <chaisave@263.net>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"


@@ -191,7 +188,7 @@ msgid ""
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\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 arbitary configuration option, eg -o dir::cache=/tmp\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 ""
 "用法： apt-cache [选项] 命令\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 "用法： apt-cache [选项] 命令\n"


@@ -200,7 +197,7 @@ msgstr ""
 "       apt-cache [选项] showsrc 软件包甲 [软件包乙 ...]\n"
 "\n"
 "apt-cache 是一个底层的工具，我们用它来操纵 APT 的二进制\n"
 "       apt-cache [选项] showsrc 软件包甲 [软件包乙 ...]\n"
 "\n"
 "apt-cache 是一个底层的工具，我们用它来操纵 APT 的二进制\n"

-"缓存文件，也用来从那些文件查询相关信息\n"
+"缓存文件，也用来在那些文件中查询相关信息\n"

 "\n"
 "命令：\n"
 "   add - 往源缓存加入一个软件包文件\n"
 "\n"
 "命令：\n"
 "   add - 往源缓存加入一个软件包文件\n"


@@ -214,11 +211,12 @@ msgstr ""
 "   search - 根据正则表达式搜索软件包列表\n"
 "   show - 显示关于该软件包的便于阅读的一个报告\n"
 "   depends - 原原本本的显示该软件包的依赖关系的信息\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   show - 显示关于该软件包的便于阅读的一个报告\n"
 "   depends - 原原本本的显示该软件包的依赖关系的信息\n"

-"   rdepends - 显示所有依赖于该软件包的软件包名字   pkgnames - 列出所有软件包"
-"的名字\n"
+"   rdepends - 显示所有依赖于该软件包的软件包名字\n"
+"   pkgnames - 列出所有软件包的名字\n"

 "   dotty - 生成可用 GraphVis 处理的软件包关系图\n"
 "   xvcg - 生成可用 xvcg 处理的软件包的关系图\n"
 "   policy - 显示软件包的安装设置状态\n"
 "   dotty - 生成可用 GraphVis 处理的软件包关系图\n"
 "   xvcg - 生成可用 xvcg 处理的软件包的关系图\n"
 "   policy - 显示软件包的安装设置状态\n"

+"\n"

 "选项：\n"
 "  -h   本帮助文档。\n"
 "  -p=? 软件包的缓存。\n"
 "选项：\n"
 "  -h   本帮助文档。\n"
 "  -p=? 软件包的缓存。\n"


@@ -246,7 +244,7 @@ msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 "用法：apt-config [选项] 命令\n"
 "\n"
 msgstr ""
 "用法：apt-config [选项] 命令\n"
 "\n"


@@ -277,7 +275,7 @@ msgid ""
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 "用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
 "\n"
 msgstr ""
 "用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
 "\n"


@@ -362,7 +360,7 @@ msgid ""
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"

-"  -o=?  Set an arbitary configuration option"
+"  -o=?  Set an arbitrary configuration option"

 msgstr ""
 "用法： apt-ftparchive [选项] 命令\n"
 "命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
 msgstr ""
 "用法： apt-ftparchive [选项] 命令\n"
 "命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"


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

-"还有软件包的所有控制字段的内容。该软件同时支持覆盖(override)文件，\n"
+"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n"

 "通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
 "\n"
 "与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
 "通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
 "\n"
 "与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"

-"可以通过使用 --source-override 选项来指定一个覆盖(override)文件\n"
+"可以通过使用 --source-override 选项来指定一个 override 文件\n"

 "\n"
 "使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
 "\n"
 "\n"
 "使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
 "\n"

-"二进制包的搜索路径一定要是递归搜索的底层，而且覆盖(override)文件里\n"
+"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"

 "应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
 "下面有个来自 Debian 文档的例子：\n"
 "   apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
 "应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
 "下面有个来自 Debian 文档的例子：\n"
 "   apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"


@@ -395,7 +393,7 @@ msgstr ""
 "选项:\n"
 "  -h    本帮助文档\n"
 "  --md5 使之生成 MD5 校验和\n"
 "选项:\n"
 "  -h    本帮助文档\n"
 "  --md5 使之生成 MD5 校验和\n"

-"  -s=?  源代码包覆盖(override)文件\n"
+"  -s=?  源代码包 override 文件\n"

 "  -q    输出精简信息  -d=?  指定可选的缓存数据库\n"
 "  --no-delink 开启delink的调试模式\n"
 "  --contents  使之生成控制内容文件\n"
 "  -q    输出精简信息  -d=?  指定可选的缓存数据库\n"
 "  --no-delink 开启delink的调试模式\n"
 "  --contents  使之生成控制内容文件\n"


@@ -411,26 +409,31 @@ msgstr "没有任何选定项是匹配的"
 msgid "Some files are missing in the package file group `%s'"
 msgstr "软件包文件组“%s”中缺少一些文件"
 
 msgid "Some files are missing in the package file group `%s'"
 msgstr "软件包文件组“%s”中缺少一些文件"
 

-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:45

 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old"
 
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old"
 

-#: ftparchive/cachedb.cc:59
+#: ftparchive/cachedb.cc:63
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB 已过时，现试图进行升级 %s"
+
+#: ftparchive/cachedb.cc:73

 #, c-format
 #, c-format

-msgid "Unable to open DB2 file %s"
-msgstr "无法打开 DB2 文件 %s"
+msgid "Unable to open DB file %s: %s"
+msgstr "无法打开 DB 文件 %s：%s"

 
 

-#: ftparchive/cachedb.cc:99
+#: ftparchive/cachedb.cc:114

 #, c-format
 msgid "File date has changed %s"
 msgstr "文件 %s 的时间已被改动"
 
 #, c-format
 msgid "File date has changed %s"
 msgstr "文件 %s 的时间已被改动"
 

-#: ftparchive/cachedb.cc:140
+#: ftparchive/cachedb.cc:155

 msgid "Archive has no control record"
 msgstr "存档没有包含控制字段"
 
 msgid "Archive has no control record"
 msgstr "存档没有包含控制字段"
 

-#: ftparchive/cachedb.cc:253 ftparchive/cachedb.cc:257
+#: ftparchive/cachedb.cc:267

 msgid "Unable to get a cursor"
 msgstr "无法获得游标(cursor)"
 
 msgid "Unable to get a cursor"
 msgstr "无法获得游标(cursor)"
 


@@ -508,7 +511,7 @@ msgstr "存档没有包含软件包(package)字段"
 #: ftparchive/writer.cc:386 ftparchive/writer.cc:595
 #, c-format
 msgid "  %s has no override entry\n"
 #: ftparchive/writer.cc:386 ftparchive/writer.cc:595
 #, c-format
 msgid "  %s has no override entry\n"

-msgstr "  %s 中没有覆盖(override)项\n"
+msgstr "  %s 中没有 override 项\n"

 
 #: ftparchive/writer.cc:429 ftparchive/writer.cc:677
 #, c-format
 
 #: ftparchive/writer.cc:429 ftparchive/writer.cc:677
 #, c-format


@@ -527,22 +530,22 @@ msgstr "无法打开 %s"
 #: ftparchive/override.cc:64 ftparchive/override.cc:170
 #, c-format
 msgid "Malformed override %s line %lu #1"
 #: ftparchive/override.cc:64 ftparchive/override.cc:170
 #, c-format
 msgid "Malformed override %s line %lu #1"

-msgstr "覆盖(override)文件 %s 第 %lu 行的格式有误 #1"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #1"

 
 #: ftparchive/override.cc:78 ftparchive/override.cc:182
 #, c-format
 msgid "Malformed override %s line %lu #2"
 
 #: ftparchive/override.cc:78 ftparchive/override.cc:182
 #, c-format
 msgid "Malformed override %s line %lu #2"

-msgstr "覆盖(override)文件 %s 第 %lu 行的格式有误 #2"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #2"

 
 #: ftparchive/override.cc:92 ftparchive/override.cc:195
 #, c-format
 msgid "Malformed override %s line %lu #3"
 
 #: ftparchive/override.cc:92 ftparchive/override.cc:195
 #, c-format
 msgid "Malformed override %s line %lu #3"

-msgstr "覆盖(override)文件 %s 第 %lu 行的格式有误 #3"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #3"

 
 #: ftparchive/override.cc:131 ftparchive/override.cc:205
 #, c-format
 msgid "Failed to read the override file %s"
 
 #: ftparchive/override.cc:131 ftparchive/override.cc:205
 #, c-format
 msgid "Failed to read the override file %s"

-msgstr "无法读取覆盖(override)文件 %s"
+msgstr "无法读取 override 文件 %s"

 
 #: ftparchive/multicompress.cc:75
 #, c-format
 
 #: ftparchive/multicompress.cc:75
 #, c-format


@@ -621,28 +624,28 @@ msgstr "下列的软件包有不能满足的依赖关系："
 #: cmdline/apt-get.cc:325
 #, c-format
 msgid "but %s is installed"
 #: cmdline/apt-get.cc:325
 #, c-format
 msgid "but %s is installed"

-msgstr "但是，%s 已经安装了"
+msgstr "但是 %s 已经安装了"

 
 #: cmdline/apt-get.cc:327
 #, c-format
 msgid "but %s is to be installed"
 
 #: cmdline/apt-get.cc:327
 #, c-format
 msgid "but %s is to be installed"

-msgstr "但是，%s 正要被安装"
+msgstr "但是 %s 正要被安装"

 
 #: cmdline/apt-get.cc:334
 msgid "but it is not installable"
 
 #: cmdline/apt-get.cc:334
 msgid "but it is not installable"

-msgstr "但是，它无法被安装"
+msgstr "但却无法安装它"

 
 #: cmdline/apt-get.cc:336
 msgid "but it is a virtual package"
 
 #: cmdline/apt-get.cc:336
 msgid "but it is a virtual package"

-msgstr "但是，它只是个虚拟软件包"
+msgstr "但是它只是个虚拟软件包"

 
 #: cmdline/apt-get.cc:339
 msgid "but it is not installed"
 
 #: cmdline/apt-get.cc:339
 msgid "but it is not installed"

-msgstr "但是，它还没有被安装"
+msgstr "但是它还没有被安装"

 
 #: cmdline/apt-get.cc:339
 msgid "but it is not going to be installed"
 
 #: cmdline/apt-get.cc:339
 msgid "but it is not going to be installed"

-msgstr "但是，它将不会被安装"
+msgstr "但是它将不会被安装"

 
 #: cmdline/apt-get.cc:344
 msgid " or"
 
 #: cmdline/apt-get.cc:344
 msgid " or"


@@ -658,7 +661,7 @@ msgstr "下列软件包将被【卸载】："
 
 #: cmdline/apt-get.cc:421
 msgid "The following packages have been kept back:"
 
 #: cmdline/apt-get.cc:421
 msgid "The following packages have been kept back:"

-msgstr "下列的软件包的版本将保持持不变："
+msgstr "下列的软件包的版本将保持不变："

 
 #: cmdline/apt-get.cc:442
 msgid "The following packages will be upgraded:"
 
 #: cmdline/apt-get.cc:442
 msgid "The following packages will be upgraded:"


@@ -786,7 +789,7 @@ msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作
 
 #: cmdline/apt-get.cc:819
 msgid "Yes, do as I say!"
 
 #: cmdline/apt-get.cc:819
 msgid "Yes, do as I say!"

-msgstr ""
+msgstr "Yes, do as I say!"

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


@@ -1147,7 +1150,7 @@ msgid ""
 "  -b  Build the source package after fetching it\n"
 "  -V  Show verbose version numbers\n"
 "  -c=? Read this configuration file\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 arbitary configuration option, eg -o dir::cache=/tmp\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"
 "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"


@@ -1166,10 +1169,10 @@ msgstr ""
 "   remove - 卸载软件包\n"
 "   source - 下载源码包文件\n"
 "   build-dep - 为源码包配置所需的构建依赖关系\n"
 "   remove - 卸载软件包\n"
 "   source - 下载源码包文件\n"
 "   build-dep - 为源码包配置所需的构建依赖关系\n"

-"   dist-upgrade - 发布版升级，见 apt-get(8)   dselect-upgrade - 根据 dselect "
-"的选择来进行升级\n"
+"   dist-upgrade - 发布版升级，见 apt-get(8)\n"
+"   dselect-upgrade - 根据 dselect的选择来进行升级\n"

 "   clean - 删除所有已下载的包文件\n"
 "   clean - 删除所有已下载的包文件\n"

-"   auto-clean - 删除老版本的已下载的包文件\n"
+"   autoclean - 删除老版本的已下载的包文件\n"

 "   check - 核对以确认系统的依赖关系的完整性\n"
 "选项：\n"
 "  -h  本帮助文档。\n"
 "   check - 核对以确认系统的依赖关系的完整性\n"
 "选项：\n"
 "  -h  本帮助文档。\n"


@@ -1186,7 +1189,7 @@ msgstr ""
 "  -c=? 读取指定配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 "请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"
 "  -c=? 读取指定配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 "请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"

-"以猎取更多信息和选项。\n"
+"以获取更多信息和选项。\n"

 "                       本 APT 有着超级牛力。\n"
 
 #: cmdline/acqprogress.cc:55
 "                       本 APT 有着超级牛力。\n"
 
 #: cmdline/acqprogress.cc:55


@@ -1241,7 +1244,7 @@ msgid ""
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 "用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
 "\n"
 msgstr ""
 "用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
 "\n"


@@ -1413,7 +1416,7 @@ msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
 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:705
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709

 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
 #, c-format
 msgid "Unable to read %s"
 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
 #, c-format
 msgid "Unable to read %s"


@@ -1538,7 +1541,7 @@ msgstr "内部错误，无法定位包内文件 %s"
 #: apt-inst/deb/debfile.cc:104
 #, c-format
 msgid "Couldn't change to %s"
 #: apt-inst/deb/debfile.cc:104
 #, c-format
 msgid "Couldn't change to %s"

-msgstr "无法切换工作到 %s"
+msgstr "无法切换工作目录到 %s"

 
 #: apt-inst/deb/debfile.cc:125
 msgid "Internal Error, could not locate member"
 
 #: apt-inst/deb/debfile.cc:125
 msgid "Internal Error, could not locate member"


@@ -1550,7 +1553,7 @@ msgstr "无法在打包文件中找到有效的主控文件"
 
 #: apt-inst/deb/debfile.cc:243
 msgid "Unparsible control file"
 
 #: apt-inst/deb/debfile.cc:243
 msgid "Unparsible control file"

-msgstr "不能解析的 control 文件"
+msgstr "不能解析的主控文件"

 
 #: methods/cdrom.cc:113
 #, c-format
 
 #: methods/cdrom.cc:113
 #, c-format


@@ -1562,8 +1565,8 @@ msgid ""
 "Please use apt-cdrom to make this CD recognized by APT. apt-get update "
 "cannot be used to add new CDs"
 msgstr ""
 "Please use apt-cdrom to make this CD recognized by APT. apt-get update "
 "cannot be used to add new CDs"
 msgstr ""

-"请使用 apt-cdrom 来让此光盘能被 APT 所识别。apt-get upgdate 不能被用来加入新"
-"的光盘。"
+"请使用 apt-cdrom，通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来"
+"加入新的光盘。"

 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168
 msgid "Wrong CD"
 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168
 msgid "Wrong CD"


@@ -1597,7 +1600,7 @@ msgstr "正在登录"
 
 #: methods/ftp.cc:168
 msgid "Unable to determine the peer name"
 
 #: methods/ftp.cc:168
 msgid "Unable to determine the peer name"

-msgstr "无法获知无端主机名"
+msgstr "无法获知对方主机名"

 
 #: methods/ftp.cc:173
 msgid "Unable to determine the local name"
 
 #: methods/ftp.cc:173
 msgid "Unable to determine the local name"


@@ -1606,17 +1609,17 @@ msgstr "无法获知本地主机名"
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
 msgid "Server refused our connection and said: %s"
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
 msgid "Server refused our connection and said: %s"

-msgstr "服务器拒绝让我们的连接，它的回应是：%s"
+msgstr "服务器拒绝了我们的连接，它响应道：%s"

 
 #: methods/ftp.cc:210
 #, c-format
 msgid "USER failed, server said: %s"
 
 #: methods/ftp.cc:210
 #, c-format
 msgid "USER failed, server said: %s"

-msgstr "USER æ\8c\87令å\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\9b\9eåº\94：%s"
+msgstr "USER æ\8c\87令å\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\93\8dåº\94é\81\93：%s"

 
 #: methods/ftp.cc:217
 #, c-format
 msgid "PASS failed, server said: %s"
 
 #: methods/ftp.cc:217
 #, c-format
 msgid "PASS failed, server said: %s"

-msgstr "PASS æ\8c\87令å\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\9b\9eåº\94：%s"
+msgstr "PASS æ\8c\87令å\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\93\8dåº\94é\81\93：%s"

 
 #: methods/ftp.cc:237
 msgid ""
 
 #: methods/ftp.cc:237
 msgid ""


@@ -1628,7 +1631,7 @@ msgstr ""
 #: methods/ftp.cc:265
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 #: methods/ftp.cc:265
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"

-msgstr "ç\99»å½\95è\84\9aæ\9c¬å\91½ä»¤â\80\9c%sâ\80\9då\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\9b\9eåº\94：%s"
+msgstr "ç\99»å½\95è\84\9aæ\9c¬å\91½ä»¤â\80\9c%sâ\80\9då\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\93\8dåº\94é\81\93：%s"

 
 #: methods/ftp.cc:291
 #, c-format
 
 #: methods/ftp.cc:291
 #, c-format


@@ -1641,7 +1644,7 @@ msgstr "连接超时"
 
 #: methods/ftp.cc:335
 msgid "Server closed the connection"
 
 #: methods/ftp.cc:335
 msgid "Server closed the connection"

-msgstr "æ\9c\8då\8a¡å\99¨å\88\87æ\96­äº\86è¿\9eæ\8e¥"
+msgstr "æ\9c\8då\8a¡å\99¨å\85³é\97­äº\86è¿\9eæ\8e¥"

 
 #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190
 msgid "Read error"
 
 #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190
 msgid "Read error"


@@ -1709,14 +1712,14 @@ msgstr "数据套接字连接超时"
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 

-#: methods/ftp.cc:864 methods/http.cc:912 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 
 #: methods/ftp.cc:877
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 
 #: methods/ftp.cc:877
 #, c-format
 msgid "Unable to fetch file, server said '%s'"

-msgstr "æ\97 æ³\95è\8e·å\8f\96æ\96\87件ï¼\8cæ\9c\8då\8a¡å\99¨å\9b\9eåº\94“%s”"
+msgstr "æ\97 æ³\95è\8e·å\8f\96æ\96\87件ï¼\8cæ\9c\8då\8a¡å\99¨å\93\8dåº\94é\81\93“%s”"

 
 #: methods/ftp.cc:892 methods/rsh.cc:322
 msgid "Data socket timed out"
 
 #: methods/ftp.cc:892 methods/rsh.cc:322
 msgid "Data socket timed out"


@@ -1725,7 +1728,7 @@ msgstr "数据套接字超时"
 #: methods/ftp.cc:922
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 #: methods/ftp.cc:922
 #, c-format
 msgid "Data transfer failed, server said '%s'"

-msgstr "数据传送出错，服务器的响应为“%s”"
+msgstr "数据传送出错，服务器响应道“%s”"

 
 #. Get the files information
 #: methods/ftp.cc:997
 
 #. Get the files information
 #: methods/ftp.cc:997


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

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

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

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

 #, 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:494
+#: methods/http.cc:498

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

-#: methods/http.cc:513 methods/http.cc:520
+#: methods/http.cc:517 methods/http.cc:524

 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:549
+#: methods/http.cc:553

 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:564
+#: methods/http.cc:568

 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:566
+#: methods/http.cc:570

 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:590
+#: methods/http.cc:594

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

-#: methods/http.cc:733
+#: methods/http.cc:737

 msgid "Select failed"
 msgid "Select failed"

-msgstr "Select 调用出错"
+msgstr "select 调用出错"

 
 

-#: methods/http.cc:738
+#: methods/http.cc:742

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

-#: methods/http.cc:761
+#: methods/http.cc:765

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

-#: methods/http.cc:789
+#: methods/http.cc:793

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

-#: methods/http.cc:814
+#: methods/http.cc:818

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

-#: methods/http.cc:828
+#: methods/http.cc:832

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

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

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

-#: methods/http.cc:1061
+#: methods/http.cc:1065

 msgid "Bad header Data"
 msgid "Bad header Data"

-msgstr "错误的包头数据"
+msgstr "错误的报头数据"

 
 

-#: methods/http.cc:1078
+#: methods/http.cc:1082

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

-#: methods/http.cc:1169
+#: methods/http.cc:1173

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


@@ -1900,45 +1903,50 @@ msgstr "无法识别的类型缩写：“%c”"
 msgid "Opening configuration file %s"
 msgstr "正在打开配置文件 %s"
 
 msgid "Opening configuration file %s"
 msgstr "正在打开配置文件 %s"
 

-#: apt-pkg/contrib/configuration.cc:563
+#: apt-pkg/contrib/configuration.cc:471
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
+
+#: apt-pkg/contrib/configuration.cc:567

 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "语法错误 %s:%u：配置小节没有以名字开头"
 
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "语法错误 %s:%u：配置小节没有以名字开头"
 

-#: apt-pkg/contrib/configuration.cc:582
+#: apt-pkg/contrib/configuration.cc:586

 #, c-format
 msgid "Syntax error %s:%u: Malformed Tag"
 msgstr "语法错误 %s:%u：标签格式有误"
 
 #, c-format
 msgid "Syntax error %s:%u: Malformed Tag"
 msgstr "语法错误 %s:%u：标签格式有误"
 

-#: apt-pkg/contrib/configuration.cc:599
+#: apt-pkg/contrib/configuration.cc:603

 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
 
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
 

-#: apt-pkg/contrib/configuration.cc:639
+#: apt-pkg/contrib/configuration.cc:643

 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
 
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
 

-#: apt-pkg/contrib/configuration.cc:646
+#: apt-pkg/contrib/configuration.cc:650

 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 

-#: apt-pkg/contrib/configuration.cc:650 apt-pkg/contrib/configuration.cc:655
+#: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659

 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "语法错误 %s:%u: Included from here"
 
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "语法错误 %s:%u: Included from here"
 

-#: apt-pkg/contrib/configuration.cc:659
+#: apt-pkg/contrib/configuration.cc:663

 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "语法错误 %s:%u: 不支持的指令“%s”"
 
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "语法错误 %s:%u: 不支持的指令“%s”"
 

-#: apt-pkg/contrib/configuration.cc:693
+#: apt-pkg/contrib/configuration.cc:697

 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"

-msgstr "语法错误 %s:%u: 文件尾部有无意义的数据"
+msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"

 
 #: apt-pkg/contrib/progress.cc:154
 #, c-format
 
 #: apt-pkg/contrib/progress.cc:154
 #, c-format


@@ -2004,7 +2012,7 @@ msgstr "无法读取文件系统挂载点 %s 的状态"
 #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44
 #, c-format
 msgid "Unable to change to %s"
 #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44
 #, c-format
 msgid "Unable to change to %s"

-msgstr "无法改变工作目录至 %s"
+msgstr "无法切换工作目录到 %s"

 
 #: apt-pkg/contrib/cdromutl.cc:190
 msgid "Failed to stat the cdrom"
 
 #: apt-pkg/contrib/cdromutl.cc:190
 msgid "Failed to stat the cdrom"


@@ -2048,7 +2056,7 @@ msgstr "子进程 %s 返回了一个错误号 (%u)"
 #: apt-pkg/contrib/fileutl.cc:373
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 #: apt-pkg/contrib/fileutl.cc:373
 #, c-format
 msgid "Sub-process %s exited unexpectedly"

-msgstr "子进程 %s 异常结束了"
+msgstr "子进程 %s 异常退出了"

 
 #: apt-pkg/contrib/fileutl.cc:417
 #, c-format
 
 #: apt-pkg/contrib/fileutl.cc:417
 #, c-format


@@ -2219,8 +2227,8 @@ msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
 
 #: apt-pkg/sourcelist.cc:270
 #, c-format
 
 #: apt-pkg/sourcelist.cc:270
 #, c-format

-msgid "Type '%s' is not known in on line %u in source list %s"
-msgstr "无法识别在安装源列表 %3$s 第 %2$u 行中的软件包类别“%1$s”"
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"

 
 #: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
 #, c-format
 
 #: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
 #, c-format


@@ -2230,7 +2238,9 @@ msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
 #: apt-pkg/sourcelist.cc:296
 #, c-format
 msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #: apt-pkg/sourcelist.cc:296
 #, c-format
 msgid "Unknown vendor ID '%s' in line %u of source list %s"

-msgstr "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的提供 vendnor ID “%1$s”"
+msgstr ""
+"在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%1"
+"$s”"

 
 #: apt-pkg/packagemanager.cc:402
 #, c-format
 
 #: apt-pkg/packagemanager.cc:402
 #, c-format


@@ -2294,7 +2304,6 @@ msgid "Packaging system '%s' is not supported"
 msgstr "不支持“%s”打包系统"
 
 #: apt-pkg/init.cc:135
 msgstr "不支持“%s”打包系统"
 
 #: apt-pkg/init.cc:135

-#, fuzzy

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


@@ -2427,7 +2436,7 @@ msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""

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

 
 #: apt-pkg/acquire-item.cc:419
 #, c-format
 
 #: apt-pkg/acquire-item.cc:419
 #, c-format